From c68dbb9073fa39850f1ac5a86c6b8e97be31edb0 Mon Sep 17 00:00:00 2001 From: fig02 Date: Mon, 28 Apr 2025 11:20:33 -0400 Subject: [PATCH] z64 - t --- include/play_state.h | 2 +- include/{z64thread.h => thread.h} | 4 ++-- include/{z64transition.h => transition.h} | 6 +++--- .../{z64transition_instances.h => transition_instances.h} | 4 ++-- src/boot/boot_main.c | 2 +- src/boot/idle.c | 2 +- src/boot/z_std_dma.c | 2 +- src/code/fault_gc.c | 2 +- src/code/fault_n64.c | 2 +- src/code/irqmgr.c | 2 +- src/code/main.c | 2 +- src/code/sched.c | 2 +- src/code/z_common_data.c | 2 +- src/code/z_fbdemo.c | 2 +- src/code/z_fbdemo_fade.c | 2 +- src/code/z_fbdemo_wipe1.c | 2 +- src/n64dd/z_n64dd.c | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) rename include/{z64thread.h => thread.h} (95%) rename include/{z64transition.h => transition.h} (97%) rename include/{z64transition_instances.h => transition_instances.h} (74%) diff --git a/include/play_state.h b/include/play_state.h index ffa6bce3c7..beacf66f14 100644 --- a/include/play_state.h +++ b/include/play_state.h @@ -23,7 +23,7 @@ #include "sfx_source.h" #include "skybox.h" #include "sram.h" -#include "z64transition.h" +#include "transition.h" #include "z64view.h" union Color_RGBA8_u32; diff --git a/include/z64thread.h b/include/thread.h similarity index 95% rename from include/z64thread.h rename to include/thread.h index c4ab827b42..c3e52a407a 100644 --- a/include/z64thread.h +++ b/include/thread.h @@ -1,5 +1,5 @@ -#ifndef Z64THREAD_H -#define Z64THREAD_H +#ifndef THREAD_H +#define THREAD_H #include "ultra64.h" diff --git a/include/z64transition.h b/include/transition.h similarity index 97% rename from include/z64transition.h rename to include/transition.h index d46683d2b3..4b6b31d4e4 100644 --- a/include/z64transition.h +++ b/include/transition.h @@ -1,5 +1,5 @@ -#ifndef Z64TRANSITION_H -#define Z64TRANSITION_H +#ifndef TRANSITION_H +#define TRANSITION_H #include "ultra64/ultratypes.h" #include "ultra64/gbi.h" // for Gfx @@ -7,7 +7,7 @@ #include "transition_fade.h" #include "transition_triforce.h" #include "transition_wipe.h" -#include "z64transition_instances.h" +#include "transition_instances.h" #define TRANS_TRIGGER_OFF 0 // transition is not active #define TRANS_TRIGGER_START 20 // start transition (exiting an area) diff --git a/include/z64transition_instances.h b/include/transition_instances.h similarity index 74% rename from include/z64transition_instances.h rename to include/transition_instances.h index cc35add03c..08e4672712 100644 --- a/include/z64transition_instances.h +++ b/include/transition_instances.h @@ -1,5 +1,5 @@ -#ifndef Z64TRANSITION_INSTANCES_H -#define Z64TRANSITION_INSTANCES_H +#ifndef TRANSITION_INSTANCES_H +#define TRANSITION_INSTANCES_H typedef enum TransitionInstanceType { /* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1, diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index 2f948b9d6a..cfe011ac33 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -10,7 +10,7 @@ #include "cic6105.h" #endif #include "z_locale.h" -#include "z64thread.h" +#include "thread.h" #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128" diff --git a/src/boot/idle.c b/src/boot/idle.c index f9d5813fbd..648ce48cf7 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -11,7 +11,7 @@ #include "translation.h" #include "versions.h" #include "vi_mode.h" -#include "z64thread.h" +#include "thread.h" #include "dma.h" #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 8060997cde..354f425de1 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -43,7 +43,7 @@ #include "yaz0.h" #endif #include "dma.h" -#include "z64thread.h" +#include "thread.h" #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:66" \ "pal-1.0:64 pal-1.1:64" diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index b2bb9d13d4..e7afa4ec81 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -56,7 +56,7 @@ #include "stackcheck.h" #include "terminal.h" #include "translation.h" -#include "z64thread.h" +#include "thread.h" void Fault_Init(void); void Fault_SetOsSyncPrintfEnabled(u32 enabled); diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c index 75fc704b91..2d31b0f323 100644 --- a/src/code/fault_n64.c +++ b/src/code/fault_n64.c @@ -10,7 +10,7 @@ #include "stack.h" #include "stackcheck.h" #include "terminal.h" -#include "z64thread.h" +#include "thread.h" #include "translation.h" #pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144" diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index ced883f7a0..bb9fc7841e 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -40,7 +40,7 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64thread.h" +#include "thread.h" vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE; volatile OSTime sIrqMgrResetTime = 0; diff --git a/src/code/main.c b/src/code/main.c index 597b121540..2405716c6c 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -41,7 +41,7 @@ extern struct IrqMgr gIrqMgr; #include "n64dd.h" #endif #include "debug.h" -#include "z64thread.h" +#include "thread.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" \ "ique-cn:0 ntsc-1.0:34 ntsc-1.1:34 ntsc-1.2:34 pal-1.0:32 pal-1.1:32" diff --git a/src/code/sched.c b/src/code/sched.c index c573bf97f6..fe1d14a0c2 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -52,7 +52,7 @@ #include "translation.h" #include "versions.h" #include "vi_mode.h" -#include "z64thread.h" +#include "thread.h" #define RSP_DONE_MSG 667 #define RDP_DONE_MSG 668 diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 299c7846c7..37d1746029 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -5,7 +5,7 @@ #include "z_locale.h" #include "environment.h" #include "save.h" -#include "z64transition.h" +#include "transition.h" #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 08c800feab..b37c4aeb39 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -17,7 +17,7 @@ #include "gfx.h" #include "printf.h" #include "z_math.h" -#include "z64transition_instances.h" +#include "transition_instances.h" // color framebuffer extern u16 D_0F000000[]; diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index 298d8654e5..4798a225a8 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -7,7 +7,7 @@ #include "translation.h" #include "z_lib.h" #include "save.h" -#include "z64transition_instances.h" +#include "transition_instances.h" typedef enum TransitionFadeDirection { /* 0 */ TRANS_FADE_DIR_IN, diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index 38b4ddb7b6..695e2828c7 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -2,7 +2,7 @@ #include "gfx.h" #include "save.h" -#include "z64transition_instances.h" +#include "transition_instances.h" typedef enum TransitionWipeDirection { /* 0 */ TRANS_WIPE_DIR_IN, diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c index 66875e3c6f..1657743061 100644 --- a/src/n64dd/z_n64dd.c +++ b/src/n64dd/z_n64dd.c @@ -14,7 +14,7 @@ #include "sys_freeze.h" #include "versions.h" #include "audio.h" -#include "z64thread.h" +#include "thread.h" #pragma increment_block_number "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"