z64 - d

include/animation.h

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

include/debug.h

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

include/debug_display.h

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

include/dma.h

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

include/draw.h

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

include/z64environment.h

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

include/z64interface.h

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

include/z64object.h

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

include/z64room.h

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

include/z64skybox.h

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

src/boot/idle.c

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

src/boot/inflate.c

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

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"

src/boot/z_std_dma.c

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

src/code/audio_thread_manager.c

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

src/code/code_n64dd_800AD410.c

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

src/code/db_camera.c

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

src/code/game.c

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

src/code/main.c

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

src/code/z_camera.c

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

src/code/z_debug.c

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

src/code/z_debug_display.c

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

src/code/z_draw.c

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

src/code/z_en_item00.c

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

src/code/z_kanfont.c

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

src/code/z_play.c

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

src/code/z_player_lib.c

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

src/code/z_sample.c

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

src/dmadata/dmadata.c

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

src/libu64/load_gc.c

@@ -2,7 +2,7 @@
 #include "ultra64.h"
 #include "printf.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) {
     s32 pad[3];

src/libu64/loadfragment2_n64.c

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

src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c

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

src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c

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

src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c

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

src/overlays/actors/ovl_En_Changer/z_en_changer.c

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

src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c

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

src/overlays/actors/ovl_En_Encount1/z_en_encount1.c

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

src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c

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

src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c

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

src/overlays/actors/ovl_En_Fr/z_en_fr.c

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

src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c

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

src/overlays/actors/ovl_En_GirlA/z_en_girla.c

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

src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c

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

src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c

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

src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c

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

src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c

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

src/overlays/actors/ovl_En_Reeba/z_en_reeba.c

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

src/overlays/actors/ovl_En_Si/z_en_si.c

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

src/overlays/actors/ovl_En_Skj/z_en_skj.c

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

src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c

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

src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c

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

src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

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

src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c

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

src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c

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

src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c

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

src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c

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

src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c

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

src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c

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

src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c

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

src/overlays/actors/ovl_player_actor/z_player.c

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