non-overlays complete

include/translation.h

@@ -2,10 +2,12 @@
 #define TRANSLATION_H
 
 /**
- * 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.
+ * 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 from "jp" to "en".
  */
 #define T(jp, en) jp
 
-#endif
+#endif

src/boot/idle.c

@@ -2,6 +2,7 @@
 #include "build.h"
 #include "idle.h"
 #include "main.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"

src/boot/viconfig.c

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

src/boot/z_locale.c

@@ -3,6 +3,7 @@
 #include "carthandle.h"
 #include "line_numbers.h"
 #include "padmgr.h"
+#include "printf.h"
 #include "region.h"
 #include "terminal.h"
 #include "versions.h"

src/boot/z_std_dma.c

@@ -32,6 +32,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"

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,6 +6,7 @@
  */
 
 #include "audiomgr.h"
+#include "printf.h"
 #include "regs.h"
 #include "speed_meter.h"
 #include "z64dma.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,6 @@
 #include "libc64/os_malloc.h"
 #include "debug_arena.h"
+#include "printf.h"
 
 #include "macros.h"
 

src/code/game.c

@@ -15,6 +15,7 @@
 #include "n64dd.h"
 #endif
 #include "padmgr.h"
+#include "printf.h"
 #include "regs.h"
 #include "rumble.h"
 #include "speed_meter.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"

src/code/irqmgr.c

@@ -34,6 +34,7 @@
  */
 #include "libu64/debug.h"
 #include "irqmgr.h"
+#include "printf.h"
 #include "stackcheck.h"
 #include "terminal.h"
 #include "versions.h"

src/code/main.c

@@ -26,6 +26,7 @@ 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"

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,6 +32,7 @@
 #include "libu64/padsetup.h"
 #include "macros.h"
 #include "padmgr.h"
+#include "printf.h"
 #include "fault.h"
 #include "terminal.h"
 #include "line_numbers.h"

src/code/shrink_window.c

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

src/code/sys_cfb.c

@@ -3,6 +3,7 @@
 #include "libu64/debug.h"
 #include "attributes.h"
 #include "line_numbers.h"
+#include "printf.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,12 @@
+#include "sys_math3d.h"
+
+#include "printf.h"
+#include "terminal.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,6 @@
 #include "console_logo_state.h"
 #include "setup_state.h"
-
+#include "printf.h"
 #include "z64save.h"
 
 #include "global.h"

src/code/ucode_disas.c

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

src/code/z_DLF.c

@@ -1,5 +1,6 @@
 #include "libc64/malloc.h"
 #include "libu64/overlay.h"
+#include "printf.h"
 #include "terminal.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"

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,3 +1,4 @@
+#include "printf.h"
 #include "terminal.h"
 #include "ultra64.h"
 #include "z64actor.h"

src/code/z_bgcheck.c

@@ -1,6 +1,7 @@
 #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"

src/code/z_camera.c

@@ -8,6 +8,7 @@
 #include "letterbox.h"
 #include "one_point_cutscene.h"
 #include "quake.h"
+#include "printf.h"
 #include "regs.h"
 #include "sfx.h"
 #include "sys_math3d.h"

src/code/z_collision_btltbls.c

@@ -1,3 +1,4 @@
+#include "printf.h"
 #include "z64collision_check.h"
 #include "macros.h"
 

src/code/z_collision_check.c

@@ -1,5 +1,6 @@
 #include "gfx.h"
 #include "macros.h"
+#include "printf.h"
 #include "regs.h"
 #include "sfx.h"
 #include "sys_math3d.h"

src/code/z_construct.c

@@ -1,4 +1,5 @@
 #include "map.h"
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "versions.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"

src/code/z_eff_blure.c

@@ -1,6 +1,7 @@
 #include "libc64/math64.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"

src/code/z_eff_shield_particle.c

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

src/code/z_eff_spark.c

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

src/code/z_effect.c

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

src/code/z_effect_soft_sprite.c

@@ -1,4 +1,5 @@
 #include "libu64/overlay.h"
+#include "printf.h"
 #include "sfx.h"
 #include "terminal.h"
 #include "zelda_arena.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,6 +1,7 @@
 #include "transition_fade.h"
 
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
 #include "z_lib.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,6 +26,7 @@
  */
 
 #include "gfx.h"
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"

src/code/z_horse.c

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

src/code/z_inventory.c

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

src/code/z_jpeg.c

@@ -2,6 +2,7 @@
 #include "ultra64.h"
 #include "attributes.h"
 #include "jpeg.h"
+#include "printf.h"
 #include "sys_ucode.h"
 #include "terminal.h"
 

src/code/z_kaleido_manager.c

@@ -1,6 +1,7 @@
 #include "libu64/debug.h"
 #include "libu64/overlay.h"
 #include "kaleido_manager.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "z64play.h"

src/code/z_kaleido_scope_call.c

@@ -4,6 +4,7 @@
 #include "libu64/debug.h"
 #include "kaleido_manager.h"
 #include "letterbox.h"
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
 #include "z64play.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,5 +1,6 @@
 #include "kanread.h"
 #include "message_data_static.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "versions.h"
 #include "z64dma.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"

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,6 @@
 #include "global.h"
 #include "libc64/os_malloc.h"
+#include "printf.h"
 
 #define LOG_SEVERITY_NOLOG 0
 #define LOG_SEVERITY_ERROR 2

src/code/z_map_exp.c

@@ -5,6 +5,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "sfx.h"

src/code/z_map_mark.c

@@ -1,6 +1,7 @@
 #include "libu64/debug.h"
 #include "libu64/overlay.h"
 #include "map.h"
+#include "printf.h"
 #include "regs.h"
 #include "romfile.h"
 #include "segment_symbols.h"

src/code/z_message.c

@@ -9,6 +9,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "segment_symbols.h"
 #include "sequence.h"
 #include "regs.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"

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"

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,6 +10,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"

src/code/z_scene.c

@@ -1,3 +1,4 @@
+#include "printf.h"
 #include "regs.h"
 #include "romfile.h"
 #include "seqcmd.h"

src/code/z_skelanime.c

@@ -1,5 +1,6 @@
 #include "libu64/debug.h"
 #include "gfx.h"
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "segment_symbols.h"

src/code/z_skin_matrix.c

@@ -1,4 +1,5 @@
 #include "gfx.h"
+#include "printf.h"
 #include "terminal.h"
 #include "z_lib.h"
 #include "z64skin_matrix.h"

src/code/z_sram.c

@@ -1,6 +1,7 @@
 #include "file_select_state.h"
 #include "controller.h"
 #include "memory_utils.h"
+#include "printf.h"
 #include "terminal.h"
 #include "versions.h"
 #include "z64audio.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

@@ -3,6 +3,7 @@
 #include "gfx.h"
 #include "letterbox.h"
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "sys_matrix.h"
 #include "terminal.h"

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,6 +1,7 @@
 #include "libc64/os_malloc.h"
 #include "alignment.h"
 #include "fault.h"
+#include "printf.h"
 #include "terminal.h"
 
 #include "global.h"

src/libc64/malloc.c

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

src/libu64/debug.c

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

src/libu64/load_gc.c

@@ -1,5 +1,6 @@
 #include "libu64/overlay.h"
 #include "ultra64.h"
+#include "printf.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/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,5 +1,6 @@
 #include "libu64/debug.h"
 #include "attributes.h"
+#include "printf.h"
 #include "stackcheck.h"
 #include "terminal.h"