Delete macros.h; Delete global.h (#2516)

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

include/global.h

@@ -1,6 +0,0 @@
-#ifndef GLOBAL_H
-#define GLOBAL_H
-
-#include "macros.h"
-
-#endif

include/macros.h

@@ -1,4 +0,0 @@
-#ifndef MACROS_H
-#define MACROS_H
-
-#endif

include/z64animation.h

@@ -5,7 +5,6 @@
 #include "ultra64.h"
 #include "z64dma.h"
 #include "z64math.h"
-#include "macros.h"
 
 struct PlayState;
 struct Actor;

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"

include/z64view.h

@@ -2,7 +2,6 @@
 #define Z64VIEW_H
 
 #include "avoid_ub.h"
-#include "macros.h"
 #include "ultra64.h"
 #include "z64math.h"
 

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

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

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

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"
 

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"

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"
 

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"

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;

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 = {

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"
 

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;

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 {

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"
 

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