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

T() in ovl_Demo_

This commit is contained in:
Dragorn421 2025-05-22 17:09:15 +02:00
parent f3bbb6196a
commit f767f1804a
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
5 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View File

@ -169,7 +169,8 @@ void DemoEc_Init(Actor* thisx, PlayState* play) {
DemoEc* this = (DemoEc*)thisx; DemoEc* this = (DemoEc*)thisx;
if ((this->actor.params < 0) || (this->actor.params > 34)) { 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) "Demo_Ec_Actor_ct:" T("arg_dataがおかしい", "arg_data is strange") "!!!!!!!!!!!!\n" VT_RST);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} else { } else {
this->updateMode = EC_UPDATE_COMMON; this->updateMode = EC_UPDATE_COMMON;
@ -702,7 +703,7 @@ Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) {
case 13: case 13:
return object_daiku_DL_005880; return object_daiku_DL_005880;
default: default:
PRINTF(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); PRINTF(VT_FGCOL(RED) T("かつらが無い", "No wig") "!!!!!!!!!!!!!!!!\n" VT_RST);
return NULL; return NULL;
} }
} }
@ -748,7 +749,7 @@ Gfx* DemoEc_GetGerudoPostLimbDList(DemoEc* this) {
case 18: case 18:
return gGerudoWhiteHairstyleSpikyDL; return gGerudoWhiteHairstyleSpikyDL;
default: default:
PRINTF(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); PRINTF(VT_FGCOL(RED) T("かつらが無い", "No wig") "!!!!!!!!!!!!!!!!\n" VT_RST);
return NULL; return NULL;
} }
} }
@ -1259,8 +1260,9 @@ void DemoEc_InitNpc(DemoEc* this, PlayState* play) {
s16 type = this->actor.params; s16 type = this->actor.params;
if (sInitFuncs[type] == NULL) { if (sInitFuncs[type] == NULL) {
// "Demo_Ec_main_init: Initialization process is wrong arg_data" PRINTF(VT_FGCOL(RED) T(" Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n",
PRINTF(VT_FGCOL(RED) " Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, type); " Demo_Ec_main_init: Initialization process is wrong arg_data = %d!\n") VT_RST,
type);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return; return;
} }
@ -1284,8 +1286,9 @@ void DemoEc_InitCommon(DemoEc* this, PlayState* play) {
secondaryObjectSlot = Object_GetSlot(&play->objectCtx, sp28); secondaryObjectSlot = Object_GetSlot(&play->objectCtx, sp28);
if ((secondaryObjectSlot < 0) || (primaryObjectSlot < 0)) { if ((secondaryObjectSlot < 0) || (primaryObjectSlot < 0)) {
// "Demo_Ec_main_bank: Bank unreadable arg_data = %d!" PRINTF(VT_FGCOL(RED) T("Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n",
PRINTF(VT_FGCOL(RED) "Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, type); "Demo_Ec_main_bank: Bank unreadable arg_data = %d!\n") VT_RST,
type);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return; return;
} }

11
src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
View File

@ -72,7 +72,8 @@ void DemoGeff_Init(Actor* thisx, PlayState* play) {
DemoGeff* this = (DemoGeff*)thisx; DemoGeff* this = (DemoGeff*)thisx;
if (this->actor.params < 0 || this->actor.params >= 9) { 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) "Demo_Geff_Actor_ct:" T("arg_dataがおかしい", "arg_data is strange") "!!!!!!!!!!!!\n" VT_RST);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return; return;
} }
@ -190,7 +191,9 @@ void func_80978370(DemoGeff* this, PlayState* play) {
s16 params = this->actor.params; s16 params = this->actor.params;
DemoGeffInitFunc initFunc = sInitFuncs[params]; DemoGeffInitFunc initFunc = sInitFuncs[params];
if (initFunc == NULL) { 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); Actor_Kill(&this->actor);
return; return;
} }
@ -206,7 +209,9 @@ void func_809783D4(DemoGeff* this, PlayState* play) {
s32 pad; s32 pad;
if (objectSlot < 0) { 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); Actor_Kill(thisx);
return; return;
} }

22
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View File

@ -239,15 +239,17 @@ s32 DemoGj_FindGanon(DemoGj* this, PlayState* play) {
if (actor->id == ACTOR_BOSS_GANON2) { if (actor->id == ACTOR_BOSS_GANON2) {
this->ganon = (BossGanon2*)actor; this->ganon = (BossGanon2*)actor;
// "Demo_Gj_Search_Boss_Ganon %d: Discover Ganon !!!!" PRINTF(T("Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n",
PRINTF("Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n", this->dyna.actor.params); "Demo_Gj_Search_Boss_Ganon %d: Ganon is discovered!!!!\n"),
this->dyna.actor.params);
return true; return true;
} }
actor = actor->next; actor = actor->next;
} }
// "Demo_Gj_Search_Boss_Ganon %d: I couldn't find Ganon" PRINTF(T("Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n",
PRINTF("Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n", this->dyna.actor.params); "Demo_Gj_Search_Boss_Ganon %d: Unable to find Ganon\n"),
this->dyna.actor.params);
return false; return false;
} }
//! @bug Missing return value when `this->ganon` is already set. No caller uses the return value //! @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; break;
default: default:
// "Demo_Gj_common_Reflect : This arg_data is not supported = %d" PRINTF(VT_FGCOL(RED) T("Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n",
PRINTF(VT_FGCOL(RED) "Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n" VT_RST, "Demo_Gj_common_Reflect : This arg_data is not supported = %d\n") VT_RST,
this->dyna.actor.params); this->dyna.actor.params);
return; return;
} }
@ -558,8 +560,8 @@ void DemoGj_SetupMovement(DemoGj* this, PlayState* play) {
break; break;
default: default:
// "Demo_Gj_Setup_Move_common : This arg_data is not supported = %d" PRINTF(VT_FGCOL(RED) T("Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n",
PRINTF(VT_FGCOL(RED) "Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n" VT_RST, "Demo_Gj_Setup_Move_common : This arg_data is not supported = %d\n") VT_RST,
actor->params); actor->params);
break; break;
} }
@ -1435,8 +1437,8 @@ void DemoGj_Init(Actor* thisx, PlayState* play) {
break; break;
default: default:
// "Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!" PRINTF(VT_FGCOL(RED) T("Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n",
PRINTF(VT_FGCOL(RED) "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); "Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST);
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
} }
} }

4
src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
View File

@ -1774,8 +1774,8 @@ void DemoGt_Init(Actor* thisx, PlayState* play) {
func_80982054_Init24(this, play); func_80982054_Init24(this, play);
break; break;
default: default:
// "Demo_Gt_Actor_ct There is no such argument !" PRINTF(T("Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",
PRINTF("Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); "Demo_Gt_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
} }
} }

4
src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
View File

@ -5,6 +5,7 @@
#include "gfx_setupdl.h" #include "gfx_setupdl.h"
#include "printf.h" #include "printf.h"
#include "sfx.h" #include "sfx.h"
#include "translation.h"
#include "z64curve.h" #include "z64curve.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"
@ -58,8 +59,7 @@ void DemoTreLgt_Init(Actor* thisx, PlayState* play) {
DemoTreLgt* this = (DemoTreLgt*)thisx; DemoTreLgt* this = (DemoTreLgt*)thisx;
if (!SkelCurve_Init(play, &this->skelCurve, &gTreasureChestCurveSkel, sAnimations[0])) { if (!SkelCurve_Init(play, &this->skelCurve, &gTreasureChestCurveSkel, sAnimations[0])) {
// "Demo_Tre_Lgt_Actor_ct (); Construct failed" PRINTF(T("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n", "Demo_Tre_Lgt_Actor_ct(); Construct failed\n"));
PRINTF("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n");
} }
ASSERT(true, "1", "../z_demo_tre_lgt.c", UNK_LINE); ASSERT(true, "1", "../z_demo_tre_lgt.c", UNK_LINE);