macros.h 3/5: Split various macros (#2512)

* split out various macros

* fix

* fix2

* fix dw

* libc path

* fix macro

* does this fix bss

* fix bss

23 files changed, 32 insertions, 9 deletions

diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index 815570a96..9965a6ec0 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -41,13 +41,14 @@
  * DPad-Down disables sending fault pages over osSyncPrintf.
  */
 
-#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-eu-mq-dbg:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192" \
-                               "gc-us-mq:192 ique-cn:192"
+#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160" \
+                               "gc-us-mq:160 ique-cn:160"
 
 #include "libc64/sleep.h"
 #include "libc64/sprintf.h"
 #include "alloca.h"
 #include "controller.h"
+#include "gfx.h"
 #include "padmgr.h"
 #include "fault.h"
 #include "stack.h"
diff --git a/src/code/fault_gc_drawer.c b/src/code/fault_gc_drawer.c
index ab95a433a..a0e409df7 100644
--- a/src/code/fault_gc_drawer.c
+++ b/src/code/fault_gc_drawer.c
@@ -6,6 +6,8 @@
  */
 
 #include "fault.h"
+
+#include "gfx.h"
 #include "terminal.h"
 
 #include "global.h"
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index d83814b9b..c6c579676 100644
--- a/src/code/fault_n64.c
+++ b/src/code/fault_n64.c
@@ -3,6 +3,7 @@
 #include "libc64/sprintf.h"
 #include "controller.h"
 #include "fault.h"
+#include "gfx.h"
 #include "padmgr.h"
 #include "segmented_address.h"
 #include "stack.h"
@@ -13,7 +14,7 @@
 
 #include "global.h"
 
-#pragma increment_block_number "ntsc-1.0:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:176 pal-1.1:176"
+#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 {
     OSThread thread;
diff --git a/src/code/main.c b/src/code/main.c
index 43556b52b..6a5dae80e 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -45,7 +45,7 @@ extern struct IrqMgr gIrqMgr;
 #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:35 ntsc-1.1:35 ntsc-1.2:35 pal-1.0:33 pal-1.1:33"
+                               "ique-cn:0 ntsc-1.0:34 ntsc-1.1:34 ntsc-1.2:34 pal-1.0:32 pal-1.1:32"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 2e075daf3..8877c92ce 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -2,6 +2,7 @@
 
 #include "libu64/debug.h"
 #include "attributes.h"
+#include "gfx.h"
 #include "line_numbers.h"
 #include "printf.h"
 #include "translation.h"
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 3bd468d49..388093116 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -5,6 +5,7 @@
 #include "attributes.h"
 #include "controller.h"
 #include "db_camera.h"
+#include "gfx.h"
 #include "letterbox.h"
 #include "one_point_cutscene.h"
 #include "quake.h"
@@ -3660,7 +3661,7 @@ s32 Camera_KeepOn3(Camera* camera) {
 }
 
 #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:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+                               "ique-cn:128 ntsc-1.0:86 ntsc-1.1:86 ntsc-1.2:86 pal-1.0:86 pal-1.1:86"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;
diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c
index 2ba1864fe..699526ce7 100644
--- a/src/code/z_fbdemo_circle.c
+++ b/src/code/z_fbdemo_circle.c
@@ -1,5 +1,6 @@
 #include "transition_circle.h"
 
+#include "color.h"
 #include "gfx.h"
 #include "sfx.h"
 
diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c
index 575cb282e..29a5404ed 100644
--- a/src/code/z_jpeg.c
+++ b/src/code/z_jpeg.c
@@ -1,11 +1,12 @@
-#include "global.h"
-#include "ultra64.h"
-#include "attributes.h"
 #include "jpeg.h"
+
+#include "attributes.h"
+#include "gfx.h"
 #include "printf.h"
 #include "sys_ucode.h"
 #include "terminal.h"
 #include "translation.h"
+#include "ultra64.h"
 
 #include "macros.h"
 
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index e9f533850..d0b003f77 100644
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@@ -1,3 +1,4 @@
+#include "avoid_ub.h"
 #include "buffers.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
diff --git a/src/code/z_message.c b/src/code/z_message.c
index ab333a875..d4de077ed 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -4,6 +4,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "gfxalloc.h"
+#include "language_array.h"
 #include "memory_utils.h"
 #include "message_data_static.h"
 #if PLATFORM_N64
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 5d0166b49..944612348 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -3,6 +3,7 @@
 #include "flag_set.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "language_array.h"
 #include "main.h"
 #include "map.h"
 #include "printf.h"
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 0ca29c698..60a20e0ed 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -2,6 +2,7 @@
 #include "libc64/qrand.h"
 #include "libu64/debug.h"
 #include "buffers.h"
+#include "color.h"
 #include "controller.h"
 #include "fault.h"
 #include "file_select_state.h"
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index 2d5414793..da2ddf648 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -1,3 +1,4 @@
+#include "avoid_ub.h"
 #include "printf.h"
 #include "regs.h"
 #include "romfile.h"
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index c48983550..9e79abcbf 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -1,4 +1,5 @@
 #include "libu64/debug.h"
+#include "avoid_ub.h"
 #include "gfx.h"
 #include "printf.h"
 #include "regs.h"
diff --git a/src/code/z_view.c b/src/code/z_view.c
index 9c6be44ab..6fe82aaeb 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -2,6 +2,7 @@
 
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
+#include "avoid_ub.h"
 #include "gfx.h"
 #include "letterbox.h"
 #include "main.h"
diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c
index e28e9c4ae..877a789c6 100644
--- a/src/code/z_vimode.c
+++ b/src/code/z_vimode.c
@@ -3,6 +3,7 @@
 #include "libu64/debug.h"
 #include "ultra64/viint.h"
 #include "controller.h"
+#include "gfx.h"
 #include "main.h"
 #include "printf.h"
 #include "regs.h"
diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c
index 9d6e54ea7..f05e1b135 100644
--- a/src/n64dd/z_n64dd.c
+++ b/src/n64dd/z_n64dd.c
@@ -2,6 +2,7 @@
 // threads and provides functions to submit commands to them.
 #include "libc64/sleep.h"
 #include "fault.h"
+#include "gfx.h"
 #include "irqmgr.h"
 #include "line_numbers.h"
 #include "n64dd.h"
@@ -12,7 +13,7 @@
 #include "z64audio.h"
 #include "z64thread.h"
 
-#pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
+#pragma increment_block_number "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 typedef struct struct_801D9C30 {
     /* 0x000 */ s32 unk_000;       // disk start
diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c
index 2873f70fb..35c2d35ca 100644
--- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c
+++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c
@@ -6,6 +6,7 @@
 
 #include "z_en_mag.h"
 
+#include "avoid_ub.h"
 #include "controller.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index cc92a6b50..673855f56 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -18,6 +18,7 @@
 
 #include "libc64/qrand.h"
 #include "libu64/debug.h"
+#include "avoid_ub.h"
 #include "controller.h"
 #include "gfx.h"
 #include "gfx_setupdl.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 95ea7c7b2..63b1e2401 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -5,6 +5,7 @@
 #include "controller.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "language_array.h"
 #include "letterbox.h"
 #include "macros.h"
 #include "main.h"
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 cbc5810fd..c5eedab9c 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
@@ -4,6 +4,7 @@
 #include "controller.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "language_array.h"
 #include "printf.h"
 #include "regs.h"
 #include "rumble.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 ac366ffd4..d6a8af68f 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c
@@ -2,6 +2,7 @@
 
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "language_array.h"
 #include "map.h"
 #include "printf.h"
 #include "regs.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 d9d558f0c..34c3b46a4 100644
--- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
+++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
@@ -4,6 +4,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "gfxalloc.h"
+#include "language_array.h"
 #include "map.h"
 #if PLATFORM_N64
 #include "n64dd.h"