From 28cc9d68cfe4a037eb232d5465b84a943539bca3 Mon Sep 17 00:00:00 2001 From: fig02 Date: Wed, 4 Jun 2025 14:38:33 -0400 Subject: Remove "z64" prefix from all headers (#2518) * z64 - a * z64 - b * z64 - c * z64 - d * z64 - e * z64 - f * z64 - g * z64 - h * z64 - i * z64 - l * z64 - m * z64 - o * z64 - p * z64 - q * z64 - r * z64 - s * z64 - t * z64 - v * restore file * fix merge * fix merge --------- Co-authored-by: Dragorn421 --- src/boot/boot_main.c | 2 +- src/boot/idle.c | 4 ++-- src/boot/inflate.c | 2 +- src/boot/yaz0.c | 2 +- src/boot/z_std_dma.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/boot') diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index 2f948b9d6..cfe011ac3 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 743219d94..648ce48cf 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -11,8 +11,8 @@ #include "translation.h" #include "versions.h" #include "vi_mode.h" -#include "z64thread.h" -#include "z64dma.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" \ "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" diff --git a/src/boot/inflate.c b/src/boot/inflate.c index d9fc7c3f8..188c3f235 100644 --- a/src/boot/inflate.c +++ b/src/boot/inflate.c @@ -102,7 +102,7 @@ #include "stdint.h" #include "alignment.h" #include "attributes.h" -#include "z64dma.h" +#include "dma.h" typedef u8 uch; typedef u16 ush; diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index eb3ce2331..601d5145e 100644 --- a/src/boot/yaz0.c +++ b/src/boot/yaz0.c @@ -2,7 +2,7 @@ #include "alignment.h" #include "ultra64.h" -#include "z64dma.h" +#include "dma.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" \ "pal-1.1:128" diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 767816854..6ab0c87f3 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -42,8 +42,8 @@ #if !PLATFORM_IQUE #include "yaz0.h" #endif -#include "z64dma.h" -#include "z64thread.h" +#include "dma.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:82" \ "pal-1.0:80 pal-1.1:80" -- cgit v1.2.3