From fcc5cf828ded5d362b2e63a8868374a50df405ed Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 8 Nov 2024 02:27:19 +0100 Subject: [PATCH] libu64 (#1705) * libu64 * libu64 -O2 * Add libu64.md --- Makefile | 2 +- docs/libu64.md | 9 +++++++++ include/{ => libu64}/debug.h | 4 ++-- include/{ => libu64}/gfxprint.h | 4 ++-- include/{ => libu64}/loadfragment.h | 4 ++-- include/{padutils.h => libu64/pad.h} | 4 ++-- include/libu64/padsetup.h | 8 ++++++++ include/{ => libu64}/stackcheck.h | 4 ++-- include/{ => libu64}/system_heap.h | 4 ++-- include/padmgr.h | 3 +-- include/z64.h | 4 ++-- include/z64actor.h | 2 +- include/z64game.h | 2 +- spec | 20 +++++++++---------- src/boot/boot_main.c | 2 +- src/boot/fault.c | 2 +- src/boot/idle.c | 2 +- src/boot/irqmgr.c | 2 +- src/boot/{O2 => libu64}/debug.c | 0 src/boot/{O2 => libu64}/gfxprint.c | 2 +- src/boot/{O2 => libu64}/loadfragment.c | 2 +- src/boot/{O2 => libu64}/loadfragment2.c | 2 +- src/boot/{O2 => libu64}/mtxuty-cvt.c | 0 src/boot/{O2/padutils.c => libu64/pad.c} | 2 +- src/boot/{O2 => libu64}/padsetup.c | 3 ++- src/boot/{O2 => libu64}/rcp_utils.c | 0 src/boot/{O2 => libu64}/stackcheck.c | 2 +- src/boot/{O2 => libu64}/system_heap.c | 0 src/boot/z_std_dma.c | 2 +- src/code/PreRender.c | 2 +- src/code/game.c | 2 +- src/code/main.c | 4 ++-- src/code/padmgr.c | 1 + src/code/sched.c | 2 +- src/code/sys_flashrom.c | 2 +- src/code/sys_slowly.c | 2 +- src/code/z_DLF.c | 2 +- src/code/z_actor.c | 2 +- src/code/z_debug_mode.c | 2 +- src/code/z_effect_soft_sprite.c | 2 +- src/code/z_kaleido_manager.c | 2 +- src/code/z_overlay.c | 2 +- src/code/z_pause.c | 2 +- src/code/z_play.c | 2 +- src/code/z_room.c | 2 +- src/code/z_vimode.c | 4 ++-- .../z_en_horse_game_check.c | 2 +- .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c | 2 +- 48 files changed, 78 insertions(+), 60 deletions(-) create mode 100644 docs/libu64.md rename include/{ => libu64}/debug.h (62%) rename include/{ => libu64}/gfxprint.h (96%) rename include/{ => libu64}/loadfragment.h (95%) rename include/{padutils.h => libu64/pad.h} (87%) create mode 100644 include/libu64/padsetup.h rename include/{ => libu64}/stackcheck.h (92%) rename include/{ => libu64}/system_heap.h (75%) rename src/boot/{O2 => libu64}/debug.c (100%) rename src/boot/{O2 => libu64}/gfxprint.c (99%) rename src/boot/{O2 => libu64}/loadfragment.c (99%) rename src/boot/{O2 => libu64}/loadfragment2.c (99%) rename src/boot/{O2 => libu64}/mtxuty-cvt.c (100%) rename src/boot/{O2/padutils.c => libu64/pad.c} (98%) rename src/boot/{O2 => libu64}/padsetup.c (93%) rename src/boot/{O2 => libu64}/rcp_utils.c (100%) rename src/boot/{O2 => libu64}/stackcheck.c (98%) rename src/boot/{O2 => libu64}/system_heap.c (100%) diff --git a/Makefile b/Makefile index 9ac7f25dc5..e5b7949d1d 100644 --- a/Makefile +++ b/Makefile @@ -376,7 +376,7 @@ $(BUILD_DIR)/src/libultra/libc/%.o: OPTFLAGS := -O2 $(BUILD_DIR)/src/libultra/gu/%.o: OPTFLAGS := -O2 $(BUILD_DIR)/src/libultra/rmon/%.o: OPTFLAGS := -O2 -$(BUILD_DIR)/src/boot/O2/%.o: OPTFLAGS := -O2 +$(BUILD_DIR)/src/boot/libu64/%.o: OPTFLAGS := -O2 $(BUILD_DIR)/src/boot/libc/%.o: OPTFLAGS := -O2 $(BUILD_DIR)/src/boot/libm/%.o: OPTFLAGS := -O2 diff --git a/docs/libu64.md b/docs/libu64.md new file mode 100644 index 0000000000..095b81d551 --- /dev/null +++ b/docs/libu64.md @@ -0,0 +1,9 @@ +# libu64 + +This document explains the reasoning behind organizing the libu64 files. + +See Ocarina of Time's document on libu64: https://github.com/zeldaret/oot/blob/main/docs/libu64.md (note: the MM repo is itself referenced by that document) + +The same libu64 files from OoT exist in MM. + +Additionally MM has `loadfragment.c`, a (unused) near-copy of the libu64 file `loadfragment2.c`, and `loadfragment.c` is in the middle of libu64 files and requires `-O2`. So that file is also taken as part of libu64. diff --git a/include/debug.h b/include/libu64/debug.h similarity index 62% rename from include/debug.h rename to include/libu64/debug.h index 96d3d11c79..5bcae690ce 100644 --- a/include/debug.h +++ b/include/libu64/debug.h @@ -1,5 +1,5 @@ -#ifndef DEBUG_H -#define DEBUG_H +#ifndef LIBU64_DEBUG_H +#define LIBU64_DEBUG_H void _dbg_hungup(const char* file, int lineNum); void Reset(void); diff --git a/include/gfxprint.h b/include/libu64/gfxprint.h similarity index 96% rename from include/gfxprint.h rename to include/libu64/gfxprint.h index bcd61221b9..78819151e1 100644 --- a/include/gfxprint.h +++ b/include/libu64/gfxprint.h @@ -1,5 +1,5 @@ -#ifndef GFXPRINT_H -#define GFXPRINT_H +#ifndef LIBU64_GFXPRINT_H +#define LIBU64_GFXPRINT_H #include "ultra64.h" diff --git a/include/loadfragment.h b/include/libu64/loadfragment.h similarity index 95% rename from include/loadfragment.h rename to include/libu64/loadfragment.h index 642db25d66..7a3e5a7d99 100644 --- a/include/loadfragment.h +++ b/include/libu64/loadfragment.h @@ -1,5 +1,5 @@ -#ifndef LOADFRAGMENT_H -#define LOADFRAGMENT_H +#ifndef LIBU64_LOADFRAGMENT_H +#define LIBU64_LOADFRAGMENT_H #include "PR/ultratypes.h" #include "stdint.h" diff --git a/include/padutils.h b/include/libu64/pad.h similarity index 87% rename from include/padutils.h rename to include/libu64/pad.h index 77d3dc1cda..db9e6e4196 100644 --- a/include/padutils.h +++ b/include/libu64/pad.h @@ -1,5 +1,5 @@ -#ifndef PADUTILS_H -#define PADUTILS_H +#ifndef LIBU64_PAD_H +#define LIBU64_PAD_H #include "PR/os_cont.h" diff --git a/include/libu64/padsetup.h b/include/libu64/padsetup.h new file mode 100644 index 0000000000..0aab4a729c --- /dev/null +++ b/include/libu64/padsetup.h @@ -0,0 +1,8 @@ +#ifndef LIBU64_PADSETUP_H +#define LIBU64_PADSETUP_H + +#include "ultra64.h" + +s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status); + +#endif diff --git a/include/stackcheck.h b/include/libu64/stackcheck.h similarity index 92% rename from include/stackcheck.h rename to include/libu64/stackcheck.h index aeb55df28e..7bf5b78fb2 100644 --- a/include/stackcheck.h +++ b/include/libu64/stackcheck.h @@ -1,5 +1,5 @@ -#ifndef STACKCHECK_H -#define STACKCHECK_H +#ifndef LIBU64_STACKCHECK_H +#define LIBU64_STACKCHECK_H #include "ultra64.h" diff --git a/include/system_heap.h b/include/libu64/system_heap.h similarity index 75% rename from include/system_heap.h rename to include/libu64/system_heap.h index df572b82bc..7f8aa9d7e8 100644 --- a/include/system_heap.h +++ b/include/libu64/system_heap.h @@ -1,5 +1,5 @@ -#ifndef SYSTEM_HEAP_H -#define SYSTEM_HEAP_H +#ifndef LIBU64_SYSTEM_HEAP_H +#define LIBU64_SYSTEM_HEAP_H #include "stddef.h" #include "PR/ultratypes.h" diff --git a/include/padmgr.h b/include/padmgr.h index a012f1450e..4f5dac3b36 100644 --- a/include/padmgr.h +++ b/include/padmgr.h @@ -6,7 +6,7 @@ #include "stdbool.h" #include "irqmgr.h" -#include "padutils.h" +#include "libu64/pad.h" typedef enum { /* 0 */ PADMGR_CONT_NONE, @@ -54,7 +54,6 @@ typedef struct PadMgr { // Initialization -s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status); void PadMgr_Init(OSMesgQueue* siEvtQ, IrqMgr* irqMgr, OSId threadId, OSPri pri, void* stack); // Fetching inputs diff --git a/include/z64.h b/include/z64.h index 30cf75ed41..9d85ddfab3 100644 --- a/include/z64.h +++ b/include/z64.h @@ -16,13 +16,13 @@ #include "controller.h" #include "gfx.h" #include "gfx_setupdl.h" -#include "gfxprint.h" +#include "libu64/gfxprint.h" #include "ichain.h" #include "irqmgr.h" #include "main.h" #include "message_data_static.h" #include "padmgr.h" -#include "padutils.h" +#include "libu64/pad.h" #include "rand.h" #include "regs.h" #include "scheduler.h" diff --git a/include/z64actor.h b/include/z64actor.h index 0fe152edef..47f0c55065 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -4,7 +4,7 @@ #include "PR/ultratypes.h" #include "stdbool.h" #include "color.h" -#include "padutils.h" +#include "libu64/pad.h" #include "z64actor_dlftbls.h" #include "z64math.h" #include "z64animation.h" diff --git a/include/z64game.h b/include/z64game.h index c581ec1aca..21d314c7e0 100644 --- a/include/z64game.h +++ b/include/z64game.h @@ -7,7 +7,7 @@ #include "stdint.h" #include "gamealloc.h" #include "padmgr.h" -#include "padutils.h" +#include "libu64/pad.h" #include "romfile.h" #include "tha.h" #include "unk.h" diff --git a/spec b/spec index 89c0766c8b..398deba8ba 100644 --- a/spec +++ b/spec @@ -32,16 +32,16 @@ beginseg include "$(BUILD_DIR)/src/boot/syncprintf.o" include "$(BUILD_DIR)/src/boot/fault.o" include "$(BUILD_DIR)/src/boot/fault_drawer.o" - include "$(BUILD_DIR)/src/boot/O2/rcp_utils.o" - include "$(BUILD_DIR)/src/boot/O2/loadfragment.o" - include "$(BUILD_DIR)/src/boot/O2/loadfragment2.o" - include "$(BUILD_DIR)/src/boot/O2/padutils.o" - include "$(BUILD_DIR)/src/boot/O2/stackcheck.o" - include "$(BUILD_DIR)/src/boot/O2/gfxprint.o" - include "$(BUILD_DIR)/src/boot/O2/mtxuty-cvt.o" - include "$(BUILD_DIR)/src/boot/O2/debug.o" - include "$(BUILD_DIR)/src/boot/O2/system_heap.o" - include "$(BUILD_DIR)/src/boot/O2/padsetup.o" + include "$(BUILD_DIR)/src/boot/libu64/rcp_utils.o" + include "$(BUILD_DIR)/src/boot/libu64/loadfragment.o" + include "$(BUILD_DIR)/src/boot/libu64/loadfragment2.o" + include "$(BUILD_DIR)/src/boot/libu64/pad.o" + include "$(BUILD_DIR)/src/boot/libu64/stackcheck.o" + include "$(BUILD_DIR)/src/boot/libu64/gfxprint.o" + include "$(BUILD_DIR)/src/boot/libu64/mtxuty-cvt.o" + include "$(BUILD_DIR)/src/boot/libu64/debug.o" + include "$(BUILD_DIR)/src/boot/libu64/system_heap.o" + include "$(BUILD_DIR)/src/boot/libu64/padsetup.o" include "$(BUILD_DIR)/src/boot/libc64/math64.o" include "$(BUILD_DIR)/asm/boot/fp.text.o" // Part of libc64 include "$(BUILD_DIR)/data/boot/fp.data.o" diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index 905582fe75..1ce87d3b0a 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -2,7 +2,7 @@ #include "CIC6105.h" #include "idle.h" #include "stack.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "z64thread.h" StackEntry sBootStackInfo; diff --git a/src/boot/fault.c b/src/boot/fault.c index 36ed37da9d..8f4739e04e 100644 --- a/src/boot/fault.c +++ b/src/boot/fault.c @@ -50,7 +50,7 @@ #include "macros.h" #include "main.h" #include "vt.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "z64thread.h" FaultMgr* sFaultInstance; diff --git a/src/boot/idle.c b/src/boot/idle.c index 3c21386727..10ee965ce6 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -6,7 +6,7 @@ #include "main.h" #include "segment_symbols.h" #include "stack.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "viconfig.h" #include "z64dma.h" #include "z64thread.h" diff --git a/src/boot/irqmgr.c b/src/boot/irqmgr.c index 7311414a67..f1dec7bc66 100644 --- a/src/boot/irqmgr.c +++ b/src/boot/irqmgr.c @@ -38,7 +38,7 @@ #include "macros.h" #include "scheduler.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "z64thread.h" vs32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE; diff --git a/src/boot/O2/debug.c b/src/boot/libu64/debug.c similarity index 100% rename from src/boot/O2/debug.c rename to src/boot/libu64/debug.c diff --git a/src/boot/O2/gfxprint.c b/src/boot/libu64/gfxprint.c similarity index 99% rename from src/boot/O2/gfxprint.c rename to src/boot/libu64/gfxprint.c index c4294177c3..53e16d9626 100644 --- a/src/boot/O2/gfxprint.c +++ b/src/boot/libu64/gfxprint.c @@ -1,4 +1,4 @@ -#include "gfxprint.h" +#include "libu64/gfxprint.h" #include "attributes.h" #define GFXP_FLAG_HIRAGANA (1 << 0) diff --git a/src/boot/O2/loadfragment.c b/src/boot/libu64/loadfragment.c similarity index 99% rename from src/boot/O2/loadfragment.c rename to src/boot/libu64/loadfragment.c index 7fbcfb411a..95a5287b00 100644 --- a/src/boot/O2/loadfragment.c +++ b/src/boot/libu64/loadfragment.c @@ -12,7 +12,7 @@ #include "global.h" #include "libc64/malloc.h" -#include "loadfragment.h" +#include "libu64/loadfragment.h" s32 gFragmentLogSeverity = 2; diff --git a/src/boot/O2/loadfragment2.c b/src/boot/libu64/loadfragment2.c similarity index 99% rename from src/boot/O2/loadfragment2.c rename to src/boot/libu64/loadfragment2.c index b8dacf82d0..1899885fb2 100644 --- a/src/boot/O2/loadfragment2.c +++ b/src/boot/libu64/loadfragment2.c @@ -8,7 +8,7 @@ */ #include "global.h" #include "libc64/malloc.h" -#include "loadfragment.h" +#include "libu64/loadfragment.h" s32 gOverlayLogSeverity = 2; diff --git a/src/boot/O2/mtxuty-cvt.c b/src/boot/libu64/mtxuty-cvt.c similarity index 100% rename from src/boot/O2/mtxuty-cvt.c rename to src/boot/libu64/mtxuty-cvt.c diff --git a/src/boot/O2/padutils.c b/src/boot/libu64/pad.c similarity index 98% rename from src/boot/O2/padutils.c rename to src/boot/libu64/pad.c index 8460bc0070..d169e56ecc 100644 --- a/src/boot/O2/padutils.c +++ b/src/boot/libu64/pad.c @@ -1,4 +1,4 @@ -#include "padutils.h" +#include "libu64/pad.h" #include "PR/os_libc.h" diff --git a/src/boot/O2/padsetup.c b/src/boot/libu64/padsetup.c similarity index 93% rename from src/boot/O2/padsetup.c rename to src/boot/libu64/padsetup.c index ebbb5d828a..c6a4a49d90 100644 --- a/src/boot/O2/padsetup.c +++ b/src/boot/libu64/padsetup.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "ultra64.h" +#include "libu64/padsetup.h" s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status) { s32 ret; diff --git a/src/boot/O2/rcp_utils.c b/src/boot/libu64/rcp_utils.c similarity index 100% rename from src/boot/O2/rcp_utils.c rename to src/boot/libu64/rcp_utils.c diff --git a/src/boot/O2/stackcheck.c b/src/boot/libu64/stackcheck.c similarity index 98% rename from src/boot/O2/stackcheck.c rename to src/boot/libu64/stackcheck.c index d08dbfcb5f..de321bddd0 100644 --- a/src/boot/O2/stackcheck.c +++ b/src/boot/libu64/stackcheck.c @@ -1,4 +1,4 @@ -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "stdbool.h" #include "stdint.h" diff --git a/src/boot/O2/system_heap.c b/src/boot/libu64/system_heap.c similarity index 100% rename from src/boot/O2/system_heap.c rename to src/boot/libu64/system_heap.c diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 8e68eafffd..053d460c70 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -26,7 +26,7 @@ #include "macros.h" #include "segment_symbols.h" #include "stack.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "yaz0.h" #include "z64thread.h" diff --git a/src/code/PreRender.c b/src/code/PreRender.c index 8cae8a52ae..1b9bd0b87d 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -18,7 +18,7 @@ #include "gfxalloc.h" #include "slowly.h" #include "stack.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "sys_ucode.h" /** diff --git a/src/code/game.c b/src/code/game.c index fe8a9915af..290f474a9c 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -2,7 +2,7 @@ #include "global.h" #include "audiomgr.h" -#include "debug.h" +#include "libu64/debug.h" #include "gfx.h" #include "gfxalloc.h" #include "idle.h" diff --git a/src/code/main.c b/src/code/main.c index e2822a9a87..953cac7c03 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -35,10 +35,10 @@ struct PadMgr gPadMgr; #include "regs.h" #include "segment_symbols.h" #include "stack.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "scheduler.h" #include "sys_initial_check.h" -#include "system_heap.h" +#include "libu64/system_heap.h" #include "z64nmi_buff.h" #include "z64thread.h" diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 53eeadb996..0655bb232d 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -34,6 +34,7 @@ #include "padmgr.h" #include "libc64/sprintf.h" +#include "libu64/padsetup.h" #include "PR/os_motor.h" #include "controller.h" diff --git a/src/code/sched.c b/src/code/sched.c index 48cc5ed6d5..78f589f45b 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -6,7 +6,7 @@ #include "idle.h" #include "macros.h" #include "regs.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "viconfig.h" #include "z64speed_meter.h" #include "z64thread.h" diff --git a/src/code/sys_flashrom.c b/src/code/sys_flashrom.c index 75286d8079..27d7c61fd4 100644 --- a/src/code/sys_flashrom.c +++ b/src/code/sys_flashrom.c @@ -6,7 +6,7 @@ #include "fault.h" #include "macros.h" #include "stack.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "z64thread.h" OSMesgQueue sFlashromMesgQueue; diff --git a/src/code/sys_slowly.c b/src/code/sys_slowly.c index 47170db629..fe048650db 100644 --- a/src/code/sys_slowly.c +++ b/src/code/sys_slowly.c @@ -11,7 +11,7 @@ #include "slowly.h" #include "global.h" -#include "stackcheck.h" +#include "libu64/stackcheck.h" #include "z64thread.h" void Slowly_Main(SlowlyMgr* slowly) { diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c index e1091e5931..8c531a3b1d 100644 --- a/src/code/z_DLF.c +++ b/src/code/z_DLF.c @@ -2,7 +2,7 @@ #include "global.h" #include "libc64/malloc.h" -#include "loadfragment.h" +#include "libu64/loadfragment.h" void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { void* vramStart; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index dbc28a11ba..532aecd653 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -6,7 +6,7 @@ #include "fault.h" #include "attributes.h" #include "sys_cfb.h" -#include "loadfragment.h" +#include "libu64/loadfragment.h" // Variables are put before most headers as a hacky way to bypass bss reordering FaultClient sActorFaultClient; // 2 funcs diff --git a/src/code/z_debug_mode.c b/src/code/z_debug_mode.c index ae4c877ce4..8e24982e87 100644 --- a/src/code/z_debug_mode.c +++ b/src/code/z_debug_mode.c @@ -3,7 +3,7 @@ #include "color.h" #include "gfx.h" #include "gfxalloc.h" -#include "gfxprint.h" +#include "libu64/gfxprint.h" #include "macros.h" typedef struct { diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 4ff5c72d68..8fd5d25685 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -1,7 +1,7 @@ #include "z64effect_ss.h" #include "tha.h" -#include "loadfragment.h" +#include "libu64/loadfragment.h" #include "zelda_arena.h" #include "global.h" diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index 8b43b255fc..072c460ab3 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -2,7 +2,7 @@ #include "global.h" #include "fault.h" -#include "loadfragment.h" +#include "libu64/loadfragment.h" #define KALEIDO_OVERLAY(name) \ { NULL, ROM_FILE(ovl_##name), SEGMENT_START(ovl_##name), SEGMENT_END(ovl_##name), 0, #name } diff --git a/src/code/z_overlay.c b/src/code/z_overlay.c index a72a979ceb..b910a13c80 100644 --- a/src/code/z_overlay.c +++ b/src/code/z_overlay.c @@ -6,7 +6,7 @@ #include "z64transition.h" -#include "loadfragment.h" +#include "libu64/loadfragment.h" #include "z64lib.h" #include "zelda_arena.h" diff --git a/src/code/z_pause.c b/src/code/z_pause.c index 9f6f4a2269..f53cb9152c 100644 --- a/src/code/z_pause.c +++ b/src/code/z_pause.c @@ -22,7 +22,7 @@ #include "z64frameadvance.h" #include "controller.h" -#include "padutils.h" +#include "libu64/pad.h" #include "stdbool.h" void FrameAdvance_Init(FrameAdvanceContext* frameAdvCtx) { diff --git a/src/code/z_play.c b/src/code/z_play.c index 68d6014d52..49a9025470 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -35,7 +35,7 @@ u8 sMotionBlurStatus; #include "overlays/gamestates/ovl_daytelop/z_daytelop.h" #include "overlays/gamestates/ovl_opening/z_opening.h" #include "overlays/gamestates/ovl_file_choose/z_file_select.h" -#include "debug.h" +#include "libu64/debug.h" s32 gDbgCamEnabled = false; u8 D_801D0D54 = false; diff --git a/src/code/z_room.c b/src/code/z_room.c index cb8d42666d..e08fb1d961 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -1,6 +1,6 @@ #include "global.h" #include "PR/gs2dex.h" -#include "debug.h" +#include "libu64/debug.h" #include "sys_ucode.h" void Room_Noop(PlayState* play, Room* room, Input* input, s32 arg3) { diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index f4da13c39d..bef6c9b4a3 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -4,10 +4,10 @@ #include "PR/viint.h" #include "controller.h" -#include "debug.h" +#include "libu64/debug.h" #include "macros.h" #include "main.h" -#include "padutils.h" +#include "libu64/pad.h" #include "regs.h" typedef struct { diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index c584252226..7a378f878b 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -7,7 +7,7 @@ #include "z_en_horse_game_check.h" #include "z64horse.h" #include "assets/objects/object_horse_game_check/object_horse_game_check.h" -#include "debug.h" +#include "libu64/debug.h" #define FLAGS (ACTOR_FLAG_10) diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index c76a861771..07de4648bc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -5,7 +5,7 @@ */ #include "z_eff_ss_kakera.h" -#include "debug.h" +#include "libu64/debug.h" #define rReg0 regs[0] #define rGravity regs[1]