1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-17 21:35:11 +00:00
This commit is contained in:
fig02 2025-04-28 10:02:59 -04:00
parent 1e3d6005ce
commit 9284398094
60 changed files with 66 additions and 66 deletions

View file

@ -3,7 +3,7 @@
#include "avoid_ub.h" #include "avoid_ub.h"
#include "ultra64.h" #include "ultra64.h"
#include "z64dma.h" #include "dma.h"
#include "z64math.h" #include "z64math.h"
struct PlayState; struct PlayState;

View file

@ -1,5 +1,5 @@
#ifndef Z64DEBUG_H #ifndef DEBUG_H
#define Z64DEBUG_H #define DEBUG_H
#include "ultra64.h" #include "ultra64.h"

View file

@ -1,5 +1,5 @@
#ifndef Z64_DEBUG_DISPLAY_H #ifndef DEBUG_DISPLAY_H
#define Z64_DEBUG_DISPLAY_H #define DEBUG_DISPLAY_H
#include "ultra64.h" #include "ultra64.h"
#include "z64math.h" #include "z64math.h"

View file

@ -1,5 +1,5 @@
#ifndef Z64_DMA_H #ifndef DMA_H
#define Z64_DMA_H #define DMA_H
#include "ultra64.h" #include "ultra64.h"
#include "alignment.h" #include "alignment.h"

View file

@ -1,5 +1,5 @@
#ifndef Z64_DRAW_H #ifndef DRAW_H
#define Z64_DRAW_H #define DRAW_H
#include "ultra64.h" #include "ultra64.h"

View file

@ -3,7 +3,7 @@
#include "z64math.h" #include "z64math.h"
#include "z64light.h" #include "z64light.h"
#include "z64dma.h" #include "dma.h"
struct GameOverContext; struct GameOverContext;
struct MessageContext; struct MessageContext;

View file

@ -2,7 +2,7 @@
#define Z64INTERFACE_H #define Z64INTERFACE_H
#include "ultra64.h" #include "ultra64.h"
#include "z64dma.h" #include "dma.h"
#include "z64view.h" #include "z64view.h"
struct PlayState; struct PlayState;

View file

@ -2,7 +2,7 @@
#define Z64OBJECT_H #define Z64OBJECT_H
#include "ultra64.h" #include "ultra64.h"
#include "z64dma.h" #include "dma.h"
struct PlayState; struct PlayState;

View file

@ -2,7 +2,7 @@
#define Z64ROOM_H #define Z64ROOM_H
#include "ultra64.h" #include "ultra64.h"
#include "z64dma.h" #include "dma.h"
#include "z64math.h" #include "z64math.h"
struct Input; struct Input;

View file

@ -5,7 +5,7 @@
#include "ultra64/gbi.h" #include "ultra64/gbi.h"
#include "z64math.h" #include "z64math.h"
#include "z64dma.h" // for RomFile #include "dma.h" // for RomFile
struct GameState; struct GameState;
struct GraphicsContext; struct GraphicsContext;

View file

@ -12,7 +12,7 @@
#include "versions.h" #include "versions.h"
#include "vi_mode.h" #include "vi_mode.h"
#include "z64thread.h" #include "z64thread.h"
#include "z64dma.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" \ #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" "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"

View file

@ -102,7 +102,7 @@
#include "libc/stdint.h" #include "libc/stdint.h"
#include "alignment.h" #include "alignment.h"
#include "attributes.h" #include "attributes.h"
#include "z64dma.h" #include "dma.h"
typedef u8 uch; typedef u8 uch;
typedef u16 ush; typedef u16 ush;

View file

@ -2,7 +2,7 @@
#include "alignment.h" #include "alignment.h"
#include "ultra64.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" \ #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" "pal-1.1:128"

View file

@ -42,7 +42,7 @@
#if !PLATFORM_IQUE #if !PLATFORM_IQUE
#include "yaz0.h" #include "yaz0.h"
#endif #endif
#include "z64dma.h" #include "dma.h"
#include "z64thread.h" #include "z64thread.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" \ #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" \

View file

@ -11,7 +11,7 @@
#include "regs.h" #include "regs.h"
#include "speed_meter.h" #include "speed_meter.h"
#include "translation.h" #include "translation.h"
#include "z64dma.h" #include "dma.h"
void AudioMgr_NotifyTaskDone(AudioMgr* audioMgr) { void AudioMgr_NotifyTaskDone(AudioMgr* audioMgr) {
AudioTask* task = audioMgr->rspTask; AudioTask* task = audioMgr->rspTask;

View file

@ -1,5 +1,5 @@
#include "ultra64.h" #include "ultra64.h"
#include "z64dma.h" #include "dma.h"
#include "segment_symbols.h" #include "segment_symbols.h"
#include "n64dd.h" #include "n64dd.h"

View file

@ -13,8 +13,8 @@
#include "camera.h" #include "camera.h"
#include "cutscene.h" #include "cutscene.h"
#include "cutscene_spline.h" #include "cutscene_spline.h"
#include "z64debug.h" #include "debug.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64olib.h" #include "z64olib.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"

View file

@ -26,8 +26,8 @@
#include "versions.h" #include "versions.h"
#include "vi_mode.h" #include "vi_mode.h"
#include "zelda_arena.h" #include "zelda_arena.h"
#include "z64debug.h" #include "debug.h"
#include "z64dma.h" #include "dma.h"
#include "z64game.h" #include "z64game.h"
#include "z64play.h" #include "z64play.h"
#include "z64vis.h" #include "z64vis.h"

View file

@ -40,7 +40,7 @@ extern struct IrqMgr gIrqMgr;
#include "cic6105.h" #include "cic6105.h"
#include "n64dd.h" #include "n64dd.h"
#endif #endif
#include "z64debug.h" #include "debug.h"
#include "z64thread.h" #include "z64thread.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" \ #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" \

View file

@ -19,7 +19,7 @@
#include "zelda_arena.h" #include "zelda_arena.h"
#include "audio.h" #include "audio.h"
#include "cutscene_spline.h" #include "cutscene_spline.h"
#include "z64debug.h" #include "debug.h"
#include "z64olib.h" #include "z64olib.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -9,7 +9,7 @@
#include "regs.h" #include "regs.h"
#include "rumble.h" #include "rumble.h"
#include "ultra64.h" #include "ultra64.h"
#include "z64debug.h" #include "debug.h"
typedef struct DebugCamTextBufferEntry { typedef struct DebugCamTextBufferEntry {
/* 0x0 */ u8 x; /* 0x0 */ u8 x;

View file

@ -2,7 +2,7 @@
#include "gfx_setupdl.h" #include "gfx_setupdl.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "z64play.h" #include "z64play.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_keep/gameplay_keep.h"

View file

@ -1,7 +1,7 @@
#include "gfx.h" #include "gfx.h"
#include "gfx_setupdl.h" #include "gfx_setupdl.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "z64draw.h" #include "draw.h"
#include "z64play.h" #include "z64play.h"
#include "assets/objects/object_gi_key/object_gi_key.h" #include "assets/objects/object_gi_key/object_gi_key.h"

View file

@ -12,7 +12,7 @@
#include "sfx.h" #include "sfx.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64draw.h" #include "draw.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64item.h" #include "z64item.h"
#include "z64play.h" #include "z64play.h"

View file

@ -4,7 +4,7 @@
#include "segment_symbols.h" #include "segment_symbols.h"
#include "translation.h" #include "translation.h"
#include "versions.h" #include "versions.h"
#include "z64dma.h" #include "dma.h"
#include "z64font.h" #include "z64font.h"
#include "z64message.h" #include "z64message.h"

View file

@ -38,7 +38,7 @@
#include "zelda_arena.h" #include "zelda_arena.h"
#include "audio.h" #include "audio.h"
#include "cutscene_flags.h" #include "cutscene_flags.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64frame_advance.h" #include "z64frame_advance.h"
#include "z64light.h" #include "z64light.h"

View file

@ -6,7 +6,7 @@
#include "sys_matrix.h" #include "sys_matrix.h"
#include "versions.h" #include "versions.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64draw.h" #include "draw.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -4,7 +4,7 @@
#include "regs.h" #include "regs.h"
#include "sample_state.h" #include "sample_state.h"
#include "segment_symbols.h" #include "segment_symbols.h"
#include "z64dma.h" #include "dma.h"
#include "z64play.h" #include "z64play.h"
void Sample_HandleStateChange(SampleState* this) { void Sample_HandleStateChange(SampleState* this) {

View file

@ -1,4 +1,4 @@
#include "z64dma.h" #include "dma.h"
// Linker symbol declarations (used in the table below) // Linker symbol declarations (used in the table below)
#define DEFINE_DMA_ENTRY(name, _1) \ #define DEFINE_DMA_ENTRY(name, _1) \

View file

@ -2,7 +2,7 @@
#include "ultra64.h" #include "ultra64.h"
#include "printf.h" #include "printf.h"
#include "translation.h" #include "translation.h"
#include "z64dma.h" #include "dma.h"
size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr) { size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr) {
s32 pad[3]; s32 pad[3];

View file

@ -9,7 +9,7 @@
#include "libc64/malloc.h" #include "libc64/malloc.h"
#include "libu64/overlay.h" #include "libu64/overlay.h"
#include "translation.h" #include "translation.h"
#include "z64dma.h" #include "dma.h"
s32 gOverlayLogSeverity = 2; s32 gOverlayLogSeverity = 2;

View file

@ -17,7 +17,7 @@
#include "z_lib.h" #include "z_lib.h"
#include "audio.h" #include "audio.h"
#include "curve.h" #include "curve.h"
#include "z64draw.h" #include "draw.h"
#include "cutscene_flags.h" #include "cutscene_flags.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"

View file

@ -20,7 +20,7 @@
#include "translation.h" #include "translation.h"
#include "z_en_item00.h" #include "z_en_item00.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64draw.h" #include "draw.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -11,7 +11,7 @@
#include "regs.h" #include "regs.h"
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64play.h" #include "z64play.h"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

View file

@ -13,7 +13,7 @@
#include "rand.h" #include "rand.h"
#include "regs.h" #include "regs.h"
#include "terminal.h" #include "terminal.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"

View file

@ -19,7 +19,7 @@
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "audio.h" #include "audio.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"
#include "z64save.h" #include "z64save.h"

View file

@ -8,7 +8,7 @@
#include "terminal.h" #include "terminal.h"
#include "translation.h" #include "translation.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"
#include "z64save.h" #include "z64save.h"

View file

@ -16,7 +16,7 @@
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64draw.h" #include "draw.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"
#include "z64save.h" #include "z64save.h"

View file

@ -11,7 +11,7 @@
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -15,7 +15,7 @@
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "audio.h" #include "audio.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64light.h" #include "z64light.h"
#include "z64ocarina.h" #include "z64ocarina.h"

View file

@ -22,7 +22,7 @@
#include "z_en_item00.h" #include "z_en_item00.h"
#include "z_lib.h" #include "z_lib.h"
#include "audio.h" #include "audio.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -11,7 +11,7 @@
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64draw.h" #include "draw.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"

View file

@ -18,7 +18,7 @@
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -13,7 +13,7 @@
#include "sfx.h" #include "sfx.h"
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64ocarina.h" #include "z64ocarina.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -13,7 +13,7 @@
#include "versions.h" #include "versions.h"
#include "audio.h" #include "audio.h"
#include "cutscene_flags.h" #include "cutscene_flags.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64frame_advance.h" #include "z64frame_advance.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"

View file

@ -15,7 +15,7 @@
#include "versions.h" #include "versions.h"
#include "z_lib.h" #include "z_lib.h"
#include "audio.h" #include "audio.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64ocarina.h" #include "z64ocarina.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -19,7 +19,7 @@
#include "terminal.h" #include "terminal.h"
#include "z_en_item00.h" #include "z_en_item00.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -9,7 +9,7 @@
#include "sequence.h" #include "sequence.h"
#include "z_lib.h" #include "z_lib.h"
#include "audio.h" #include "audio.h"
#include "z64draw.h" #include "draw.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"
#include "z64save.h" #include "z64save.h"

View file

@ -13,7 +13,7 @@
#include "z_en_item00.h" #include "z_en_item00.h"
#include "z_lib.h" #include "z_lib.h"
#include "audio.h" #include "audio.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64face_reaction.h" #include "z64face_reaction.h"
#include "z64ocarina.h" #include "z64ocarina.h"
#include "z64effect.h" #include "z64effect.h"

View file

@ -9,7 +9,7 @@
#include "sfx.h" #include "sfx.h"
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"
#include "z64save.h" #include "z64save.h"

View file

@ -16,7 +16,7 @@
#include "quake.h" #include "quake.h"
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"

View file

@ -11,7 +11,7 @@
#include "terminal.h" #include "terminal.h"
#include "versions.h" #include "versions.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"
#include "z64save.h" #include "z64save.h"

View file

@ -13,7 +13,7 @@
#include "translation.h" #include "translation.h"
#include "z_en_item00.h" #include "z_en_item00.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -9,7 +9,7 @@
#include "printf.h" #include "printf.h"
#include "regs.h" #include "regs.h"
#include "terminal.h" #include "terminal.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"

View file

@ -9,7 +9,7 @@
#include "printf.h" #include "printf.h"
#include "regs.h" #include "regs.h"
#include "terminal.h" #include "terminal.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64item.h" #include "z64item.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"

View file

@ -13,7 +13,7 @@
#include "terminal.h" #include "terminal.h"
#include "z_lib.h" #include "z_lib.h"
#include "audio.h" #include "audio.h"
#include "z64debug_display.h" #include "debug_display.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"

View file

@ -10,7 +10,7 @@
#include "libu64/debug.h" #include "libu64/debug.h"
#include "printf.h" #include "printf.h"
#include "rand.h" #include "rand.h"
#include "z64draw.h" #include "draw.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"

View file

@ -5,7 +5,7 @@
*/ */
#include "z_item_inbox.h" #include "z_item_inbox.h"
#include "z64draw.h" #include "draw.h"
#include "z64play.h" #include "z64play.h"
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)

View file

@ -9,7 +9,7 @@
#include "libu64/debug.h" #include "libu64/debug.h"
#include "segmented_address.h" #include "segmented_address.h"
#include "sfx.h" #include "sfx.h"
#include "z64draw.h" #include "draw.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"

View file

@ -43,7 +43,7 @@
#include "z_lib.h" #include "z_lib.h"
#include "zelda_arena.h" #include "zelda_arena.h"
#include "audio.h" #include "audio.h"
#include "z64debug.h" #include "debug.h"
#include "z64effect.h" #include "z64effect.h"
#include "z64lifemeter.h" #include "z64lifemeter.h"
#include "z64ocarina.h" #include "z64ocarina.h"