mirror of https://github.com/zeldaret/oot.git
dont break up strings
This commit is contained in:
parent
f767f1804a
commit
b3ecd5ea86
|
@ -169,8 +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:" T("arg_dataがおかしい", "arg_data is strange") "!!!!!!!!!!!!\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;
|
||||
|
@ -703,7 +703,7 @@ Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) {
|
|||
case 13:
|
||||
return object_daiku_DL_005880;
|
||||
default:
|
||||
PRINTF(VT_FGCOL(RED) T("かつらが無い", "No wig") "!!!!!!!!!!!!!!!!\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(RED) T("かつらが無い!!!!!!!!!!!!!!!!\n", "No wig!!!!!!!!!!!!!!!!\n") VT_RST);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
@ -749,7 +749,7 @@ Gfx* DemoEc_GetGerudoPostLimbDList(DemoEc* this) {
|
|||
case 18:
|
||||
return gGerudoWhiteHairstyleSpikyDL;
|
||||
default:
|
||||
PRINTF(VT_FGCOL(RED) T("かつらが無い", "No wig") "!!!!!!!!!!!!!!!!\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(RED) T("かつらが無い!!!!!!!!!!!!!!!!\n", "No wig!!!!!!!!!!!!!!!!\n") VT_RST);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -72,8 +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:" T("arg_dataがおかしい", "arg_data is strange") "!!!!!!!!!!!!\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;
|
||||
}
|
||||
|
|
|
@ -101,13 +101,13 @@ void ObjMure_Init(Actor* thisx, PlayState* play) {
|
|||
this->type = PARAMS_GET_U(thisx->params, 0, 5);
|
||||
|
||||
if (this->ptn >= 4) {
|
||||
PRINTF("Error " T("群れな敵", "Swarm of enemies") " (%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 " T("群れな敵", "Swarm of enemies") " (%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)) {
|
||||
|
@ -115,13 +115,14 @@ void ObjMure_Init(Actor* thisx, PlayState* play) {
|
|||
return;
|
||||
}
|
||||
this->actionFunc = ObjMure_InitialAction;
|
||||
PRINTF(T("群れな敵", "Swarm of enemies") " (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n",
|
||||
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 : " T("個体数が設定されていません",
|
||||
"The number of individuals is not set") "(%s %d)(arg_data 0x%04x)\n",
|
||||
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
|
||||
|
@ -140,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(T("おかしなの", "That's strange") " (%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
|
||||
|
||||
|
@ -175,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 " T("発生失敗", "failed to occur") " (%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:
|
||||
|
@ -186,7 +188,8 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) {
|
|||
if (this->children[i] != NULL) {
|
||||
this->children[i]->room = actor->room;
|
||||
} else {
|
||||
PRINTF("warning " T("発生失敗", "failed to occur") " (%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;
|
||||
}
|
||||
|
@ -218,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 " T("発生失敗", "failed to occur") " (%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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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 : " T("氷発生失敗", "Ice generation failure") " (%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;
|
||||
}
|
||||
|
|
|
@ -150,7 +150,8 @@ void ObjTimeblock_Init(Actor* thisx, PlayState* play) {
|
|||
ObjTimeblock_SetupAltBehaviourNotVisible(this);
|
||||
}
|
||||
|
||||
PRINTF(T("時のブロック", "Time Block") " (<arg> %04xH <type> save:%d color:%d range:%d move:%d)\n",
|
||||
PRINTF(T("時のブロック (<arg> %04xH <type> save:%d color:%d range:%d move:%d)\n",
|
||||
"Time Block (<arg> %04xH <type> 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));
|
||||
}
|
||||
|
|
|
@ -150,12 +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 : " T("バンク危険!", "Bank danger!") " (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 " T("壷", "pot") ")(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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue