mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-06-08 01:21:52 +00:00
Code Issues Projects Releases Wiki Activity

T() macro in overlays 4 (#2533)

Browse source 
* T() macro in various overlays

* revert problematic T() in mir_ray
This commit is contained in:
Dragorn421 2025-05-27 18:00:25 +02:00 • committed by GitHub
parent 91e9553ee5
commit 1eaae98ed3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 48 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
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_lib.h"
#include "z64audio.h"
@ -547,7 +548,7 @@ void DemoEffect_WaitForObject(DemoEffect* this, PlayState* play) {
this->actor.draw = this->initDrawFunc;
this->updateFunc = this->initUpdateFunc;
PRINTF(VT_FGCOL(CYAN) " 転送終了 move_wait " VT_RST);
PRINTF(VT_FGCOL(CYAN) T(" 転送終了 move_wait ", " Transfer completed move_wait ") VT_RST);
}
}
@ -705,12 +706,12 @@ void DemoEffect_InitTimeWarp(DemoEffect* this, PlayState* play) {
SkelCurve_SetAnim(&this->skelCurve, &gTimeWarpAnim, 1.0f, 59.0f, 59.0f, 0.0f);
SkelCurve_Update(play, &this->skelCurve);
this->updateFunc = DemoEffect_UpdateTimeWarpReturnFromChamberOfSages;
PRINTF(VT_FGCOL(CYAN) " 縮むバージョン \n" VT_RST);
PRINTF(VT_FGCOL(CYAN) T(" 縮むバージョン \n", " Shrinking version \n") VT_RST);
} else {
SkelCurve_SetAnim(&this->skelCurve, &gTimeWarpAnim, 1.0f, 59.0f, 1.0f, 1.0f);
SkelCurve_Update(play, &this->skelCurve);
this->updateFunc = DemoEffect_UpdateTimeWarpPullMasterSword;
PRINTF(VT_FGCOL(CYAN) " 通常 バージョン \n" VT_RST);
PRINTF(VT_FGCOL(CYAN) T(" 通常 バージョン \n", " Normal version \n") VT_RST);
}
}

7
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
View file

@ -9,6 +9,7 @@
#include "sequence.h"
#include "sfx.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64light.h"
#include "z64play.h"
@ -509,7 +510,9 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
this->warpTimer++;
if (sWarpTimerTarget < this->warpTimer && gSaveContext.nextCutsceneIndex == 0xFFEF) {
PRINTF("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->transitionTrigger, TRANS_TRIGGER_START);
PRINTF(T("\n\n\nじかんがきたからおーしまい fade_direction=[%d]",
"\n\n\nThe time has come, so it's over. fade_direction=[%d]"),
play->transitionTrigger, TRANS_TRIGGER_START);
if (play->sceneId == SCENE_DODONGOS_CAVERN_BOSS) {
if (!Flags_GetEventChkInf(EVENTCHKINF_25)) {
@ -536,7 +539,7 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) {
play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0;
gSaveContext.nextCutsceneIndex = 0;
}
PRINTF("\n\n\nおわりおわり");
PRINTF(T("\n\n\nおわりおわり", "\n\n\nThe end The end"));
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_FADE_WHITE_SLOW;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;

9
src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
View file

@ -14,6 +14,7 @@
#include "regs.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "z64play.h"
#include "z64player.h"
@ -88,12 +89,12 @@ s32 ElfMsg_KillCheck(ElfMsg* this, PlayState* play) {
void ElfMsg_Init(Actor* thisx, PlayState* play) {
ElfMsg* this = (ElfMsg*)thisx;
// "Conditions for Elf Tag disappearing"
PRINTF(VT_FGCOL(CYAN) "\nエルフ タグ 消える条件 %d" VT_RST "\n", PARAMS_GET_U(thisx->params, 8, 6));
PRINTF(VT_FGCOL(CYAN) T("\nエルフ タグ 消える条件 %d", "\nConditions for Elf Tag disappearing %d") VT_RST "\n",
PARAMS_GET_U(thisx->params, 8, 6));
PRINTF(VT_FGCOL(CYAN) "\nthisx->shape.angle.sy = %d\n" VT_RST, thisx->shape.rot.y);
if (thisx->shape.rot.y >= 0x41) {
// "Conditions for Elf Tag appearing"
PRINTF(VT_FGCOL(CYAN) "\nエルフ タグ 出現条件 %d" VT_RST "\n", thisx->shape.rot.y - 0x41);
PRINTF(VT_FGCOL(CYAN) T("\nエルフ タグ 出現条件 %d", "\nConditions for Elf Tag appearing %d") VT_RST "\n",
thisx->shape.rot.y - 0x41);
}
if (!ElfMsg_KillCheck(this, play)) {

4
src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
View file

@ -12,6 +12,7 @@
#include "gfx_setupdl.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z64curve.h"
#include "z64play.h"
#include "z64player.h"
@ -56,8 +57,7 @@ void MagicWind_Init(Actor* thisx, PlayState* play) {
Player* player = GET_PLAYER(play);
if (!SkelCurve_Init(play, &this->skelCurve, &sSkel, &sAnim)) {
// "Magic_Wind_Actor_ct (): Construct failed"
PRINTF("Magic_Wind_Actor_ct():コンストラクト失敗\n");
PRINTF(T("Magic_Wind_Actor_ct():コンストラクト失敗\n", "Magic_Wind_Actor_ct(): Construct failed\n"));
}
this->actor.room = -1;
switch (this->actor.params) {

5
src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
View file

@ -14,6 +14,7 @@
#include "sfx.h"
#include "sys_math3d.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64light.h"
#include "z64play.h"
@ -180,8 +181,8 @@ void MirRay_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
// "Generation of reflectable light!"
PRINTF("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
PRINTF(T("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",
"Generation of reflectable light!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
LOG_NUM("this->actor.arg_data", this->actor.params, "../z_mir_ray.c", 518);
if (this->actor.params >= 0xA) {

7
src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
View file

@ -13,6 +13,7 @@
#include "regs.h"
#include "sys_matrix.h"
#include "terminal.h"
#include "translation.h"
#include "z_lib.h"
#include "z64light.h"
#include "z64ocarina.h"
@ -99,15 +100,13 @@ void OceffSpot_End(OceffSpot* this, PlayState* play) {
play->msgCtx.ocarinaMode != OCARINA_MODE_08) {
gSaveContext.sunsSongState = SUNSSONG_START;
PRINTF_COLOR_YELLOW();
// "Sun's Song Flag"
PRINTF("z_oceff_spot 太陽の歌フラグ\n");
PRINTF(T("z_oceff_spot 太陽の歌フラグ\n", "z_oceff_spot Sun's Song Flag\n"));
PRINTF_RST();
}
} else {
play->msgCtx.ocarinaMode = OCARINA_MODE_04;
PRINTF_COLOR_YELLOW();
// "Ocarina End"
PRINTF("z_oceff_spot オカリナ終了\n");
PRINTF(T("z_oceff_spot オカリナ終了\n", "z_oceff_spot Ocarina finished\n"));
PRINTF_RST();
}
}

5
src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
View file

@ -14,6 +14,7 @@
#include "sfx.h"
#include "sys_math3d.h"
#include "terminal.h"
#include "translation.h"
#include "z_en_item00.h"
#include "z_lib.h"
#include "z64environment.h"
@ -77,8 +78,8 @@ void ShotSun_Init(Actor* thisx, PlayState* play) {
ShotSun* this = (ShotSun*)thisx;
s32 params;
// "Ocarina secret occurrence"
PRINTF("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", this->actor.params);
PRINTF(T("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", "%d ---- Ocarina secret occurrence!!!!!!!!!!!!!\n"),
this->actor.params);
params = PARAMS_GET_U(this->actor.params, 0, 8);
if (params == 0x40 || params == 0x41) {
this->fairySpawnerState = SPAWNER_OUT_OF_RANGE;

3
src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
View file

@ -10,6 +10,7 @@
#include "gfx.h"
#include "gfx_setupdl.h"
#include "printf.h"
#include "translation.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64skin_matrix.h"
@ -92,7 +93,7 @@ u32 EffectSsDeadDd_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
this->accel.z = this->velocity.z = (Rand_ZeroOne() - 0.5f) * 2.0f;
}
} else {
PRINTF("Effect_SS_Dd_disp_mode():mode_swが変です。\n");
PRINTF(T("Effect_SS_Dd_disp_mode():mode_swが変です。\n", "Effect_SS_Dd_disp_mode():mode_sw is strange.\n"));
return 0;
}

3
src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
View file

@ -7,6 +7,7 @@
#include "z_eff_ss_dead_sound.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z64effect.h"
#include "z64play.h"
@ -33,7 +34,7 @@ u32 EffectSsDeadSound_Init(PlayState* play, u32 index, EffectSs* this, void* ini
this->update = EffectSsDeadSound_Update;
this->rRepeatMode = initParams->repeatMode;
this->rSfxId = initParams->sfxId;
PRINTF("コンストラクター3\n"); // "constructor 3"
PRINTF(T("コンストラクター3\n", "Constructor 3\n"));
return 1;
}

4
src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
View file

@ -12,6 +12,7 @@
#include "rand.h"
#include "sys_math.h"
#include "sys_matrix.h"
#include "translation.h"
#include "versions.h"
#include "z_lib.h"
#include "z64effect.h"
@ -90,7 +91,8 @@ u32 EffectSsEnIce_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
this->rEnvColorB = initParams->envColor.b;
this->rAlphaMode = 0;
} else {
PRINTF("Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n");
PRINTF(T("Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n",
"Effect_Ss_En_Ice_ct():pid->mode_sw is an error.\n"));
return 0;
}

3
src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
View file

@ -14,6 +14,7 @@
#include "rand.h"
#include "segmented_address.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
@ -69,7 +70,7 @@ u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* init
this->gfx = SEGMENTED_TO_VIRTUAL(gPhantomEnergyBallDL);
gSegments[6] = prevSeg6;
} else {
PRINTF("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n");
PRINTF(T("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n", "Effect_Ss_Fhg_Flash_ct():pffd->mode error\n"));
return 0;
}
} else {

4
src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
View file

@ -11,6 +11,7 @@
#include "printf.h"
#include "segmented_address.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
@ -55,7 +56,8 @@ u32 EffectSsIceSmoke_Init(PlayState* play, u32 index, EffectSs* this, void* init
return 1;
}
PRINTF("Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n");
PRINTF(T("Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n",
"Effect_SS_Ice_Smoke_ct(): Bank Object_Bank_Fz does not exist.\n"));
return 0;
}

6
src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
View file

@ -13,6 +13,7 @@
#include "line_numbers.h"
#include "printf.h"
#include "sys_matrix.h"
#include "translation.h"
#include "versions.h"
#include "z64effect.h"
#include "z64play.h"
@ -65,7 +66,7 @@ u32 EffectSsKakera_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
}
} else {
PRINTF("shape_modelがNULL\n");
PRINTF(T("shape_modelがNULL\n", "shape_model is NULL\n"));
LogUtils_HungupThread("../z_eff_kakera.c", LN1(175, 178));
}
@ -92,7 +93,8 @@ f32 func_809A9818(f32 arg0, f32 arg1) {
#if DEBUG_FEATURES
if (arg1 < 0.0f) {
PRINTF("範囲がマイナス！！(randomD_sectionUniformity)\n");
PRINTF(T("範囲がマイナス！！(randomD_sectionUniformity)\n",
"The range is negative!! (randomD_sectionUniformity)\n"));
}
#endif

12
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View file

@ -20,6 +20,7 @@
#include "sys_matrix.h"
#include "terminal.h"
#include "title_setup_state.h"
#include "translation.h"
#include "versions.h"
#include "z64audio.h"
#include "z64ocarina.h"
@ -1910,8 +1911,9 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
if (pauseCtx->pageIndex == PAUSE_MAP) {
if (YREG(7) != 0) {
PRINTF_COLOR_YELLOW();
PRINTF("キンスタ数(%d) Get_KIN_STA=%x (%x) (%x)\n", YREG(6), GET_GS_FLAGS(YREG(6)),
gAreaGsFlags[YREG(6)], gSaveContext.save.info.gsFlags[YREG(6) >> 2]);
PRINTF(T("キンスタ数(%d) Get_KIN_STA=%x (%x) (%x)\n", "Kinsta Count(%d) Get_KIN_STA=%x (%x) (%x)\n"),
YREG(6), GET_GS_FLAGS(YREG(6)), gAreaGsFlags[YREG(6)],
gSaveContext.save.info.gsFlags[YREG(6) >> 2]);
PRINTF_RST();
YREG(7) = 0;
@ -3681,7 +3683,7 @@ void KaleidoScope_Update(PlayState* play) {
pauseCtx->playerSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F);
size1 = Player_InitPauseDrawData(play, pauseCtx->playerSegment, &pauseCtx->playerSkelAnime);
PRINTF("プレイヤー size1＝%x\n", size1);
PRINTF(T("プレイヤー size1＝%x\n", "Player size1=%x\n"), size1);
size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart;
pauseCtx->iconItemSegment = (void*)ALIGN16((uintptr_t)pauseCtx->playerSegment + size1);
@ -3784,10 +3786,10 @@ void KaleidoScope_Update(PlayState* play) {
pauseCtx->nameSegment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItemLangSegment + size);
PRINTF("サイズ＝%x\n", size2 + size1 + size0 + size);
PRINTF(T("サイズ＝%x\n", "size=%x\n"), size2 + size1 + size0 + size);
PRINTF("item_name I_N_PT=%x\n", 0x800);
Interface_SetDoAction(play, DO_ACTION_DECIDE);
PRINTF("サイズ＝%x\n", size2 + size1 + size0 + size + 0x800);
PRINTF(T("サイズ＝%x\n", "size=%x\n"), size2 + size1 + size0 + size + 0x800);
if (((void)0, gSaveContext.worldMapArea) < WORLD_MAP_AREA_MAX) {
#if OOT_NTSC