mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-09 18:43:45 +00:00
Code Issues Projects Releases Wiki Activity

z64 - t

Browse source
This commit is contained in:
fig02 2025-04-28 11:20:33 -04:00
parent 70826d56f5
commit c68dbb9073
17 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/play_state.h
View file

@ -23,7 +23,7 @@
#include "sfx_source.h" #include "sfx_source.h"
#include "skybox.h" #include "skybox.h"
#include "sram.h" #include "sram.h"
#include "z64transition.h" #include "transition.h"
#include "z64view.h" #include "z64view.h"
union Color_RGBA8_u32; union Color_RGBA8_u32;

4
include/z64thread.h → include/thread.h
View file

@ -1,5 +1,5 @@
#ifndef Z64THREAD_H #ifndef THREAD_H
#define Z64THREAD_H #define THREAD_H
#include "ultra64.h" #include "ultra64.h"

6
include/z64transition.h → include/transition.h
View file

@ -1,5 +1,5 @@
#ifndef Z64TRANSITION_H #ifndef TRANSITION_H
#define Z64TRANSITION_H #define TRANSITION_H
#include "ultra64/ultratypes.h" #include "ultra64/ultratypes.h"
#include "ultra64/gbi.h" // for Gfx #include "ultra64/gbi.h" // for Gfx
@ -7,7 +7,7 @@
#include "transition_fade.h" #include "transition_fade.h"
#include "transition_triforce.h" #include "transition_triforce.h"
#include "transition_wipe.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_OFF 0 // transition is not active
#define TRANS_TRIGGER_START 20 // start transition (exiting an area) #define TRANS_TRIGGER_START 20 // start transition (exiting an area)

4
include/z64transition_instances.h → include/transition_instances.h
View file

@ -1,5 +1,5 @@
#ifndef Z64TRANSITION_INSTANCES_H #ifndef TRANSITION_INSTANCES_H
#define Z64TRANSITION_INSTANCES_H #define TRANSITION_INSTANCES_H
typedef enum TransitionInstanceType { typedef enum TransitionInstanceType {
/* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1, /* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1,

2
src/boot/boot_main.c
View file

@ -10,7 +10,7 @@
#include "cic6105.h" #include "cic6105.h"
#endif #endif
#include "z_locale.h" #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" #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"

2
src/boot/idle.c
View file

@ -11,7 +11,7 @@
#include "translation.h" #include "translation.h"
#include "versions.h" #include "versions.h"
#include "vi_mode.h" #include "vi_mode.h"
#include "z64thread.h" #include "thread.h"
#include "dma.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" \

2
src/boot/z_std_dma.c
View file

@ -43,7 +43,7 @@
#include "yaz0.h" #include "yaz0.h"
#endif #endif
#include "dma.h" #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" \ #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" "pal-1.0:64 pal-1.1:64"

2
src/code/fault_gc.c
View file

@ -56,7 +56,7 @@
#include "stackcheck.h" #include "stackcheck.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h" #include "translation.h"
#include "z64thread.h" #include "thread.h"
void Fault_Init(void); void Fault_Init(void);
void Fault_SetOsSyncPrintfEnabled(u32 enabled); void Fault_SetOsSyncPrintfEnabled(u32 enabled);

2
src/code/fault_n64.c
View file

@ -10,7 +10,7 @@
#include "stack.h" #include "stack.h"
#include "stackcheck.h" #include "stackcheck.h"
#include "terminal.h" #include "terminal.h"
#include "z64thread.h" #include "thread.h"
#include "translation.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" #pragma increment_block_number "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144"

2
src/code/irqmgr.c
View file

@ -40,7 +40,7 @@
#include "terminal.h" #include "terminal.h"
#include "translation.h" #include "translation.h"
#include "versions.h" #include "versions.h"
#include "z64thread.h" #include "thread.h"
vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE; vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE;
volatile OSTime sIrqMgrResetTime = 0; volatile OSTime sIrqMgrResetTime = 0;

2
src/code/main.c
View file

@ -41,7 +41,7 @@ extern struct IrqMgr gIrqMgr;
#include "n64dd.h" #include "n64dd.h"
#endif #endif
#include "debug.h" #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" \ #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" "ique-cn:0 ntsc-1.0:34 ntsc-1.1:34 ntsc-1.2:34 pal-1.0:32 pal-1.1:32"

2
src/code/sched.c
View file

@ -52,7 +52,7 @@
#include "translation.h" #include "translation.h"
#include "versions.h" #include "versions.h"
#include "vi_mode.h" #include "vi_mode.h"
#include "z64thread.h" #include "thread.h"
#define RSP_DONE_MSG 667 #define RSP_DONE_MSG 667
#define RDP_DONE_MSG 668 #define RDP_DONE_MSG 668

2
src/code/z_common_data.c
View file

@ -5,7 +5,7 @@
#include "z_locale.h" #include "z_locale.h"
#include "environment.h" #include "environment.h"
#include "save.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" \ #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" "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"

2
src/code/z_fbdemo.c
View file

@ -17,7 +17,7 @@
#include "gfx.h" #include "gfx.h"
#include "printf.h" #include "printf.h"
#include "z_math.h" #include "z_math.h"
#include "z64transition_instances.h" #include "transition_instances.h"
// color framebuffer // color framebuffer
extern u16 D_0F000000[]; extern u16 D_0F000000[];

2
src/code/z_fbdemo_fade.c
View file

@ -7,7 +7,7 @@
#include "translation.h" #include "translation.h"
#include "z_lib.h" #include "z_lib.h"
#include "save.h" #include "save.h"
#include "z64transition_instances.h" #include "transition_instances.h"
typedef enum TransitionFadeDirection { typedef enum TransitionFadeDirection {
/* 0 */ TRANS_FADE_DIR_IN, /* 0 */ TRANS_FADE_DIR_IN,

2
src/code/z_fbdemo_wipe1.c
View file

@ -2,7 +2,7 @@
#include "gfx.h" #include "gfx.h"
#include "save.h" #include "save.h"
#include "z64transition_instances.h" #include "transition_instances.h"
typedef enum TransitionWipeDirection { typedef enum TransitionWipeDirection {
/* 0 */ TRANS_WIPE_DIR_IN, /* 0 */ TRANS_WIPE_DIR_IN,

2
src/n64dd/z_n64dd.c
View file

@ -14,7 +14,7 @@
#include "sys_freeze.h" #include "sys_freeze.h"
#include "versions.h" #include "versions.h"
#include "audio.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" #pragma increment_block_number "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"