mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-21 06:21:16 +00:00
T() macro 4 (#2084)
* T() in z_kankyo.c * T() in z_demo.c * T() in z_effect.c * remaining T() in z_sram.c * T() in z_en_encount1.c * T() in z_en_owl.c * T() in z_en_wonder_item.c * fix forgot T * Demonstration -> Demo
This commit is contained in:
Dragorn421
GitHub
parent
20b93a6488
commit
271eff9234
7 changed files with 79 additions and 79 deletions
|
|
@ -33,12 +33,11 @@ void EnEncount1_Init(Actor* thisx, PlayState* play) {
|
|||
|
||||
if (this->actor.params <= 0) {
|
||||
PRINTF("\n\n");
|
||||
// "Input error death!"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n", "☆☆☆☆☆ Input error death! ☆☆☆☆☆ \n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n", "☆☆☆☆☆ Input error death! ☆☆☆☆☆ \n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n", "☆☆☆☆☆ Input error death! ☆☆☆☆☆ \n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n", "☆☆☆☆☆ Input error death! ☆☆☆☆☆ \n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n", "☆☆☆☆☆ Input error death! ☆☆☆☆☆ \n") VT_RST);
|
||||
PRINTF("\n\n");
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
|
|
@ -54,16 +53,17 @@ void EnEncount1_Init(Actor* thisx, PlayState* play) {
|
|||
if (1) {}
|
||||
|
||||
PRINTF("\n\n");
|
||||
// "It's an enemy spawner!"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 敵発生ゾーンでた！ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params);
|
||||
// "Type"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 種類\t\t ☆☆☆☆☆ %d\n" VT_RST, this->spawnType);
|
||||
// "Maximum number of simultaneous spawns"
|
||||
PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 最大同時発生数 ☆☆☆☆☆ %d\n" VT_RST, this->maxCurSpawns);
|
||||
// "Maximum number of spawns"
|
||||
PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 最大発生数 \t ☆☆☆☆☆ %d\n" VT_RST, this->maxTotalSpawns);
|
||||
// "Spawn check range"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生チェック範囲 ☆☆☆☆☆ %f\n" VT_RST, this->spawnRange);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 敵発生ゾーンでた！ ☆☆☆☆☆ %x\n", "☆☆☆☆☆ It's an enemy spawner! ☆☆☆☆☆ %x\n") VT_RST,
|
||||
this->actor.params);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 種類\t\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Type\t\t ☆☆☆☆☆ %d\n") VT_RST, this->spawnType);
|
||||
PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 最大同時発生数 ☆☆☆☆☆ %d\n",
|
||||
"☆☆☆☆☆ Maximum number of simultaneous spawns ☆☆☆☆☆ %d\n") VT_RST,
|
||||
this->maxCurSpawns);
|
||||
PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 最大発生数 \t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Maximum number of spawns \t ☆☆☆☆☆ %d\n")
|
||||
VT_RST,
|
||||
this->maxTotalSpawns);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生チェック範囲 ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Spawn check range ☆☆☆☆☆ %f\n") VT_RST,
|
||||
this->spawnRange);
|
||||
PRINTF("\n\n");
|
||||
|
||||
this->actor.flags &= ~ACTOR_FLAG_0;
|
||||
|
|
@ -165,10 +165,9 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, PlayState* play) {
|
|||
this->maxCurSpawns = (s16)Rand_ZeroFloat(2.99f) + 1;
|
||||
}
|
||||
} else {
|
||||
// "Cannot spawn!"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -204,10 +203,9 @@ void EnEncount1_SpawnTektites(EnEncount1* this, PlayState* play) {
|
|||
this->curNumSpawn++;
|
||||
this->totalNumSpawn++;
|
||||
} else {
|
||||
// "Cannot spawn!"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -304,10 +302,9 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) {
|
|||
this->totalNumSpawn++;
|
||||
}
|
||||
} else {
|
||||
// "Cannot spawn!"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n", "☆☆☆☆☆ Cannot spawn! ☆☆☆☆☆\n") VT_RST);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -131,11 +131,11 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
|
|||
owlType = OWL_OUTSIDE_KOKIRI;
|
||||
switchFlag = 0x20;
|
||||
}
|
||||
// "conversation owl %4x no = %d, sv = %d"
|
||||
PRINTF(VT_FGCOL(CYAN) " 会話フクロウ %4x no = %d, sv = %d\n" VT_RST, this->actor.params, owlType, switchFlag);
|
||||
PRINTF(VT_FGCOL(CYAN) T(" 会話フクロウ %4x no = %d, sv = %d\n", " conversation owl %4x no = %d, sv = %d\n") VT_RST,
|
||||
this->actor.params, owlType, switchFlag);
|
||||
|
||||
if ((owlType != OWL_DEFAULT) && (switchFlag < 0x20) && Flags_GetSwitch(play, switchFlag)) {
|
||||
PRINTF("savebitでフクロウ退避\n"); // "Save owl with savebit"
|
||||
PRINTF(T("savebitでフクロウ退避\n", "Save owl with savebit\n"));
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
|
@ -160,7 +160,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
|
|||
case OWL_KAKARIKO:
|
||||
if (GET_EVENTCHKINF(EVENTCHKINF_40)) {
|
||||
// has zelda's letter
|
||||
PRINTF("フクロウ退避\n"); // "Owl evacuation"
|
||||
PRINTF(T("フクロウ退避\n", "Owl evacuation\n"));
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
|
@ -170,7 +170,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
|
|||
case OWL_HYLIA_GERUDO:
|
||||
if (GET_EVENTCHKINF(EVENTCHKINF_43)) {
|
||||
// has ocarina of time
|
||||
PRINTF("フクロウ退避\n"); // "Owl evacuation"
|
||||
PRINTF(T("フクロウ退避\n", "Owl evacuation\n"));
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
|
@ -182,7 +182,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
|
|||
case OWL_ZORA_RIVER:
|
||||
if (GET_EVENTCHKINF(EVENTCHKINF_39) || !GET_EVENTCHKINF(EVENTCHKINF_40)) {
|
||||
// opened zora's domain or has zelda's letter
|
||||
PRINTF("フクロウ退避\n"); // "Owl evacuation"
|
||||
PRINTF(T("フクロウ退避\n", "Owl evacuation\n"));
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
|
@ -204,7 +204,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
|
|||
break;
|
||||
case OWL_LOST_WOODS_PRESARIA:
|
||||
if (!CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) {
|
||||
PRINTF("フクロウ退避\n"); // "Owl evacuation"
|
||||
PRINTF(T("フクロウ退避\n", "Owl evacuation\n"));
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
|
@ -212,7 +212,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
|
|||
break;
|
||||
case OWL_LOST_WOODS_POSTSARIA:
|
||||
if (!CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) {
|
||||
PRINTF("フクロウ退避\n"); // "Owl evacuation"
|
||||
PRINTF(T("フクロウ退避\n", "Owl evacuation\n"));
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
|
@ -222,8 +222,8 @@ void EnOwl_Init(Actor* thisx, PlayState* play) {
|
|||
// Outside kokiri forest
|
||||
PRINTF(VT_FGCOL(CYAN));
|
||||
PRINTF("no = %d \n", owlType);
|
||||
// "Unfinished owl unfinished owl unfinished owl"
|
||||
PRINTF("未完成のフクロウ未完成のフクロウ未完成のフクロウ\n");
|
||||
PRINTF(T("未完成のフクロウ未完成のフクロウ未完成のフクロウ\n",
|
||||
"Unfinished owl unfinished owl unfinished owl\n"));
|
||||
PRINTF(VT_RST);
|
||||
this->actionFlags |= 2;
|
||||
this->unk_3EE = 0x20;
|
||||
|
|
@ -928,12 +928,12 @@ void func_80ACC00C(EnOwl* this, PlayState* play) {
|
|||
if (!Play_InCsMode(play)) {
|
||||
owlType = PARAMS_GET_S(this->actor.params, 6, 6);
|
||||
PRINTF(VT_FGCOL(CYAN));
|
||||
PRINTF("%dのフクロウ\n", owlType); // "%d owl"
|
||||
PRINTF(T("%dのフクロウ\n", "%d owl\n"), owlType);
|
||||
PRINTF(VT_RST);
|
||||
switch (owlType) {
|
||||
case 7:
|
||||
PRINTF(VT_FGCOL(CYAN));
|
||||
PRINTF("SPOT 06 の デモがはしった\n"); // "Demo of SPOT 06 has been completed"
|
||||
PRINTF(T("SPOT 06 の デモがはしった\n", "Demo of SPOT 06 has been completed\n"));
|
||||
PRINTF(VT_RST);
|
||||
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gLakeHyliaOwlCs);
|
||||
this->actor.draw = NULL;
|
||||
|
|
@ -1084,8 +1084,8 @@ void EnOwl_Update(Actor* thisx, PlayState* play) {
|
|||
this->actionFlags &= ~8;
|
||||
this->actionFunc(this, play);
|
||||
if (this->actor.update == NULL) {
|
||||
// "Owl disappears"
|
||||
PRINTF("フクロウ消滅!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
|
||||
PRINTF(T("フクロウ消滅!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",
|
||||
"Owl disappears!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -120,8 +120,9 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) {
|
|||
s16 tagIndex;
|
||||
|
||||
PRINTF("\n\n");
|
||||
// "Mysterious mystery, very mysterious"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 不思議不思議まか不思議 \t ☆☆☆☆☆ %x\n" VT_RST, this->actor.params);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 不思議不思議まか不思議 \t ☆☆☆☆☆ %x\n",
|
||||
"☆☆☆☆☆ Mysterious mystery, very mysterious \t ☆☆☆☆☆ %x\n") VT_RST,
|
||||
this->actor.params);
|
||||
this->actor.flags &= ~ACTOR_FLAG_0;
|
||||
|
||||
this->wonderMode = PARAMS_GET_U(this->actor.params, 11, 5);
|
||||
|
|
@ -328,8 +329,8 @@ void EnWonderItem_BombSoldier(EnWonderItem* this, PlayState* play) {
|
|||
this->collider.base.acFlags &= ~AC_HIT;
|
||||
if (Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HEISHI2, this->actor.world.pos.x, this->actor.world.pos.y,
|
||||
this->actor.world.pos.z, 0, this->actor.yawTowardsPlayer, 0, 9) != NULL) {
|
||||
// "Careless soldier spawned"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ うっかり兵セット完了 ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ うっかり兵セット完了 ☆☆☆☆☆ \n", "☆☆☆☆☆ Careless soldier spawned ☆☆☆☆☆ \n")
|
||||
VT_RST);
|
||||
}
|
||||
if (this->switchFlag >= 0) {
|
||||
Flags_SetSwitch(play, this->switchFlag);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue