mirror of https://github.com/zeldaret/oot.git
T() syateki_niw, ta, takara_man, tite
This commit is contained in:
parent
c5fb201b35
commit
ab477be09e
|
@ -15,6 +15,7 @@
|
||||||
#include "sfx.h"
|
#include "sfx.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 "z64effect.h"
|
#include "z64effect.h"
|
||||||
#include "z64play.h"
|
#include "z64play.h"
|
||||||
|
@ -96,13 +97,11 @@ void EnSyatekiNiw_Init(Actor* thisx, PlayState* play) {
|
||||||
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
|
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
|
||||||
if (this->minigameType == SYATEKI_MINIGAME_ARCHERY) {
|
if (this->minigameType == SYATEKI_MINIGAME_ARCHERY) {
|
||||||
PRINTF("\n\n");
|
PRINTF("\n\n");
|
||||||
// "Archery range chicken"
|
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n", "☆☆☆☆☆ Archery range chicken ☆☆☆☆☆ \n") VT_RST);
|
||||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n" VT_RST);
|
|
||||||
Actor_SetScale(&this->actor, 0.01f);
|
Actor_SetScale(&this->actor, 0.01f);
|
||||||
} else {
|
} else {
|
||||||
PRINTF("\n\n");
|
PRINTF("\n\n");
|
||||||
// "Bomb chicken"
|
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ボムにわ! ☆☆☆☆☆ \n", "☆☆☆☆☆ Bomb chicken! ☆☆☆☆☆ \n") VT_RST);
|
||||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ボムにわ! ☆☆☆☆☆ \n" VT_RST);
|
|
||||||
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
|
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
|
||||||
Actor_SetScale(&this->actor, 0.01f);
|
Actor_SetScale(&this->actor, 0.01f);
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "sfx.h"
|
#include "sfx.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 "z64audio.h"
|
#include "z64audio.h"
|
||||||
#include "z64face_reaction.h"
|
#include "z64face_reaction.h"
|
||||||
|
@ -176,8 +177,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
|
||||||
|
|
||||||
switch (this->actor.params) {
|
switch (this->actor.params) {
|
||||||
case ENTA_IN_KAKARIKO:
|
case ENTA_IN_KAKARIKO:
|
||||||
// "Exile Talon"
|
PRINTF(VT_FGCOL(CYAN) T(" 追放タロン \n", " Exile Talon \n") VT_RST);
|
||||||
PRINTF(VT_FGCOL(CYAN) " 追放タロン \n" VT_RST);
|
|
||||||
if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) {
|
if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) {
|
||||||
Actor_Kill(&this->actor);
|
Actor_Kill(&this->actor);
|
||||||
} else if (!LINK_IS_ADULT) {
|
} else if (!LINK_IS_ADULT) {
|
||||||
|
@ -197,15 +197,14 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ENTA_RETURNED_FROM_KAKARIKO:
|
case ENTA_RETURNED_FROM_KAKARIKO:
|
||||||
// "Return Talon"
|
PRINTF(VT_FGCOL(CYAN) T(" 出戻りタロン \n", " Return Talon \n") VT_RST);
|
||||||
PRINTF(VT_FGCOL(CYAN) " 出戻りタロン \n" VT_RST);
|
|
||||||
if (!GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) {
|
if (!GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) {
|
||||||
Actor_Kill(&this->actor);
|
Actor_Kill(&this->actor);
|
||||||
} else if (!LINK_IS_ADULT) {
|
} else if (!LINK_IS_ADULT) {
|
||||||
Actor_Kill(&this->actor);
|
Actor_Kill(&this->actor);
|
||||||
} else if (play->sceneId == SCENE_STABLE && !IS_DAY) {
|
} else if (play->sceneId == SCENE_STABLE && !IS_DAY) {
|
||||||
Actor_Kill(&this->actor);
|
Actor_Kill(&this->actor);
|
||||||
PRINTF(VT_FGCOL(CYAN) " 夜はいない \n" VT_RST);
|
PRINTF(VT_FGCOL(CYAN) T(" 夜はいない \n", " He's not here at night \n") VT_RST);
|
||||||
} else {
|
} else {
|
||||||
EnTa_SetupAction(this, EnTa_IdleAtRanch, EnTa_AnimRepeatCurrent);
|
EnTa_SetupAction(this, EnTa_IdleAtRanch, EnTa_AnimRepeatCurrent);
|
||||||
this->eyeIndex = TALON_EYE_INDEX_OPEN;
|
this->eyeIndex = TALON_EYE_INDEX_OPEN;
|
||||||
|
@ -215,8 +214,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default: // Child era Talon
|
default: // Child era Talon
|
||||||
// "Other Talon"
|
PRINTF(VT_FGCOL(CYAN) T(" その他のタロン \n", " Other Talon \n") VT_RST);
|
||||||
PRINTF(VT_FGCOL(CYAN) " その他のタロン \n" VT_RST);
|
|
||||||
if (play->sceneId == SCENE_HYRULE_CASTLE) {
|
if (play->sceneId == SCENE_HYRULE_CASTLE) {
|
||||||
if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
|
if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) {
|
||||||
Actor_Kill(&this->actor);
|
Actor_Kill(&this->actor);
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include "rand.h"
|
#include "rand.h"
|
||||||
#include "segmented_address.h"
|
#include "segmented_address.h"
|
||||||
#include "terminal.h"
|
#include "terminal.h"
|
||||||
|
#include "translation.h"
|
||||||
#include "versions.h"
|
#include "versions.h"
|
||||||
#include "z64play.h"
|
#include "z64play.h"
|
||||||
#include "z64save.h"
|
#include "z64save.h"
|
||||||
|
@ -56,14 +57,14 @@ void EnTakaraMan_Init(Actor* thisx, PlayState* play) {
|
||||||
|
|
||||||
if (sTakaraIsInitialized) {
|
if (sTakaraIsInitialized) {
|
||||||
Actor_Kill(&this->actor);
|
Actor_Kill(&this->actor);
|
||||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); // "Already initialized"
|
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n", "☆☆☆☆☆ Already initialized ☆☆☆☆☆ \n") VT_RST);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
sTakaraIsInitialized = true;
|
sTakaraIsInitialized = true;
|
||||||
PRINTF("\n\n");
|
PRINTF("\n\n");
|
||||||
// "Bun! %x" (needs a better translation)
|
PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ ばぅん! ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Bang! ☆☆☆☆☆ %x\n") VT_RST,
|
||||||
PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ばぅん! ☆☆☆☆☆ %x\n" VT_RST, play->actorCtx.flags.chest);
|
play->actorCtx.flags.chest);
|
||||||
play->actorCtx.flags.chest = 0;
|
play->actorCtx.flags.chest = 0;
|
||||||
gSaveContext.save.info.inventory.dungeonKeys[gSaveContext.mapIndex] = -1;
|
gSaveContext.save.info.inventory.dungeonKeys[gSaveContext.mapIndex] = -1;
|
||||||
SkelAnime_InitFlex(play, &this->skelAnime, &object_ts_Skel_004FE0, &object_ts_Anim_000498, this->jointTable,
|
SkelAnime_InitFlex(play, &this->skelAnime, &object_ts_Skel_004FE0, &object_ts_Anim_000498, this->jointTable,
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include "sfx.h"
|
#include "sfx.h"
|
||||||
#include "sys_matrix.h"
|
#include "sys_matrix.h"
|
||||||
#include "terminal.h"
|
#include "terminal.h"
|
||||||
|
#include "translation.h"
|
||||||
#include "z_en_item00.h"
|
#include "z_en_item00.h"
|
||||||
#include "z_lib.h"
|
#include "z_lib.h"
|
||||||
#include "z64effect.h"
|
#include "z64effect.h"
|
||||||
|
@ -226,8 +227,9 @@ void EnTite_Destroy(Actor* thisx, PlayState* play) {
|
||||||
spawner->curNumSpawn--;
|
spawner->curNumSpawn--;
|
||||||
}
|
}
|
||||||
PRINTF("\n\n");
|
PRINTF("\n\n");
|
||||||
// "Number of simultaneous occurrences"
|
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous occurrences ☆☆☆☆☆%d\n")
|
||||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, spawner->curNumSpawn);
|
VT_RST,
|
||||||
|
spawner->curNumSpawn);
|
||||||
PRINTF("\n\n");
|
PRINTF("\n\n");
|
||||||
}
|
}
|
||||||
Collider_DestroyJntSph(play, &this->collider);
|
Collider_DestroyJntSph(play, &this->collider);
|
||||||
|
|
Loading…
Reference in New Issue