mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 17:30:25 +00:00
Code Issues Projects Releases Wiki Activity

T() macro in overlays 4 (#2533)

Browse source 
* T() macro in various overlays

* revert problematic T() in mir_ray
This commit is contained in:
Dragorn421 2025-05-27 18:00:25 +02:00 • committed by GitHub
parent 91e9553ee5
commit 1eaae98ed3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
View file

@ -10,6 +10,7 @@
#include "gfx.h"
#include "gfx_setupdl.h"
#include "printf.h"
#include "translation.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64skin_matrix.h"
@ -92,7 +93,7 @@ u32 EffectSsDeadDd_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
this->accel.z = this->velocity.z = (Rand_ZeroOne() - 0.5f) * 2.0f;
}
} else {
PRINTF("Effect_SS_Dd_disp_mode():mode_swが変です。\n");
PRINTF(T("Effect_SS_Dd_disp_mode():mode_swが変です。\n", "Effect_SS_Dd_disp_mode():mode_sw is strange.\n"));
return 0;
}

3
src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c
View file

@ -7,6 +7,7 @@
#include "z_eff_ss_dead_sound.h"
#include "printf.h"
#include "sfx.h"
#include "translation.h"
#include "z64effect.h"
#include "z64play.h"
@ -33,7 +34,7 @@ u32 EffectSsDeadSound_Init(PlayState* play, u32 index, EffectSs* this, void* ini
this->update = EffectSsDeadSound_Update;
this->rRepeatMode = initParams->repeatMode;
this->rSfxId = initParams->sfxId;
PRINTF("コンストラクター3\n"); // "constructor 3"
PRINTF(T("コンストラクター3\n", "Constructor 3\n"));
return 1;
}

4
src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
View file

@ -12,6 +12,7 @@
#include "rand.h"
#include "sys_math.h"
#include "sys_matrix.h"
#include "translation.h"
#include "versions.h"
#include "z_lib.h"
#include "z64effect.h"
@ -90,7 +91,8 @@ u32 EffectSsEnIce_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
this->rEnvColorB = initParams->envColor.b;
this->rAlphaMode = 0;
} else {
PRINTF("Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n");
PRINTF(T("Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n",
"Effect_Ss_En_Ice_ct():pid->mode_sw is an error.\n"));
return 0;
}

3
src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
View file

@ -14,6 +14,7 @@
#include "rand.h"
#include "segmented_address.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z64effect.h"
#include "z64play.h"
#include "z64player.h"
@ -69,7 +70,7 @@ u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* init
this->gfx = SEGMENTED_TO_VIRTUAL(gPhantomEnergyBallDL);
gSegments[6] = prevSeg6;
} else {
PRINTF("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n");
PRINTF(T("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n", "Effect_Ss_Fhg_Flash_ct():pffd->mode error\n"));
return 0;
}
} else {

4
src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
View file

@ -11,6 +11,7 @@
#include "printf.h"
#include "segmented_address.h"
#include "sys_matrix.h"
#include "translation.h"
#include "z_lib.h"
#include "z64effect.h"
#include "z64play.h"
@ -55,7 +56,8 @@ u32 EffectSsIceSmoke_Init(PlayState* play, u32 index, EffectSs* this, void* init
return 1;
}
PRINTF("Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n");
PRINTF(T("Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n",
"Effect_SS_Ice_Smoke_ct(): Bank Object_Bank_Fz does not exist.\n"));
return 0;
}

6
src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
View file

@ -13,6 +13,7 @@
#include "line_numbers.h"
#include "printf.h"
#include "sys_matrix.h"
#include "translation.h"
#include "versions.h"
#include "z64effect.h"
#include "z64play.h"
@ -65,7 +66,7 @@ u32 EffectSsKakera_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
}
} else {
PRINTF("shape_modelがNULL\n");
PRINTF(T("shape_modelがNULL\n", "shape_model is NULL\n"));
LogUtils_HungupThread("../z_eff_kakera.c", LN1(175, 178));
}
@ -92,7 +93,8 @@ f32 func_809A9818(f32 arg0, f32 arg1) {
#if DEBUG_FEATURES
if (arg1 < 0.0f) {
PRINTF("範囲がマイナス！！(randomD_sectionUniformity)\n");
PRINTF(T("範囲がマイナス！！(randomD_sectionUniformity)\n",
"The range is negative!! (randomD_sectionUniformity)\n"));
}
#endif