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

T() in hs2, kakasi2, ru2

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

3
src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
View File

@ -11,6 +11,7 @@
#include "printf.h" #include "printf.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64face_reaction.h" #include "z64face_reaction.h"
#include "z64play.h" #include "z64play.h"
@ -69,7 +70,7 @@ void EnHs2_Init(Actor* thisx, PlayState* play) {
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = MASS_IMMOVABLE; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
Actor_SetScale(&this->actor, 0.01f); Actor_SetScale(&this->actor, 0.01f);
PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST); PRINTF(VT_FGCOL(CYAN) T(" ヒヨコの店(子人の時) \n", " Chick's Shop (Children's Time) \n") VT_RST);
this->actionFunc = func_80A6F1A4; this->actionFunc = func_80A6F1A4;
this->unk_2A8 = 0; this->unk_2A8 = 0;
this->actor.attentionRangeType = ATTENTION_RANGE_6; this->actor.attentionRangeType = ATTENTION_RANGE_6;

6
src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
View File

@ -146,7 +146,8 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->switchFlag);
} }
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ SAVE finished ☆☆☆☆☆ %d\n") VT_RST,
this->switchFlag);
this->actionFunc = func_80A904D8; this->actionFunc = func_80A904D8;
} else if ((this->actor.xzDistToPlayer < this->maxSpawnDistance.x) && } else if ((this->actor.xzDistToPlayer < this->maxSpawnDistance.x) &&
(fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y) &&
@ -157,7 +158,8 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
if (this->switchFlag >= 0) { if (this->switchFlag >= 0) {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->switchFlag);
} }
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ SAVE finished ☆☆☆☆☆ %d\n") VT_RST,
this->switchFlag);
play->msgCtx.ocarinaMode = OCARINA_MODE_04; play->msgCtx.ocarinaMode = OCARINA_MODE_04;
this->actor.draw = func_80A90948; this->actor.draw = func_80A90948;
Collider_InitCylinder(play, &this->collider); Collider_InitCylinder(play, &this->collider);

6
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View File

@ -835,13 +835,11 @@ void EnRu2_DialogCameraHandler(EnRu2* this, PlayState* play) {
if (dialogState == TEXT_STATE_DONE_FADING) { if (dialogState == TEXT_STATE_DONE_FADING) {
if (this->lastDialogState != TEXT_STATE_DONE_FADING) { if (this->lastDialogState != TEXT_STATE_DONE_FADING) {
// "I'm Komatsu!" (cinema scene dev) PRINTF(T("おれが小松だ！ \n", "I'm Komatsu! \n")); // (cinema scene dev)
PRINTF("おれが小松だ！ \n");
this->textboxCount++; this->textboxCount++;
if (this->textboxCount % 6 == 3) { if (this->textboxCount % 6 == 3) {
player = GET_PLAYER(play); player = GET_PLAYER(play);
// "uorya-!" (screeming sound) PRINTF(T("うおりゃー！ \n", "uorya-! \n")); // (screaming sound)
PRINTF("うおりゃー！ \n");
Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); Camera_SetFinishedFlag(GET_ACTIVE_CAM(play));
player->actor.world.pos.x = 820.0f; player->actor.world.pos.x = 820.0f;
player->actor.world.pos.y = 0.0f; player->actor.world.pos.y = 0.0f;