diff options
Diffstat (limited to 'src/code')
69 files changed, 136 insertions, 12 deletions
diff --git a/src/code/PreRender.c b/src/code/PreRender.c index 9dcb28f3a..c6cf72c59 100644 --- a/src/code/PreRender.c +++ b/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" diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c index 8837601f8..5c7ff901e 100644 --- a/src/code/audio_thread_manager.c +++ b/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" diff --git a/src/code/db_camera.c b/src/code/db_camera.c index f31650587..727600849 100644 --- a/src/code/db_camera.c +++ b/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" diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index acfca47ca..6204e674f 100644 --- a/src/code/debug_malloc.c +++ b/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" diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index ee96a4c16..815570a96 100644 --- a/src/code/fault_gc.c +++ b/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" diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c index 4dbae9b84..d83814b9b 100644 --- a/src/code/fault_n64.c +++ b/src/code/fault_n64.c @@ -9,6 +9,7 @@ #include "stackcheck.h" #include "terminal.h" #include "z64thread.h" +#include "translation.h" #include "global.h" diff --git a/src/code/game.c b/src/code/game.c index 933de55c1..e3ffb5381 100644 --- a/src/code/game.c +++ b/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" diff --git a/src/code/gamealloc.c b/src/code/gamealloc.c index 47591fd00..33ad848a1 100644 --- a/src/code/gamealloc.c +++ b/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" diff --git a/src/code/graph.c b/src/code/graph.c index e2a35cd5e..62453359a 100644 --- a/src/code/graph.c +++ b/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. diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index d741612e2..2915e1c83 100644 --- a/src/code/irqmgr.c +++ b/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" diff --git a/src/code/main.c b/src/code/main.c index 8a1fc820a..43556b52b 100644 --- a/src/code/main.c +++ b/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" diff --git a/src/code/mempak.c b/src/code/mempak.c index f316f0ea3..19c11b31d 100644 --- a/src/code/mempak.c +++ b/src/code/mempak.c @@ -9,6 +9,7 @@ */ #include "mempak.h" #include "padmgr.h" +#include "printf.h" #include "macros.h" diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 9e6d1ae14..6d88b34c1 100644 --- a/src/code/padmgr.c +++ b/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) \ diff --git a/src/code/sched.c b/src/code/sched.c index 2b519c6bd..d8fea59fa 100644 --- a/src/code/sched.c +++ b/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" diff --git a/src/code/shrink_window.c b/src/code/shrink_window.c index e952a0c3f..a485d8168 100644 --- a/src/code/shrink_window.c +++ b/src/code/shrink_window.c @@ -1,4 +1,5 @@ #include "letterbox.h" +#include "printf.h" #include "regs.h" #include "macros.h" diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 3771c8ce6..bf8a247ac 100644 --- a/src/code/speed_meter.c +++ b/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" diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 4fa17abfd..2e075daf3 100644 --- a/src/code/sys_cfb.c +++ b/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" \ diff --git a/src/code/sys_freeze.c b/src/code/sys_freeze.c index ea50a8949..427fca389 100644 --- a/src/code/sys_freeze.c +++ b/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" diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 3ade95d82..35f15bdaf 100644 --- a/src/code/sys_math3d.c +++ b/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" diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 081a29276..3dc86d25d 100644 --- a/src/code/sys_matrix.c +++ b/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" diff --git a/src/code/title_setup.c b/src/code/title_setup.c index cf736cf8e..64e30ecaa 100644 --- a/src/code/title_setup.c +++ b/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" diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 0684dcd5d..4ccbdcb59 100644 --- a/src/code/ucode_disas.c +++ b/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" diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c index 501fed21a..2dbcb115b 100644 --- a/src/code/z_DLF.c +++ b/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" diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 28a98ef31..b4bbfd3e4 100644 --- a/src/code/z_actor.c +++ b/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" diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index accce471c..f489e614c 100644 --- a/src/code/z_actor_dlftbls.c +++ b/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" diff --git a/src/code/z_bg_collect.c b/src/code/z_bg_collect.c index c74adbc12..f4d63087b 100644 --- a/src/code/z_bg_collect.c +++ b/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" diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 469840de9..51d7e8ad1 100644 --- a/src/code/z_bgcheck.c +++ b/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" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 8e835e1fd..3bd468d49 100644 --- a/src/code/z_camera.c +++ b/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" diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index a80182eb7..34e25b2ff 100644 --- a/src/code/z_collision_btltbls.c +++ b/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[] = { diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 15eec283a..2c77d9441 100644 --- a/src/code/z_collision_check.c +++ b/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" diff --git a/src/code/z_construct.c b/src/code/z_construct.c index 4696cb76e..aa92850b3 100644 --- a/src/code/z_construct.c +++ b/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" diff --git a/src/code/z_demo.c b/src/code/z_demo.c index dc95fd575..68f2fbc2f 100644 --- a/src/code/z_demo.c +++ b/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" diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 7b40b261f..a956d3468 100644 --- a/src/code/z_eff_blure.c +++ b/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" diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index e4e331964..351676791 100644 --- a/src/code/z_eff_shield_particle.c +++ b/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" diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index f14c8160f..429635956 100644 --- a/src/code/z_eff_spark.c +++ b/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" diff --git a/src/code/z_effect.c b/src/code/z_effect.c index 02ba00a8d..c0a39cc4b 100644 --- a/src/code/z_effect.c +++ b/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" diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 2acddc4bf..696a18504 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/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" diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 46cfa0573..482fa99d6 100644 --- a/src/code/z_fbdemo.c +++ b/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" diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index cbd9f6813..c789cfd6c 100644 --- a/src/code/z_fbdemo_fade.c +++ b/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" diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index 93826fa36..c12029035 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/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" diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index 379744931..e5d1f1fbb 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/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" diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 800f72c73..9d185d1e3 100644 --- a/src/code/z_horse.c +++ b/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" diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c index bb4bb5f85..c31d4d926 100644 --- a/src/code/z_inventory.c +++ b/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" diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 81e299946..9ac9fcc1a 100644 --- a/src/code/z_jpeg.c +++ b/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" diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index 9fa8f5ebc..87a7c0fa1 100644 --- a/src/code/z_kaleido_manager.c +++ b/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" diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index e6ff49f50..b50cc0f86 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/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" diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index cc1621947..3b88de28c 100644 --- a/src/code/z_kaleido_setup.c +++ b/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" diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 21ba416b3..0996a1a6e 100644 --- a/src/code/z_kanfont.c +++ b/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" diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index a4bb1295b..d87f908be 100644 --- a/src/code/z_kankyo.c +++ b/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" diff --git a/src/code/z_lib.c b/src/code/z_lib.c index d5f59a2a8..741c982e0 100644 --- a/src/code/z_lib.c +++ b/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" diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index eaa1408bf..6751bcbee 100644 --- a/src/code/z_malloc.c +++ b/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 diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index bac9ed222..ee93a9a29 100644 --- a/src/code/z_map_exp.c +++ b/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" diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 600aa2189..1bccd2921 100644 --- a/src/code/z_map_mark.c +++ b/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 { diff --git a/src/code/z_message.c b/src/code/z_message.c index f544ccefa..ab333a875 100644 --- a/src/code/z_message.c +++ b/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" diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 33abd83f7..2114996cb 100644 --- a/src/code/z_moji.c +++ b/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 diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 6a4c896ac..700353cb8 100644 --- a/src/code/z_onepointdemo.c +++ b/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" diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 4dd6662d5..a4a9acb6f 100644 --- a/src/code/z_parameter.c +++ b/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" diff --git a/src/code/z_play.c b/src/code/z_play.c index e5c3c3c4a..71cbb8838 100644 --- a/src/code/z_play.c +++ b/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" diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index f232fca10..6d50f4106 100644 --- a/src/code/z_prenmi.c +++ b/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" diff --git a/src/code/z_quake.c b/src/code/z_quake.c index 2e83a7c10..690dbc81d 100644 --- a/src/code/z_quake.c +++ b/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" diff --git a/src/code/z_room.c b/src/code/z_room.c index a9daab204..eae1c9187 100644 --- a/src/code/z_room.c +++ b/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" diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 77206ce6f..56b0d0886 100644 --- a/src/code/z_scene.c +++ b/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" diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index be5f27564..c48983550 100644 --- a/src/code/z_skelanime.c +++ b/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" diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index f83cb8295..5e9edf45e 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -1,7 +1,10 @@ +#include "z64skin_matrix.h" + #include "gfx.h" +#include "printf.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" -#include "z64skin_matrix.h" #include "macros.h" diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 2fb3124a7..d25362704 100644 --- a/src/code/z_sram.c +++ b/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" diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c index 330f5ca4a..809786245 100644 --- a/src/code/z_ss_sram.c +++ b/src/code/z_ss_sram.c @@ -1,4 +1,5 @@ #include "ultra64.h" +#include "printf.h" #include "z64ss_sram.h" #include "macros.h" diff --git a/src/code/z_view.c b/src/code/z_view.c index dd4608cde..9c6be44ab 100644 --- a/src/code/z_view.c +++ b/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; diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index d1f472057..e28e9c4ae 100644 --- a/src/code/z_vimode.c +++ b/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" diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index a8c9bb587..ab39d3ca6 100644 --- a/src/code/z_vr_box.c +++ b/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" |