T() okarina_effect, ossan, reeba, rr

src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c

@@ -10,6 +10,7 @@
 #include "regs.h"
 #include "sequence.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z64audio.h"
 #include "z64cutscene_flags.h"
@@ -64,8 +65,8 @@ void EnOkarinaEffect_Init(Actor* thisx, PlayState* play) {
     EnOkarinaEffect* this = (EnOkarinaEffect*)thisx;
 
     PRINTF("\n\n");
-    // "Ocarina Storm Effect"
+    PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n",
-    PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n" VT_RST);
+                              "☆☆☆☆☆ Ocarina storm effect, sparkling, sparkling, sparkling ☆☆☆☆☆ \n") VT_RST);
     PRINTF("\n\n");
     if (play->envCtx.precipitation[PRECIP_RAIN_CUR] != 0) {
         Actor_Kill(&this->actor);
@@ -97,7 +98,7 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, PlayState* play) {
         }
         PRINTF("\nthis->timer=[%d]", this->timer);
         if (this->timer == 308) {
-            PRINTF("\n\n\n豆よ のびろ 指定\n\n\n"); // "Let's grow some beans"
+            PRINTF(T("\n\n\n豆よ のびろ 指定\n\n\n", "\n\n\nLet's grow some beans\n\n\n"));
             CutsceneFlags_Set(play, 5);
         }
     }

src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

@@ -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"
@@ -677,8 +678,8 @@ void EnOssan_UpdateCursorPos(PlayState* play, EnOssan* this) {
 void EnOssan_EndInteraction(PlayState* play, EnOssan* this) {
     Player* player = GET_PLAYER(play);
 
-    // "End of conversation!"
+    PRINTF(VT_FGCOL(YELLOW) T("%s[%d]:★★★ 会話終了！！ ★★★", "%s[%d]:★★★ End of conversation!! ★★★") VT_RST "\n",
-    PRINTF(VT_FGCOL(YELLOW) "%s[%d]:★★★ 会話終了！！ ★★★" VT_RST "\n", "../z_en_oB1.c", 1337);
+           "../z_en_oB1.c", 1337);
     YREG(31) = 0;
     Actor_TalkOfferAccepted(&this->actor, play);
     play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
@@ -765,8 +766,7 @@ void EnOssan_State_Idle(EnOssan* this, PlayState* play, Player* player) {
     this->headTargetRot = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
 
     if (Actor_TalkOfferAccepted(&this->actor, play)) {
-        // "Start conversation!!"
+        PRINTF(VT_FGCOL(YELLOW) T("★★★ 会話開始！！ ★★★", "★★★ Start conversation!! ★★★") VT_RST "\n");
-        PRINTF(VT_FGCOL(YELLOW) "★★★ 会話開始！！ ★★★" VT_RST "\n");
         player->stateFlags2 |= PLAYER_STATE2_29;
         Play_SetShopBrowsingViewpoint(play);
         EnOssan_SetStateStartShopping(play, this, false);
@@ -955,8 +955,7 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla
         }
 
         if (!EnOssan_TestEndInteraction(this, play, &play->state.input[0])) {
-            // "Shop around by moving the stick left and right"
+            PRINTF(T("「スティック左右で品物みてくれ！」\n", "「Shop around by moving the stick left and right!」\n"));
-            PRINTF("「スティック左右で品物みてくれ！」\n");
             EnOssan_StartShopping(play, this);
         }
     }
@@ -2145,14 +2144,13 @@ void EnOssan_InitActionFunc(EnOssan* this, PlayState* play) {
 
         if (this->shelves == NULL) {
             PRINTF_COLOR_ERROR();
-            // "Warning!! There are no shelves!!"
+            PRINTF(T("★★★ 警告！！ 棚がないよ！！ ★★★\n", "★★★ Warning!! There are no shelves!! ★★★\n"));
-            PRINTF("★★★ 警告！！ 棚がないよ！！ ★★★\n");
             PRINTF_RST();
             return;
         }
 
-        // "Shopkeeper (params) init"
+        PRINTF(VT_FGCOL(YELLOW) T("◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇", "◇◇◇ Shopkeeper ( %d ) init ◇◇◇") VT_RST "\n",
-        PRINTF(VT_FGCOL(YELLOW) "◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇" VT_RST "\n", this->actor.params);
+               this->actor.params);
 
         this->actor.world.pos.x += sShopkeeperPositionOffsets[this->actor.params].x;
         this->actor.world.pos.y += sShopkeeperPositionOffsets[this->actor.params].y;

src/overlays/actors/ovl_En_Reeba/z_en_reeba.c

@@ -17,6 +17,7 @@
 #include "regs.h"
 #include "sfx.h"
 #include "terminal.h"
+#include "translation.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
 #include "z64debug_display.h"
@@ -147,8 +148,8 @@ void EnReeba_Init(Actor* thisx, PlayState* play) {
         this->scale *= 1.5f;
         this->collider.dim.radius = 35;
         this->collider.dim.height = 45;
-        // "Reeba Boss Appears %f"
+        PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Reeba boss appears ☆☆☆☆☆ %f\n") VT_RST,
-        PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" VT_RST, this->scale);
+               this->scale);
         this->actor.colChkInfo.health = 20;
         this->collider.elem.atDmgInfo.effect = 4;
         this->collider.elem.atDmgInfo.damage = 16;
@@ -520,9 +521,10 @@ void EnReeba_Die(EnReeba* this, PlayState* play) {
                     if (spawner->killCount < 10) {
                         spawner->killCount++;
                     }
-                    // "How many are dead?"
                     PRINTF("\n\n");
-                    PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" VT_RST, spawner->killCount);
+                    PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n", "☆☆☆☆☆ How many are DEAD? ☆☆☆☆☆%d\n")
+                               VT_RST,
+                           spawner->killCount);
                     PRINTF("\n\n");
                 }
 

src/overlays/actors/ovl_En_Rr/z_en_rr.c

@@ -16,6 +16,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "terminal.h"
+#include "translation.h"
 #include "versions.h"
 #include "z_en_item00.h"
 #include "z_lib.h"
@@ -468,9 +469,9 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
                     dropType++; // magic jar
                     FALLTHROUGH;
                 case RR_DMG_NORMAL:
-                    // "ouch"
+                    PRINTF(VT_FGCOL(RED) T("いてっ( %d : LIFE %d : DAMAGE %d : %x )！！",
-                    PRINTF(VT_FGCOL(RED) "いてっ( %d : LIFE %d : DAMAGE %d : %x )！！" VT_RST "\n", this->frameCount,
+                                           "ouch ( %d : LIFE %d : DAMAGE %d : %x )!!") VT_RST "\n",
-                           this->actor.colChkInfo.health, this->actor.colChkInfo.damage,
+                           this->frameCount, this->actor.colChkInfo.health, this->actor.colChkInfo.damage,
                            this->actor.colChkInfo.damageEffect);
                     this->stopScroll = false;
                     Actor_ApplyDamage(&this->actor);
@@ -532,8 +533,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) {
             ((this->collider1.base.ocFlags1 & OC1_HIT) || (this->collider2.base.ocFlags1 & OC1_HIT))) {
             this->collider1.base.ocFlags1 &= ~OC1_HIT;
             this->collider2.base.ocFlags1 &= ~OC1_HIT;
-            // "catch"
+            PRINTF(VT_FGCOL(GREEN) T("キャッチ(%d)！！", "catch (%d)!!") VT_RST "\n", this->frameCount);
-            PRINTF(VT_FGCOL(GREEN) "キャッチ(%d)！！" VT_RST "\n", this->frameCount);
             if (play->grabPlayer(play, player)) {
                 player->actor.parent = &this->actor;
                 this->stopScroll = false;
@@ -714,8 +714,7 @@ void EnRr_Death(EnRr* this, PlayState* play) {
                 Item_DropCollectible(play, &dropPos, ITEM00_TUNIC_ZORA);
                 break;
         }
-        // "dropped"
+        PRINTF(VT_FGCOL(GREEN) T("「%s」が出た！！", "「%s」dropped!!") VT_RST "\n", sDropNames[this->dropType]);
-        PRINTF(VT_FGCOL(GREEN) "「%s」が出た！！" VT_RST "\n", sDropNames[this->dropType]);
         switch (this->dropType) {
             case RR_DROP_MAGIC:
                 Item_DropCollectible(play, &dropPos, ITEM00_MAGIC_SMALL);