Merge branch 'main' of github.com:zeldaret/oot into k0

include/macros.h

@@ -1,7 +1,6 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "terminal.h"
 #include "versions.h"
 
 #define SCREEN_WIDTH  320
@@ -13,13 +12,6 @@
 #define BAD_RETURN(type) void
 #endif
 
-/**
- * The T macro holds translations in English for original debug strings written in Japanese.
- * The translated strings match the original debug strings, they are only direct translations.
- * For example, any original name is left as is rather than being replaced with the name in the codebase.
- */
-#define T(jp, en) jp
-
 #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
 #define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0]))
 #define ARRAY_COUNT_2D(arr) (s32)(sizeof(arr) / sizeof(arr[0][0]))
@@ -42,50 +34,6 @@
 
 #define CHECK_FLAG_ALL(flags, mask) (((flags) & (mask)) == (mask))
 
-// IDO doesn't support variadic macros, but it merely throws a warning for the
-// number of arguments not matching the definition (warning 609) instead of
-// throwing an error. We suppress this warning and rely on GCC to catch macro
-// argument errors instead.
-// Note some tools define __sgi but preprocess with a modern cpp implementation,
-// ensure that these do not use the IDO workaround to avoid errors.
-#define IDO_PRINTF_WORKAROUND (__sgi && !__GNUC__ && !M2CTX)
-
-#if DEBUG_FEATURES
-#define PRINTF osSyncPrintf
-#elif defined(EGCS)
-#define PRINTF(format, args...) while (0) osSyncPrintf(format, ##args)
-#elif IDO_PRINTF_WORKAROUND
-#define PRINTF(args) (void)0
-#else
-#define PRINTF(format, ...) (void)0
-#endif
-
-#if DEBUG_FEATURES
-#define PRINTF_COLOR_BLACK()    PRINTF(VT_FGCOL(BLACK))
-#define PRINTF_COLOR_RED()      PRINTF(VT_FGCOL(RED))
-#define PRINTF_COLOR_GREEN()    PRINTF(VT_FGCOL(GREEN))
-#define PRINTF_COLOR_YELLOW()   PRINTF(VT_FGCOL(YELLOW))
-#define PRINTF_COLOR_BLUE()     PRINTF(VT_FGCOL(BLUE))
-#define PRINTF_COLOR_MAGENTA()  PRINTF(VT_FGCOL(MAGENTA))
-#define PRINTF_COLOR_CYAN()     PRINTF(VT_FGCOL(CYAN))
-#define PRINTF_COLOR_WHITE()    PRINTF(VT_FGCOL(WHITE))
-#define PRINTF_COLOR_WARNING()  PRINTF(VT_COL(YELLOW, BLACK))
-#define PRINTF_COLOR_ERROR()    PRINTF(VT_COL(RED, WHITE))
-#define PRINTF_RST()            PRINTF(VT_RST)
-#else
-#define PRINTF_COLOR_BLACK()    (void)0
-#define PRINTF_COLOR_RED()      (void)0
-#define PRINTF_COLOR_GREEN()    (void)0
-#define PRINTF_COLOR_YELLOW()   (void)0
-#define PRINTF_COLOR_BLUE()     (void)0
-#define PRINTF_COLOR_MAGENTA()  (void)0
-#define PRINTF_COLOR_CYAN()     (void)0
-#define PRINTF_COLOR_WHITE()    (void)0
-#define PRINTF_COLOR_WARNING()  (void)0
-#define PRINTF_COLOR_ERROR()    (void)0
-#define PRINTF_RST()            (void)0
-#endif
-
 #if PLATFORM_N64 || DEBUG_FEATURES
 #define HUNGUP_AND_CRASH(file, line) Fault_AddHungupAndCrash(file, line)
 #else

include/printf.h

@@ -0,0 +1,51 @@
+#ifndef PRINTF_H
+#define PRINTF_H
+
+#include "terminal.h"
+#include "ultra64.h"
+
+// IDO doesn't support variadic macros, but it merely throws a warning for the
+// number of arguments not matching the definition (warning 609) instead of
+// throwing an error. We suppress this warning and rely on GCC to catch macro
+// argument errors instead.
+// Note some tools define __sgi but preprocess with a modern cpp implementation,
+// ensure that these do not use the IDO workaround to avoid errors.
+#define IDO_PRINTF_WORKAROUND (__sgi && !__GNUC__ && !M2CTX)
+
+#if DEBUG_FEATURES
+#define PRINTF osSyncPrintf
+#elif defined(EGCS)
+#define PRINTF(format, args...) while (0) osSyncPrintf(format, ##args)
+#elif IDO_PRINTF_WORKAROUND
+#define PRINTF(args) (void)0
+#else
+#define PRINTF(format, ...) (void)0
+#endif
+
+#if DEBUG_FEATURES
+#define PRINTF_COLOR_BLACK()    PRINTF(VT_FGCOL(BLACK))
+#define PRINTF_COLOR_RED()      PRINTF(VT_FGCOL(RED))
+#define PRINTF_COLOR_GREEN()    PRINTF(VT_FGCOL(GREEN))
+#define PRINTF_COLOR_YELLOW()   PRINTF(VT_FGCOL(YELLOW))
+#define PRINTF_COLOR_BLUE()     PRINTF(VT_FGCOL(BLUE))
+#define PRINTF_COLOR_MAGENTA()  PRINTF(VT_FGCOL(MAGENTA))
+#define PRINTF_COLOR_CYAN()     PRINTF(VT_FGCOL(CYAN))
+#define PRINTF_COLOR_WHITE()    PRINTF(VT_FGCOL(WHITE))
+#define PRINTF_COLOR_WARNING()  PRINTF(VT_COL(YELLOW, BLACK))
+#define PRINTF_COLOR_ERROR()    PRINTF(VT_COL(RED, WHITE))
+#define PRINTF_RST()            PRINTF(VT_RST)
+#else
+#define PRINTF_COLOR_BLACK()    (void)0
+#define PRINTF_COLOR_RED()      (void)0
+#define PRINTF_COLOR_GREEN()    (void)0
+#define PRINTF_COLOR_YELLOW()   (void)0
+#define PRINTF_COLOR_BLUE()     (void)0
+#define PRINTF_COLOR_MAGENTA()  (void)0
+#define PRINTF_COLOR_CYAN()     (void)0
+#define PRINTF_COLOR_WHITE()    (void)0
+#define PRINTF_COLOR_WARNING()  (void)0
+#define PRINTF_COLOR_ERROR()    (void)0
+#define PRINTF_RST()            (void)0
+#endif
+
+#endif

include/translation.h

@@ -0,0 +1,16 @@
+#ifndef TRANSLATION_H
+#define TRANSLATION_H
+
+/**
+ * The "T" macro holds translations in English for original debug strings written in Japanese.
+ * The translated strings are only direct translations. Certain names or terms may not reflect
+ * their in-game localized counterparts.
+ *
+ * To use translated English strings in the build, change the definition below to "en".
+ *
+ * Note: This translation macro exists for quality of life purposes.
+ *       The original game would not have had a macro like this.
+ */
+#define T(jp, en) jp
+
+#endif

src/audio/general.c

@@ -4,6 +4,7 @@
 #include "audiothread_cmd.h"
 #include "controller.h"
 #include "padmgr.h"
+#include "printf.h"
 #include "seqcmd.h"
 #include "sequence.h"
 #include "sfx.h"

src/audio/sfx.c

@@ -1,5 +1,6 @@
 #include "audiothread_cmd.h"
 #include "macros.h"
+#include "printf.h"
 #include "sfx.h"
 #include "terminal.h"
 #include "ultra64.h"

src/boot/idle.c

@@ -2,10 +2,12 @@
 #include "build.h"
 #include "idle.h"
 #include "main.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "vi_mode.h"
 #include "z64thread.h"

src/boot/viconfig.c

@@ -1,3 +1,4 @@
+#include "printf.h"
 #include "terminal.h"
 #include "idle.h"
 

src/boot/z_locale.c

@@ -3,8 +3,10 @@
 #include "carthandle.h"
 #include "line_numbers.h"
 #include "padmgr.h"
+#include "printf.h"
 #include "region.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "vi_mode.h"
 #include "z_locale.h"

src/boot/z_std_dma.c

@@ -32,10 +32,12 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"
 #include "terminal.h"
+#include "translation.h"
 #if !PLATFORM_IQUE
 #include "yaz0.h"
 #endif

src/code/PreRender.c

@@ -10,6 +10,7 @@
 #include "color.h"
 #include "gfx.h"
 #include "prerender.h"
+#include "printf.h"
 #include "regs.h"
 
 #include "macros.h"

src/code/audio_thread_manager.c

@@ -6,8 +6,10 @@
  */
 
 #include "audiomgr.h"
+#include "printf.h"
 #include "regs.h"
 #include "speed_meter.h"
+#include "translation.h"
 #include "z64dma.h"
 
 #include "macros.h"

src/code/db_camera.c

@@ -5,6 +5,7 @@
 #include "debug_arena.h"
 #include "letterbox.h"
 #include "mempak.h"
+#include "printf.h"
 #include "regs.h"
 #include "sfx.h"
 #include "z_lib.h"

src/code/debug_malloc.c

@@ -1,5 +1,7 @@
 #include "libc64/os_malloc.h"
 #include "debug_arena.h"
+#include "printf.h"
+#include "translation.h"
 
 #include "macros.h"
 

src/code/fault_gc.c

@@ -53,6 +53,7 @@
 #include "stack.h"
 #include "stackcheck.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z64thread.h"
 
 #include "global.h"

src/code/fault_n64.c

@@ -9,6 +9,7 @@
 #include "stackcheck.h"
 #include "terminal.h"
 #include "z64thread.h"
+#include "translation.h"
 
 #include "global.h"
 

src/code/game.c

@@ -15,11 +15,13 @@
 #include "n64dd.h"
 #endif
 #include "padmgr.h"
+#include "printf.h"
 #include "regs.h"
 #include "rumble.h"
 #include "speed_meter.h"
 #include "sys_debug_controller.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "vi_mode.h"
 #include "zelda_arena.h"

src/code/gamealloc.c

@@ -1,6 +1,7 @@
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
 #include "gamealloc.h"
+#include "printf.h"
 
 #include "macros.h"
 

src/code/graph.c

@@ -12,6 +12,7 @@
 #include "map_select_state.h"
 #include "prenmi_buff.h"
 #include "prenmi_state.h"
+#include "printf.h"
 #include "regs.h"
 #include "setup_state.h"
 #include "speed_meter.h"
@@ -20,6 +21,7 @@
 #include "sys_ucode.h"
 #include "terminal.h"
 #include "title_setup_state.h"
+#include "translation.h"
 #include "ucode_disas.h"
 #include "versions.h"
 #include "vi_mode.h"
@@ -35,7 +37,7 @@
 #define GFXPOOL_TAIL_MAGIC 0x5678
 
 #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:128" \
-                               "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+                               "ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224"
 
 /**
  * The time at which the previous `Graph_Update` ended.

src/code/irqmgr.c

@@ -34,8 +34,10 @@
  */
 #include "libu64/debug.h"
 #include "irqmgr.h"
+#include "printf.h"
 #include "stackcheck.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64thread.h"
 

src/code/main.c

@@ -26,12 +26,14 @@ extern struct IrqMgr gIrqMgr;
 #include "idle.h"
 #include "padmgr.h"
 #include "prenmi_buff.h"
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "segmented_address.h"
 #include "stack.h"
 #include "stackcheck.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #if PLATFORM_N64
 #include "cic6105.h"

src/code/mempak.c

@@ -9,6 +9,7 @@
  */
 #include "mempak.h"
 #include "padmgr.h"
+#include "printf.h"
 
 #include "macros.h"
 

src/code/padmgr.c

@@ -32,8 +32,10 @@
 #include "libu64/padsetup.h"
 #include "macros.h"
 #include "padmgr.h"
+#include "printf.h"
 #include "fault.h"
 #include "terminal.h"
+#include "translation.h"
 #include "line_numbers.h"
 
 #define PADMGR_LOG(controllerNum, msg)                                                                \

src/code/sched.c

@@ -44,9 +44,11 @@
 #include "fault.h"
 #include "irqmgr.h"
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "sched.h"
 #include "speed_meter.h"
+#include "translation.h"
 #include "versions.h"
 #include "vi_mode.h"
 #include "z64thread.h"

src/code/shrink_window.c

@@ -1,4 +1,5 @@
 #include "letterbox.h"
+#include "printf.h"
 #include "regs.h"
 
 #include "macros.h"

src/code/speed_meter.c

@@ -3,6 +3,7 @@
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
 #include "gfx.h"
+#include "printf.h"
 #include "regs.h"
 #include "speed_meter.h"
 #include "terminal.h"

src/code/sys_cfb.c

@@ -3,6 +3,9 @@
 #include "libu64/debug.h"
 #include "attributes.h"
 #include "line_numbers.h"
+#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" \

src/code/sys_freeze.c

@@ -1,5 +1,6 @@
 #include "libc64/sleep.h"
 #include "attributes.h"
+#include "printf.h"
 #include "sys_freeze.h"
 #include "terminal.h"
 

src/code/sys_math3d.c

@@ -1,9 +1,13 @@
+#include "sys_math3d.h"
+
+#include "printf.h"
+#include "terminal.h"
+#include "translation.h"
 #include "ultra64.h"
 #include "z_lib.h"
 #include "z64math.h"
-#include "terminal.h"
+
 #include "macros.h"
-#include "sys_math3d.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_matrix.c

@@ -4,6 +4,7 @@
 #include "fault.h"
 #endif
 #include "macros.h"
+#include "printf.h"
 #include "sys_matrix.h"
 #include "ultra64.h"
 #include "z_lib.h"

src/code/title_setup.c

@@ -1,6 +1,7 @@
 #include "console_logo_state.h"
 #include "setup_state.h"
-
+#include "printf.h"
+#include "translation.h"
 #include "z64save.h"
 
 #include "global.h"

src/code/ucode_disas.c

@@ -2,7 +2,9 @@
 #include "ultra64.h"
 #include "ultra64/gs2dex.h"
 #include "libu64/mtxuty-cvt.h"
+#include "printf.h"
 #include "segmented_address.h"
+#include "translation.h"
 
 #include "macros.h"
 

src/code/z_DLF.c

@@ -1,6 +1,8 @@
 #include "libc64/malloc.h"
 #include "libu64/overlay.h"
+#include "printf.h"
 #include "terminal.h"
+#include "translation.h"
 #include "ultra64.h"
 #include "z_game_dlftbls.h"
 

src/code/z_actor.c

@@ -3,6 +3,7 @@
 #include "fault.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "quake.h"
 #include "rand.h"
 #include "regs.h"
@@ -12,6 +13,7 @@
 #include "sys_math.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "z_lib.h"

src/code/z_actor_dlftbls.c

@@ -1,4 +1,5 @@
 #include "fault.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "z_actor_dlftbls.h"
 

src/code/z_bg_collect.c

@@ -1,4 +1,6 @@
+#include "printf.h"
 #include "terminal.h"
+#include "translation.h"
 #include "ultra64.h"
 #include "z64actor.h"
 #include "z64bgcheck.h"

src/code/z_bgcheck.c

@@ -1,10 +1,12 @@
 #include "libu64/debug.h"
 #include "attributes.h"
 #include "line_numbers.h"
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_math3d.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64bgcheck.h"
 #include "z64play.h"

src/code/z_camera.c

@@ -8,10 +8,12 @@
 #include "letterbox.h"
 #include "one_point_cutscene.h"
 #include "quake.h"
+#include "printf.h"
 #include "regs.h"
 #include "sfx.h"
 #include "sys_math3d.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
 #include "z64audio.h"

src/code/z_collision_btltbls.c

@@ -1,4 +1,7 @@
+#include "printf.h"
+#include "translation.h"
 #include "z64collision_check.h"
+
 #include "macros.h"
 
 static DamageTable sDamageTablePresets[] = {

src/code/z_collision_check.c

@@ -1,10 +1,12 @@
 #include "gfx.h"
 #include "macros.h"
+#include "printf.h"
 #include "regs.h"
 #include "sfx.h"
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64collision_check.h"
 #include "z64effect.h"

src/code/z_construct.c

@@ -1,6 +1,8 @@
 #include "map.h"
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64lifemeter.h"
 #include "z64interface.h"

src/code/z_demo.c

@@ -10,6 +10,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "rumble.h"
 #include "quake.h"
@@ -17,6 +18,7 @@
 #include "seqcmd.h"
 #include "sequence.h"
 #include "sfx.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64audio.h"
 #include "z64camera.h"

src/code/z_eff_blure.c

@@ -1,8 +1,10 @@
 #include "libc64/math64.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "sys_math3d.h"
 #include "sys_matrix.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64skin_matrix.h"

src/code/z_eff_shield_particle.c

@@ -1,7 +1,9 @@
 #include "libc64/qrand.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z64effect.h"
 #include "z64light.h"
 #include "z64play.h"

src/code/z_eff_spark.c

@@ -1,7 +1,9 @@
 #include "libc64/qrand.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "sys_matrix.h"
+#include "translation.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64skin_matrix.h"

src/code/z_effect.c

@@ -1,4 +1,6 @@
 #include "gfx.h"
+#include "printf.h"
+#include "translation.h"
 #include "z64effect.h"
 #include "z64frame_advance.h"
 #include "z64play.h"

src/code/z_effect_soft_sprite.c

@@ -1,6 +1,8 @@
 #include "libu64/overlay.h"
+#include "printf.h"
 #include "sfx.h"
 #include "terminal.h"
+#include "translation.h"
 #include "zelda_arena.h"
 #include "z64frame_advance.h"
 #include "z64effect.h"

src/code/z_fbdemo.c

@@ -15,6 +15,7 @@
 #include "libc64/sleep.h"
 #include "libu64/debug.h"
 #include "gfx.h"
+#include "printf.h"
 #include "z64math.h"
 #include "z64transition_instances.h"
 

src/code/z_fbdemo_fade.c

@@ -1,8 +1,10 @@
 #include "transition_fade.h"
 
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64save.h"
 #include "z64transition_instances.h"

src/code/z_fbdemo_triforce.c

@@ -1,6 +1,7 @@
 #include "transition_triforce.h"
 
 #include "global.h"
+#include "printf.h"
 
 #include "assets/code/fbdemo_triforce/z_fbdemo_triforce.c"
 

src/code/z_fcurve_data_skelanime.c

@@ -26,9 +26,11 @@
  */
 
 #include "gfx.h"
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
+#include "translation.h"
 #include "zelda_arena.h"
 #include "z64actor.h"
 #include "z64curve.h"

src/code/z_horse.c

@@ -1,6 +1,8 @@
 #include "terminal.h"
 #include "z_lib.h"
+#include "printf.h"
 #include "regs.h"
+#include "translation.h"
 #include "z64horse.h"
 #include "z64play.h"
 #include "z64player.h"

src/code/z_inventory.c

@@ -1,4 +1,6 @@
 #include "ultra64.h"
+#include "printf.h"
+#include "translation.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"

src/code/z_jpeg.c

@@ -2,8 +2,10 @@
 #include "ultra64.h"
 #include "attributes.h"
 #include "jpeg.h"
+#include "printf.h"
 #include "sys_ucode.h"
 #include "terminal.h"
+#include "translation.h"
 
 #include "macros.h"
 

src/code/z_kaleido_manager.c

@@ -1,8 +1,10 @@
 #include "libu64/debug.h"
 #include "libu64/overlay.h"
 #include "kaleido_manager.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z64play.h"
 
 #include "macros.h"

src/code/z_kaleido_scope_call.c

@@ -4,8 +4,10 @@
 #include "libu64/debug.h"
 #include "kaleido_manager.h"
 #include "letterbox.h"
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z64play.h"
 
 #include "global.h"

src/code/z_kaleido_setup.c

@@ -3,6 +3,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "z64audio.h"
 #include "z64play.h"

src/code/z_kanfont.c

@@ -1,6 +1,8 @@
 #include "kanread.h"
 #include "message_data_static.h"
+#include "printf.h"
 #include "segment_symbols.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64dma.h"
 #include "z64font.h"

src/code/z_kankyo.c

@@ -8,6 +8,7 @@
 #include "gfx_setupdl.h"
 #include "gfxalloc.h"
 #include "ultra64.h"
+#include "printf.h"
 #include "regs.h"
 #include "rumble.h"
 #include "segment_symbols.h"
@@ -19,6 +20,7 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
 #include "z64audio.h"

src/code/z_lib.c

@@ -1,6 +1,7 @@
 #include "ultra64.h"
 #include "z_lib.h"
 #include "ichain.h"
+#include "printf.h"
 #include "regs.h"
 #include "macros.h"
 #include "sys_math.h"

src/code/z_malloc.c

@@ -1,5 +1,8 @@
-#include "global.h"
 #include "libc64/os_malloc.h"
+#include "printf.h"
+#include "translation.h"
+
+#include "global.h"
 
 #define LOG_SEVERITY_NOLOG 0
 #define LOG_SEVERITY_ERROR 2

src/code/z_map_exp.c

@@ -5,11 +5,13 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z64map_mark.h"
 #include "z64play.h"
 #include "z64player.h"

src/code/z_map_mark.c

@@ -1,18 +1,21 @@
 #include "libu64/debug.h"
 #include "libu64/overlay.h"
 #include "map.h"
+#include "printf.h"
+#if PLATFORM_N64
+#include "n64dd.h"
+#endif
 #include "regs.h"
 #include "romfile.h"
 #include "segment_symbols.h"
 #include "terminal.h"
-#include "assets/textures/parameter_static/parameter_static.h"
-#if PLATFORM_N64
-#include "n64dd.h"
-#endif
+#include "translation.h"
 #include "z64map_mark.h"
 #include "z64play.h"
 #include "z64save.h"
 
+#include "assets/textures/parameter_static/parameter_static.h"
+
 #include "global.h"
 
 typedef struct MapMarkInfo {

src/code/z_message.c

@@ -9,10 +9,12 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "segment_symbols.h"
 #include "sequence.h"
 #include "regs.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64audio.h"
 #include "z64ocarina.h"

src/code/z_moji.c

@@ -5,6 +5,7 @@
 #include "gfx.h"
 
 #include "macros.h"
+#include "printf.h"
 #include "global.h"
 
 // how big to draw the characters on screen

src/code/z_onepointdemo.c

@@ -1,6 +1,7 @@
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "quake.h"
 #include "sfx.h"
 #include "terminal.h"

src/code/z_parameter.c

@@ -5,6 +5,7 @@
 #include "gfx_setupdl.h"
 #include "main.h"
 #include "map.h"
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "segmented_address.h"
@@ -12,6 +13,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64audio.h"
 #include "z64lifemeter.h"

src/code/z_play.c

@@ -14,6 +14,7 @@
 #include "n64dd.h"
 #endif
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "quake.h"
 #include "regs.h"
 #include "rumble.h"
@@ -29,6 +30,7 @@
 #include "transition_tile.h"
 #include "transition_triforce.h"
 #include "transition_wipe.h"
+#include "translation.h"
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "zelda_arena.h"

src/code/z_prenmi.c

@@ -1,6 +1,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "prenmi_state.h"
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
 #include "versions.h"

src/code/z_quake.c

@@ -1,5 +1,6 @@
 #include "libc64/qrand.h"
 #include "macros.h"
+#include "printf.h"
 #include "quake.h"
 #include "terminal.h"
 #include "z_lib.h"

src/code/z_room.c

@@ -10,11 +10,13 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
 #include "sys_ucode.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64audio.h"
 #include "z64play.h"

src/code/z_scene.c

@@ -1,9 +1,11 @@
+#include "printf.h"
 #include "regs.h"
 #include "romfile.h"
 #include "seqcmd.h"
 #include "segment_symbols.h"
 #include "segmented_address.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "z_lib.h"

src/code/z_skelanime.c

@@ -1,10 +1,12 @@
 #include "libu64/debug.h"
 #include "gfx.h"
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "segment_symbols.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
 #include "z64animation.h"

src/code/z_skin_matrix.c

@@ -1,8 +1,11 @@
-#include "gfx.h"
-#include "terminal.h"
-#include "z_lib.h"
 #include "z64skin_matrix.h"
 
+#include "gfx.h"
+#include "printf.h"
+#include "terminal.h"
+#include "translation.h"
+#include "z_lib.h"
+
 #include "macros.h"
 
 // clang-format off

src/code/z_sram.c

@@ -1,7 +1,11 @@
+#include "z64sram.h"
+
 #include "file_select_state.h"
 #include "controller.h"
 #include "memory_utils.h"
+#include "printf.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64audio.h"
 #include "z64game.h"
@@ -10,7 +14,6 @@
 #include "z64ocarina.h"
 #include "z64save.h"
 #include "z64scene.h"
-#include "z64sram.h"
 #include "z64ss_sram.h"
 
 #include "global.h"

src/code/z_ss_sram.c

@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "printf.h"
 #include "z64ss_sram.h"
 
 #include "macros.h"

src/code/z_view.c

@@ -1,12 +1,15 @@
+#include "z64view.h"
+
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
 #include "gfx.h"
 #include "letterbox.h"
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "sys_matrix.h"
 #include "terminal.h"
-#include "z64view.h"
+#include "translation.h"
 
 vu32 sLogOnNextViewInit = true;
 

src/code/z_vimode.c

@@ -4,6 +4,7 @@
 #include "ultra64/viint.h"
 #include "controller.h"
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "versions.h"
 

src/code/z_vr_box.c

@@ -1,5 +1,6 @@
 #include "z64skybox.h"
 
+#include "printf.h"
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "ultra64.h"

src/libc64/__osMalloc_gc.c

@@ -1,7 +1,10 @@
 #include "libc64/os_malloc.h"
+
 #include "alignment.h"
 #include "fault.h"
+#include "printf.h"
 #include "terminal.h"
+#include "translation.h"
 
 #include "global.h"
 

src/libc64/__osMalloc_n64.c

@@ -2,6 +2,7 @@
 
 #include "alignment.h"
 #include "fault.h"
+#include "translation.h"
 
 #include "global.h"
 

src/libc64/malloc.c

@@ -1,7 +1,11 @@
 #include "libc64/malloc.h"
-#include "ultra64.h"
-#include "macros.h"
+
 #include "libc64/os_malloc.h"
+#include "printf.h"
+#include "translation.h"
+#include "ultra64.h"
+
+#include "macros.h"
 
 #define LOG_SEVERITY_NOLOG 0
 #define LOG_SEVERITY_ERROR 2

src/libu64/debug.c

@@ -1,5 +1,7 @@
 #include "fault.h"
+#include "printf.h"
 #include "terminal.h"
+#include "translation.h"
 
 #include "global.h"
 

src/libu64/gfxprint.c

@@ -1,6 +1,7 @@
 #include "libc64/aprintf.h"
 #include "libu64/gfxprint.h"
 #include "attributes.h"
+#include "translation.h"
 
 #include "macros.h"
 

src/libu64/load_gc.c

@@ -1,5 +1,7 @@
 #include "libu64/overlay.h"
 #include "ultra64.h"
+#include "printf.h"
+#include "translation.h"
 #include "z64dma.h"
 
 #include "macros.h"

src/libu64/loadfragment2_gc.c

@@ -1,5 +1,6 @@
 #include "libc64/malloc.h"
 #include "libu64/overlay.h"
+#include "printf.h"
 
 #include "macros.h"
 

src/libu64/loadfragment2_n64.c

@@ -8,6 +8,7 @@
  */
 #include "libc64/malloc.h"
 #include "libu64/overlay.h"
+#include "translation.h"
 #include "z64dma.h"
 
 #include "macros.h"

src/libu64/rcp_utils.c

@@ -1,5 +1,7 @@
 #include "libu64/rcp_utils.h"
 #include "ultra64.h"
+#include "printf.h"
+
 #include "global.h"
 
 #if PLATFORM_N64 || DEBUG_FEATURES

src/libu64/relocation_gc.c

@@ -8,6 +8,7 @@
  */
 #include "libu64/overlay.h"
 #include "attributes.h"
+#include "printf.h"
 #include "ultra64.h"
 
 #include "macros.h"

src/libu64/stackcheck.c

@@ -1,7 +1,9 @@
 #include "libu64/debug.h"
 #include "attributes.h"
+#include "printf.h"
 #include "stackcheck.h"
 #include "terminal.h"
+#include "translation.h"
 
 #include "macros.h"
 

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

@@ -8,10 +8,12 @@
 
 #include "ichain.h"
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "quake.h"
 #include "rumble.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64audio.h"
 #include "z64play.h"

src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c

@@ -7,10 +7,12 @@
 #include "z_bg_bdan_switch.h"
 
 #include "ichain.h"
-#include "rumble.h"
 #include "one_point_cutscene.h"
+#include "printf.h"
+#include "rumble.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"

src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c

@@ -7,8 +7,10 @@
 #include "z_bg_bom_guard.h"
 #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h"
 
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z64play.h"
 
 #include "assets/objects/object_bowl/object_bowl.h"

src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c

@@ -7,7 +7,9 @@
 #include "z_bg_bombwall.h"
 #include "libc64/qrand.h"
 #include "ichain.h"
+#include "printf.h"
 #include "sfx.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64play.h"
 

src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c

@@ -10,11 +10,13 @@
 
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
+#include "quake.h"
 #include "rand.h"
 #include "sfx.h"
-#include "quake.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"

src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c

@@ -9,6 +9,7 @@
 #include "libc64/qrand.h"
 #include "ichain.h"
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "rand.h"
 #include "rumble.h"
 #include "sfx.h"

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -11,12 +11,14 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "rand.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
 #include "z64ocarina.h"

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

@@ -10,6 +10,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
+#include "printf.h"
 #include "rand.h"
 #include "sfx.h"
 #include "sys_matrix.h"

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c

@@ -8,9 +8,11 @@
 
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64save.h"

src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c

@@ -10,8 +10,10 @@
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64skin_matrix.h"

src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c

@@ -11,6 +11,7 @@
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "quake.h"
 #include "rand.h"
 #include "rumble.h"
@@ -18,6 +19,7 @@
 #include "sys_math.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"