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

more T() in heishi[124]

This commit is contained in:
Dragorn421 2025-06-01 20:00:51 +02:00
parent 8205887d9f
commit 09db3d556f
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
View File

@ -207,11 +207,11 @@ void EnHeishi1_Walk(EnHeishi1* this, PlayState* play) {
Math_ApproachF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax); Math_ApproachF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax);
if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) { if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) {
PRINTF(VT_FGCOL(RED) " 種類 %d\n" VT_RST, this->path); PRINTF(VT_FGCOL(RED) T(" 種類 %d\n"," Type %d\n") VT_RST, this->path);
PRINTF(VT_FGCOL(RED) " ぱす %d\n" VT_RST, this->waypoint); PRINTF(VT_FGCOL(RED) T(" ぱす %d\n"," Path %d\n") VT_RST, this->waypoint);
PRINTF(VT_FGCOL(RED) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); PRINTF(VT_FGCOL(RED) T(" 反転 %d\n"," Turning around %d\n") VT_RST, this->bodyTurnSpeed);
PRINTF(VT_FGCOL(RED) " 時間 %d\n" VT_RST, this->waypointTimer); PRINTF(VT_FGCOL(RED) T(" 時間 %d\n"," Time %d\n") VT_RST, this->waypointTimer);
PRINTF(VT_FGCOL(RED) " 点座 %d\n" VT_RST, path->count); PRINTF(VT_FGCOL(RED) T(" 点座 %d\n"," Tenza %d\n") VT_RST, path->count);
PRINTF("\n\n"); PRINTF("\n\n");
} }
@ -325,10 +325,10 @@ void EnHeishi1_Wait(EnHeishi1* this, PlayState* play) {
this->headTurnSpeedMax + this->headTurnSpeedMax); this->headTurnSpeedMax + this->headTurnSpeedMax);
if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) { if (DEBUG_FEATURES && (this->path == BREG(1)) && (BREG(0) != 0)) {
PRINTF(VT_FGCOL(GREEN) " 種類 %d\n" VT_RST, this->path); PRINTF(VT_FGCOL(GREEN) T(" 種類 %d\n"," Type %d\n") VT_RST, this->path);
PRINTF(VT_FGCOL(GREEN) " ぱす %d\n" VT_RST, this->waypoint); PRINTF(VT_FGCOL(GREEN) T(" ぱす %d\n"," Path %d\n") VT_RST, this->waypoint);
PRINTF(VT_FGCOL(GREEN) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); PRINTF(VT_FGCOL(GREEN) T(" 反転 %d\n"," Turning around %d\n") VT_RST, this->bodyTurnSpeed);
PRINTF(VT_FGCOL(GREEN) " 時間 %d\n" VT_RST, this->waypointTimer); PRINTF(VT_FGCOL(GREEN) T(" 時間 %d\n"," Time %d\n") VT_RST, this->waypointTimer);
PRINTF("\n\n"); PRINTF("\n\n");
} }
} }

4
src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View File

@ -113,8 +113,8 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) {
} else { } else {
PRINTF("\n\n"); PRINTF("\n\n");
// "No, I'm completely disappointed" (message for when shooting guard window in courtyard) PRINTF(VT_FGCOL(MAGENTA)
PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" VT_RST); T(" ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n", " ☆☆☆☆☆ Oh, no, I was just careless. ☆☆☆☆☆ \n") VT_RST);
Actor_SetScale(&this->actor, 0.02f); Actor_SetScale(&this->actor, 0.02f);

22
src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
View File

@ -4,6 +4,7 @@
#include "gfx_setupdl.h" #include "gfx_setupdl.h"
#include "printf.h" #include "printf.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "z64face_reaction.h" #include "z64face_reaction.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.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); this->unk_27C = PARAMS_GET_U(thisx->params, 8, 8);
PRINTF("\n\n"); PRINTF("\n\n");
PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" VT_RST, thisx->params); PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n", " ☆☆☆☆☆ Soldier Set 2 Completed! ☆☆☆☆☆ %d\n")
PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！\t ☆☆☆☆☆ %d\n" VT_RST, this->type); VT_RST,
PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST, PARAMS_GET_U(thisx->params, 8, 4)); 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"); 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); Animation_Change(&this->skelAnime, &gEnHeishiIdleAnim, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, -10.0f);
if (LINK_AGE_IN_YEARS != YEARS_CHILD) { 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); Actor_Kill(&this->actor);
} else { } else {
this->actionFunc = func_80A56614; this->actionFunc = func_80A56614;
@ -223,7 +230,8 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) {
f32 frames; f32 frames;
if (GET_EVENTCHKINF(EVENTCHKINF_45)) { 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); Actor_Kill(&this->actor);
return; return;
} }
@ -236,11 +244,11 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) {
this->actor.textId = 0x7007; this->actor.textId = 0x7007;
this->unk_282 = TEXT_STATE_EVENT; this->unk_282 = TEXT_STATE_EVENT;
this->unk_284 = 1; this->unk_284 = 1;
PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n" VT_RST); PRINTF(VT_FGCOL(YELLOW) T(" ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n", " ☆☆☆☆☆ Demo begins! ☆☆☆☆☆ \n") VT_RST);
} else { } else {
this->actor.textId = 0x7008; this->actor.textId = 0x7008;
this->unk_282 = TEXT_STATE_DONE; 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; this->actionFunc = func_80A56874;
} else { } else {