mirror of https://github.com/zeldaret/oot.git
T() macro in overlays 8 (#2551)
* There is no bank!! * T() horse_game_check, hs, ice_hono, insect * T() ishi, kusa * T() kakasi, kakasi2, kakasi3 * T() Got the rail data * T() ko, ny, okarina_tag * review * review2
This commit is contained in:
parent
186dfb4aa9
commit
84d4b6701f
|
@ -10,6 +10,7 @@
|
|||
#include "rand.h"
|
||||
#include "sys_matrix.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64draw.h"
|
||||
#include "z64play.h"
|
||||
|
@ -402,7 +403,7 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
|
|||
if (this->requiredObjectSlot < 0) {
|
||||
Actor_Kill(&this->actor);
|
||||
PRINTF_COLOR_ERROR();
|
||||
PRINTF("バンクが無いよ!!(%s)\n", sShopItemDescriptions[params]);
|
||||
PRINTF(T("バンクが無いよ!!(%s)\n", "There is no bank!! (%s)\n"), sShopItemDescriptions[params]);
|
||||
PRINTF_RST();
|
||||
ASSERT(0, "0", "../z_en_girlA.c", 1434);
|
||||
return;
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include "segmented_address.h"
|
||||
#include "sys_matrix.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64play.h"
|
||||
#include "z64player.h"
|
||||
|
@ -71,8 +72,7 @@ void EnGuest_Init(Actor* thisx, PlayState* play) {
|
|||
this->osAnimeObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_OS_ANIME);
|
||||
if (this->osAnimeObjectSlot < 0) {
|
||||
PRINTF_COLOR_ERROR();
|
||||
// "No such bank!!"
|
||||
PRINTF("%s[%d] : バンクが無いよ!!\n", "../z_en_guest.c", 129);
|
||||
PRINTF(T("%s[%d] : バンクが無いよ!!\n", "%s[%d] : There is no bank!!\n"), "../z_en_guest.c", 129);
|
||||
PRINTF_RST();
|
||||
ASSERT(0, "0", "../z_en_guest.c", 132);
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "seqcmd.h"
|
||||
#include "sequence.h"
|
||||
#include "sys_math3d.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64play.h"
|
||||
#include "z64player.h"
|
||||
|
@ -319,8 +320,7 @@ void EnHorseGameCheck_FinishMalonRace(EnHorseGameCheckMalonRace* this, PlayState
|
|||
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
|
||||
play->transitionTrigger = TRANS_TRIGGER_START;
|
||||
} else {
|
||||
// "not supported"
|
||||
PRINTF("En_HGC_Spot20_Ta_end():対応せず\n");
|
||||
PRINTF(T("En_HGC_Spot20_Ta_end():対応せず\n", "En_HGC_Spot20_Ta_end(): not supported\n"));
|
||||
gSaveContext.save.cutsceneIndex = 0;
|
||||
play->nextEntranceIndex = ENTR_LON_LON_RANCH_0;
|
||||
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "sfx.h"
|
||||
#include "sys_matrix.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64play.h"
|
||||
#include "z64player.h"
|
||||
|
@ -85,17 +86,14 @@ void EnHs_Init(Actor* thisx, PlayState* play) {
|
|||
}
|
||||
|
||||
if (this->actor.params == 1) {
|
||||
// "chicken shop (adult era)"
|
||||
PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(CYAN) T(" ヒヨコの店(大人の時) \n", " chicken shop (adult era) \n") VT_RST);
|
||||
func_80A6E3A0(this, func_80A6E9AC);
|
||||
if (GET_ITEMGETINF(ITEMGETINF_30)) {
|
||||
// "chicken shop closed"
|
||||
PRINTF(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(CYAN) T(" ヒヨコ屋閉店 \n", " chicken shop closed \n") VT_RST);
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
} else {
|
||||
// "chicken shop (child era)"
|
||||
PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(CYAN) T(" ヒヨコの店(子人の時) \n", " chicken shop (child era) \n") VT_RST);
|
||||
func_80A6E3A0(this, func_80A6E9AC);
|
||||
}
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include "printf.h"
|
||||
#include "sfx.h"
|
||||
#include "sys_matrix.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64item.h"
|
||||
#include "z64light.h"
|
||||
|
@ -186,7 +187,7 @@ void EnIceHono_Init(Actor* thisx, PlayState* play) {
|
|||
this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo);
|
||||
this->unk_154 = Rand_ZeroOne() * (0x1FFFF / 2.0f);
|
||||
this->unk_156 = Rand_ZeroOne() * (0x1FFFF / 2.0f);
|
||||
PRINTF("(ice 炎)(arg_data 0x%04x)\n", this->actor.params); // "(ice flame)"
|
||||
PRINTF(T("(ice 炎)(arg_data 0x%04x)\n", "(ice flame)(arg_data 0x%04x)\n"), this->actor.params);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -373,7 +374,7 @@ void EnIceHono_Update(Actor* thisx, PlayState* play) {
|
|||
|
||||
#if DEBUG_FEATURES
|
||||
if ((intensity > 0.7f) || (intensity < 0.2f)) {
|
||||
PRINTF("ありえない値(ratio = %f)\n", intensity); // "impossible value(ratio = %f)"
|
||||
PRINTF(T("ありえない値(ratio = %f)\n", "Impossible value (ratio = %f)\n"), intensity);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "sfx.h"
|
||||
#include "sys_math3d.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64effect.h"
|
||||
#include "z64play.h"
|
||||
|
@ -593,8 +594,8 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) {
|
|||
} else {
|
||||
if (this->insectFlags & INSECT_FLAG_FOUND_SOIL) {
|
||||
PRINTF_COLOR_WARNING();
|
||||
// "warning: target Actor is NULL"
|
||||
PRINTF("warning:目標 Actor が NULL (%s %d)\n", "../z_en_mushi.c", 1046);
|
||||
PRINTF(T("warning:目標 Actor が NULL (%s %d)\n", "warning: target Actor is NULL (%s %d)\n"),
|
||||
"../z_en_mushi.c", 1046);
|
||||
PRINTF_RST();
|
||||
}
|
||||
distanceSq = 40.0f;
|
||||
|
@ -721,8 +722,8 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) {
|
|||
(this->insectFlags & INSECT_FLAG_0) && this->lifeTimer <= 0 && this->actionTimer <= 0 &&
|
||||
this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f) {
|
||||
PRINTF_COLOR_WARNING();
|
||||
// "BG missing? To do Actor_delete"
|
||||
PRINTF("BG 抜け? Actor_delete します(%s %d)\n", "../z_en_mushi.c", 1197);
|
||||
PRINTF(T("BG 抜け? Actor_delete します(%s %d)\n", "BG missing? To do Actor_delete (%s %d)\n"),
|
||||
"../z_en_mushi.c", 1197);
|
||||
PRINTF_RST();
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "sys_matrix.h"
|
||||
#include "quake.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_en_item00.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64effect.h"
|
||||
|
@ -143,8 +144,7 @@ s32 EnIshi_SnapToFloor(EnIshi* this, PlayState* play, f32 arg2) {
|
|||
return true;
|
||||
} else {
|
||||
PRINTF_COLOR_WARNING();
|
||||
// "Failure attaching to ground"
|
||||
PRINTF("地面に付着失敗(%s %d)\n", "../z_en_ishi.c", 388);
|
||||
PRINTF(T("地面に付着失敗(%s %d)\n", "Failed to attach to ground (%s %d)\n"), "../z_en_ishi.c", 388);
|
||||
PRINTF_RST();
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "regs.h"
|
||||
#include "sfx.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64ocarina.h"
|
||||
#include "z64play.h"
|
||||
|
@ -251,8 +252,7 @@ void func_80A8F8D0(EnKakasi* this, PlayState* play) {
|
|||
Player* player = GET_PLAYER(play);
|
||||
|
||||
if (play->msgCtx.ocarinaMode == OCARINA_MODE_04 && play->msgCtx.msgMode == MSGMODE_NONE) {
|
||||
// "end?"
|
||||
PRINTF(VT_FGCOL(BLUE) "☆☆☆☆☆ 終り? ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(BLUE) T("☆☆☆☆☆ 終り? ☆☆☆☆☆ \n", "☆☆☆☆☆ end? ☆☆☆☆☆ \n") VT_RST);
|
||||
|
||||
if (this->unk_19A != 0) {
|
||||
Message_CloseTextbox(play);
|
||||
|
@ -355,8 +355,8 @@ void EnKakasi_Draw(Actor* thisx, PlayState* play) {
|
|||
|
||||
if (BREG(3) != 0) {
|
||||
PRINTF("\n\n");
|
||||
// "flag!"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ! ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.save.info.scarecrowLongSongSet);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ フラグ! ☆☆☆☆☆ %d\n", "☆☆☆☆☆ flag! ☆☆☆☆☆ %d\n") VT_RST,
|
||||
gSaveContext.save.info.scarecrowLongSongSet);
|
||||
}
|
||||
Gfx_SetupDL_25Opa(play->state.gfxCtx);
|
||||
SkelAnime_DrawFlexOpa(play, this->skelanime.skeleton, this->skelanime.jointTable, this->skelanime.dListCount, NULL,
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "regs.h"
|
||||
#include "sfx.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64debug_display.h"
|
||||
#include "z64ocarina.h"
|
||||
|
@ -75,8 +76,7 @@ void EnKakasi2_Init(Actor* thisx, PlayState* play) {
|
|||
f32 spawnRangeXZ;
|
||||
|
||||
PRINTF("\n\n");
|
||||
// "Visit Umeda"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 梅田参号見参! ☆☆☆☆☆ \n" VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 梅田参号見参! ☆☆☆☆☆ \n", "☆☆☆☆☆ Umeda Sangyo visit! ☆☆☆☆☆ \n") VT_RST);
|
||||
|
||||
this->switchFlag = PARAMS_GET_U(this->actor.params, 0, 6);
|
||||
spawnRangeY = PARAMS_GET_U(this->actor.params, 6, 8);
|
||||
|
@ -88,16 +88,16 @@ void EnKakasi2_Init(Actor* thisx, PlayState* play) {
|
|||
this->maxSpawnDistance.x = (spawnRangeY * 40.0f) + 40.0f;
|
||||
this->maxSpawnDistance.y = (spawnRangeXZ * 40.0f) + 40.0f;
|
||||
|
||||
// "Former? (Argument 0)"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元?(引数0) ☆☆☆☆ %f\n" VT_RST, spawnRangeY);
|
||||
// "Former? (Z angle)"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元?(Zアングル) ☆☆ %f\n" VT_RST, spawnRangeXZ);
|
||||
// "Correction coordinates X"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標X ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x);
|
||||
// "Correction coordinates Y"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Y ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.y);
|
||||
// "Correction coordinates Z"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Z ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.z);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 元?(引数0) ☆☆☆☆ %f\n", "☆☆☆☆☆ Former? (Argument 0) ☆☆☆☆ %f\n") VT_RST,
|
||||
spawnRangeY);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 元?(Zアングル) ☆☆ %f\n", "☆☆☆☆☆ Former? (Z angle) ☆☆ %f\n") VT_RST,
|
||||
spawnRangeXZ);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 補正座標X ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Correction coordinates X ☆☆☆☆☆ %f\n") VT_RST,
|
||||
this->maxSpawnDistance.x);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 補正座標Y ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Correction coordinates Y ☆☆☆☆☆ %f\n") VT_RST,
|
||||
this->maxSpawnDistance.y);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 補正座標Z ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Correction coordinates Z ☆☆☆☆☆ %f\n") VT_RST,
|
||||
this->maxSpawnDistance.z);
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
|
||||
PRINTF("\n\n");
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "regs.h"
|
||||
#include "sfx.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64ocarina.h"
|
||||
#include "z64play.h"
|
||||
|
@ -357,8 +358,8 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
|
|||
Player* player = GET_PLAYER(play);
|
||||
|
||||
if (BREG(3) != 0) {
|
||||
// "No way!"
|
||||
PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ まさか! ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode);
|
||||
PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ まさか! ☆☆☆☆☆ %d\n", "☆☆☆☆☆ No way! ☆☆☆☆☆ %d\n") VT_RST,
|
||||
play->msgCtx.ocarinaMode);
|
||||
}
|
||||
if ((play->msgCtx.ocarinaMode == OCARINA_MODE_04 ||
|
||||
(play->msgCtx.ocarinaMode >= OCARINA_MODE_05 && play->msgCtx.ocarinaMode < OCARINA_MODE_0B)) &&
|
||||
|
@ -377,8 +378,9 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
|
|||
play->msgCtx.ocarinaMode = OCARINA_MODE_04;
|
||||
if (BREG(3) != 0) {
|
||||
PRINTF("\n\n");
|
||||
// "With this, other guys are OK! That's it!"
|
||||
PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ これで、他の奴もOK!だ! ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode);
|
||||
PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ これで、他の奴もOK!だ! ☆☆☆☆☆ %d\n",
|
||||
"☆☆☆☆☆ With this, other guys are OK! That's it! ☆☆☆☆☆ %d\n") VT_RST,
|
||||
play->msgCtx.ocarinaMode);
|
||||
}
|
||||
this->unk_195 = true;
|
||||
Message_StartTextbox(play, 0x40A7, NULL);
|
||||
|
@ -425,8 +427,8 @@ void EnKakasi3_Update(Actor* thisx, PlayState* play) {
|
|||
|
||||
if (BREG(2) != 0) {
|
||||
PRINTF("\n\n");
|
||||
// "flag!"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ! ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.save.info.scarecrowSpawnSongSet);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ フラグ! ☆☆☆☆☆ %d\n", "☆☆☆☆☆ flag! ☆☆☆☆☆ %d\n") VT_RST,
|
||||
gSaveContext.save.info.scarecrowSpawnSongSet);
|
||||
}
|
||||
|
||||
this->unk_198++;
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include "sfx.h"
|
||||
#include "sys_matrix.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "versions.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64face_reaction.h"
|
||||
|
@ -1195,8 +1196,7 @@ void func_80A99048(EnKo* this, PlayState* play) {
|
|||
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
|
||||
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
|
||||
if (ENKO_TYPE == ENKO_TYPE_CHILD_7) {
|
||||
// "Angle Z"
|
||||
PRINTF(VT_BGCOL(BLUE) " アングルZ->(%d)\n" VT_RST, this->actor.shape.rot.z);
|
||||
PRINTF(VT_BGCOL(BLUE) T(" アングルZ->(%d)\n", " Angle Z->(%d)\n") VT_RST, this->actor.shape.rot.z);
|
||||
if (LINK_IS_ADULT && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)) {
|
||||
if (this->actor.shape.rot.z != 1) {
|
||||
Actor_Kill(&this->actor);
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "rand.h"
|
||||
#include "sfx.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_en_item00.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64effect.h"
|
||||
|
@ -128,8 +129,7 @@ s32 EnKusa_SnapToFloor(EnKusa* this, PlayState* play, f32 yOffset) {
|
|||
return true;
|
||||
} else {
|
||||
PRINTF_COLOR_WARNING();
|
||||
// "Failure attaching to ground"
|
||||
PRINTF("地面に付着失敗(%s %d)\n", "../z_en_kusa.c", 323);
|
||||
PRINTF(T("地面に付着失敗(%s %d)\n", "Failed to attach to ground (%s %d)\n"), "../z_en_kusa.c", 323);
|
||||
PRINTF_RST();
|
||||
return false;
|
||||
}
|
||||
|
@ -268,8 +268,8 @@ void EnKusa_Init(Actor* thisx, PlayState* play) {
|
|||
this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[PARAMS_GET_U(thisx->params, 0, 2)]);
|
||||
|
||||
if (this->requiredObjectSlot < 0) {
|
||||
// "Bank danger!"
|
||||
PRINTF("Error : バンク危険! (arg_data 0x%04x)(%s %d)\n", thisx->params, "../z_en_kusa.c", 561);
|
||||
PRINTF(T("Error : バンク危険! (arg_data 0x%04x)(%s %d)\n", "Error : Bank danger! (arg_data 0x%04x)(%s %d)\n"),
|
||||
thisx->params, "../z_en_kusa.c", 561);
|
||||
Actor_Kill(&this->actor);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -140,11 +140,12 @@ void EnNb_UpdatePath(EnNb* this, PlayState* play) {
|
|||
this->finalPos.z = pointPos[1].z;
|
||||
this->pathYaw =
|
||||
RAD_TO_BINANG(Math_FAtan2F(this->finalPos.x - this->initialPos.x, this->finalPos.z - this->initialPos.z));
|
||||
// "En_Nb_Get_path_info Rail Data Get! = %d!!!!!!!!!!!!!!"
|
||||
PRINTF("En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", path);
|
||||
PRINTF(T("En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n",
|
||||
"En_Nb_Get_path_info Got the rail data = %d!!!!!!!!!!!!!!\n"),
|
||||
path);
|
||||
} else {
|
||||
// "En_Nb_Get_path_info Rail Data Doesn't Exist!!!!!!!!!!!!!!!!!!!!"
|
||||
PRINTF("En_Nb_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n");
|
||||
PRINTF(T("En_Nb_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n",
|
||||
"En_Nb_Get_path_info No rail data!!!!!!!!!!!!!!!!!!!!\n"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include "rand.h"
|
||||
#include "sfx.h"
|
||||
#include "sys_matrix.h"
|
||||
#include "translation.h"
|
||||
#include "z_en_item00.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64effect.h"
|
||||
|
@ -141,8 +142,7 @@ void EnNy_Init(Actor* thisx, PlayState* play) {
|
|||
this->unk_1E8 = 0.0f;
|
||||
this->unk_1E0 = 0.25f;
|
||||
if (this->actor.params == 0) {
|
||||
// "New initials"
|
||||
PRINTF("ニュウ イニシャル[ %d ] !!\n", this->actor.params);
|
||||
PRINTF(T("ニュウ イニシャル[ %d ] !!\n", "New init [ %d ] !!\n"), this->actor.params);
|
||||
this->actor.colChkInfo.mass = 0;
|
||||
this->unk_1D4 = 0;
|
||||
this->unk_1D8 = 0xFF;
|
||||
|
@ -150,8 +150,7 @@ void EnNy_Init(Actor* thisx, PlayState* play) {
|
|||
func_80ABCDBC(this);
|
||||
} else {
|
||||
// This mode is unused in the final game
|
||||
// "Dummy new initials"
|
||||
PRINTF("ダミーニュウ イニシャル[ %d ] !!\n", this->actor.params);
|
||||
PRINTF(T("ダミーニュウ イニシャル[ %d ] !!\n", "Dummy new init [ %d ] !!\n"), this->actor.params);
|
||||
PRINTF("En_Ny_actor_move2[ %x ] !!\n", EnNy_UpdateUnused);
|
||||
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
|
||||
this->actor.update = EnNy_UpdateUnused;
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "segmented_address.h"
|
||||
#include "sfx.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "versions.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64audio.h"
|
||||
|
@ -59,8 +60,8 @@ void EnOkarinaTag_Init(Actor* thisx, PlayState* play) {
|
|||
EnOkarinaTag* this = (EnOkarinaTag*)thisx;
|
||||
|
||||
PRINTF("\n\n");
|
||||
// "Ocarina tag outbreak"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Ocarina tag occurrence ☆☆☆☆☆ %x\n") VT_RST,
|
||||
this->actor.params);
|
||||
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
|
||||
this->type = PARAMS_GET_U(this->actor.params, 10, 6);
|
||||
this->ocarinaSong = PARAMS_GET_U(this->actor.params, 6, 4);
|
||||
|
@ -77,18 +78,17 @@ void EnOkarinaTag_Init(Actor* thisx, PlayState* play) {
|
|||
this->interactRange = this->actor.world.rot.z * 40.0f;
|
||||
}
|
||||
|
||||
// "Save information"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セーブ情報\t ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
|
||||
// "Type index"
|
||||
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" VT_RST, this->type);
|
||||
// "Correct answer information"
|
||||
PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 正解情報\t ☆☆☆☆☆ %d\n" VT_RST, this->ocarinaSong);
|
||||
// "Range information"
|
||||
PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 範囲情報\t ☆☆☆☆☆ %d\n" VT_RST, this->actor.world.rot.z);
|
||||
// "Processing range information"
|
||||
PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 処理範囲情報\t ☆☆☆☆☆ %f\n" VT_RST, this->interactRange);
|
||||
// "Hit?"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 当り?\t\t ☆☆☆☆☆ %d\n" VT_RST, this->unk_158);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ セーブ情報\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Save information\t ☆☆☆☆☆ %d\n") VT_RST,
|
||||
this->switchFlag);
|
||||
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Type index ☆☆☆☆☆ %d\n") VT_RST, this->type);
|
||||
PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 正解情報\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Correct answer information\t ☆☆☆☆☆ %d\n") VT_RST,
|
||||
this->ocarinaSong);
|
||||
PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 範囲情報\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Range information\t ☆☆☆☆☆ %d\n") VT_RST,
|
||||
this->actor.world.rot.z);
|
||||
PRINTF(VT_FGCOL(CYAN) T("☆☆☆☆☆ 処理範囲情報\t ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Processing range information\t ☆☆☆☆☆ %f\n")
|
||||
VT_RST,
|
||||
this->interactRange);
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 当り?\t\t ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Hit?\t\t ☆☆☆☆☆ %d\n") VT_RST, this->unk_158);
|
||||
PRINTF("\n\n");
|
||||
|
||||
if ((this->switchFlag >= 0) && (Flags_GetSwitch(play, this->switchFlag))) {
|
||||
|
@ -131,8 +131,8 @@ void func_80ABEF2C(EnOkarinaTag* this, PlayState* play) {
|
|||
} else {
|
||||
if ((this->ocarinaSong != 6) || (gSaveContext.save.info.scarecrowSpawnSongSet)) {
|
||||
if (player->stateFlags2 & PLAYER_STATE2_24) {
|
||||
// "North! ! ! ! !"
|
||||
PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 北!!!!! ☆☆☆☆☆ %f\n" VT_RST, this->actor.xzDistToPlayer);
|
||||
PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ 北!!!!! ☆☆☆☆☆ %f\n", "☆☆☆☆☆ North!!!!! ☆☆☆☆☆ %f\n") VT_RST,
|
||||
this->actor.xzDistToPlayer);
|
||||
}
|
||||
if ((this->actor.xzDistToPlayer < (90.0f + this->interactRange)) &&
|
||||
(fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 80.0f)) {
|
||||
|
@ -228,8 +228,9 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) {
|
|||
Message_StartOcarina(play, OCARINA_ACTION_CHECK_LULLABY);
|
||||
break;
|
||||
default:
|
||||
// "Ocarina Invisible-kun demo start check error source"
|
||||
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n" VT_RST,
|
||||
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n",
|
||||
"☆☆☆☆☆ Ocarina Invisible-kun demo start check error source ☆☆☆☆☆ %d\n")
|
||||
VT_RST,
|
||||
this->type);
|
||||
Actor_Kill(&this->actor);
|
||||
break;
|
||||
|
@ -320,8 +321,8 @@ void func_80ABF708(EnOkarinaTag* this, PlayState* play) {
|
|||
}
|
||||
|
||||
void func_80ABF7CC(EnOkarinaTag* this, PlayState* play) {
|
||||
// "Open sesame sesame!"
|
||||
PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 開けゴマゴマゴマ! ☆☆☆☆☆ %d\n" VT_RST, Message_GetState(&play->msgCtx));
|
||||
PRINTF(VT_FGCOL(MAGENTA) T("☆☆☆☆☆ 開けゴマゴマゴマ! ☆☆☆☆☆ %d\n", "☆☆☆☆☆ Open gomagomagoma! ☆☆☆☆☆ %d\n") VT_RST,
|
||||
Message_GetState(&play->msgCtx));
|
||||
|
||||
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
|
||||
Message_CloseTextbox(play);
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include "segmented_address.h"
|
||||
#include "sfx.h"
|
||||
#include "terminal.h"
|
||||
#include "translation.h"
|
||||
#include "z_lib.h"
|
||||
#include "z64play.h"
|
||||
#include "z64player.h"
|
||||
|
@ -640,7 +641,7 @@ void EnOssan_Init(Actor* thisx, PlayState* play) {
|
|||
if (this->objectSlot1 < 0) {
|
||||
Actor_Kill(&this->actor);
|
||||
PRINTF_COLOR_ERROR();
|
||||
PRINTF("バンクが無いよ!!(%s)\n", sShopkeeperPrintName[this->actor.params]);
|
||||
PRINTF(T("バンクが無いよ!!(%s)\n", "There is no bank!! (%s)\n"), sShopkeeperPrintName[this->actor.params]);
|
||||
PRINTF_RST();
|
||||
ASSERT(0, "0", "../z_en_oB1.c", 1284);
|
||||
return;
|
||||
|
@ -649,7 +650,8 @@ void EnOssan_Init(Actor* thisx, PlayState* play) {
|
|||
if (EnOssan_TryGetObjBankIndices(this, play, objectIds) == 0) {
|
||||
Actor_Kill(&this->actor);
|
||||
PRINTF_COLOR_ERROR();
|
||||
PRINTF("予備バンクが無いよ!!(%s)\n", sShopkeeperPrintName[this->actor.params]);
|
||||
PRINTF(T("予備バンクが無いよ!!(%s)\n", "There is no spare bank!! (%s)\n"),
|
||||
sShopkeeperPrintName[this->actor.params]);
|
||||
PRINTF_RST();
|
||||
ASSERT(0, "0", "../z_en_oB1.c", 1295);
|
||||
return;
|
||||
|
|
|
@ -1606,9 +1606,12 @@ void func_80B56F10(EnZl3* this, PlayState* play) {
|
|||
pathHead += waypoint;
|
||||
this->unk_30C = pathHead;
|
||||
this->unk_310 = pathHead->count;
|
||||
PRINTF("En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", waypoint);
|
||||
PRINTF(T("En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n",
|
||||
"En_Zl3_Get_path_info Got the rail data = %d!!!!!!!!!!!!!!\n"),
|
||||
waypoint);
|
||||
} else {
|
||||
PRINTF("En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n");
|
||||
PRINTF(T("En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n",
|
||||
"En_Zl3_Get_path_info No rail data!!!!!!!!!!!!!!!!!!!!\n"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue