diff options
128 files changed, 0 insertions, 256 deletions
diff --git a/include/buffers.h b/include/buffers.h index e74719c44..2a690d273 100644 --- a/include/buffers.h +++ b/include/buffers.h @@ -2,7 +2,6 @@ #define BUFFERS_H #include "gfx.h" -#include "macros.h" #include "ultra64.h" extern u16 gZBuffer[SCREEN_HEIGHT][SCREEN_WIDTH]; // 0x25800 bytes diff --git a/include/global.h b/include/global.h deleted file mode 100644 index 0b9114f96..000000000 --- a/include/global.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef GLOBAL_H -#define GLOBAL_H - -#include "macros.h" - -#endif diff --git a/include/macros.h b/include/macros.h deleted file mode 100644 index 9cb702f0b..000000000 --- a/include/macros.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef MACROS_H -#define MACROS_H - -#endif diff --git a/include/z64animation.h b/include/z64animation.h index 9db7b260d..a085da5dd 100644 --- a/include/z64animation.h +++ b/include/z64animation.h @@ -5,7 +5,6 @@ #include "ultra64.h" #include "z64dma.h" #include "z64math.h" -#include "macros.h" struct PlayState; struct Actor; diff --git a/include/z64scene.h b/include/z64scene.h index 7453f48ba..09b342c04 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -2,7 +2,6 @@ #define Z64SCENE_H #include "avoid_ub.h" -#include "macros.h" #include "ultra64.h" #include "z64bgcheck.h" #include "z64environment.h" diff --git a/include/z64view.h b/include/z64view.h index b007129f9..83bdf0fe8 100644 --- a/include/z64view.h +++ b/include/z64view.h @@ -2,7 +2,6 @@ #define Z64VIEW_H #include "avoid_ub.h" -#include "macros.h" #include "ultra64.h" #include "z64math.h" diff --git a/src/audio/general.c b/src/audio/general.c index abdbcade0..f04f203a1 100644 --- a/src/audio/general.c +++ b/src/audio/general.c @@ -13,8 +13,6 @@ #include "z64audio.h" #include "z64ocarina.h" -#include "global.h" - #define ABS_ALT(x) ((x) < 0 ? -(x) : (x)) #if !PLATFORM_N64 diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c index f05850c69..ebd968ae9 100644 --- a/src/audio/lib/load.c +++ b/src/audio/lib/load.c @@ -6,8 +6,6 @@ #include "versions.h" #include "z64audio.h" -#include "global.h" - #define MK_ASYNC_MSG(retData, tableType, id, loadStatus) \ (((retData) << 24) | ((tableType) << 16) | ((id) << 8) | (loadStatus)) #define ASYNC_TBLTYPE(v) ((u8)(v >> 16)) diff --git a/src/audio/lib/playback.c b/src/audio/lib/playback.c index 03e749437..327e271d0 100644 --- a/src/audio/lib/playback.c +++ b/src/audio/lib/playback.c @@ -1,5 +1,4 @@ #include "ultra64.h" -#include "macros.h" #include "z64audio.h" void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) { diff --git a/src/audio/lib/seqplayer.c b/src/audio/lib/seqplayer.c index c906e6728..c43ae4848 100644 --- a/src/audio/lib/seqplayer.c +++ b/src/audio/lib/seqplayer.c @@ -17,7 +17,6 @@ #include "array_count.h" #include "assert.h" #include "attributes.h" -#include "macros.h" #include "ultra64.h" #include "z64audio.h" diff --git a/src/audio/lib/thread.c b/src/audio/lib/thread.c index 43cb6d498..b47efa326 100644 --- a/src/audio/lib/thread.c +++ b/src/audio/lib/thread.c @@ -1,6 +1,5 @@ #include "array_count.h" #include "audiothread_cmd.h" -#include "macros.h" #include "ultra64.h" #include "versions.h" #include "z64audio.h" diff --git a/src/audio/session_init.c b/src/audio/session_init.c index e7248907e..3c3d9c4ae 100644 --- a/src/audio/session_init.c +++ b/src/audio/session_init.c @@ -2,8 +2,6 @@ #include "buffers.h" #include "z64audio.h" -#include "global.h" - #include "assets/audio/sequence_sizes.h" #include "assets/audio/soundfont_sizes.h" diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 9c6d7c6eb..65309942a 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -1,6 +1,5 @@ #include "array_count.h" #include "audiothread_cmd.h" -#include "macros.h" #include "printf.h" #include "sfx.h" #include "terminal.h" diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index 811c75d35..2f948b9d6 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -12,8 +12,6 @@ #include "z_locale.h" #include "z64thread.h" -#include "global.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" StackEntry sBootThreadInfo; diff --git a/src/boot/cic6105.c b/src/boot/cic6105.c index 81c0af99c..fadae3a18 100644 --- a/src/boot/cic6105.c +++ b/src/boot/cic6105.c @@ -7,8 +7,6 @@ #include "regs.h" #include "sched.h" -#include "global.h" - s32 func_80001714(void); OSTask D_800067C0_unknown = { diff --git a/src/boot/idle.c b/src/boot/idle.c index 2acfe2ddb..743219d94 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -14,8 +14,6 @@ #include "z64thread.h" #include "z64dma.h" -#include "global.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" diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c index 1340e850b..0381f57f3 100644 --- a/src/boot/viconfig.c +++ b/src/boot/viconfig.c @@ -2,8 +2,6 @@ #include "terminal.h" #include "idle.h" -#include "global.h" - s8 D_80009430 = 1; vu8 gViConfigBlack = true; u8 gViConfigAdditionalScanLines = 0; diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c index 0e3df93e4..a517f561c 100644 --- a/src/boot/z_locale.c +++ b/src/boot/z_locale.c @@ -11,9 +11,6 @@ #include "vi_mode.h" #include "z_locale.h" -#include "macros.h" -#include "global.h" - s32 gCurrentRegion = 0; typedef struct LocaleCartInfo { diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index ac91d0d82..de2a19e57 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -45,8 +45,6 @@ #include "z64dma.h" #include "z64thread.h" -#include "global.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" diff --git a/src/buffers/zbuffer.c b/src/buffers/zbuffer.c index 0eda88921..69c445b63 100644 --- a/src/buffers/zbuffer.c +++ b/src/buffers/zbuffer.c @@ -1,6 +1,5 @@ #include "alignment.h" #include "buffers.h" -#include "macros.h" #include "ultra64/ultratypes.h" ALIGNED(64) u16 gZBuffer[SCREEN_HEIGHT][SCREEN_WIDTH]; diff --git a/src/code/PreRender.c b/src/code/PreRender.c index c6cf72c59..ddf6b473e 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -13,9 +13,6 @@ #include "printf.h" #include "regs.h" -#include "macros.h" -#include "global.h" - void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg) { this->widthSave = width; this->heightSave = height; diff --git a/src/code/audio_stop_all_sfx.c b/src/code/audio_stop_all_sfx.c index 2702f8a57..b1b526e8e 100644 --- a/src/code/audio_stop_all_sfx.c +++ b/src/code/audio_stop_all_sfx.c @@ -2,8 +2,6 @@ #include "sfx.h" #include "ultra64.h" -#include "macros.h" - u8 sSfxBankIds[] = { BANK_PLAYER, BANK_ITEM, BANK_ENV, BANK_ENEMY, BANK_SYSTEM, BANK_OCARINA, BANK_VOICE, }; diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c index 5e0cbfc28..57f530a4b 100644 --- a/src/code/audio_thread_manager.c +++ b/src/code/audio_thread_manager.c @@ -13,8 +13,6 @@ #include "translation.h" #include "z64dma.h" -#include "macros.h" - void AudioMgr_NotifyTaskDone(AudioMgr* audioMgr) { AudioTask* task = audioMgr->rspTask; diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index 6204e674f..ad7c786f3 100644 --- a/src/code/debug_malloc.c +++ b/src/code/debug_malloc.c @@ -3,8 +3,6 @@ #include "printf.h" #include "translation.h" -#include "macros.h" - #define LOG_SEVERITY_NOLOG 0 #define LOG_SEVERITY_ERROR 2 #define LOG_SEVERITY_VERBOSE 3 diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index 75104362d..b2bb9d13d 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -58,8 +58,6 @@ #include "translation.h" #include "z64thread.h" -#include "global.h" - void Fault_Init(void); void Fault_SetOsSyncPrintfEnabled(u32 enabled); void Fault_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 color); diff --git a/src/code/fault_gc_drawer.c b/src/code/fault_gc_drawer.c index 044b9561b..9c2470b9b 100644 --- a/src/code/fault_gc_drawer.c +++ b/src/code/fault_gc_drawer.c @@ -7,12 +7,9 @@ #include "array_count.h" #include "fault.h" - #include "gfx.h" #include "terminal.h" -#include "global.h" - #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" typedef struct FaultDrawer { diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c index 5e071d87b..75fc704b9 100644 --- a/src/code/fault_n64.c +++ b/src/code/fault_n64.c @@ -13,8 +13,6 @@ #include "z64thread.h" #include "translation.h" -#include "global.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" typedef struct FaultMgr { diff --git a/src/code/game.c b/src/code/game.c index 536013aa9..7f63d4d64 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -32,9 +32,6 @@ #include "z64play.h" #include "z64vis.h" -#include "macros.h" -#include "global.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" SpeedMeter D_801664D0; diff --git a/src/code/gamealloc.c b/src/code/gamealloc.c index 33ad848a1..506ef7721 100644 --- a/src/code/gamealloc.c +++ b/src/code/gamealloc.c @@ -3,8 +3,6 @@ #include "gamealloc.h" #include "printf.h" -#include "macros.h" - void GameAlloc_Log(GameAlloc* this) { GameAllocEntry* iter; diff --git a/src/code/graph.c b/src/code/graph.c index 8fbb1b02f..86543cc50 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -30,9 +30,6 @@ #include "z64save.h" #include "z64play.h" -#include "macros.h" -#include "global.h" - #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index fe6b3a12f..ced883f7a 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -42,8 +42,6 @@ #include "versions.h" #include "z64thread.h" -#include "macros.h" - vu32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE; volatile OSTime sIrqMgrResetTime = 0; volatile OSTime gIrqMgrRetraceTime = 0; diff --git a/src/code/main.c b/src/code/main.c index 584e098e6..cb936b217 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -43,8 +43,6 @@ extern struct IrqMgr gIrqMgr; #include "z64debug.h" #include "z64thread.h" -#include "global.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" diff --git a/src/code/mempak.c b/src/code/mempak.c index 19c11b31d..850c478b9 100644 --- a/src/code/mempak.c +++ b/src/code/mempak.c @@ -11,8 +11,6 @@ #include "padmgr.h" #include "printf.h" -#include "macros.h" - #define MEMPAK_MAX_FILES 11 OSPfs sMempakPfsHandle; diff --git a/src/code/object_table.c b/src/code/object_table.c index 0de131824..9ed6a1f44 100644 --- a/src/code/object_table.c +++ b/src/code/object_table.c @@ -4,8 +4,6 @@ #include "ultra64.h" #include "z64object.h" -#include "macros.h" - s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD }; u32 gObjectTableSize = ARRAY_COUNT(gObjectTable); diff --git a/src/code/padmgr.c b/src/code/padmgr.c index ddea9b254..01a952c87 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -38,8 +38,6 @@ #include "translation.h" #include "line_numbers.h" -#include "macros.h" - #define PADMGR_LOG(controllerNum, msg) \ if (DEBUG_FEATURES) { \ PRINTF_COLOR_YELLOW(); \ diff --git a/src/code/sched.c b/src/code/sched.c index b009dff35..c573bf97f 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -54,9 +54,6 @@ #include "vi_mode.h" #include "z64thread.h" -#include "macros.h" -#include "global.h" - #define RSP_DONE_MSG 667 #define RDP_DONE_MSG 668 #define NOTIFY_MSG 670 // original name: ENTRY_MSG diff --git a/src/code/shrink_window.c b/src/code/shrink_window.c index a485d8168..3c92ede0e 100644 --- a/src/code/shrink_window.c +++ b/src/code/shrink_window.c @@ -2,8 +2,6 @@ #include "printf.h" #include "regs.h" -#include "macros.h" - typedef enum LetterboxState { /* 0 */ LETTERBOX_STATE_IDLE, /* 1 */ LETTERBOX_STATE_GROWING, diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 8877c92ce..38fc9c65d 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -7,8 +7,6 @@ #include "printf.h" #include "translation.h" -#include "global.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" \ "pal-1.1:128" diff --git a/src/code/sys_freeze.c b/src/code/sys_freeze.c index 427fca389..295715555 100644 --- a/src/code/sys_freeze.c +++ b/src/code/sys_freeze.c @@ -4,8 +4,6 @@ #include "sys_freeze.h" #include "terminal.h" -#include "macros.h" - NORETURN void func_800D31A0(void) { PRINTF(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST); for (;;) { diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 35f15bdaf..1ce651e9c 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -7,8 +7,6 @@ #include "z_lib.h" #include "z64math.h" -#include "macros.h" - #pragma increment_block_number "gc-eu:77 gc-eu-mq:77 gc-jp:77 gc-jp-ce:77 gc-jp-mq:77 gc-us:77 gc-us-mq:77 ique-cn:67" \ "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c index e2b70a361..0c99eaced 100644 --- a/src/code/sys_math_atan.c +++ b/src/code/sys_math_atan.c @@ -2,8 +2,6 @@ #include "sys_math.h" #include "z64math.h" -#include "macros.h" - static u16 sAtan2Tbl[] = { 0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA, 0x00F4, 0x00FF, 0x0109, 0x0113, diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 3dc86d25d..2ca488260 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -3,7 +3,6 @@ #if DEBUG_FEATURES #include "fault.h" #endif -#include "macros.h" #include "printf.h" #include "sys_matrix.h" #include "ultra64.h" diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 64e30ecaa..027202247 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -4,8 +4,6 @@ #include "translation.h" #include "z64save.h" -#include "global.h" - void Setup_InitImpl(SetupState* this) { PRINTF(T("ゼルダ共通データ初期化\n", "Zelda common data initialization\n")); SaveContext_Init(); diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 7626ed620..8d1ff6cd7 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -7,8 +7,6 @@ #include "ucode_disas.h" #include "ultra64.h" -#include "macros.h" - #if DEBUG_FEATURES typedef struct F3dzexConst { diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c index 2dbcb115b..ad2cdff11 100644 --- a/src/code/z_DLF.c +++ b/src/code/z_DLF.c @@ -6,8 +6,6 @@ #include "ultra64.h" #include "z_game_dlftbls.h" -#include "macros.h" - void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { if (overlayEntry->loadedRamAddr != NULL) { PRINTF(T("既にリンクされています\n", "Already linked\n")); diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 202b2e232..721087332 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -28,8 +28,6 @@ #include "z64save.h" #include "z64skin_matrix.h" -#include "global.h" - #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index f489e614c..1e3c6c96b 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -3,8 +3,6 @@ #include "segment_symbols.h" #include "z_actor_dlftbls.h" -#include "macros.h" - // Linker symbol declarations (used in the table below) #define DEFINE_ACTOR(name, _1, _2, _3) DECLARE_OVERLAY_SEGMENT(name) #define DEFINE_ACTOR_INTERNAL(_0, _1, _2, _3) diff --git a/src/code/z_camera_data.inc.c b/src/code/z_camera_data.inc.c index 18b071b1d..9a9795f45 100644 --- a/src/code/z_camera_data.inc.c +++ b/src/code/z_camera_data.inc.c @@ -1,8 +1,6 @@ #include "array_count.h" #include "ultra64.h" -#include "global.h" - typedef struct CameraModeValue { s16 val; s16 dataType; diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index a49a71d05..5c2a210bc 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -3,8 +3,6 @@ #include "translation.h" #include "z64collision_check.h" -#include "macros.h" - static DamageTable sDamageTablePresets[] = { { { // 0 diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 2c77d9441..dcf07766e 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1,5 +1,4 @@ #include "gfx.h" -#include "macros.h" #include "printf.h" #include "regs.h" #include "sfx.h" diff --git a/src/code/z_cutscene_spline.c b/src/code/z_cutscene_spline.c index d95b2ca7f..137f9f544 100644 --- a/src/code/z_cutscene_spline.c +++ b/src/code/z_cutscene_spline.c @@ -2,7 +2,6 @@ #include "z64math.h" #include "z64camera.h" #include "z64cutscene_spline.h" -#include "macros.h" // The code in this file is very similar to a spline system used in Super Mario 64 for cutscene camera movement diff --git a/src/code/z_debug.c b/src/code/z_debug.c index 65f8eb60a..d5804cd7e 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -11,8 +11,6 @@ #include "ultra64.h" #include "z64debug.h" -#include "macros.h" - typedef struct DebugCamTextBufferEntry { /* 0x0 */ u8 x; /* 0x1 */ u8 y; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index f45fd1933..d5135b99d 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -30,8 +30,6 @@ #include "z64player.h" #include "z64save.h" -#include "global.h" - #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h" #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h" diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index a956d3468..614cfa5b5 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -9,9 +9,6 @@ #include "z64effect.h" #include "z64skin_matrix.h" -#include "macros.h" -#include "global.h" - #include "z64.h" // required for gameplay keep, the header doesnt include any external dependencies #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index bc71d8c4f..865bd8ec9 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -10,9 +10,6 @@ #include "z64play.h" #include "z64skin_matrix.h" -#include "macros.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" static Vtx sVertices[5] = { diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index dc3ebf9d1..57ce3d9ba 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -9,9 +9,6 @@ #include "z64play.h" #include "z64skin_matrix.h" -#include "macros.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" // original name: "spark" diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 482fa99d6..2621f1c12 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -19,8 +19,6 @@ #include "z64math.h" #include "z64transition_instances.h" -#include "macros.h" - // color framebuffer extern u16 D_0F000000[]; diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c index 699526ce7..499867d57 100644 --- a/src/code/z_fbdemo_circle.c +++ b/src/code/z_fbdemo_circle.c @@ -4,8 +4,6 @@ #include "gfx.h" #include "sfx.h" -#include "global.h" - typedef enum TransitionCircleDirection { /* 0 */ TRANS_CIRCLE_DIR_IN, /* 1 */ TRANS_CIRCLE_DIR_OUT diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index c789cfd6c..1be97d5f5 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -9,8 +9,6 @@ #include "z64save.h" #include "z64transition_instances.h" -#include "macros.h" - typedef enum TransitionFadeDirection { /* 0 */ TRANS_FADE_DIR_IN, /* 1 */ TRANS_FADE_DIR_OUT diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index c12029035..d844644a2 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -1,6 +1,5 @@ #include "transition_triforce.h" -#include "global.h" #include "printf.h" #include "assets/code/fbdemo_triforce/z_fbdemo_triforce.c" diff --git a/src/code/z_fcurve_data.c b/src/code/z_fcurve_data.c index a1c03a927..a1950a568 100644 --- a/src/code/z_fcurve_data.c +++ b/src/code/z_fcurve_data.c @@ -2,7 +2,6 @@ * File: z_fcurve_data.c * Description: Interpolation functions for use with Curve SkelAnime */ -#include "global.h" #include "z64curve.h" #define FCURVE_INTERP_CUBIC 0 // Interpolate using a Hermite cubic spline diff --git a/src/code/z_frame_advance.c b/src/code/z_frame_advance.c index 5c8f685f2..6ca410a75 100644 --- a/src/code/z_frame_advance.c +++ b/src/code/z_frame_advance.c @@ -4,7 +4,6 @@ #include "controller.h" #include "libu64/pad.h" -#include "macros.h" void FrameAdvance_Init(FrameAdvanceContext* frameAdvCtx) { frameAdvCtx->timer = 0; diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index e05bcff26..f73616116 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -8,9 +8,6 @@ #include "z64play.h" #include "z64save.h" -#include "macros.h" -#include "global.h" - void GameOver_Init(PlayState* play) { play->gameOverCtx.state = GAMEOVER_INACTIVE; } diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 86c896e62..4413e8ae6 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -9,9 +9,6 @@ #include "translation.h" #include "ultra64.h" -#include "global.h" -#include "macros.h" - #define MARKER_ESCAPE 0x00 #define MARKER_SOI 0xD8 #define MARKER_SOF 0xC0 diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index efecef646..d9bca732e 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -8,8 +8,6 @@ #include "translation.h" #include "z64play.h" -#include "macros.h" - #define KALEIDO_OVERLAY(name, nameString) \ { NULL, ROM_FILE(ovl_##name), _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, 0, nameString, } diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index b50cc0f86..2707db826 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -10,8 +10,6 @@ #include "translation.h" #include "z64play.h" -#include "global.h" - void (*sKaleidoScopeUpdateFunc)(PlayState* play); void (*sKaleidoScopeDrawFunc)(PlayState* play); f32 gBossMarkScale; diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 0996a1a6e..89f5bbd3b 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -8,8 +8,6 @@ #include "z64font.h" #include "z64message.h" -#include "macros.h" - /** * Loads a texture from kanji for the requested `character` into the character texture buffer * at `codePointIndex`. The value of `character` is the SHIFT-JIS encoding of the character. diff --git a/src/code/z_lib.c b/src/code/z_lib.c index 741c982e0..e4d56b8da 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -3,7 +3,6 @@ #include "ichain.h" #include "printf.h" #include "regs.h" -#include "macros.h" #include "sys_math.h" #include "rand.h" #include "sfx.h" diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index 6751bcbee..513a61b31 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -2,8 +2,6 @@ #include "printf.h" #include "translation.h" -#include "global.h" - #define LOG_SEVERITY_NOLOG 0 #define LOG_SEVERITY_ERROR 2 #define LOG_SEVERITY_VERBOSE 3 diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index ee93a9a29..e46c70bd1 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -17,8 +17,6 @@ #include "z64player.h" #include "z64save.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 1bccd2921..402d942d6 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -16,8 +16,6 @@ #include "assets/textures/parameter_static/parameter_static.h" -#include "global.h" - typedef struct MapMarkInfo { /* 0x00 */ void* texture; /* 0x04 */ u32 imageFormat; diff --git a/src/code/z_message.c b/src/code/z_message.c index 38153dff0..046d3ff88 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -24,8 +24,6 @@ #include "z64player.h" #include "z64save.h" -#include "global.h" - #include "assets/textures/parameter_static/parameter_static.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.0:32" \ diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 2114996cb..e26ce68e7 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -3,10 +3,7 @@ */ #include "gfx.h" - -#include "macros.h" #include "printf.h" -#include "global.h" // how big to draw the characters on screen #define DISP_CHAR_WIDTH 8 diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 078567510..1498db0fb 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -25,8 +25,6 @@ #include "z64player.h" #include "z64save.h" -#include "global.h" - #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/do_action_static/do_action_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/code/z_play.c b/src/code/z_play.c index 31dbc765c..d4d28422c 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -47,8 +47,6 @@ #include "z64save.h" #include "z64vis.h" -#include "global.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 ique-cn:224" \ "ntsc-1.0:240 ntsc-1.1:240 ntsc-1.2:240 pal-1.0:240 pal-1.1:240" diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 6d50f4106..6bf73b057 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -7,9 +7,6 @@ #include "versions.h" #include "vi_mode.h" -#include "macros.h" -#include "global.h" - void func_80092320(PreNMIState* this) { this->state.running = false; this->state.init = NULL; diff --git a/src/code/z_prenmi_buff.c b/src/code/z_prenmi_buff.c index 17ef0b78c..3c45d7e54 100644 --- a/src/code/z_prenmi_buff.c +++ b/src/code/z_prenmi_buff.c @@ -1,5 +1,4 @@ #include "prenmi_buff.h" -#include "global.h" #define COLD_RESET 0 #define NMI 1 diff --git a/src/code/z_quake.c b/src/code/z_quake.c index cacb5a213..d3ba17810 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -1,6 +1,5 @@ #include "libc64/qrand.h" #include "array_count.h" -#include "macros.h" #include "printf.h" #include "quake.h" #include "terminal.h" diff --git a/src/code/z_sfx_source.c b/src/code/z_sfx_source.c index 9dda34ce3..785afcde3 100644 --- a/src/code/z_sfx_source.c +++ b/src/code/z_sfx_source.c @@ -5,8 +5,6 @@ #include "z64play.h" #include "z64skin_matrix.h" -#include "global.h" - void SfxSource_InitAll(PlayState* play) { SfxSource* sources = &play->sfxSources[0]; s32 i; diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 9e79abcbf..4e4fd97e9 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -14,8 +14,6 @@ #include "z64animation_legacy.h" #include "z64play.h" -#include "macros.h" - #define ANIM_INTERP 1 s32 LinkAnimation_Loop(PlayState* play, SkelAnime* skelAnime); diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index 5e9edf45e..36d7a0279 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -6,8 +6,6 @@ #include "translation.h" #include "z_lib.h" -#include "macros.h" - // clang-format off MtxF sMtxFClear = { 1.0f, 0.0f, 0.0f, 0.0f, diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 456e7a822..2eef6db03 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -17,8 +17,6 @@ #include "z64scene.h" #include "z64ss_sram.h" -#include "global.h" - #define SLOT_SIZE (sizeof(SaveContext) + 0x28) #define CHECKSUM_SIZE (sizeof(Save) / 2) diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c index 809786245..94e97639a 100644 --- a/src/code/z_ss_sram.c +++ b/src/code/z_ss_sram.c @@ -2,9 +2,6 @@ #include "printf.h" #include "z64ss_sram.h" -#include "macros.h" -#include "global.h" - typedef struct SsSramContext { /* 0x00 */ OSPiHandle piHandle; /* 0x74 */ OSIoMesg ioMesg; diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index 877a789c6..6eceeaa7e 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -9,9 +9,6 @@ #include "regs.h" #include "versions.h" -#include "global.h" -#include "macros.h" - void ViMode_LogPrint(OSViMode* osViMode) { LOG_ADDRESS("osvimodep", osViMode, "../z_vimode.c", 87); LOG_HEX32("osvimodep->comRegs.ctrl", osViMode->comRegs.ctrl, "../z_vimode.c", 88); diff --git a/src/code/z_viscvg.c b/src/code/z_viscvg.c index 5fff1a460..51fc6f8e5 100644 --- a/src/code/z_viscvg.c +++ b/src/code/z_viscvg.c @@ -23,8 +23,6 @@ #include "gfx.h" #include "z64vis.h" -#include "macros.h" - /** * Draws only coverage: does not retain any of the original pixel RGB, primColor is used as background color. */ diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index e3cecda5c..517f2ada6 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -15,8 +15,6 @@ #include "gfxalloc.h" #include "z64vis.h" -#include "macros.h" - // Height of the fragments the color frame buffer (CFB) is split into. // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into // the half of TMEM dedicated to color-indexed data. diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c index 8f8265bfd..431d7f6d9 100644 --- a/src/code/z_viszbuf.c +++ b/src/code/z_viszbuf.c @@ -35,8 +35,6 @@ #include "gfx.h" #include "z64vis.h" -#include "macros.h" - // Height of the fragments the z-buffer is split into. // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into TMEM. #define VISZBUF_ZBUFFRAG_HEIGHT (TMEM_SIZE / (SCREEN_WIDTH * G_IM_SIZ_16b_BYTES)) diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index f0ef9b008..2fa2122ac 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -10,8 +10,6 @@ #include "z64play.h" #include "z64save.h" -#include "global.h" - typedef struct SkyboxFaceParams { /* 0x000 */ s32 xStart; /* 0x004 */ s32 yStart; diff --git a/src/libc64/__osMalloc_gc.c b/src/libc64/__osMalloc_gc.c index a14894cfe..d6e4e17d1 100644 --- a/src/libc64/__osMalloc_gc.c +++ b/src/libc64/__osMalloc_gc.c @@ -6,8 +6,6 @@ #include "terminal.h" #include "translation.h" -#include "global.h" - #define FILL_ALLOC_BLOCK_FLAG (1 << 0) #define FILL_FREE_BLOCK_FLAG (1 << 1) #define CHECK_FREE_BLOCK_FLAG (1 << 2) diff --git a/src/libc64/__osMalloc_n64.c b/src/libc64/__osMalloc_n64.c index bb7945a5a..6b8121296 100644 --- a/src/libc64/__osMalloc_n64.c +++ b/src/libc64/__osMalloc_n64.c @@ -4,8 +4,6 @@ #include "fault.h" #include "translation.h" -#include "global.h" - #define NODE_MAGIC 0x7373 #define NODE_IS_VALID(node) ((node)->magic == NODE_MAGIC) diff --git a/src/libc64/malloc.c b/src/libc64/malloc.c index 545c86a62..8b9c9b670 100644 --- a/src/libc64/malloc.c +++ b/src/libc64/malloc.c @@ -5,8 +5,6 @@ #include "translation.h" #include "ultra64.h" -#include "macros.h" - #define LOG_SEVERITY_NOLOG 0 #define LOG_SEVERITY_ERROR 2 #define LOG_SEVERITY_VERBOSE 3 diff --git a/src/libc64/math64.c b/src/libc64/math64.c index f2a6edba9..b51eb333e 100644 --- a/src/libc64/math64.c +++ b/src/libc64/math64.c @@ -1,6 +1,5 @@ #include "libc64/math64.h" #include "z64math.h" -#include "macros.h" #if !PLATFORM_N64 s32 gUseAtanContFrac; diff --git a/src/libleo/leo/leofunc.c b/src/libleo/leo/leofunc.c index 8aaf794fd..35ba14005 100644 --- a/src/libleo/leo/leofunc.c +++ b/src/libleo/leo/leofunc.c @@ -4,8 +4,6 @@ #include "array_count.h" #include "ultra64.h" -#include "macros.h" - static s32 __leoResetCalled = false; static s32 __leoQueuesCreated = false; diff --git a/src/libleo/leo/leoutil.c b/src/libleo/leo/leoutil.c index 44240b055..e90ea1f67 100644 --- a/src/libleo/leo/leoutil.c +++ b/src/libleo/leo/leoutil.c @@ -4,8 +4,6 @@ #include "array_count.h" #include "ultra64.h" -#include "macros.h" - u16 leoLba_to_phys(u32 lba) { u16 vzone_num; u16 zone_slba; diff --git a/src/libu64/debug.c b/src/libu64/debug.c index 127820696..e1ed15fe4 100644 --- a/src/libu64/debug.c +++ b/src/libu64/debug.c @@ -3,8 +3,6 @@ #include "terminal.h" #include "translation.h" -#include "global.h" - #if PLATFORM_N64 || DEBUG_FEATURES f32 LogUtils_CheckFloatRange(const char* exp, int line, const char* valueName, f32 value, const char* minName, f32 min, const char* maxName, f32 max) { diff --git a/src/libu64/gfxprint.c b/src/libu64/gfxprint.c index 579e011f7..c47d52a3a 100644 --- a/src/libu64/gfxprint.c +++ b/src/libu64/gfxprint.c @@ -3,8 +3,6 @@ #include "attributes.h" #include "translation.h" -#include "macros.h" - u16 sGfxPrintFontTLUT[64] = { 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, diff --git a/src/libu64/load_gc.c b/src/libu64/load_gc.c index b39593d78..340780a13 100644 --- a/src/libu64/load_gc.c +++ b/src/libu64/load_gc.c @@ -4,8 +4,6 @@ #include "translation.h" #include "z64dma.h" -#include "macros.h" - size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr) { s32 pad[3]; uintptr_t end; diff --git a/src/libu64/loadfragment2_gc.c b/src/libu64/loadfragment2_gc.c index e20fcefff..5ad556e50 100644 --- a/src/libu64/loadfragment2_gc.c +++ b/src/libu64/loadfragment2_gc.c @@ -2,8 +2,6 @@ #include "libu64/overlay.h" #include "printf.h" -#include "macros.h" - void* Overlay_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd) { void* allocatedRamAddr = SYSTEM_ARENA_MALLOC_R((intptr_t)vramEnd - (intptr_t)vramStart, "../loadfragment2.c", 31); diff --git a/src/libu64/loadfragment2_n64.c b/src/libu64/loadfragment2_n64.c index 76ca03046..be0e5295d 100644 --- a/src/libu64/loadfragment2_n64.c +++ b/src/libu64/loadfragment2_n64.c @@ -11,8 +11,6 @@ #include "translation.h" #include "z64dma.h" -#include "macros.h" - s32 gOverlayLogSeverity = 2; // Extract MIPS register rs from an instruction word diff --git a/src/libu64/rcp_utils.c b/src/libu64/rcp_utils.c index f3a6ae32c..27e929f7d 100644 --- a/src/libu64/rcp_utils.c +++ b/src/libu64/rcp_utils.c @@ -2,8 +2,6 @@ #include "ultra64.h" #include "printf.h" -#include "global.h" - #if PLATFORM_N64 || DEBUG_FEATURES #define RCP_UTILS_PRINTF osSyncPrintf #elif IDO_PRINTF_WORKAROUND diff --git a/src/libu64/relocation_gc.c b/src/libu64/relocation_gc.c index 049c961fd..91d7eaf79 100644 --- a/src/libu64/relocation_gc.c +++ b/src/libu64/relocation_gc.c @@ -11,8 +11,6 @@ #include "printf.h" #include "ultra64.h" -#include "macros.h" - // Extract MIPS register rs from an instruction word #define MIPS_REG_RS(insn) (((insn) >> 0x15) & 0x1F) diff --git a/src/libu64/stackcheck.c b/src/libu64/stackcheck.c index 8c65d87d1..69fe224ee 100644 --- a/src/libu64/stackcheck.c +++ b/src/libu64/stackcheck.c @@ -5,8 +5,6 @@ #include "terminal.h" #include "translation.h" -#include "macros.h" - StackEntry* sStackInfoListStart = NULL; StackEntry* sStackInfoListEnd = NULL; diff --git a/src/libultra/io/contpfs.c b/src/libultra/io/contpfs.c index c99c31682..0506ca5d5 100644 --- a/src/libultra/io/contpfs.c +++ b/src/libultra/io/contpfs.c @@ -1,8 +1,6 @@ #include "array_count.h" #include "ultra64.h" -#include "macros.h" - s32 __osPfsInodeCacheChannel = -1; u8 __osPfsInodeCacheBank = 250; diff --git a/src/libultra/io/contreaddata.c b/src/libultra/io/contreaddata.c index 56ebf0a09..bafb2ad40 100644 --- a/src/libultra/io/contreaddata.c +++ b/src/libultra/io/contreaddata.c @@ -1,8 +1,6 @@ #include "array_count.h" #include "ultra64.h" -#include "macros.h" - s32 osContStartReadData(OSMesgQueue* mq) { s32 ret; diff --git a/src/libultra/io/controller.c b/src/libultra/io/controller.c index 97a33dc00..588e2ae9a 100644 --- a/src/libultra/io/controller.c +++ b/src/libultra/io/controller.c @@ -1,8 +1,6 @@ #include "array_count.h" #include "ultra64.h" -#include "macros.h" - OSPifRam __osContPifRam; u8 __osContLastCmd; u8 __osMaxControllers; // always 4 diff --git a/src/libultra/io/piacs.c b/src/libultra/io/piacs.c index 3b9af6d40..84cc4246b 100644 --- a/src/libultra/io/piacs.c +++ b/src/libultra/io/piacs.c @@ -1,8 +1,6 @@ #include "array_count.h" #include "ultra64.h" -#include "macros.h" - u32 __osPiAccessQueueEnabled = false; static OSMesg piAccessBuf[1]; OSMesgQueue __osPiAccessQueue; diff --git a/src/libultra/io/siacs.c b/src/libultra/io/siacs.c index 480efd31a..8359c1bdd 100644 --- a/src/libultra/io/siacs.c +++ b/src/libultra/io/siacs.c @@ -1,8 +1,6 @@ #include "array_count.h" #include "ultra64.h" -#include "macros.h" - static OSMesg siAccessBuf[1]; OSMesgQueue __osSiAccessQueue; u32 __osSiAccessQueueEnabled = false; diff --git a/src/libultra/io/vimgr.c b/src/libultra/io/vimgr.c index 1caf997d4..b4857c334 100644 --- a/src/libultra/io/vimgr.c +++ b/src/libultra/io/vimgr.c @@ -3,8 +3,6 @@ #include "stack.h" #include "ultra64.h" -#include "macros.h" - static OSThread viThread; static STACK(viThreadStack, 0x1000); static OSMesgQueue viEventQueue; diff --git a/src/n64dd/n64dd_801C8940.c b/src/n64dd/n64dd_801C8940.c index a0f975c23..132222b68 100644 --- a/src/n64dd/n64dd_801C8940.c +++ b/src/n64dd/n64dd_801C8940.c @@ -4,8 +4,6 @@ #include "libc64/sleep.h" #include "attributes.h" -#include "global.h" - s32 D_801D2EA0 = 0; u8* D_801D2EA4 = NULL; s32 D_801D2EA8 = 0; diff --git a/src/n64dd/n64dd_801C9440.c b/src/n64dd/n64dd_801C9440.c index 2d0b1b5c0..ecab855d4 100644 --- a/src/n64dd/n64dd_801C9440.c +++ b/src/n64dd/n64dd_801C9440.c @@ -1,5 +1,4 @@ // Some text-handling functions -#include "global.h" #include "n64dd.h" #include "versions.h" diff --git a/src/n64dd/n64dd_801CA0B0.c b/src/n64dd/n64dd_801CA0B0.c index a98634622..e3ba1be18 100644 --- a/src/n64dd/n64dd_801CA0B0.c +++ b/src/n64dd/n64dd_801CA0B0.c @@ -4,8 +4,6 @@ #include "attributes.h" #include "array_count.h" -#include "global.h" - // Draws text to framebuffer typedef struct struct_801CA704 { /* 0x00 */ PrintCallback callback; diff --git a/src/n64dd/n64dd_data_buffer.c b/src/n64dd/n64dd_data_buffer.c index 6aacae2d5..d4dfeb336 100644 --- a/src/n64dd/n64dd_data_buffer.c +++ b/src/n64dd/n64dd_data_buffer.c @@ -1,4 +1,3 @@ -#include "global.h" #include "n64dd.h" // Buffer used for reading from the disk? diff --git a/src/n64dd/n64dd_error_bodies.c b/src/n64dd/n64dd_error_bodies.c index 757e1afb6..9c990d76b 100644 --- a/src/n64dd/n64dd_error_bodies.c +++ b/src/n64dd/n64dd_error_bodies.c @@ -1,4 +1,3 @@ -#include "global.h" #include "n64dd.h" const char* D_801D2EE0[2][8][4] = { diff --git a/src/n64dd/n64dd_error_headers.c b/src/n64dd/n64dd_error_headers.c index b14d80fba..ee7d611c2 100644 --- a/src/n64dd/n64dd_error_headers.c +++ b/src/n64dd/n64dd_error_headers.c @@ -1,4 +1,3 @@ -#include "global.h" #include "n64dd.h" // Padding in .rodata suggests that these are in a separate file diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 6ef8c9250..3764381c1 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -11,7 +11,6 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "ichain.h" -#include "macros.h" #include "one_point_cutscene.h" #include "rand.h" #include "rumble.h" diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 1113a3926..c8e6e1545 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -34,8 +34,6 @@ #include "z64save.h" #include "z64skin_matrix.h" -#include "global.h" - #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_mo/object_mo.h" diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 15ce25734..2d741172b 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -23,8 +23,6 @@ #include "z64player.h" #include "z64save.h" -#include "global.h" - #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/object_fr/object_fr.h" diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index cb120b20c..0d03f7230 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -23,10 +23,6 @@ #include "z64player.h" #include "z64save.h" -#if PLATFORM_N64 -#include "global.h" -#endif - #include "assets/objects/object_zl2/object_zl2.h" #include "assets/objects/object_zl2_anime1/object_zl2_anime1.h" diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 63b1e2401..c3d9302ee 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -7,7 +7,6 @@ #include "gfx_setupdl.h" #include "language_array.h" #include "letterbox.h" -#include "macros.h" #include "main.h" #include "map_select_state.h" #include "memory_utils.h" @@ -34,8 +33,6 @@ #include "z64ss_sram.h" #include "z64view.h" -#include "global.h" - #if OOT_PAL_N64 #include "assets/objects/object_mag/object_mag.h" #endif diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index dc3987acd..03fb5d0f1 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -9,8 +9,6 @@ #include "z64save.h" #include "z64sram.h" -#include "macros.h" - // In iQue versions, this file contains many workarounds for EGCS internal // compiler errors (see docs/compilers.md) diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c index 77de467bf..bc7ae7edc 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c @@ -16,9 +16,6 @@ #include "z64audio.h" #include "z64save.h" -#include "macros.h" -#include "global.h" - #include "assets/textures/title_static/title_static.h" #include "assets/overlays/ovl_file_choose/ovl_file_choose.h" diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 79f76c861..84b1cb69a 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -29,8 +29,6 @@ #include "z64save.h" #include "z64sram.h" -#include "macros.h" - void MapSelect_LoadTitle(MapSelectState* this) { this->state.running = false; SET_NEXT_GAMESTATE(&this->state, ConsoleLogo_Init, ConsoleLogoState); diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index bf5029cb2..588588b24 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -29,8 +29,6 @@ #include "z64environment.h" #include "z64save.h" -#include "global.h" - #include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h" #if DEBUG_FEATURES diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index 2729bf54e..2f086413b 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -10,8 +10,6 @@ #include "z64play.h" #include "z64save.h" -#include "global.h" - #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c index d6a8af68f..c090b77fb 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c @@ -12,8 +12,6 @@ #include "z64play.h" #include "z64save.h" -#include "global.h" - #include "assets/textures/icon_item_24_static/icon_item_24_static.h" #if OOT_NTSC #include "assets/textures/icon_item_jpn_static/icon_item_jpn_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index d07720d12..2e4bda50c 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -27,8 +27,6 @@ #include "z64player.h" #include "z64save.h" -#include "global.h" - #include "assets/textures/icon_item_static/icon_item_static.h" #include "assets/textures/icon_item_24_static/icon_item_24_static.h" #if OOT_NTSC diff --git a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c index 126ceca4f..ec2c566ec 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c @@ -7,8 +7,6 @@ #include "z_lib.h" #include "z64play.h" -#include "global.h" - #include "assets/textures/parameter_static/parameter_static.h" typedef struct PauseMapMarkInfo { diff --git a/tools/ZAPD/ZAPD/ZFile.cpp b/tools/ZAPD/ZAPD/ZFile.cpp index e59c50e67..281e6132f 100644 --- a/tools/ZAPD/ZAPD/ZFile.cpp +++ b/tools/ZAPD/ZAPD/ZFile.cpp @@ -810,7 +810,6 @@ void ZFile::GenerateSourceFiles() sourceOutput += "#include \"ultra64.h\"\n"; sourceOutput += "#include \"z64.h\"\n"; - sourceOutput += "#include \"macros.h\"\n"; sourceOutput += GetHeaderInclude(); bool hasZRoom = false; |