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

T() tubo_trap, wall_tubo, weather_tag, wf

This commit is contained in:
Dragorn421 2025-05-27 20:59:38 +02:00
parent ab477be09e
commit ee0f645e17
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
4 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
View File

@ -12,6 +12,7 @@
#include "regs.h" #include "regs.h"
#include "sfx.h" #include "sfx.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"
@ -69,7 +70,7 @@ void EnTuboTrap_Init(Actor* thisx, PlayState* play) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 2.0f); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 2.0f);
PRINTF("\n\n"); PRINTF("\n\n");
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); // "Urn Trap" PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n", "☆☆☆☆☆ Urn Trap ☆☆☆☆☆ %x\n") VT_RST, this->actor.params);
Collider_InitCylinder(play, &this->collider); Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
Actor_SetScale(&this->actor, 0.1f); Actor_SetScale(&this->actor, 0.1f);
@ -234,8 +235,9 @@ void EnTuboTrap_WaitForProximity(EnTuboTrap* this, PlayState* play) {
f32 targetHeight; f32 targetHeight;
if (BREG(2) != 0) { if (BREG(2) != 0) {
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ わて ☆☆☆☆☆ %f\n" VT_RST, this->actor.world.pos.y); // "You" PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ わて ☆☆☆☆☆ %f\n", "☆☆☆☆☆ You ☆☆☆☆☆ %f\n") VT_RST, this->actor.world.pos.y);
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n" VT_RST, player->actor.world.pos.y); // "Me" PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Me ☆☆☆☆☆ %f\n") VT_RST,
player->actor.world.pos.y);
PRINTF("\n\n"); PRINTF("\n\n");
} }

4
src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
View File

@ -15,6 +15,7 @@
#include "printf.h" #include "printf.h"
#include "quake.h" #include "quake.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "z64debug_display.h"
#include "z64effect.h" #include "z64effect.h"
@ -46,8 +47,7 @@ void EnWallTubo_Init(Actor* thisx, PlayState* play) {
EnWallTubo* this = (EnWallTubo*)thisx; EnWallTubo* this = (EnWallTubo*)thisx;
PRINTF("\n\n"); PRINTF("\n\n");
// "Wall Target" PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n", "☆☆☆☆☆ Points on the wall ☆☆☆☆☆ \n") VT_RST);
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n" VT_RST);
this->unk_164 = this->actor.world.pos; this->unk_164 = this->actor.world.pos;
this->actionFunc = EnWallTubo_FindGirl; this->actionFunc = EnWallTubo_FindGirl;
} }

33
src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
View File

@ -9,6 +9,7 @@
#include "printf.h" #include "printf.h"
#include "regs.h" #include "regs.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "versions.h" #include "versions.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64debug_display.h" #include "z64debug_display.h"
@ -67,14 +68,14 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
switch (PARAMS_GET_U(this->actor.params, 0, 4)) { switch (PARAMS_GET_U(this->actor.params, 0, 4)) {
case EN_WEATHER_TAG_TYPE_CLOUDY_MARKET: case EN_WEATHER_TAG_TYPE_CLOUDY_MARKET:
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ (;o;) About ☆☆☆☆☆☆" PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n", "☆☆☆☆☆ (;o;) About that much ☆☆☆☆☆ \n")
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n" VT_RST); VT_RST);
EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyHyruleMarket); EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyHyruleMarket);
break; break;
case EN_WEATHER_TAG_TYPE_CLOUDY_LON_LON_RANCH: case EN_WEATHER_TAG_TYPE_CLOUDY_LON_LON_RANCH:
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆" PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n",
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆ \n") VT_RST);
if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) { if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
@ -82,8 +83,8 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
break; break;
case EN_WEATHER_TAG_TYPE_SNOW_ZORAS_DOMAIN: case EN_WEATHER_TAG_TYPE_SNOW_ZORAS_DOMAIN:
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ Yukigafuru You won't come (._.) ☆☆☆☆☆" PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n",
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" VT_RST); "☆☆☆☆☆ The snow is falling... You're not coming... (._.) ☆☆☆☆☆ \n") VT_RST);
if (GET_EVENTCHKINF(EVENTCHKINF_4A)) { if (GET_EVENTCHKINF(EVENTCHKINF_4A)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
@ -92,8 +93,8 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
break; break;
case EN_WEATHER_TAG_TYPE_RAIN_LAKE_HYLIA: case EN_WEATHER_TAG_TYPE_RAIN_LAKE_HYLIA:
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆" PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n",
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆ \n") VT_RST);
if (GET_EVENTCHKINF(EVENTCHKINF_4A)) { if (GET_EVENTCHKINF(EVENTCHKINF_4A)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
@ -102,8 +103,8 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
break; break;
case EN_WEATHER_TAG_TYPE_CLOUDY_DEATH_MOUNTAIN: case EN_WEATHER_TAG_TYPE_CLOUDY_DEATH_MOUNTAIN:
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆" PRINTF(VT_FGCOL(YELLOW)
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); T("☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n", "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆") VT_RST);
if (GET_EVENTCHKINF(EVENTCHKINF_49)) { if (GET_EVENTCHKINF(EVENTCHKINF_49)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
@ -111,8 +112,8 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
break; break;
case EN_WEATHER_TAG_TYPE_THUNDERSTORM_KAKARIKO: case EN_WEATHER_TAG_TYPE_THUNDERSTORM_KAKARIKO:
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ Cloudy Rain Thunder (;O;) Uo Melancholy ☆☆☆☆☆" PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n",
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" VT_RST); "☆☆☆☆☆ Cloudy with rain and thunder (;O;) Wow, I'm depressed ☆☆☆☆☆ \n") VT_RST);
if (!GET_EVENTCHKINF(EVENTCHKINF_48) || !GET_EVENTCHKINF(EVENTCHKINF_49) || if (!GET_EVENTCHKINF(EVENTCHKINF_48) || !GET_EVENTCHKINF(EVENTCHKINF_49) ||
!GET_EVENTCHKINF(EVENTCHKINF_4A) || CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) { !GET_EVENTCHKINF(EVENTCHKINF_4A) || CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) {
@ -122,14 +123,14 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) {
break; break;
case EN_WEATHER_TAG_TYPE_SANDSTORM_INTENSITY: case EN_WEATHER_TAG_TYPE_SANDSTORM_INTENSITY:
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ The desert becomes thicker ☆☆☆☆☆" PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n", "☆☆☆☆☆ The desert becomes thicker ☆☆☆☆☆ \n")
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n" VT_RST); VT_RST);
EnWeatherTag_SetupAction(this, EnWeatherTag_SetSandstormIntensity); EnWeatherTag_SetupAction(this, EnWeatherTag_SetSandstormIntensity);
break; break;
case EN_WEATHER_TAG_TYPE_THUNDERSTORM_GRAVEYARD: case EN_WEATHER_TAG_TYPE_THUNDERSTORM_GRAVEYARD:
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆" PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n",
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆ \n") VT_RST);
EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledRainThunder); EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledRainThunder);
break; break;

6
src/overlays/actors/ovl_En_Wf/z_en_wf.c
View File

@ -19,6 +19,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 "z64audio.h" #include "z64audio.h"
@ -292,8 +293,9 @@ void EnWf_Destroy(Actor* thisx, PlayState* play) {
} }
PRINTF("\n\n"); PRINTF("\n\n");
// "☆☆☆☆☆ Number of concurrent events ☆☆☆☆☆" PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n", "☆☆☆☆☆ Number of simultaneous occurrences ☆☆☆☆☆%d\n")
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, parent->curNumSpawn); VT_RST,
parent->curNumSpawn);
PRINTF("\n\n"); PRINTF("\n\n");
} }
} }