diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2025-06-04 19:15:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-04 13:15:01 -0400 |
| commit | e8b708a4480e568f409c8e53986c2e96595b9405 (patch) | |
| tree | 98a57a8a3ffa31bf7eca698f4ea8bf762b7d69d7 /src/code | |
| parent | c903555e832050e0150c7420c55c0719bab96803 (diff) | |
T() macro loose ends 2 (#2564)
* More T() in niw_girl, ossan, rr, ta, tana, wall_tubo, yabusame_mark
* Add and use LOG_STRING_T()
* include debug.h in translation.h
* Kyaaaaaa
* bss
* comment on Yabusame mato possible typo
* Revert "Kyaaaaaa"
This reverts commit 95097831fac62dd1f039b89cefca114c6a23b56e.
* (Kuzu)hara
* 原 -> "-Hara" from dev name, possibly
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/sys_math3d.c | 2 | ||||
| -rw-r--r-- | src/code/z_camera.c | 2 | ||||
| -rw-r--r-- | src/code/z_elf_message.c | 6 | ||||
| -rw-r--r-- | src/code/z_play.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 1ce651e9c..f27ee6a34 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -7,7 +7,7 @@ #include "z_lib.h" #include "z64math.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" \ +#pragma increment_block_number "gc-eu:76 gc-eu-mq:76 gc-jp:76 gc-jp-ce:76 gc-jp-mq:76 gc-us:76 gc-us-mq:76 ique-cn:66" \ "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, diff --git a/src/code/z_camera.c b/src/code/z_camera.c index cf5ed3073..e23e17a04 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -3661,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:83 ntsc-1.1:83 ntsc-1.2:83 pal-1.0:83 pal-1.1:83" + "ique-cn:128 ntsc-1.0:82 ntsc-1.1:82 ntsc-1.2:82 pal-1.0:82 pal-1.1:82" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index bb9309936..c06248f26 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -1,5 +1,5 @@ -#include "libu64/debug.h" #include "rand.h" +#include "translation.h" #include "z64play.h" #include "z64player.h" #include "z64quest_hint.h" @@ -73,7 +73,7 @@ u32 QuestHint_CheckCondition(QuestHintCmd* hintCmd) { } } - LOG_STRING("企画外 条件", "../z_elf_message.c", 156); // "Unplanned conditions" + LOG_STRING_T("企画外 条件", "Unplanned conditions", "../z_elf_message.c", 156); ASSERT(0, "0", "../z_elf_message.c", 157); return false; @@ -170,7 +170,7 @@ u16 QuestHint_GetTextIdFromScript(QuestHintCmd* hintCmd) { return hintCmd->byte2 | 0x100; default: - LOG_STRING("企画外 条件", "../z_elf_message.c", 281); // "Unplanned conditions" + LOG_STRING_T("企画外 条件", "Unplanned conditions", "../z_elf_message.c", 281); ASSERT(0, "0", "../z_elf_message.c", 282); } diff --git a/src/code/z_play.c b/src/code/z_play.c index d4d28422c..87d344b13 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -895,8 +895,8 @@ void Play_Update(PlayState* this) { this->envCtx.sandstormState = SANDSTORM_DISSIPATE; this->envCtx.sandstormPrimA = 255; this->envCtx.sandstormEnvA = 255; - // "It's here!!!!!!!!!" - LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", 3471); + LOG_STRING_T("来た!!!!!!!!!!!!!!!!!!!!!", "It's here!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", + 3471); this->transitionMode = TRANS_MODE_SANDSTORM_END; } else { this->transitionMode = TRANS_MODE_SANDSTORM_INIT; |