falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more single strings T()

This commit is contained in:
Dragorn421 2025-06-04 20:05:41 +02:00
parent 12de3a9264
commit c402f9d712
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
17 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/boot/z_std_dma.c
View File

@ -519,7 +519,7 @@ void DmaMgr_ThreadEntry(void* arg) {
}
if (0) {
PRINTF(T("ＤＭＡ登録受付", "DMA registration acceptance") " dmap=%08x\n", req);
PRINTF(T("ＤＭＡ登録受付 dmap=%08x\n", "DMA registration acceptance dmap=%08x\n"), req);
}
// Process the DMA request

7
src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
View File

@ -209,12 +209,13 @@ void BgBdanSwitch_Init(Actor* thisx, PlayState* play) {
}
break;
default:
PRINTF(T("不正な", "Invalid") " ARG_DATA(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
"../z_bg_bdan_switch.c", 454);
PRINTF(T("不正な ARG_DATA(arg_data 0x%04x)(%s %d)\n", "Invalid ARG_DATA(arg_data 0x%04x)(%s %d)\n"),
this->dyna.actor.params, "../z_bg_bdan_switch.c", 454);
Actor_Kill(&this->dyna.actor);
return;
}
PRINTF(T("(巨大魚ダンジョン 専用スイッチ)", "(Giant Fish Dungeon Special Switch)") "(arg_data 0x%04x)\n",
PRINTF(T("(巨大魚ダンジョン 専用スイッチ)(arg_data 0x%04x)\n",
"(Giant Fish Dungeon Special Switch)(arg_data 0x%04x)\n"),
this->dyna.actor.params);
}

8
src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
View File

@ -87,8 +87,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) {
Actor_SetFocus(&this->actor, 20.0f);
this->type = PARAMS_GET_U(thisx->params, 12, 4);
if (this->type > 6) {
PRINTF(T("Error : object のタイプが設定されていない",
"Error : object type is not set") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n",
"Error : object type is not set (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_hidan_curtain.c", 352, this->actor.params);
Actor_Kill(&this->actor);
return;
@ -100,8 +100,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) {
thisx->params &= 0x3F;
if (DEBUG_FEATURES && ((this->actor.params < 0) || (this->actor.params > 0x3F))) {
PRINTF(T("Warning : object のセーブビットが設定されていない",
"Warning : object save bit is not set") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n",
"Warning : object save bit is not set (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_hidan_curtain.c", 373, this->actor.params);
}

12
src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
View File

@ -131,10 +131,9 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) {
if (PARAMS_GET_U(this->dyna.actor.params, 0, 8) < CRACKED_STONE_FLOOR ||
PARAMS_GET_U(this->dyna.actor.params, 0, 8) > LARGE_BOMBABLE_WALL) {
PRINTF(
T("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない",
"Error : arg_data for the Fire Temple breakable wall cannot be determined") "(%s %d)(arg_data 0x%04x)\n",
"../z_bg_hidan_kowarerukabe.c", 254, this->dyna.actor.params);
PRINTF(T("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n",
"Error : arg_data for the Fire Temple breakable wall cannot be determined (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_hidan_kowarerukabe.c", 254, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
return;
}
@ -148,8 +147,9 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) {
Actor_SetScale(&this->dyna.actor, 0.1f);
BgHidanKowarerukabe_InitColliderSphere(this, play);
BgHidanKowarerukabe_OffsetActorYPos(this);
PRINTF(T("(hidan 爆弾で壊れる 壁 床)", "(hidan bomb destroys walls and floors)") "(arg_data 0x%04x)\n",
this->dyna.actor.params);
PRINTF(
T("(hidan 爆弾で壊れる 壁 床)(arg_data 0x%04x)\n", "(hidan bomb destroys walls and floors)(arg_data 0x%04x)\n"),
this->dyna.actor.params);
}
void BgHidanKowarerukabe_Destroy(Actor* thisx, PlayState* play) {

3
src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
View File

@ -104,7 +104,8 @@ void BgJya1flift_InitCollision(Actor* thisx, PlayState* play) {
void BgJya1flift_Init(Actor* thisx, PlayState* play) {
BgJya1flift* this = (BgJya1flift*)thisx;
PRINTF(T("(１Ｆリフト)", "1F lift") "(flag %d)(room %d)\n", sIsSpawned, play->roomCtx.curRoom.num);
PRINTF(T("(１Ｆリフト)(flag %d)(room %d)\n", "(1F lift)(flag %d)(room %d)\n"), sIsSpawned,
play->roomCtx.curRoom.num);
this->hasInitialized = false;
if (sIsSpawned) {
Actor_Kill(thisx);

7
src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
View File

@ -102,8 +102,8 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) {
if (PARAMS_GET_U(this->dyna.actor.params, 0, 6) != 0x29) {
PRINTF_COLOR_WARNING();
PRINTF(T("Ｗａｒｎｉｎｇ : Switch Number が変更された",
"Warning : Switch Number has been changed") "(%s %d)(SW %d)\n",
PRINTF(T("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n",
"Warning : Switch Number has been changed (%s %d)(SW %d)\n"),
"../z_bg_jya_bombiwa.c", 218, PARAMS_GET_U(this->dyna.actor.params, 0, 6));
PRINTF_RST();
}
@ -114,7 +114,8 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) {
} else {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
PRINTF(T("(jya 爆弾で破壊岩)", "(jya bomb destroys rocks)") "(arg_data 0x%04x)\n", this->dyna.actor.params);
PRINTF(T("(jya 爆弾で破壊岩)(arg_data 0x%04x)\n", "(jya bomb destroys rocks)(arg_data 0x%04x)\n"),
this->dyna.actor.params);
}
}

2
src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
View File

@ -159,7 +159,7 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, PlayState* play) {
#if DEBUG_FEATURES
if (this->dyna.actor.child == NULL) {
PRINTF_COLOR_RED();
PRINTF(T("Ｅｒｒｏｒ : Mir Ray 発生失敗", "Error : Mir Ray failed to occur") " (%s %d)\n",
PRINTF(T("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", "Error : Mir Ray failed to occur (%s %d)\n"),
"../z_bg_jya_cobra.c", 270);
PRINTF_RST();
}

20
src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
View File

@ -211,8 +211,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
Collider_InitTris(play, &this->collider);
if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitFloor,
this->colliderElements)) {
PRINTF(T("Error : コリジョンデータセット失敗",
"Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
"Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_mizu_bwall.c", 484, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
@ -252,8 +252,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
Collider_InitTris(play, &this->collider);
if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitRutoWall,
this->colliderElements)) {
PRINTF(T("Error : コリジョンデータセット失敗",
"Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
"Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_mizu_bwall.c", 558, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
@ -293,8 +293,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
Collider_InitTris(play, &this->collider);
if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitUnusedWall,
this->colliderElements)) {
PRINTF(T("Error : コリジョンデータセット失敗",
"Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
"Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_mizu_bwall.c", 638, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
@ -336,8 +336,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
Collider_InitTris(play, &this->collider);
if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall,
this->colliderElements)) {
PRINTF(T("Error : コリジョンデータセット失敗",
"Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
"Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_mizu_bwall.c", 724, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
@ -379,8 +379,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) {
Collider_InitTris(play, &this->collider);
if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall,
this->colliderElements)) {
PRINTF(T("Error : コリジョンデータセット失敗",
"Error : Collision data set failure") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n",
"Error : Collision data set failure (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_mizu_bwall.c", 798, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {

2
src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
View File

@ -122,7 +122,7 @@ void BgMizuWater_Init(Actor* thisx, PlayState* play) {
switch (this->type) {
case 0:
if (bREG(15) == 0) {
PRINTF(T("<コンストラクト>", "<construct>") "%x %x %x\n",
PRINTF(T("<コンストラクト>%x %x %x\n", "<construct>%x %x %x\n"),
Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG),
Flags_GetSwitch(play, WATER_TEMPLE_WATER_F2_FLAG),
Flags_GetSwitch(play, WATER_TEMPLE_WATER_F3_FLAG));

4
src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
View File

@ -85,8 +85,8 @@ void BgMoriBigst_Init(Actor* thisx, PlayState* play) {
s32 pad;
BgMoriBigst* this = (BgMoriBigst*)thisx;
PRINTF(T("mori (bigST.鍵型天井)",
"mori (bigST. key-shaped ceiling)") "(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n",
PRINTF(T("mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n",
"mori (bigST. key-shaped ceiling)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n"),
this->dyna.actor.params, Flags_GetSwitch(play, PARAMS_GET_U(this->dyna.actor.params, 8, 6)),
Flags_GetTempClear(play, this->dyna.actor.room), Flags_GetClear(play, this->dyna.actor.room),
GET_PLAYER(play)->actor.world.pos.y);

2
src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
View File

@ -68,7 +68,7 @@ void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play) {
DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS);
#if DEBUG_FEATURES
PRINTF(T("森の神殿 obj. 落下天井", "Forest Temple obj. Falling Ceiling") " (home posY %f)\n",
PRINTF(T("森の神殿 obj. 落下天井 (home posY %f)\n", "Forest Temple obj. Falling Ceiling (home posY %f)\n"),
this->dyna.actor.home.pos.y);
if ((fabsf(1991.0f - this->dyna.actor.home.pos.x) > 0.001f) ||
(fabsf(683.0f - this->dyna.actor.home.pos.y) > 0.001f) ||

6
src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
View File

@ -77,9 +77,9 @@ void BgSpot08Iceblock_CheckParams(BgSpot08Iceblock* this) {
this->dyna.actor.params = 0x10;
break;
default:
PRINTF(
T("Error : arg_data 設定ミスです。", "Error : arg_data setting error. ") "(%s %d)(arg_data 0x%04x)\n",
"../z_bg_spot08_iceblock.c", 0xF6, this->dyna.actor.params);
PRINTF(T("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n",
"Error : arg_data setting error. (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_spot08_iceblock.c", 0xF6, this->dyna.actor.params);
this->dyna.actor.params = 0x10;
break;
case 1:

4
src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
View File

@ -153,8 +153,8 @@ void BgSpot09Obj_Init(Actor* thisx, PlayState* play) {
this->dyna.actor.params, GET_EVENTCHKINF_CARPENTERS_RESCUED_FLAGS());
this->dyna.actor.params &= 0xFF;
if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) {
PRINTF(T("Error : Spot 09 object の arg_data が判別出来ない",
"Error : Spot 09 object arg_data cannot be determined") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n",
"Error : Spot 09 object arg_data cannot be determined (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_spot09_obj.c", 322, this->dyna.actor.params);
}

3
src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
View File

@ -410,7 +410,8 @@ void func_808B56BC(BgSpot16Bombstone* this, PlayState* play) {
player->actor.world.pos.x += sinValue * this->sinRotation;
player->actor.world.pos.z += sinValue * this->cosRotation;
} else {
PRINTF(T("Error 補正出来ない", "Error Can't correct") "(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n",
PRINTF(T("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n",
"Error Can't correct (%s %d)(arg_data 0x%04x)(hosei_angY %x)\n"),
"../z_bg_spot16_bombstone.c", 935, this->actor.params, adjustedYawDiff);
}
}

3
src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
View File

@ -85,7 +85,8 @@ void BgSpot16Doughnut_Init(Actor* thisx, PlayState* play) {
} else {
this->fireFlag |= 1;
}
PRINTF(T("(ｓｐｏｔ１６ ドーナツ雲)", "(spot16 Donut Cloud)") "(arg_data 0x%04x)\n", this->actor.params);
PRINTF(T("(ｓｐｏｔ１６ ドーナツ雲)(arg_data 0x%04x)\n", "(spot16 Donut Cloud)(arg_data 0x%04x)\n"),
this->actor.params);
}
}

2
src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
View File

@ -171,7 +171,7 @@ void BgSpot18Basket_Init(Actor* thisx, PlayState* play) {
if (this->dyna.actor.child == NULL) {
PRINTF_COLOR_RED();
PRINTF(T("Ｅｒｒｏｒ : 変化壷蓋発生失敗", "Error : Failed to spawn the change pot cover") "(%s %d)\n",
PRINTF(T("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", "Error : Failed to spawn the change pot cover (%s %d)\n"),
"../z_bg_spot18_basket.c", 351);
PRINTF_RST();
Actor_Kill(&this->dyna.actor);

10
src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
View File

@ -108,7 +108,8 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) {
} else if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
age = 0;
} else {
PRINTF(T("Error : リンク年齢不詳", "Error : Link age unknown") " (%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n",
"Error : Link age unknown (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_spot18_obj.c", 182, this->dyna.actor.params);
return 0;
}
@ -121,12 +122,13 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) {
}
return D_808B90F0[PARAMS_GET_U(this->dyna.actor.params, 0, 4)][age];
case 2:
PRINTF(T("Error : Obj出現判定が設定されていない",
"Error : Obj appearance detection is not set") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n",
"Error : Obj appearance detection is not set (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_spot18_obj.c", 202, this->dyna.actor.params);
return 0;
default:
PRINTF(T("Error : Obj出現判定失敗", "Error : Obj appearance check failed") "(%s %d)(arg_data 0x%04x)\n",
PRINTF(T("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n",
"Error : Obj appearance check failed (%s %d)(arg_data 0x%04x)\n"),
"../z_bg_spot18_obj.c", 210, this->dyna.actor.params);
}
return 0;