T() macro 4 (#2084)

* T() in z_kankyo.c

* T() in z_demo.c

* T() in z_effect.c

* remaining T() in z_sram.c

* T() in z_en_encount1.c

* T() in z_en_owl.c

* T() in z_en_wonder_item.c

* fix forgot T

* Demonstration -> Demo

4 files changed, 35 insertions, 33 deletions

diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 36ae51e99..7417b7868 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -202,7 +202,7 @@ void Cutscene_UpdateScripted(PlayState* play, CutsceneContext* csCtx) {
     }
 
     if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE)) {
-        PRINTF("\nデモ開始要求 発令！"); // "Cutscene start request announcement!"
+        PRINTF(T("\nデモ開始要求 発令！", "\nDemo start request issued!"));
         gSaveContext.save.cutsceneIndex = 0xFFFD;
         gSaveContext.cutsceneTrigger = 1;
     }
@@ -577,7 +577,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti
         Audio_SetCutsceneFlag(0);
         gSaveContext.cutsceneTransitionControl = 1;
 
-        PRINTF("\n分岐先指定！！=[%d]番", cmd->destination); // "Future fork designation=No. [%d]"
+        PRINTF(T("\n分岐先指定！！=[%d]番", "\nBranch destination specified!!=[%d]"), cmd->destination);
 
         // `forceRisingButtonAlphas` has a secondary purpose, which is to signal to the title screen actor
         // that it should display immediately. This occurs when a title screen cutscene that is not the main
@@ -2257,7 +2257,7 @@ void CutsceneHandler_StopScript(PlayState* play, CutsceneContext* csCtx) {
             csCtx->actorCues[i] = NULL;
         }
 
-        PRINTF("\n\n\n\n\nやっぱりここかいな"); // "Right here, huh"
+        PRINTF(T("\n\n\n\n\nやっぱりここかいな", "\n\n\n\n\nThis is it after all"));
 
         gSaveContext.save.cutsceneIndex = 0;
         gSaveContext.gameMode = GAMEMODE_NORMAL;
diff --git a/src/code/z_effect.c b/src/code/z_effect.c
index 089387b17..ac2141db0 100644
--- a/src/code/z_effect.c
+++ b/src/code/z_effect.c
@@ -146,9 +146,10 @@ void Effect_Add(PlayState* play, s32* pIndex, s32 type, u8 arg3, u8 arg4, void*
         }
 
         if (!slotFound) {
-            // "EffectAdd(): I cannot secure it. Be careful. Type %d"
-            PRINTF("EffectAdd():確保できません。注意してください。Type%d\n", type);
-            PRINTF("エフェクト追加せずに終了します。\n"); // "Exit without adding the effect."
+            PRINTF(T("EffectAdd():確保できません。注意してください。Type%d\n",
+                     "EffectAdd(): I cannot secure it. Be careful. Type %d\n"),
+                   type);
+            PRINTF(T("エフェクト追加せずに終了します。\n", "Exit without adding the effect.\n"));
         } else {
             sEffectInfoTable[type].init(effect, initParams);
             status->unk_02 = arg3;
@@ -240,7 +241,7 @@ void Effect_Delete(PlayState* play, s32 index) {
 void Effect_DeleteAll(PlayState* play) {
     s32 i;
 
-    PRINTF("エフェクト総て解放\n"); // "All effect release"
+    PRINTF(T("エフェクト総て解放\n", "All effects release\n"));
 
     for (i = 0; i < SPARK_COUNT; i++) {
         sEffectContext.sparks[i].status.active = false;
@@ -257,5 +258,5 @@ void Effect_DeleteAll(PlayState* play) {
         sEffectInfoTable[EFFECT_SHIELD_PARTICLE].destroy(&sEffectContext.shieldParticles[i].effect);
     }
 
-    PRINTF("エフェクト総て解放 終了\n"); // "All effects release End"
+    PRINTF(T("エフェクト総て解放 終了\n", "All effects release End\n"));
 }
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index f75aceff6..e6036a27f 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -450,8 +450,8 @@ void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 unused)
 
     if (Object_GetSlot(&play->objectCtx, OBJECT_GAMEPLAY_FIELD_KEEP) < 0 && !play->envCtx.sunMoonDisabled) {
         play->envCtx.sunMoonDisabled = true;
-        // "Sun setting other than field keep! So forced release!"
-        PRINTF(VT_COL(YELLOW, BLACK) "\n\nフィールド常駐以外、太陽設定！よって強制解除！\n" VT_RST);
+        PRINTF(VT_COL(YELLOW, BLACK) T("\n\nフィールド常駐以外、太陽設定！よって強制解除！\n",
+                                       "\n\nSun setting other than field keep! So forced release!\n") VT_RST);
     }
 
     gCustomLensFlareOn = false;
@@ -568,8 +568,8 @@ f32 Environment_LerpWeightAccelDecel(u16 endFrame, u16 startFrame, u16 curFrame,
     decelDurationF = (s32)decelDuration;
 
     if ((startFrameF >= endFrameF) || (accelDurationF + decelDurationF > totalFrames)) {
-        // "The frame relation between end_frame and start_frame is wrong!!!"
-        PRINTF(VT_COL(RED, WHITE) "\nend_frameとstart_frameのフレーム関係がおかしい!!!" VT_RST);
+        PRINTF(VT_COL(RED, WHITE) T("\nend_frameとstart_frameのフレーム関係がおかしい!!!",
+                                    "\nThe frame relation between end_frame and start_frame is wrong!!!") VT_RST);
         PRINTF(VT_COL(RED, WHITE) "\nby get_parcent_forAccelBrake!!!!!!!!!" VT_RST);
 
         return 0.0f;
@@ -717,8 +717,8 @@ void Environment_UpdateSkybox(u8 skyboxId, EnvironmentContext* envCtx, SkyboxCon
 
 #if OOT_DEBUG
         if (newSkybox1Index == 0xFF) {
-            // "Environment VR data acquisition failed! Report to Sasaki!"
-            PRINTF(VT_COL(RED, WHITE) "\n環境ＶＲデータ取得失敗！ ささきまでご報告を！" VT_RST);
+            PRINTF(VT_COL(RED, WHITE) T("\n環境ＶＲデータ取得失敗！ ささきまでご報告を！",
+                                        "\nEnvironment VR data acquisition failed! Report to Sasaki!") VT_RST);
         }
 #endif
 
@@ -804,8 +804,8 @@ void Environment_UpdateSkybox(u8 skyboxId, EnvironmentContext* envCtx, SkyboxCon
 void Environment_EnableUnderwaterLights(PlayState* play, s32 waterLightsIndex) {
     if (waterLightsIndex == WATERBOX_LIGHT_INDEX_NONE) {
         waterLightsIndex = 0;
-        // "Underwater color is not set in the water poly data!"
-        PRINTF(VT_COL(YELLOW, BLACK) "\n水ポリゴンデータに水中カラーが設定されておりません!" VT_RST);
+        PRINTF(VT_COL(YELLOW, BLACK) T("\n水ポリゴンデータに水中カラーが設定されておりません!",
+                                       "\nUnderwater color is not set in the water poly data!") VT_RST);
     }
 
     if (play->envCtx.lightMode == LIGHT_MODE_TIME) {
@@ -1140,11 +1140,11 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex
 #if OOT_DEBUG
                     if (sTimeBasedLightConfigs[envCtx->changeLightNextConfig][i].nextLightSetting >=
                         envCtx->numLightSettings) {
-                        // "The color palette setting seems to be wrong!"
-                        PRINTF(VT_COL(RED, WHITE) "\nカラーパレットの設定がおかしいようです！" VT_RST);
+                        PRINTF(VT_COL(RED, WHITE) T("\nカラーパレットの設定がおかしいようです！",
+                                                    "\nThe color palette setting seems to be wrong!") VT_RST);
 
-                        // "Palette setting = [] Last palette number = []"
-                        PRINTF(VT_COL(RED, WHITE) "\n設定パレット＝[%d] 最後パレット番号＝[%d]\n" VT_RST,
+                        PRINTF(VT_COL(RED, WHITE) T("\n設定パレット＝[%d] 最後パレット番号＝[%d]\n",
+                                                    "\nPalette setting = [%d] Last palette number = [%d]\n") VT_RST,
                                sTimeBasedLightConfigs[envCtx->changeLightNextConfig][i].nextLightSetting,
                                envCtx->numLightSettings - 1);
                     }
@@ -1219,12 +1219,12 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex
 
 #if OOT_DEBUG
             if (envCtx->lightSetting >= envCtx->numLightSettings) {
-                // "The color palette seems to be wrong!"
-                PRINTF("\n" VT_FGCOL(RED) "カラーパレットがおかしいようです！");
+                PRINTF("\n" VT_FGCOL(RED)
+                           T("カラーパレットがおかしいようです！", "The color palette seems to be wrong!"));
 
-                // "Palette setting = [] Last palette number = []"
-                PRINTF("\n" VT_FGCOL(YELLOW) "設定パレット＝[%d] パレット数＝[%d]\n" VT_RST, envCtx->lightSetting,
-                       envCtx->numLightSettings);
+                PRINTF("\n" VT_FGCOL(YELLOW) T("設定パレット＝[%d] パレット数＝[%d]\n",
+                                               "Palette setting = [%d] Last palette number = [%d]\n") VT_RST,
+                       envCtx->lightSetting, envCtx->numLightSettings);
             }
 #endif
         }
@@ -2073,9 +2073,9 @@ void Environment_PlaySceneSequence(PlayState* play) {
             Audio_PlayNatureAmbienceSequence(play->sceneSequences.natureAmbienceId);
         }
     } else if (play->sceneSequences.natureAmbienceId == NATURE_ID_NONE) {
-        // "BGM Configuration"
-        PRINTF("\n\n\nBGM設定game_play->sound_info.BGM=[%d] old_bgm=[%d]\n\n", play->sceneSequences.seqId,
-               ((void)0, gSaveContext.seqId));
+        PRINTF(T("\n\n\nBGM設定game_play->sound_info.BGM=[%d] old_bgm=[%d]\n\n",
+                 "\n\n\nBGM Configuration game_play->sound_info.BGM=[%d] old_bgm=[%d]\n\n"),
+               play->sceneSequences.seqId, ((void)0, gSaveContext.seqId));
         if (((void)0, gSaveContext.seqId) != play->sceneSequences.seqId) {
             Audio_PlaySceneSequence(play->sceneSequences.seqId);
         }
@@ -2103,9 +2103,9 @@ void Environment_PlaySceneSequence(PlayState* play) {
     }
 
     PRINTF("\n-----------------\n", ((void)0, gSaveContext.forcedSeqId));
-    PRINTF("\n 強制ＢＧＭ=[%d]", ((void)0, gSaveContext.forcedSeqId)); // "Forced BGM"
+    PRINTF(T("\n 強制ＢＧＭ=[%d]", "\n Forced BGM=[%d]"), ((void)0, gSaveContext.forcedSeqId));
     PRINTF("\n     ＢＧＭ=[%d]", play->sceneSequences.seqId);
-    PRINTF("\n     エンブ=[%d]", play->sceneSequences.natureAmbienceId);
+    PRINTF(T("\n     エンブ=[%d]", "\n      Embed=[%d]"), play->sceneSequences.natureAmbienceId);
     PRINTF("\n     status=[%d]", play->envCtx.timeSeqState);
 
     Audio_SetEnvReverb(play->roomCtx.curRoom.echo);
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index fc3538a66..ffcd516d4 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -593,7 +593,8 @@ void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCt
 
     for (slotNum = 0; slotNum < 3; slotNum++) {
         offset = gSramSlotOffsets[slotNum];
-        PRINTF("ぽいんと＝%x(%d)    SAVE_MAX=%d\n", offset, gSaveContext.fileNum, sizeof(Save));
+        PRINTF(T("ぽいんと＝%x(%d)    SAVE_MAX=%d\n", "Point=%x(%d)    SAVE_MAX=%d\n"), offset, gSaveContext.fileNum,
+               sizeof(Save));
         MemCpy(&gSaveContext, sramCtx->readBuff + offset, sizeof(Save));
 
         oldChecksum = gSaveContext.save.info.checksum;
@@ -782,7 +783,7 @@ void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx) {
     gSaveContext.save.info.playerData.newf[5] = 'Z';
 
     gSaveContext.save.info.playerData.n64ddFlag = fileSelect->n64ddFlag;
-    PRINTF("６４ＤＤフラグ=%d\n", fileSelect->n64ddFlag);
+    PRINTF(T("６４ＤＤフラグ=%d\n", "64DD flags=%d\n"), fileSelect->n64ddFlag);
     PRINTF("newf=%x,%x,%x,%x,%x,%x\n", gSaveContext.save.info.playerData.newf[0],
            gSaveContext.save.info.playerData.newf[1], gSaveContext.save.info.playerData.newf[2],
            gSaveContext.save.info.playerData.newf[3], gSaveContext.save.info.playerData.newf[4],
@@ -856,7 +857,7 @@ void Sram_EraseSave(FileSelectState* fileSelect, SramContext* sramCtx) {
     MemCpy(sramCtx->readBuff + offset, &gSaveContext, sizeof(Save));
     SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000) + offset, &gSaveContext, SLOT_SIZE, OS_WRITE);
 
-    PRINTF("ＣＬＥＡＲ終了\n");
+    PRINTF(T("ＣＬＥＡＲ終了\n", "CLEAR END\n"));
 }
 
 void Sram_CopySave(FileSelectState* fileSelect, SramContext* sramCtx) {