mirror of https://github.com/zeldaret/oot.git
T() dnt_demo, dnt_jiji, dnt_nomal with translating the probably misspelled デグナッツ as deku scrub (japanese text of the game uses デクナッツ (note the second character is slightly different) and is translated to english as Deku Scrub)
This commit is contained in:
parent
3eb8f3c69f
commit
88b2d995db
|
@ -17,6 +17,7 @@
|
|||
#include "sequence.h"
|
||||
#include "sfx.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64audio.h"
|
||||
#include "z64debug_display.h"
|
||||
|
@ -89,8 +90,8 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) {
|
|||
s32 pad;
|
||||
|
||||
PRINTF("\n\n");
|
||||
// "Deku Scrub mask show start"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN)
|
||||
T("☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n", "☆☆☆☆☆ Deku Scrub mask competition start ☆☆☆☆☆ \n") VT_RST);
|
||||
for (i = 0; i < 9; i++) {
|
||||
this->scrubPos[i] = sScrubPos[i];
|
||||
this->scrubs[i] = (EnDntNomal*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_DNT_NOMAL,
|
||||
|
@ -108,8 +109,10 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) {
|
|||
this->leader = (EnDntJiji*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_DNT_JIJI,
|
||||
this->leaderPos.x, this->leaderPos.y, this->leaderPos.z, 0, 0, 0, 0);
|
||||
if (this->leader != NULL) {
|
||||
// "jiji jiji jiji jiji jiji" [onomatopoeia for the scrub sound?]
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n" VT_RST, this->leader);
|
||||
// onomatopoeia for the scrub sound?
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n", "☆☆☆☆☆ jiji jiji jiji jiji jiji ☆☆☆☆☆ %x\n")
|
||||
VT_RST,
|
||||
this->leader);
|
||||
}
|
||||
this->subCamId = SUB_CAM_ID_DONE;
|
||||
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
|
||||
|
@ -206,15 +209,17 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) {
|
|||
ignore = true;
|
||||
delay = 8;
|
||||
reaction = DNT_SIGNAL_HIDE;
|
||||
// "Special!"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 特別! ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 特別! ☆☆☆☆☆ \n", "☆☆☆☆☆ Special! ☆☆☆☆☆ \n") VT_RST);
|
||||
} else {
|
||||
if (maskIdx >= PLAYER_MASK_MAX - 1) {
|
||||
// "This is dangerous!"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ヤバいよこれ! ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ヤバいよこれ! ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ヤバいよこれ! ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ ヤバいよこれ! ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ ヤバいよこれ! ☆☆☆☆☆ \n", "☆☆☆☆☆ This is bad! ☆☆☆☆☆ \n")
|
||||
VT_RST);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ ヤバいよこれ! ☆☆☆☆☆ \n", "☆☆☆☆☆ This is bad! ☆☆☆☆☆ \n")
|
||||
VT_RST);
|
||||
PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ ヤバいよこれ! ☆☆☆☆☆ \n", "☆☆☆☆☆ This is bad! ☆☆☆☆☆ \n")
|
||||
VT_RST);
|
||||
PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ ヤバいよこれ! ☆☆☆☆☆ \n", "☆☆☆☆☆ This is bad! ☆☆☆☆☆ \n")
|
||||
VT_RST);
|
||||
maskIdx = Rand_ZeroFloat(7.99f);
|
||||
}
|
||||
|
||||
|
@ -237,17 +242,22 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) {
|
|||
break;
|
||||
}
|
||||
PRINTF("\n\n");
|
||||
// "Each index 1"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス1 ☆☆☆☆☆ %d\n" VT_RST, rand9);
|
||||
// "Each index 2"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス2 ☆☆☆☆☆ %d\n" VT_RST, maskIdx);
|
||||
// "Each index 3"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス3 ☆☆☆☆☆ %d\n" VT_RST, resultIdx);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 各インデックス1 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Each index 1 ☆☆☆☆☆ %d\n")
|
||||
VT_RST,
|
||||
rand9);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 各インデックス2 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Each index 2 ☆☆☆☆☆ %d\n")
|
||||
VT_RST,
|
||||
maskIdx);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 各インデックス3 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Each index 3 ☆☆☆☆☆ %d\n")
|
||||
VT_RST,
|
||||
resultIdx);
|
||||
PRINTF("\n");
|
||||
// "What kind of evaluation?"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ どういう評価? ☆☆☆☆☆☆ %d\n" VT_RST, reaction);
|
||||
// "What kind of action?"
|
||||
PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ どういうアクション? ☆☆☆ %d\n" VT_RST, this->action);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ どういう評価? ☆☆☆☆☆☆ %d\n",
|
||||
"☆☆☆☆☆ What kind of evaluation? ☆☆☆☆☆☆ %d\n") VT_RST,
|
||||
reaction);
|
||||
PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ どういうアクション? ☆☆☆ %d\n",
|
||||
"☆☆☆☆☆ What kind of action? ☆☆☆ %d\n") VT_RST,
|
||||
this->action);
|
||||
PRINTF("\n\n");
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "sfx.h"
|
||||
#include "sys_matrix.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64effect.h"
|
||||
#include "z64play.h"
|
||||
|
@ -99,8 +100,9 @@ void EnDntJiji_Init(Actor* thisx, PlayState* play) {
|
|||
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
|
||||
this->stage = (EnDntDemo*)this->actor.parent;
|
||||
PRINTF("\n\n");
|
||||
// "Deku Scrub mask show elder"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n" VT_RST, this->stage);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n",
|
||||
"☆☆☆☆☆ Deku Scrub mask competition elder ☆☆☆☆☆ %x\n") VT_RST,
|
||||
this->stage);
|
||||
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
|
||||
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
|
||||
this->actor.attentionRangeType = ATTENTION_RANGE_6;
|
||||
|
@ -292,24 +294,22 @@ void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) {
|
|||
SkelAnime_Update(&this->skelAnime);
|
||||
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
|
||||
if ((this->getItemId == GI_DEKU_NUT_UPGRADE_30) || (this->getItemId == GI_DEKU_NUT_UPGRADE_40)) {
|
||||
// "nut"
|
||||
PRINTF("実 \n");
|
||||
PRINTF("実 \n");
|
||||
PRINTF("実 \n");
|
||||
PRINTF("実 \n");
|
||||
PRINTF("実 \n");
|
||||
PRINTF("実 \n");
|
||||
PRINTF("実 \n");
|
||||
PRINTF("実 \n");
|
||||
PRINTF(T("実 \n", "nut \n"));
|
||||
PRINTF(T("実 \n", "nut \n"));
|
||||
PRINTF(T("実 \n", "nut \n"));
|
||||
PRINTF(T("実 \n", "nut \n"));
|
||||
PRINTF(T("実 \n", "nut \n"));
|
||||
PRINTF(T("実 \n", "nut \n"));
|
||||
PRINTF(T("実 \n", "nut \n"));
|
||||
PRINTF(T("実 \n", "nut \n"));
|
||||
SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_NUT_UPGRADE);
|
||||
} else {
|
||||
// "stick"
|
||||
PRINTF("棒 \n");
|
||||
PRINTF("棒 \n");
|
||||
PRINTF("棒 \n");
|
||||
PRINTF("棒 \n");
|
||||
PRINTF("棒 \n");
|
||||
PRINTF("棒 \n");
|
||||
PRINTF(T("棒 \n", "stick \n"));
|
||||
PRINTF(T("棒 \n", "stick \n"));
|
||||
PRINTF(T("棒 \n", "stick \n"));
|
||||
PRINTF(T("棒 \n", "stick \n"));
|
||||
PRINTF(T("棒 \n", "stick \n"));
|
||||
PRINTF(T("棒 \n", "stick \n"));
|
||||
SET_ITEMGETINF(ITEMGETINF_FOREST_STAGE_STICK_UPGRADE);
|
||||
}
|
||||
this->actor.textId = 0;
|
||||
|
@ -393,8 +393,7 @@ void EnDntJiji_Update(Actor* thisx, PlayState* play) {
|
|||
Actor_SetScale(&this->actor, 0.015f);
|
||||
this->unkTimer++;
|
||||
if (BREG(0)) {
|
||||
// "time"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n" VT_RST, this->timer);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n", "☆☆☆☆☆ time ☆☆☆☆☆ %d\n") VT_RST, this->timer);
|
||||
}
|
||||
if ((this->timer > 1) && (this->timer != 0)) {
|
||||
this->timer--;
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "sfx.h"
|
||||
#include "sys_matrix.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "versions.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64effect.h"
|
||||
|
@ -149,16 +150,15 @@ void EnDntNomal_Init(Actor* thisx, PlayState* play) {
|
|||
this->objectId = -1;
|
||||
if (this->type == ENDNTNOMAL_TARGET) {
|
||||
PRINTF("\n\n");
|
||||
// "Deku Scrub target"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n", "☆☆☆☆☆ Deku Scrub target ☆☆☆☆☆ \n") VT_RST);
|
||||
Collider_InitQuad(play, &this->targetColliderQuad);
|
||||
Collider_SetQuad(play, &this->targetColliderQuad, &this->actor, &sTargetQuadInit);
|
||||
this->actor.world.rot.y = this->actor.shape.rot.y = this->actor.yawTowardsPlayer;
|
||||
this->objectId = OBJECT_HINTNUTS;
|
||||
} else {
|
||||
PRINTF("\n\n");
|
||||
// "Deku Scrub mask show audience"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n",
|
||||
"☆☆☆☆☆ Deku Scrub mask competition audience ☆☆☆☆☆ \n") VT_RST);
|
||||
Collider_InitCylinder(play, &this->bodyColliderCylinder);
|
||||
Collider_SetCylinder(play, &this->bodyColliderCylinder, &this->actor, &sBodyCylinderInit);
|
||||
this->objectId = OBJECT_DNK;
|
||||
|
@ -167,10 +167,9 @@ void EnDntNomal_Init(Actor* thisx, PlayState* play) {
|
|||
this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, this->objectId);
|
||||
if (this->requiredObjectSlot < 0) {
|
||||
Actor_Kill(&this->actor);
|
||||
// "What?"
|
||||
PRINTF(VT_FGCOL(MAGENTA) " なにみの? %d\n" VT_RST "\n", this->requiredObjectSlot);
|
||||
// "Bank is funny"
|
||||
PRINTF(VT_FGCOL(CYAN) " バンクおかしいしぞ!%d\n" VT_RST "\n", this->actor.params);
|
||||
PRINTF(VT_FGCOL(MAGENTA) T(" なにみの? %d\n", " What? %d\n") VT_RST "\n", this->requiredObjectSlot);
|
||||
PRINTF(VT_FGCOL(CYAN) T(" バンクおかしいしぞ!%d\n", " The bank is weird! %d\n") VT_RST "\n",
|
||||
this->actor.params);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
|
@ -279,8 +278,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, PlayState* play) {
|
|||
EffectSsExtra_Spawn(play, &scorePos, &scoreVel, &scoreAccel, 4, 2);
|
||||
Audio_StopSfxById(NA_SE_SY_TRE_BOX_APPEAR);
|
||||
Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
|
||||
// "Big hit"
|
||||
PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter);
|
||||
PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Big hit ☆☆☆☆☆ %d\n") VT_RST, this->hitCounter);
|
||||
if (!LINK_IS_ADULT && !GET_ITEMGETINF(ITEMGETINF_1D)) {
|
||||
this->hitCounter++;
|
||||
if (this->hitCounter >= 3) {
|
||||
|
|
Loading…
Reference in New Issue