1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-09 18:43:45 +00:00

move T macro

This commit is contained in:
fig02 2025-04-23 03:22:00 -04:00
parent 1a35c52078
commit 51874589ee
139 changed files with 169 additions and 21 deletions

View file

@ -12,15 +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 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
#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]))

View file

@ -1,6 +1,16 @@
#ifndef TRANSLATION_H
#define TRANSLATION_H
/**
* Note: This translation macro exists for quality of life purposes.
* This does not refect anything from the original game
*
* 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 to "en".
*/
#define T(jp, en) jp
#endif

View file

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

View file

@ -6,6 +6,7 @@
#include "printf.h"
#include "region.h"
#include "terminal.h"
#include "translation.h"
#include "versions.h"
#include "vi_mode.h"
#include "z_locale.h"

View file

@ -37,6 +37,7 @@
#include "stack.h"
#include "stackcheck.h"
#include "terminal.h"
#include "translation.h"
#if !PLATFORM_IQUE
#include "yaz0.h"
#endif

View file

@ -9,6 +9,7 @@
#include "printf.h"
#include "regs.h"
#include "speed_meter.h"
#include "translation.h"
#include "z64dma.h"
#include "macros.h"

View file

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

View file

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

View file

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

View file

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

View file

@ -21,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"

View file

@ -37,6 +37,7 @@
#include "printf.h"
#include "stackcheck.h"
#include "terminal.h"
#include "translation.h"
#include "versions.h"
#include "z64thread.h"

View file

@ -33,6 +33,7 @@ extern struct IrqMgr gIrqMgr;
#include "stack.h"
#include "stackcheck.h"
#include "terminal.h"
#include "translation.h"
#include "versions.h"
#if PLATFORM_N64
#include "cic6105.h"

View file

@ -35,6 +35,7 @@
#include "printf.h"
#include "fault.h"
#include "terminal.h"
#include "translation.h"
#include "line_numbers.h"
#define PADMGR_LOG(controllerNum, msg) \

View file

@ -48,6 +48,7 @@
#include "regs.h"
#include "sched.h"
#include "speed_meter.h"
#include "translation.h"
#include "versions.h"
#include "vi_mode.h"
#include "z64thread.h"

View file

@ -4,6 +4,8 @@
#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" \

View file

@ -2,6 +2,7 @@
#include "printf.h"
#include "terminal.h"
#include "translation.h"
#include "ultra64.h"
#include "z_lib.h"
#include "z64math.h"

View file

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

View file

@ -4,6 +4,7 @@
#include "libu64/mtxuty-cvt.h"
#include "printf.h"
#include "segmented_address.h"
#include "translation.h"
#include "macros.h"

View file

@ -2,6 +2,7 @@
#include "libu64/overlay.h"
#include "printf.h"
#include "terminal.h"
#include "translation.h"
#include "ultra64.h"
#include "z_game_dlftbls.h"

View file

@ -13,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"

View file

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

View file

@ -6,6 +6,7 @@
#include "segmented_address.h"
#include "sys_math3d.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "z64bgcheck.h"
#include "z64play.h"

View file

@ -13,6 +13,7 @@
#include "sfx.h"
#include "sys_math3d.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "zelda_arena.h"
#include "z64audio.h"

View file

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

View file

@ -6,6 +6,7 @@
#include "sys_math3d.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "versions.h"
#include "z64collision_check.h"
#include "z64effect.h"

View file

@ -2,6 +2,7 @@
#include "printf.h"
#include "regs.h"
#include "segment_symbols.h"
#include "translation.h"
#include "versions.h"
#include "z64lifemeter.h"
#include "z64interface.h"

View file

@ -18,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"

View file

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

View file

@ -3,6 +3,7 @@
#include "gfx_setupdl.h"
#include "printf.h"
#include "terminal.h"
#include "translation.h"
#include "z64effect.h"
#include "z64light.h"
#include "z64play.h"

View file

@ -3,6 +3,7 @@
#include "gfx_setupdl.h"
#include "printf.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64skin_matrix.h"

View file

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

View file

@ -2,6 +2,7 @@
#include "printf.h"
#include "sfx.h"
#include "terminal.h"
#include "translation.h"
#include "zelda_arena.h"
#include "z64frame_advance.h"
#include "z64effect.h"

View file

@ -4,6 +4,7 @@
#include "printf.h"
#include "regs.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "z64save.h"
#include "z64transition_instances.h"

View file

@ -30,6 +30,7 @@
#include "regs.h"
#include "segmented_address.h"
#include "sys_matrix.h"
#include "translation.h"
#include "zelda_arena.h"
#include "z64actor.h"
#include "z64curve.h"

View file

@ -2,6 +2,7 @@
#include "z_lib.h"
#include "printf.h"
#include "regs.h"
#include "translation.h"
#include "z64horse.h"
#include "z64play.h"
#include "z64player.h"

View file

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

View file

@ -5,6 +5,7 @@
#include "printf.h"
#include "sys_ucode.h"
#include "terminal.h"
#include "translation.h"
#include "macros.h"

View file

@ -4,6 +4,7 @@
#include "printf.h"
#include "segment_symbols.h"
#include "terminal.h"
#include "translation.h"
#include "z64play.h"
#include "macros.h"

View file

@ -7,6 +7,7 @@
#include "printf.h"
#include "regs.h"
#include "terminal.h"
#include "translation.h"
#include "z64play.h"
#include "global.h"

View file

@ -2,6 +2,7 @@
#include "message_data_static.h"
#include "printf.h"
#include "segment_symbols.h"
#include "translation.h"
#include "versions.h"
#include "z64dma.h"
#include "z64font.h"

View file

@ -20,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"

View file

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

View file

@ -11,6 +11,7 @@
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "z64map_mark.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -2,18 +2,20 @@
#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 {

View file

@ -14,6 +14,7 @@
#include "sequence.h"
#include "regs.h"
#include "terminal.h"
#include "translation.h"
#include "versions.h"
#include "z64audio.h"
#include "z64ocarina.h"

View file

@ -13,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"

View file

@ -30,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"

View file

@ -16,6 +16,7 @@
#include "sys_matrix.h"
#include "sys_ucode.h"
#include "terminal.h"
#include "translation.h"
#include "versions.h"
#include "z64audio.h"
#include "z64play.h"

View file

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

View file

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

View file

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

View file

@ -1,8 +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"
@ -11,7 +14,6 @@
#include "z64ocarina.h"
#include "z64save.h"
#include "z64scene.h"
#include "z64sram.h"
#include "z64ss_sram.h"
#include "global.h"

View file

@ -1,3 +1,5 @@
#include "z64view.h"
#include "libc64/malloc.h"
#include "libu64/debug.h"
#include "gfx.h"
@ -7,7 +9,7 @@
#include "regs.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "z64view.h"
#include "translation.h"
vu32 sLogOnNextViewInit = true;

View file

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

View file

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

View file

@ -1,8 +1,11 @@
#include "libc64/malloc.h"
#include "ultra64.h"
#include "macros.h"
#include "printf.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

View file

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

View file

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

View file

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

View file

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

View file

@ -3,6 +3,7 @@
#include "printf.h"
#include "stackcheck.h"
#include "terminal.h"
#include "translation.h"
#include "macros.h"

View file

@ -13,6 +13,7 @@
#include "rumble.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64audio.h"
#include "z64play.h"

View file

@ -12,6 +12,7 @@
#include "rumble.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -10,6 +10,7 @@
#include "printf.h"
#include "regs.h"
#include "terminal.h"
#include "translation.h"
#include "z64play.h"
#include "assets/objects/object_bowl/object_bowl.h"

View file

@ -9,6 +9,7 @@
#include "ichain.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -16,6 +16,7 @@
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"

View file

@ -18,6 +18,7 @@
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "versions.h"
#include "z_lib.h"
#include "z64ocarina.h"

View file

@ -12,6 +12,7 @@
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64save.h"

View file

@ -13,6 +13,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64skin_matrix.h"

View file

@ -19,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"

View file

@ -13,6 +13,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64save.h"

View file

@ -16,6 +16,7 @@
#include "rumble.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "versions.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -13,6 +13,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -14,6 +14,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"

View file

@ -13,6 +13,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"

View file

@ -9,6 +9,7 @@
#include "ichain.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64save.h"

View file

@ -9,6 +9,7 @@
#include "ichain.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -11,6 +11,7 @@
#include "gfx_setupdl.h"
#include "printf.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z64play.h"
#include "assets/objects/object_jya_obj/object_jya_obj.h"

View file

@ -9,6 +9,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"

View file

@ -12,6 +12,7 @@
#include "printf.h"
#include "sfx.h"
#include "terminal.h"
#include "translation.h"
#include "z64effect.h"
#include "z64play.h"

View file

@ -9,6 +9,7 @@
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -11,6 +11,7 @@
#include "ichain.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64effect.h"

View file

@ -11,6 +11,7 @@
#include "printf.h"
#include "quake.h"
#include "sfx.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -10,6 +10,7 @@
#include "one_point_cutscene.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -10,6 +10,7 @@
#include "printf.h"
#include "sfx.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -14,6 +14,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -15,6 +15,7 @@
#include "rumble.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -14,6 +14,7 @@
#include "quake.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -7,6 +7,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z64audio.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -11,6 +11,7 @@
#include "ichain.h"
#include "printf.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -13,6 +13,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -12,6 +12,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"

View file

@ -12,6 +12,7 @@
#include "printf.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -14,6 +14,7 @@
#include "rumble.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -14,6 +14,7 @@
#include "sfx.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"

View file

@ -9,6 +9,7 @@
#include "ichain.h"
#include "printf.h"
#include "segmented_address.h"
#include "translation.h"
#include "z64play.h"
#include "z64save.h"

View file

@ -12,6 +12,7 @@
#include "printf.h"
#include "sys_math3d.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64play.h"
#include "z64player.h"

View file

@ -11,6 +11,7 @@
#include "ichain.h"
#include "printf.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z64play.h"
#include "z64save.h"

View file

@ -10,6 +10,7 @@
#include "libc64/qrand.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"

Some files were not shown because too many files have changed in this diff Show more