z64 - t

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;

include/thread.h

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

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)

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,

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"
 

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" \

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"

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);

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"

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;

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"

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

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"

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[];

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,

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,

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"