diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 4236fe05bd..04fbc5de93 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -207,11 +207,11 @@ void EnHeishi1_Walk(EnHeishi1* this, PlayState* play) { Math_ApproachF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax); if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) { - PRINTF(VT_FGCOL(RED) " 種類 %d\n" VT_RST, this->path); - PRINTF(VT_FGCOL(RED) " ぱす %d\n" VT_RST, this->waypoint); - PRINTF(VT_FGCOL(RED) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); - PRINTF(VT_FGCOL(RED) " 時間 %d\n" VT_RST, this->waypointTimer); - PRINTF(VT_FGCOL(RED) " 点座 %d\n" VT_RST, path->count); + PRINTF(VT_FGCOL(RED) T(" 種類 %d\n"," Type %d\n") VT_RST, this->path); + PRINTF(VT_FGCOL(RED) T(" ぱす %d\n"," Path %d\n") VT_RST, this->waypoint); + PRINTF(VT_FGCOL(RED) T(" 反転 %d\n"," Turning around %d\n") VT_RST, this->bodyTurnSpeed); + PRINTF(VT_FGCOL(RED) T(" 時間 %d\n"," Time %d\n") VT_RST, this->waypointTimer); + PRINTF(VT_FGCOL(RED) T(" 点座 %d\n"," Tenza %d\n") VT_RST, path->count); PRINTF("\n\n"); } @@ -325,10 +325,10 @@ void EnHeishi1_Wait(EnHeishi1* this, PlayState* play) { this->headTurnSpeedMax + this->headTurnSpeedMax); if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) { - PRINTF(VT_FGCOL(GREEN) " 種類 %d\n" VT_RST, this->path); - PRINTF(VT_FGCOL(GREEN) " ぱす %d\n" VT_RST, this->waypoint); - PRINTF(VT_FGCOL(GREEN) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); - PRINTF(VT_FGCOL(GREEN) " 時間 %d\n" VT_RST, this->waypointTimer); + PRINTF(VT_FGCOL(GREEN) T(" 種類 %d\n"," Type %d\n") VT_RST, this->path); + PRINTF(VT_FGCOL(GREEN) T(" ぱす %d\n"," Path %d\n") VT_RST, this->waypoint); + PRINTF(VT_FGCOL(GREEN) T(" 反転 %d\n"," Turning around %d\n") VT_RST, this->bodyTurnSpeed); + PRINTF(VT_FGCOL(GREEN) T(" 時間 %d\n"," Time %d\n") VT_RST, this->waypointTimer); PRINTF("\n\n"); } } diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index f9d5999c88..abb33f3fe3 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -113,8 +113,8 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) { } else { PRINTF("\n\n"); - // "No, I'm completely disappointed" (message for when shooting guard window in courtyard) - PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) + T(" ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n", " ☆☆☆☆☆ Oh, no, I was just careless. ☆☆☆☆☆ \n") VT_RST); Actor_SetScale(&this->actor, 0.02f); diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index b90c778114..6a7866f17d 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -4,6 +4,7 @@ #include "gfx_setupdl.h" #include "printf.h" #include "terminal.h" +#include "translation.h" #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" @@ -104,9 +105,15 @@ void EnHeishi4_Init(Actor* thisx, PlayState* play) { } this->unk_27C = PARAMS_GET_U(thisx->params, 8, 8); PRINTF("\n\n"); - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士2セット完了! ☆☆☆☆☆ %d\n" VT_RST, thisx->params); - PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了!\t ☆☆☆☆☆ %d\n" VT_RST, this->type); - PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了! ☆☆☆☆☆ %x\n\n" VT_RST, PARAMS_GET_U(thisx->params, 8, 4)); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 兵士2セット完了! ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Soldier Set 2 Completed! ☆☆☆☆☆ %d\n") + VT_RST, + thisx->params); + PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ 識別完了!\t ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Identification Completed!\t ☆☆☆☆☆ %d\n") + VT_RST, + this->type); + PRINTF(VT_FGCOL(MAGENTA) T(" ☆☆☆☆☆ メッセージ完了! ☆☆☆☆☆ %x\n\n", " ☆☆☆☆☆ Message completed! ☆☆☆☆☆ %x\n\n") + VT_RST, + PARAMS_GET_U(thisx->params, 8, 4)); PRINTF("\n\n"); } @@ -176,7 +183,7 @@ void func_80A56544(EnHeishi4* this, PlayState* play) { Animation_Change(&this->skelAnime, &gEnHeishiIdleAnim, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, -10.0f); if (LINK_AGE_IN_YEARS != YEARS_CHILD) { - PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ ぎゃぁ!オトナだー ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ ぎゃぁ!オトナだー ☆☆☆☆☆ \n", " ☆☆☆☆☆ Oh, no! I'm an adult! ☆☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); } else { this->actionFunc = func_80A56614; @@ -223,7 +230,8 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) { f32 frames; if (GET_EVENTCHKINF(EVENTCHKINF_45)) { - PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ マスターソード祝入手! ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ マスターソード祝入手! ☆☆☆☆☆ \n", + " ☆☆☆☆☆ Congratulations on obtaining the Master Sword! ☆☆☆☆☆ \n") VT_RST); Actor_Kill(&this->actor); return; } @@ -236,11 +244,11 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) { this->actor.textId = 0x7007; this->unk_282 = TEXT_STATE_EVENT; this->unk_284 = 1; - PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ デモ開始! ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ デモ開始! ☆☆☆☆☆ \n", " ☆☆☆☆☆ Demo begins! ☆☆☆☆☆ \n") VT_RST); } else { this->actor.textId = 0x7008; this->unk_282 = TEXT_STATE_DONE; - PRINTF(VT_FGCOL(BLUE) " ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) T(" ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n", " ☆☆☆☆☆ No reply ☆☆☆☆☆ \n") VT_RST); } this->actionFunc = func_80A56874; } else {