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

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;

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,
 };

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;
 

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

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

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 {

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 {

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;

src/code/gamealloc.c

@@ -3,8 +3,6 @@
 #include "gamealloc.h"
 #include "printf.h"
 
-#include "macros.h"
-
 void GameAlloc_Log(GameAlloc* this) {
     GameAllocEntry* iter;
 

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
 

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;

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"
 

src/code/mempak.c

@@ -11,8 +11,6 @@
 #include "padmgr.h"
 #include "printf.h"
 
-#include "macros.h"
-
 #define MEMPAK_MAX_FILES 11
 
 OSPfs sMempakPfsHandle;

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

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

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

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,

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"
 

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

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"
 

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,

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"

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

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 {

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

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"
 

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)

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;

src/code/z_collision_btltbls.c

@@ -3,8 +3,6 @@
 #include "translation.h"
 #include "z64collision_check.h"
 
-#include "macros.h"
-
 static DamageTable sDamageTablePresets[] = {
     { {
         // 0

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"

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
 

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;

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"

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"
 

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

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"

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

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

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

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"

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

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;

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

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

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, }
 

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;

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.

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"

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

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"
 

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;

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

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

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"

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"
 

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;

src/code/z_prenmi_buff.c

@@ -1,5 +1,4 @@
 #include "prenmi_buff.h"
-#include "global.h"
 
 #define COLD_RESET 0
 #define NMI 1

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"

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;

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

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,

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)
 

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;

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

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.
  */

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.

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

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;