falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

T() ge1, ge2, gm, goroiwa

This commit is contained in:
Dragorn421 2025-05-26 11:24:22 +02:00
parent b6f3a624af
commit 416a00b28e
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View File

@ -14,6 +14,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 "z64face_reaction.h" #include "z64face_reaction.h"
#include "z64horse.h" #include "z64horse.h"
@ -147,8 +148,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
case GE1_TYPE_VALLEY_FLOOR: case GE1_TYPE_VALLEY_FLOOR:
if (LINK_IS_ADULT) { if (LINK_IS_ADULT) {
// "Valley floor Gerudo withdrawal" PRINTF(VT_FGCOL(CYAN) T("谷底 ゲルド 撤退 \n", "Valley floor Gerudo withdrawal \n") VT_RST);
PRINTF(VT_FGCOL(CYAN) "谷底 ゲルド 撤退 \n" VT_RST);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return; return;
} }
@ -163,8 +163,9 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
} }
this->actor.attentionRangeType = ATTENTION_RANGE_3; this->actor.attentionRangeType = ATTENTION_RANGE_3;
this->hairstyle = GE1_HAIR_BOB; this->hairstyle = GE1_HAIR_BOB;
// "Horseback archery Gerudo EVENT_INF(0) =" PRINTF(VT_FGCOL(CYAN)
PRINTF(VT_FGCOL(CYAN) "やぶさめ ゲルド EVENT_INF(0) = %x\n" VT_RST, gSaveContext.eventInf[0]); T("やぶさめ ゲルド EVENT_INF(0) = %x\n", "Horseback archery Gerudo EVENT_INF(0) = %x\n") VT_RST,
gSaveContext.eventInf[0]);
if (GET_EVENTINF(EVENTINF_HORSES_08)) { if (GET_EVENTINF(EVENTINF_HORSES_08)) {
this->actionFunc = EnGe1_TalkAfterGame_Archery; this->actionFunc = EnGe1_TalkAfterGame_Archery;

7
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View File

@ -13,6 +13,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 "z64horse.h" #include "z64horse.h"
@ -585,14 +586,12 @@ void EnGe2_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play); this->actionFunc(this, play);
if (Ge2_DetectPlayerInUpdate(play, this, &this->actor.focus.pos, this->actor.shape.rot.y, this->yDetectRange)) { if (Ge2_DetectPlayerInUpdate(play, this, &this->actor.focus.pos, this->actor.shape.rot.y, this->yDetectRange)) {
// "Discovered!" PRINTF(VT_FGCOL(GREEN) T("発見!!!!!!!!!!!!\n", "Discovered!!!!!!!!!!!!\n") VT_RST);
PRINTF(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST);
EnGe2_SetupCapturePlayer(this, play); EnGe2_SetupCapturePlayer(this, play);
} }
if ((PARAMS_GET_S(this->actor.params, 0, 8) == GE2_TYPE_STATIONARY) && (this->actor.xzDistToPlayer < 100.0f)) { if ((PARAMS_GET_S(this->actor.params, 0, 8) == GE2_TYPE_STATIONARY) && (this->actor.xzDistToPlayer < 100.0f)) {
// "Discovered!" PRINTF(VT_FGCOL(GREEN) T("発見!!!!!!!!!!!!\n", "Discovered!!!!!!!!!!!!\n") VT_RST);
PRINTF(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST);
EnGe2_SetupCapturePlayer(this, play); EnGe2_SetupCapturePlayer(this, play);
} }
} }

8
src/overlays/actors/ovl_En_Gm/z_en_gm.c
View File

@ -15,6 +15,7 @@
#include "segmented_address.h" #include "segmented_address.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"
#include "z64save.h" #include "z64save.h"
@ -80,15 +81,14 @@ void EnGm_Init(Actor* thisx, PlayState* play) {
Actor_ProcessInitChain(&this->actor, sInitChain); Actor_ProcessInitChain(&this->actor, sInitChain);
// "Medi Goron" PRINTF(VT_FGCOL(GREEN) T("%s[%d] : 中ゴロン[%d]", "%s[%d] : Medi Goron [%d]") VT_RST "\n", "../z_en_gm.c", 133,
PRINTF(VT_FGCOL(GREEN) "%s[%d] : 中ゴロン[%d]" VT_RST "\n", "../z_en_gm.c", 133, this->actor.params); this->actor.params);
this->gmObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_GM); this->gmObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_GM);
if (this->gmObjectSlot < 0) { if (this->gmObjectSlot < 0) {
PRINTF_COLOR_ERROR(); PRINTF_COLOR_ERROR();
// "There is no model bank! !! (Medi Goron)" PRINTF(T("モデル バンクが無いよ！！（中ゴロン）\n", "There is no model bank!! (Medi Goron)\n"));
PRINTF("モデル バンクが無いよ！！（中ゴロン）\n");
PRINTF_RST(); PRINTF_RST();
ASSERT(0, "0", "../z_en_gm.c", 145); ASSERT(0, "0", "../z_en_gm.c", 145);
} }

21
src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
View File

@ -17,6 +17,7 @@
#include "sys_math3d.h" #include "sys_math3d.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"
@ -268,8 +269,7 @@ s32 EnGoroiwa_GetAscendDirection(EnGoroiwa* this, PlayState* play) {
if (nextPointPos->x == currentPointPos->x && nextPointPos->z == currentPointPos->z) { if (nextPointPos->x == currentPointPos->x && nextPointPos->z == currentPointPos->z) {
#if DEBUG_FEATURES #if DEBUG_FEATURES
if (nextPointPos->y == currentPointPos->y) { if (nextPointPos->y == currentPointPos->y) {
// "Error: Invalid path data (points overlap)" PRINTF(T("Error : レールデータ不正(点が重なっている)", "Error : Rail data is incorrect (dots overlap)"));
PRINTF("Error : レールデータ不正(点が重なっている)");
PRINTF("(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 559, this->actor.params); PRINTF("(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 559, this->actor.params);
} }
#endif #endif
@ -564,14 +564,15 @@ void EnGoroiwa_Init(Actor* thisx, PlayState* play) {
EnGoroiwa_InitCollider(this, play); EnGoroiwa_InitCollider(this, play);
pathIdx = PARAMS_GET_U(this->actor.params, 0, 8); pathIdx = PARAMS_GET_U(this->actor.params, 0, 8);
if (pathIdx == 0xFF) { if (pathIdx == 0xFF) {
// "Error: Invalid arg_data" PRINTF(T("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n",
PRINTF("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 1033, this->actor.params); "Error : Invalid arg_data (%s %d)(arg_data 0x%04x)\n"),
"../z_en_gr.c", 1033, this->actor.params);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return; return;
} }
if (play->pathList[pathIdx].count < 2) { if (play->pathList[pathIdx].count < 2) {
// "Error: Invalid Path Data" PRINTF(T("Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n", "Error : Rail data is invalid (%s %d)\n"), "../z_en_gr.c",
PRINTF("Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n", "../z_en_gr.c", 1043); 1043);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return; return;
} }
@ -585,9 +586,9 @@ void EnGoroiwa_Init(Actor* thisx, PlayState* play) {
EnGoroiwa_InitRotation(this); EnGoroiwa_InitRotation(this);
EnGoroiwa_FaceNextWaypoint(this, play); EnGoroiwa_FaceNextWaypoint(this, play);
EnGoroiwa_SetupRoll(this); EnGoroiwa_SetupRoll(this);
// "(Goroiwa)" PRINTF(T("(ごろ岩)(arg 0x%04x)(rail %d)(end %d)(bgc %d)(hit %d)\n",
PRINTF("(ごろ岩)(arg 0x%04x)(rail %d)(end %d)(bgc %d)(hit %d)\n", this->actor.params, "(Goroiwa)(arg 0x%04x)(rail %d)(end %d)(bgc %d)(hit %d)\n"),
PARAMS_GET_U(this->actor.params, 0, 8), PARAMS_GET_U(this->actor.params, 8, 2), this->actor.params, PARAMS_GET_U(this->actor.params, 0, 8), PARAMS_GET_U(this->actor.params, 8, 2),
PARAMS_GET_U(this->actor.params, 10, 1), this->actor.home.rot.z & 1); PARAMS_GET_U(this->actor.params, 10, 1), this->actor.home.rot.z & 1);
} }
@ -625,7 +626,7 @@ void EnGoroiwa_Roll(EnGoroiwa* this, PlayState* play) {
} }
Actor_SetPlayerKnockbackLarge(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0); Actor_SetPlayerKnockbackLarge(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0);
PRINTF_COLOR_CYAN(); PRINTF_COLOR_CYAN();
PRINTF("Player ぶっ飛ばし\n"); // "Player knocked down" PRINTF(T("Player ぶっ飛ばし\n", "Player knocked down\n"));
PRINTF_RST(); PRINTF_RST();
onHitSetupFuncs[PARAMS_GET_U(this->actor.params, 10, 1)](this); onHitSetupFuncs[PARAMS_GET_U(this->actor.params, 10, 1)](this);
Player_PlaySfx(GET_PLAYER(play), NA_SE_PL_BODY_HIT); Player_PlaySfx(GET_PLAYER(play), NA_SE_PL_BODY_HIT);