diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 2230b86d35..028606443f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -218,7 +218,6 @@ void BgMoriElevator_SetPosition(BgMoriElevator* this, PlayState* play) { this->targetY = 233.0f; BgMoriElevator_StopMovement(this); } else { - // "Error:Forest Temple obj elevator Room setting is dangerous(%s %d)" PRINTF(T("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "Error : Forest Temple obj elevator room setting is dangerous(%s %d)\n"), "../z_bg_mori_elevator.c", 479); diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index c8e6e15450..c12ca1e950 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -26,6 +26,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64audio.h" #include "z64effect.h" @@ -1785,20 +1786,17 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { } if (this->coreCollider.base.acFlags & AC_HIT) { ColliderElement* acHitElem = this->coreCollider.elem.acHitElem; - // "hit!!" - PRINTF("Core_Damage_check 当り!!\n"); + PRINTF(T("Core_Damage_check 当り!!\n", "Core_Damage_check hit!!\n")); this->coreCollider.base.acFlags &= ~AC_HIT; if ((acHitElem->atDmgInfo.dmgFlags & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) { this->work[MO_TENT_ACTION_STATE] = MO_CORE_RETREAT; } - // "hit 2 !!" - PRINTF("Core_Damage_check 当り 2 !!\n"); + PRINTF(T("Core_Damage_check 当り 2 !!\n", "Core_Damage_check hit 2 !!\n")); if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_UNDERWATER) && (this->work[MO_TENT_INVINC_TIMER] == 0)) { u8 damage = CollisionCheck_GetSwordDamage(acHitElem->atDmgInfo.dmgFlags); if ((damage != 0) && (this->work[MO_TENT_ACTION_STATE] < MO_CORE_ATTACK)) { - // "sword hit !!" - PRINTF("Core_Damage_check 剣 当り!!\n"); + PRINTF(T("Core_Damage_check 剣 当り!!\n", "Core_Damage_check sword hit!!\n")); this->work[MO_TENT_ACTION_STATE] = MO_CORE_STUNNED; this->timers[0] = 25; @@ -1868,8 +1866,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { } } } - // "end !!" - PRINTF("Core_Damage_check 終わり !!\n"); + PRINTF(T("Core_Damage_check 終わり !!\n", "Core_Damage_check end !!\n")); PRINTF_RST(); } diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index a4fba78e7b..d3d275de9e 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -922,8 +922,8 @@ void DemoDu_CsCredits_HandleCues(DemoDu* this, PlayState* play) { DemoDu_CsCredits_AdvanceTo04(this); break; default: - // "Demo_Du_inEnding_Check_DemoMode:There is no such operation!!!!!!!!" - PRINTF("Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Du_inEnding_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } this->cueId = nextCueId; diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 7528a2a6a2..c2c86d8a04 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -169,7 +169,8 @@ void DemoEc_Init(Actor* thisx, PlayState* play) { DemoEc* this = (DemoEc*)thisx; if ((this->actor.params < 0) || (this->actor.params > 34)) { - PRINTF(VT_FGCOL(RED) "Demo_Ec_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("Demo_Ec_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n", + "Demo_Ec_Actor_ct:arg_data is strange!!!!!!!!!!!!\n") VT_RST); Actor_Kill(&this->actor); } else { this->updateMode = EC_UPDATE_COMMON; @@ -702,7 +703,7 @@ Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) { case 13: return object_daiku_DL_005880; default: - PRINTF(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("かつらが無い!!!!!!!!!!!!!!!!\n", "No wig!!!!!!!!!!!!!!!!\n") VT_RST); return NULL; } } @@ -748,7 +749,7 @@ Gfx* DemoEc_GetGerudoPostLimbDList(DemoEc* this) { case 18: return gGerudoWhiteHairstyleSpikyDL; default: - PRINTF(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("かつらが無い!!!!!!!!!!!!!!!!\n", "No wig!!!!!!!!!!!!!!!!\n") VT_RST); return NULL; } } @@ -1259,8 +1260,9 @@ void DemoEc_InitNpc(DemoEc* this, PlayState* play) { s16 type = this->actor.params; if (sInitFuncs[type] == NULL) { - // "Demo_Ec_main_init: Initialization process is wrong arg_data" - PRINTF(VT_FGCOL(RED) " Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, type); + PRINTF(VT_FGCOL(RED) T(" Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n", + " Demo_Ec_main_init: Initialization process is wrong arg_data = %d!\n") VT_RST, + type); Actor_Kill(&this->actor); return; } @@ -1284,8 +1286,9 @@ void DemoEc_InitCommon(DemoEc* this, PlayState* play) { secondaryObjectSlot = Object_GetSlot(&play->objectCtx, sp28); if ((secondaryObjectSlot < 0) || (primaryObjectSlot < 0)) { - // "Demo_Ec_main_bank: Bank unreadable arg_data = %d!" - PRINTF(VT_FGCOL(RED) "Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, type); + PRINTF(VT_FGCOL(RED) T("Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n", + "Demo_Ec_main_bank: Bank unreadable arg_data = %d!\n") VT_RST, + type); Actor_Kill(&this->actor); return; } diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 129b99d926..8720d49df2 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -122,8 +122,8 @@ void DemoExt_HandleCues(DemoExt* this, PlayState* play) { DemoExt_SetupDispellVortex(this); break; default: - // "Demo_Ext_Check_DemoMode: there is no such action!" - PRINTF("Demo_Ext_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Ext_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Ext_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } this->cueId = nextCueId; diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 27cb963a4b..5446d622fb 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -72,7 +72,8 @@ void DemoGeff_Init(Actor* thisx, PlayState* play) { DemoGeff* this = (DemoGeff*)thisx; if (this->actor.params < 0 || this->actor.params >= 9) { - PRINTF(VT_FGCOL(RED) "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n", + "Demo_Geff_Actor_ct:arg_data is strange!!!!!!!!!!!!\n") VT_RST); Actor_Kill(&this->actor); return; } @@ -190,7 +191,9 @@ void func_80978370(DemoGeff* this, PlayState* play) { s16 params = this->actor.params; DemoGeffInitFunc initFunc = sInitFuncs[params]; if (initFunc == NULL) { - PRINTF(VT_FGCOL(RED) " Demo_Geff_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, params); + PRINTF(VT_FGCOL(RED) T(" Demo_Geff_main_init:初期化処理がおかしいarg_data = %d!\n", + " Demo_Geff_main_init: Initialization process is wrong arg_data = %d!\n") VT_RST, + params); Actor_Kill(&this->actor); return; } @@ -206,7 +209,9 @@ void func_809783D4(DemoGeff* this, PlayState* play) { s32 pad; if (objectSlot < 0) { - PRINTF(VT_FGCOL(RED) "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, params); + PRINTF(VT_FGCOL(RED) T("Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n", + "Demo_Geff_main_bank: Bank unreadable arg_data = %d!\n") VT_RST, + params); Actor_Kill(thisx); return; } diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 6bc60ac276..e7e6afe3a4 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -239,15 +239,17 @@ s32 DemoGj_FindGanon(DemoGj* this, PlayState* play) { if (actor->id == ACTOR_BOSS_GANON2) { this->ganon = (BossGanon2*)actor; - // "Demo_Gj_Search_Boss_Ganon %d: Discover Ganon !!!!" - PRINTF("Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n", this->dyna.actor.params); + PRINTF(T("Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n", + "Demo_Gj_Search_Boss_Ganon %d: Ganon is discovered!!!!\n"), + this->dyna.actor.params); return true; } actor = actor->next; } - // "Demo_Gj_Search_Boss_Ganon %d: I couldn't find Ganon" - PRINTF("Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n", this->dyna.actor.params); + PRINTF(T("Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n", + "Demo_Gj_Search_Boss_Ganon %d: Unable to find Ganon\n"), + this->dyna.actor.params); return false; } //! @bug Missing return value when `this->ganon` is already set. No caller uses the return value @@ -404,8 +406,8 @@ void DemoGj_SetupRotation(DemoGj* this, PlayState* play) { break; default: - // "Demo_Gj_common_Reflect : This arg_data is not supported = %d" - PRINTF(VT_FGCOL(RED) "Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n" VT_RST, + PRINTF(VT_FGCOL(RED) T("Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n", + "Demo_Gj_common_Reflect : This arg_data is not supported = %d\n") VT_RST, this->dyna.actor.params); return; } @@ -558,8 +560,8 @@ void DemoGj_SetupMovement(DemoGj* this, PlayState* play) { break; default: - // "Demo_Gj_Setup_Move_common : This arg_data is not supported = %d" - PRINTF(VT_FGCOL(RED) "Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n" VT_RST, + PRINTF(VT_FGCOL(RED) T("Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n", + "Demo_Gj_Setup_Move_common : This arg_data is not supported = %d\n") VT_RST, actor->params); break; } @@ -1435,8 +1437,8 @@ void DemoGj_Init(Actor* thisx, PlayState* play) { break; default: - // "Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!" - PRINTF(VT_FGCOL(RED) "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) T("Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n", + "Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST); Actor_Kill(&this->dyna.actor); } } diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 98552aec93..006a9267d3 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -1774,8 +1774,8 @@ void DemoGt_Init(Actor* thisx, PlayState* play) { func_80982054_Init24(this, play); break; default: - // "Demo_Gt_Actor_ct There is no such argument !" - PRINTF("Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF(T("Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n", + "Demo_Gt_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n")); Actor_Kill(&this->dyna.actor); } } diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index af3ddeb000..a5dff0d4a3 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -244,8 +244,8 @@ void func_809839D0(DemoIk* this, PlayState* play) { case 6: break; default: - // "there is no such action" - PRINTF("Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Ik_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } @@ -393,8 +393,8 @@ void func_80984048(DemoIk* this, PlayState* play) { Actor_Kill(&this->actor); break; default: - // "there is no such action" - PRINTF("Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Ik_inFace_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 0eef345821..508128f7be 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -647,7 +647,8 @@ void func_809861C4(DemoIm* this, PlayState* play) { this->action = 12; break; default: - PRINTF("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Im_Ocarina_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } @@ -687,7 +688,8 @@ void func_809862E0(DemoIm* this, PlayState* play) { func_80986148(this); break; default: - PRINTF("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Im_Ocarina_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } @@ -815,7 +817,8 @@ void func_8098680C(DemoIm* this, PlayState* play) { Actor_Kill(&this->actor); break; default: - PRINTF("Demo_Im_Spot00_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Im_Spot00_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Im_Spot00_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } @@ -1085,7 +1088,8 @@ void func_809871E8(DemoIm* this, PlayState* play) { func_80987174(this); break; default: - PRINTF("Demo_Im_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Im_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Im_inEnding_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 38a44165d5..5831c44b06 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -592,7 +592,8 @@ void func_8098F654(DemoSa* this, PlayState* play) { func_8098F5D0(this); break; default: - PRINTF("Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Sa_inEnding_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } @@ -741,7 +742,8 @@ void func_8098FB68(DemoSa* this, PlayState* play) { func_8098FAE0(this); break; default: - PRINTF("Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "Demo_Sa_inPresent_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index c1f7983ce8..992417b888 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -5,6 +5,7 @@ #include "gfx_setupdl.h" #include "printf.h" #include "sfx.h" +#include "translation.h" #include "z64curve.h" #include "z64play.h" #include "z64save.h" @@ -58,8 +59,7 @@ void DemoTreLgt_Init(Actor* thisx, PlayState* play) { DemoTreLgt* this = (DemoTreLgt*)thisx; if (!SkelCurve_Init(play, &this->skelCurve, &gTreasureChestCurveSkel, sAnimations[0])) { - // "Demo_Tre_Lgt_Actor_ct (); Construct failed" - PRINTF("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n"); + PRINTF(T("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n", "Demo_Tre_Lgt_Actor_ct(); Construct failed\n")); } ASSERT(true, "1", "../z_demo_tre_lgt.c", UNK_LINE); diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 9b49e35f78..a0533d4569 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -1380,7 +1380,8 @@ void EnIk_HandleCsCues(EnIk* this, PlayState* play) { break; default: - PRINTF("En_Ik_inConfrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Ik_inConfrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Ik_inConfrontion_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index e0d2edddf3..2a00eb9ef6 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -695,8 +695,8 @@ void EnNb_CheckKidnapCsMode(EnNb* this, PlayState* play) { Actor_Kill(&this->actor); break; default: - // "Operation Doesn't Exist!!!!!!!!" - PRINTF("En_Nb_Kidnap_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Nb_Kidnap_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Nb_Kidnap_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } this->cueId = nextCueId; @@ -914,8 +914,8 @@ void EnNb_CheckConfrontationCsMode(EnNb* this, PlayState* play) { EnNb_SetupConfrontationDestroy(this); break; default: - // "En_Nb_Confrontion_Check_DemoMode: Operation doesn't exist!!!!!!!!" - PRINTF("En_Nb_Confrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Nb_Confrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Nb_Confrontion_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } this->cueId = nextCueId; @@ -1102,8 +1102,8 @@ void EnNb_CheckCreditsCsModeImpl(EnNb* this, PlayState* play) { EnNb_SetupCreditsHeadTurn(this); break; default: - // "En_Nb_inEnding_Check_DemoMode: Operation doesn't exist!!!!!!!!" - PRINTF("En_Nb_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Nb_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Nb_inEnding_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } this->cueId = nextCueId; diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index db44d32ed0..b6c7405a03 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -703,8 +703,8 @@ void EnRu2_NextCreditsAction(EnRu2* this, PlayState* play) { EnRu2_SetupTurnHeadDownLeftAnimation(this); break; default: - // "There is no such action!" - PRINTF("En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Ru2_inEnding_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } this->cueId = nextCueId; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 9d2ec13761..c8b6685587 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -2043,7 +2043,8 @@ s32 EnXc_SetupNocturneState(Actor* thisx, PlayState* play) { Actor_Kill(thisx); break; default: - PRINTF("En_Oa2_Stalker_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Oa2_Stalker_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Oa2_Stalker_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 0d03f72301..c00790e02c 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -1005,7 +1005,8 @@ void func_80B50A04(EnZl2* this, PlayState* play) { func_80B50644(this, play); break; default: - PRINTF("En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Zl2_inAgain_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } @@ -1396,7 +1397,8 @@ void func_80B51948(EnZl2* this, PlayState* play) { func_80B513A8(this, play); break; default: - PRINTF("En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Zl2_inEnding_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->cueId = nextCueId; } @@ -1560,7 +1562,8 @@ void func_80B51FA8(EnZl2* this, PlayState* play) { Actor_Kill(&this->actor); break; default: - PRINTF("En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Zl2_inRunning_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } this->cueId = nextCueId; diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 28cf2833bb..ca44cb5731 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -968,7 +968,8 @@ void func_80B55444(EnZl3* this, PlayState* play) { this->unk_328 = 1; FALLTHROUGH; default: - PRINTF("En_Zl3_inFinal_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Zl3_inFinal_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Zl3_inFinal_Check_DemoMode: There is no such action!!!!!!!!\n")); break; } this->unk_2F0 = temp_v0; @@ -1384,7 +1385,8 @@ void func_80B564A8(EnZl3* this, PlayState* play) { Actor_Kill(&this->actor); break; default: - PRINTF("En_Zl3_inFinal2_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF(T("En_Zl3_inFinal2_Check_DemoMode:そんな動作は無い!!!!!!!!\n", + "En_Zl3_inFinal2_Check_DemoMode: There is no such action!!!!!!!!\n")); } this->unk_2F0 = temp_v0; } diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 13443bffdb..88638e1ed8 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -492,16 +492,17 @@ void ObjBean_Init(Actor* thisx, PlayState* play) { path = PARAMS_GET_U(this->dyna.actor.params, 8, 5); if (path == 0x1F) { PRINTF_COLOR_ERROR(); - // "No path data?" - PRINTF("パスデータが無い?(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 909, this->dyna.actor.params); + PRINTF(T("パスデータが無い?(%s %d)(arg_data %xH)\n", "No path data? (%s %d)(arg_data %xH)\n"), + "../z_obj_bean.c", 909, this->dyna.actor.params); PRINTF_RST(); Actor_Kill(&this->dyna.actor); return; } if (play->pathList[path].count < 3) { PRINTF_COLOR_ERROR(); - // "Incorrect number of path data" - PRINTF("パスデータ数が不正(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 921, this->dyna.actor.params); + PRINTF(T("パスデータ数が不正(%s %d)(arg_data %xH)\n", + "Path data count is invalid (%s %d)(arg_data %xH)\n"), + "../z_obj_bean.c", 921, this->dyna.actor.params); PRINTF_RST(); Actor_Kill(&this->dyna.actor); return; @@ -530,8 +531,8 @@ void ObjBean_Init(Actor* thisx, PlayState* play) { ObjBean_SetupWaitForBean(this); } this->dyna.actor.world.rot.z = this->dyna.actor.home.rot.z = this->dyna.actor.shape.rot.z = 0; - // "Magic bean tree lift" - PRINTF("(魔法の豆の木リフト)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(魔法の豆の木リフト)(arg_data 0x%04x)\n", "(Magic beanstalk lift)(arg_data 0x%04x)\n"), + this->dyna.actor.params); } void ObjBean_Destroy(Actor* thisx, PlayState* play) { @@ -908,8 +909,7 @@ void ObjBean_Update(Actor* thisx, PlayState* play) { if (ObjBean_CheckForHorseTrample(this, play)) { PRINTF_COLOR_CYAN(); - // "Horse and bean tree lift collision" - PRINTF("馬と豆の木リフト衝突!!!\n"); + PRINTF(T("馬と豆の木リフト衝突!!!\n", "Horse and beanstalk lift collide!!!\n")); PRINTF_RST(); ObjBean_Break(this, play); DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index e417659024..8501c29f5b 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -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" @@ -108,8 +109,8 @@ void ObjKibako_Init(Actor* thisx, PlayState* play) { ObjKibako_InitCollider(&this->actor, play); CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sCCInfoInit); ObjKibako_SetupIdle(this); - // "wooden box" - PRINTF("(dungeon keep 木箱)(arg_data 0x%04x)\n", this->actor.params); + PRINTF(T("(dungeon keep 木箱)(arg_data 0x%04x)\n", "(dungeon keep wooden box)(arg_data 0x%04x)\n"), + this->actor.params); } void ObjKibako_Destroy(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index d81ec6f0c9..9233f00c7a 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -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" @@ -140,9 +141,8 @@ void ObjKibako2_Init(Actor* thisx, PlayState* play) { this->actionFunc = ObjKibako2_Idle; this->dyna.actor.home.rot.z = this->dyna.actor.world.rot.z = this->dyna.actor.shape.rot.z = this->dyna.actor.world.rot.x = this->dyna.actor.shape.rot.x = 0; - // "Wooden box (stationary)" - PRINTF("木箱(据置)(arg %04xH)(item %04xH %d)\n", this->dyna.actor.params, this->collectibleFlag, - this->dyna.actor.home.rot.x); + PRINTF(T("木箱(据置)(arg %04xH)(item %04xH %d)\n", "Wooden box (stationary)(arg %04xH)(item %04xH %d)\n"), + this->dyna.actor.params, this->collectibleFlag, this->dyna.actor.home.rot.x); } void ObjKibako2_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 52d71f3d7f..05fe7a206f 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -17,6 +17,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64effect.h" #include "z64play.h" @@ -203,8 +204,9 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) { this->actor.home.pos.y, this->actor.home.pos.z, 0, this->actor.home.rot.y, 0, (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) { PRINTF_COLOR_ERROR(); - // "Push-pull block occurrence failure" - PRINTF("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_obj_lightswitch.c", 452, this->actor.params); + PRINTF(T("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", + "Push/pull block failure(%s %d)(arg_data 0x%04x)\n"), + "../z_obj_lightswitch.c", 452, this->actor.params); PRINTF_RST(); removeSelf = true; } @@ -214,8 +216,7 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) { if (removeSelf) { Actor_Kill(&this->actor); } - // "Light switch" - PRINTF("(光スイッチ)(arg_data 0x%04x)\n", this->actor.params); + PRINTF(T("(光スイッチ)(arg_data 0x%04x)\n", "(Light switch)(arg_data 0x%04x)\n"), this->actor.params); } void ObjLightswitch_Destroy(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index cd25733300..cc7651b6b4 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -8,6 +8,7 @@ #include "printf.h" #include "terminal.h" +#include "translation.h" #include "z64play.h" #include "z64player.h" @@ -36,13 +37,12 @@ void ObjMakekinsuta_Init(Actor* thisx, PlayState* play) { if (PARAMS_GET_NOSHIFT(this->actor.params, 13, 2) == 0x4000) { PRINTF_COLOR_BLUE(); - // "Gold Star Enemy(arg_data %x)" - PRINTF("金スタ発生敵(arg_data %x)\n", this->actor.params); + PRINTF(T("金スタ発生敵(arg_data %x)\n", "Gold Star Enemy(arg_data %x)\n"), this->actor.params); PRINTF_RST(); } else { PRINTF_COLOR_WARNING(); - // "Invalid Argument (arg_data %x)(%s %d)" - PRINTF("引数不正 (arg_data %x)(%s %d)\n", this->actor.params, "../z_obj_makekinsuta.c", 119); + PRINTF(T("引数不正 (arg_data %x)(%s %d)\n", "Invalid Argument (arg_data %x)(%s %d)\n"), this->actor.params, + "../z_obj_makekinsuta.c", 119); PRINTF_RST(); } this->actionFunc = func_80B98320; diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index d7a80212c1..ee2e8801c5 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -12,6 +12,7 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" @@ -78,9 +79,9 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play) { if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, spawnPos->z, 0, block->rotY, 0, ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) { - // "Push-pull block failure" PRINTF_COLOR_ERROR(); - PRINTF("Error : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194); + PRINTF(T("Error : 押し引きブロック発生失敗(%s %d)\n", "Error : Push/pull block failure (%s %d)\n"), + "../z_obj_makeoshihiki.c", 194); PRINTF_RST(); Actor_Kill(thisx); return; diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index b86e27a258..126e2c42ec 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -10,6 +10,7 @@ #include "libc64/qrand.h" #include "ichain.h" #include "printf.h" +#include "translation.h" #include "z64play.h" #define FLAGS 0 @@ -76,9 +77,9 @@ s32 ObjMure_SetCullingImpl(Actor* thisx, PlayState* play) { result = true; break; default: - // "Error : Culling is not set.(%s %d)(arg_data 0x%04x)" - PRINTF("Error : カリングの設定がされていません。(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 204, - this->actor.params); + PRINTF(T("Error : カリングの設定がされていません。(%s %d)(arg_data 0x%04x)\n", + "Error : Culling is not set. (%s %d)(arg_data 0x%04x)\n"), + "../z_obj_mure.c", 204, this->actor.params); return false; } return result; @@ -100,11 +101,13 @@ void ObjMure_Init(Actor* thisx, PlayState* play) { this->type = PARAMS_GET_U(thisx->params, 0, 5); if (this->ptn >= 4) { - PRINTF("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 237, thisx->params); + PRINTF(T("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "Error Swarm of enemies (%s %d)(arg_data 0x%04x)\n"), + "../z_obj_mure.c", 237, thisx->params); Actor_Kill(&this->actor); return; } else if (this->type >= 5) { - PRINTF("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 245, thisx->params); + PRINTF(T("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "Error Swarm of enemies (%s %d)(arg_data 0x%04x)\n"), + "../z_obj_mure.c", 245, thisx->params); Actor_Kill(&this->actor); return; } else if (!ObjMure_SetCulling(thisx, play)) { @@ -112,12 +115,15 @@ void ObjMure_Init(Actor* thisx, PlayState* play) { return; } this->actionFunc = ObjMure_InitialAction; - PRINTF("群れな敵 (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n", thisx->params, this->chNum, this->ptn, - this->svNum, this->type); + PRINTF(T("群れな敵 (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n", + "Swarm of enemies (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n"), + thisx->params, this->chNum, this->ptn, this->svNum, this->type); #if DEBUG_FEATURES if (ObjMure_GetMaxChildSpawns(this) <= 0) { - PRINTF("Warning : 個体数が設定されていません(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 268, thisx->params); + PRINTF(T("Warning : 個体数が設定されていません(%s %d)(arg_data 0x%04x)\n", + "Warning : The number of individuals is not set(%s %d)(arg_data 0x%04x)\n"), + "../z_obj_mure.c", 268, thisx->params); } #endif } @@ -135,7 +141,7 @@ s32 ObjMure_GetMaxChildSpawns(ObjMure* this) { void ObjMure_GetSpawnPos(Vec3f* outPos, Vec3f* inPos, s32 ptn, s32 idx) { #if DEBUG_FEATURES if (ptn >= 4) { - PRINTF("おかしなの (%s %d)\n", "../z_obj_mure.c", 307); + PRINTF(T("おかしなの (%s %d)\n", "That's strange (%s %d)\n"), "../z_obj_mure.c", 307); } #endif @@ -152,8 +158,9 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { for (i = 0; i < maxChildren; i++) { #if DEBUG_FEATURES if (this->children[i] != NULL) { - // "Error: I already have a child(%s %d)(arg_data 0x%04x)" - PRINTF("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 333, actor->params); + PRINTF(T("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", + "Error : I already have a child (%s %d)(arg_data 0x%04x)\n"), + "../z_obj_mure.c", 333, actor->params); } #endif @@ -169,7 +176,8 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { this->children[i]->flags |= ACTOR_FLAG_GRASS_DESTROYED; this->children[i]->room = actor->room; } else { - PRINTF("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 359); + PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c", + 359); } break; default: @@ -180,7 +188,8 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { if (this->children[i] != NULL) { this->children[i]->room = actor->room; } else { - PRINTF("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 382); + PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c", + 382); } break; } @@ -197,7 +206,9 @@ void ObjMure_SpawnActors1(ObjMure* this, PlayState* play2) { for (i = 0; i < maxChildren; i++) { #if DEBUG_FEATURES if (this->children[i] != NULL) { - PRINTF("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 407, actor->params); + PRINTF(T("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", + "Error : I already have a child (%s %d)(arg_data 0x%04x)\n"), + "../z_obj_mure.c", 407, actor->params); } #endif @@ -210,7 +221,7 @@ void ObjMure_SpawnActors1(ObjMure* this, PlayState* play2) { this->children[i]->room = actor->room; } else { this->childrenStates[i] = OBJMURE_CHILD_STATE_1; - PRINTF("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 438); + PRINTF(T("warning 発生失敗 (%s %d)\n", "warning failed to occur (%s %d)\n"), "../z_obj_mure.c", 438); } } } diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 365a0e37c3..eca8b0d933 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -9,6 +9,7 @@ #include "ichain.h" #include "printf.h" #include "sys_math3d.h" +#include "translation.h" #include "z_lib.h" #include "z64play.h" @@ -117,8 +118,9 @@ void ObjMure2_SpawnActors(ObjMure2* this, PlayState* play) { for (i = 0; i < D_80B9A818[actorNum]; i++) { if (this->actorSpawnPtrList[i] != NULL) { - // "Warning : I already have a child (%s %d)(arg_data 0x%04x)" - PRINTF("Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure2.c", 269, this->actor.params); + PRINTF(T("Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", + "Warning : I already have a child (%s %d)(arg_data 0x%04x)\n"), + "../z_obj_mure2.c", 269, this->actor.params); continue; } diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 8c62e888f3..efa0fe3f46 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -230,9 +230,9 @@ void ObjOshihiki_CheckType(ObjOshihiki* this, PlayState* play) { ObjOshihiki_InitDynapoly(this, play, &gPushBlockCol, 1); break; default: - // "Error : type cannot be determined" - PRINTF("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 444, - this->dyna.actor.params); + PRINTF(T("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", + "Error : type cannot be determined (%s %d)(arg_data 0x%04x)\n"), + "../z_obj_oshihiki.c", 444, this->dyna.actor.params); break; } } @@ -274,8 +274,9 @@ void ObjOshihiki_SetColor(ObjOshihiki* this, PlayState* play2) { } if (i >= ARRAY_COUNT(sColors)) { - // "Error : scene_data_ID cannot be determined" - PRINTF("Error : scene_data_ID が判別できない。(%s %d)\n", "../z_obj_oshihiki.c", 579); + PRINTF(T("Error : scene_data_ID が判別できない。(%s %d)\n", + "Error : scene_data_ID cannot be determined. (%s %d)\n"), + "../z_obj_oshihiki.c", 579); color->r = color->g = color->b = 255; } else { src = &sColors[i][paramsColorIdx]; @@ -320,8 +321,8 @@ void ObjOshihiki_Init(Actor* thisx, PlayState* play2) { ObjOshihiki_SetColor(this, play); ObjOshihiki_ResetFloors(this); ObjOshihiki_SetupOnActor(this, play); - // "(dungeon keep push-pull block)" - PRINTF("(dungeon keep 押し引きブロック)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF(T("(dungeon keep 押し引きブロック)(arg_data 0x%04x)\n", "(dungeon keep push/pull block)(arg_data 0x%04x)\n"), + this->dyna.actor.params); } void ObjOshihiki_Destroy(Actor* thisx, PlayState* play) { @@ -387,9 +388,9 @@ s32 ObjOshihiki_CheckFloor(ObjOshihiki* this, PlayState* play) { s32 ObjOshihiki_CheckGround(ObjOshihiki* this, PlayState* play) { if (this->dyna.actor.world.pos.y <= BGCHECK_Y_MIN + 10.0f) { - // "Warning : Push-pull block fell too much" - PRINTF("Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 809, - this->dyna.actor.params); + PRINTF(T("Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n", + "Warning : Push/pull block fell too much (%s %d)(arg_data 0x%04x)\n"), + "../z_obj_oshihiki.c", 809, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); return 0; } diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index b21c99e2ea..2ad4bbf09a 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -339,7 +339,7 @@ void ObjSwitch_Init(Actor* thisx, PlayState* play) { if (OBJSWITCH_FROZEN(&this->dyna.actor) && (ObjSwitch_SpawnIce(this, play) == NULL)) { PRINTF_COLOR_RED(); - PRINTF("Error : 氷発生失敗 (%s %d)\n", "../z_obj_switch.c", 732); + PRINTF(T("Error : 氷発生失敗 (%s %d)\n", "Error : Ice generation failure (%s %d)\n"), "../z_obj_switch.c", 732); PRINTF_RST(); this->dyna.actor.params &= ~OBJSWITCH_FROZEN_FLAG; } diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index ad927dca9a..b3dc890ca8 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -13,6 +13,7 @@ #include "printf.h" #include "sfx.h" #include "sys_matrix.h" +#include "translation.h" #include "z_lib.h" #include "z64ocarina.h" #include "z64play.h" @@ -149,10 +150,10 @@ void ObjTimeblock_Init(Actor* thisx, PlayState* play) { ObjTimeblock_SetupAltBehaviourNotVisible(this); } - // "Block of time" - PRINTF("時のブロック ( %04xH save:%d color:%d range:%d move:%d)\n", (u16)this->dyna.actor.params, - this->unk_177, this->dyna.actor.home.rot.z & 7, PARAMS_GET_U(this->dyna.actor.params, 11, 3), - PARAMS_GET_U(this->dyna.actor.params, 10, 1)); + PRINTF(T("時のブロック ( %04xH save:%d color:%d range:%d move:%d)\n", + "Time Block ( %04xH save:%d color:%d range:%d move:%d)\n"), + (u16)this->dyna.actor.params, this->unk_177, this->dyna.actor.home.rot.z & 7, + PARAMS_GET_U(this->dyna.actor.params, 11, 3), PARAMS_GET_U(this->dyna.actor.params, 10, 1)); } void ObjTimeblock_Destroy(Actor* thisx, PlayState* play) { @@ -233,8 +234,9 @@ void ObjTimeblock_Normal(ObjTimeblock* this, PlayState* play) { // Possibly points the camera to this actor OnePointCutscene_Attention(play, &this->dyna.actor); - // "◯◯◯◯ Time Block Attention Camera (frame counter %d)\n" - PRINTF("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", play->state.frames); + PRINTF(T("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", + "◯◯◯◯ Time Block Attention Camera (frame counter %d)\n"), + play->state.frames); this->demoEffectFirstPartTimer = 12; @@ -291,8 +293,9 @@ void ObjTimeblock_AltBehaviorVisible(ObjTimeblock* this, PlayState* play) { ObjTimeblock_SpawnDemoEffect(this, play); this->demoEffectTimer = 160; OnePointCutscene_Attention(play, &this->dyna.actor); - // "Time Block Attention Camera (frame counter)" - PRINTF("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", play->state.frames); + PRINTF(T("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", + "◯◯◯◯ Time Block Attention Camera (frame counter %d)\n"), + play->state.frames); ObjTimeblock_ToggleSwitchFlag(play, PARAMS_GET_U(this->dyna.actor.params, 0, 6)); } diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index d5171ad128..9afd53ae53 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -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" @@ -124,7 +125,7 @@ s32 ObjTsubo_SnapToFloor(ObjTsubo* this, PlayState* play) { Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos); return true; } else { - PRINTF("地面に付着失敗\n"); + PRINTF(T("地面に付着失敗\n", "Failed to attach to ground\n")); return false; } } @@ -149,11 +150,12 @@ void ObjTsubo_Init(Actor* thisx, PlayState* play) { } this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[PARAMS_GET_U(this->actor.params, 8, 1)]); if (this->requiredObjectSlot < 0) { - PRINTF("Error : バンク危険! (arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_obj_tsubo.c", 410); + PRINTF(T("Error : バンク危険! (arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"), + this->actor.params, "../z_obj_tsubo.c", 410); Actor_Kill(&this->actor); } else { ObjTsubo_SetupWaitForObject(this); - PRINTF("(dungeon keep 壷)(arg_data 0x%04x)\n", this->actor.params); + PRINTF(T("(dungeon keep 壷)(arg_data 0x%04x)\n", "(dungeon keep pot)(arg_data 0x%04x)\n"), this->actor.params); } } diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index 78e1cdf3a4..55023cccc1 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -15,6 +15,7 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "terminal.h" +#include "translation.h" #include "z_lib.h" #include "z64ocarina.h" #include "z64play.h" @@ -234,7 +235,8 @@ void ObjWarp2block_Init(Actor* thisx, PlayState* play2) { ObjWarp2block_SetInactive(this); } - PRINTF("時のブロック(ワープ2) ( %04xH color:%d range:%d)\n", + PRINTF(T("時のブロック(ワープ2) ( %04xH color:%d range:%d)\n", + "Time Block (Warp 2) ( %04xH color:%d range:%d)\n"), PARAMS_GET_U(this->dyna.actor.params, 0, 16), this->dyna.actor.home.rot.z & 7, PARAMS_GET_U(this->dyna.actor.params, 11, 3)); } @@ -279,7 +281,9 @@ void func_80BA24F8(ObjWarp2block* this, PlayState* play) { this->unk_174++; if (this->unk_174 > 60) { PRINTF_COLOR_ERROR(); - PRINTF("Error : 時のブロック(ワープ2)が対でセットされていません(%s %d)\n", "../z_obj_warp2block.c", 505); + PRINTF(T("Error : 時のブロック(ワープ2)が対でセットされていません(%s %d)\n", + "Error : Time Blocks (Warp 2) are not set in pairs (%s %d)\n"), + "../z_obj_warp2block.c", 505); PRINTF_RST(); Actor_Kill(&this->dyna.actor); }