From c57c0f13fcd2d83d412641e71de05153c20fd6d3 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Wed, 29 Sep 2021 01:53:56 +0200
Subject: [PATCH] Format all translation comments like `// "..."` (hopefully
 all of them) (#986)

* Format all translation comments like `// "..."` (hopefully all of them)

* Move translation comments to before on long lines

Located them with `grep -r src -e '^[^(]*);[ ]*//'`
Regex `osSyncPrintf\([^;]*\n.*//` didn't find more

* Format two more
---
 src/code/__osMalloc.c                         |  18 ++--
 src/code/code_800430A0.c                      |   2 +-
 src/code/db_camera.c                          |  16 +--
 src/code/debug_malloc.c                       |  12 +--
 src/code/graph.c                              |  12 +--
 src/code/irqmgr.c                             |   4 +-
 src/code/padmgr.c                             |   2 +-
 src/code/sched.c                              |   2 +-
 src/code/system_malloc.c                      |  12 +--
 src/code/z_camera.c                           |   2 +-
 src/code/z_fbdemo_fade.c                      |   2 +-
 src/code/z_jpeg.c                             |   6 +-
 .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c    |   2 +-
 .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c       |  12 +--
 .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c |   4 +-
 .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c     |   2 +-
 .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c       |   4 +-
 .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c |   8 +-
 .../z_bg_jya_bombchuiwa.c                     |   2 +-
 .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c     |   6 +-
 .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c  |   6 +-
 .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c    |   4 +-
 .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c       |  12 +--
 .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c |  10 +-
 .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c   |   8 +-
 .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c |   6 +-
 .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c   |   4 +-
 .../z_bg_mori_kaitenkabe.c                    |   4 +-
 .../z_bg_mori_rakkatenjo.c                    |   8 +-
 .../z_bg_spot01_objects2.c                    |   4 +-
 .../z_bg_spot08_iceblock.c                    |   6 +-
 .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c   |   2 +-
 src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c   |   8 +-
 src/overlays/actors/ovl_Demo_Du/z_demo_du.c   |   6 +-
 src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c   |   8 +-
 src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c |   6 +-
 src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c   |  14 +--
 src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c   |   6 +-
 src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c   |   8 +-
 .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c    |   2 +-
 .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c  |   2 +-
 .../actors/ovl_En_Anubice/z_en_anubice.c      |   4 +-
 .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c   |  14 +--
 .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c   |   4 +-
 .../actors/ovl_En_Changer/z_en_changer.c      |  30 +++---
 src/overlays/actors/ovl_En_Dns/z_en_dns.c     |   8 +-
 .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c    |  22 ++--
 .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c    |   8 +-
 .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c  |  10 +-
 .../actors/ovl_En_Encount1/z_en_encount1.c    |  18 ++--
 .../actors/ovl_En_Ex_Item/z_en_ex_item.c      |  18 ++--
 .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c    |   2 +-
 src/overlays/actors/ovl_En_Fish/z_en_fish.c   |   8 +-
 src/overlays/actors/ovl_En_Ge1/z_en_ge1.c     |   4 +-
 src/overlays/actors/ovl_En_Ge2/z_en_ge2.c     |   4 +-
 src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 100 +++++++++---------
 src/overlays/actors/ovl_En_Gm/z_en_gm.c       |   2 +-
 src/overlays/actors/ovl_En_Guest/z_en_guest.c |   2 +-
 .../actors/ovl_En_Heishi2/z_en_heishi2.c      |   2 +-
 .../z_en_horse_game_check.c                   |   2 +-
 src/overlays/actors/ovl_En_Hs/z_en_hs.c       |   6 +-
 .../actors/ovl_En_Insect/z_en_insect.c        |   4 +-
 .../actors/ovl_En_Kakasi/z_en_kakasi.c        |   4 +-
 .../actors/ovl_En_Kakasi2/z_en_kakasi2.c      |  12 +--
 .../actors/ovl_En_Kakasi3/z_en_kakasi3.c      |   6 +-
 src/overlays/actors/ovl_En_Ko/z_en_ko.c       |   2 +-
 src/overlays/actors/ovl_En_Kusa/z_en_kusa.c   |   2 +-
 .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c    |   4 +-
 src/overlays/actors/ovl_En_Ny/z_en_ny.c       |   4 +-
 src/overlays/actors/ovl_En_Owl/z_en_owl.c     |  24 ++---
 src/overlays/actors/ovl_En_Reeba/z_en_reeba.c |   2 +-
 src/overlays/actors/ovl_En_Rr/z_en_rr.c       |   8 +-
 src/overlays/actors/ovl_En_Ru1/z_en_ru1.c     |  14 +--
 src/overlays/actors/ovl_En_Ru2/z_en_ru2.c     |  10 +-
 src/overlays/actors/ovl_En_Sb/z_en_sb.c       |   2 +-
 .../ovl_En_Syateki_Itm/z_en_syateki_itm.c     |   8 +-
 .../ovl_En_Syateki_Man/z_en_syateki_man.c     |   6 +-
 .../ovl_En_Syateki_Niw/z_en_syateki_niw.c     |   4 +-
 .../ovl_En_Takara_Man/z_en_takara_man.c       |   4 +-
 src/overlays/actors/ovl_En_Tite/z_en_tite.c   |   2 +-
 .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c  |   4 +-
 .../ovl_En_Weather_Tag/z_en_weather_tag.c     |  16 +--
 .../ovl_En_Wonder_Item/z_en_wonder_item.c     |   4 +-
 .../ovl_En_Wonder_Talk/z_en_wonder_talk.c     |  34 +++---
 .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c   |  52 ++++-----
 .../actors/ovl_Magic_Wind/z_magic_wind.c      |   8 +-
 src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c   |   4 +-
 src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c |   8 +-
 .../actors/ovl_Obj_Kibako/z_obj_kibako.c      |   2 +-
 .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c    |   2 +-
 .../ovl_Obj_Lightswitch/z_obj_lightswitch.c   |   4 +-
 .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c |   2 +-
 .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c  |   8 +-
 .../actors/ovl_Obj_Switch/z_obj_switch.c      |   2 +-
 .../actors/ovl_Oceff_Spot/z_oceff_spot.c      |   4 +-
 95 files changed, 404 insertions(+), 404 deletions(-)

diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c
index b42effe081..113e1444f0 100644
--- a/src/code/__osMalloc.c
+++ b/src/code/__osMalloc.c
@@ -421,16 +421,16 @@ void __osFree_NoLock(Arena* arena, void* ptr) {
 
     node = (ArenaNode*)((u32)ptr - sizeof(ArenaNode));
     if (node == NULL || node->magic != NODE_MAGIC) {
-        osSyncPrintf(VT_COL(RED, WHITE) "__osFree:不正解放(%08x)\n" VT_RST,
-                     ptr); // __osFree: Unauthorized release (%08x)
+        // "__osFree: Unauthorized release (%08x)"
+        osSyncPrintf(VT_COL(RED, WHITE) "__osFree:不正解放(%08x)\n" VT_RST, ptr);
         return;
     }
     if (node->isFree) {
-        osSyncPrintf(VT_COL(RED, WHITE) "__osFree:二重解放(%08x)\n" VT_RST, ptr); // __osFree: Double release (%08x)
+        osSyncPrintf(VT_COL(RED, WHITE) "__osFree:二重解放(%08x)\n" VT_RST, ptr); // "__osFree: Double release (%08x)"
         return;
     }
     if (arena != node->arena && arena != NULL) {
-        // __osFree:Tried to release in a different way than when it was secured (%08x:%08x)
+        // "__osFree:Tried to release in a different way than when it was secured (%08x:%08x)"
         osSyncPrintf(VT_COL(RED, WHITE) "__osFree:確保時と違う方法で解放しようとした (%08x:%08x)\n" VT_RST, arena,
                      node->arena);
         return;
@@ -490,17 +490,17 @@ void __osFree_NoLockDebug(Arena* arena, void* ptr, const char* file, s32 line) {
 
     node = (ArenaNode*)((u32)ptr - sizeof(ArenaNode));
     if (node == NULL || node->magic != NODE_MAGIC) {
-        osSyncPrintf(VT_COL(RED, WHITE) "__osFree:不正解放(%08x) [%s:%d ]\n" VT_RST, ptr, file,
-                     line); // __osFree: Unauthorized release (%08x)
+        // "__osFree: Unauthorized release (%08x)"
+        osSyncPrintf(VT_COL(RED, WHITE) "__osFree:不正解放(%08x) [%s:%d ]\n" VT_RST, ptr, file, line);
         return;
     }
     if (node->isFree) {
-        osSyncPrintf(VT_COL(RED, WHITE) "__osFree:二重解放(%08x) [%s:%d ]\n" VT_RST, ptr, file,
-                     line); // __osFree: Double release (%08x)
+        // "__osFree: Double release (%08x)"
+        osSyncPrintf(VT_COL(RED, WHITE) "__osFree:二重解放(%08x) [%s:%d ]\n" VT_RST, ptr, file, line);
         return;
     }
     if (arena != node->arena && arena != NULL) {
-        // __osFree:Tried to release in a different way than when it was secured (%08x:%08x)
+        // "__osFree:Tried to release in a different way than when it was secured (%08x:%08x)"
         osSyncPrintf(VT_COL(RED, WHITE) "__osFree:確保時と違う方法で解放しようとした (%08x:%08x)\n" VT_RST, arena,
                      node->arena);
         return;
diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c
index 742aa2ea06..b571297f5f 100644
--- a/src/code/code_800430A0.c
+++ b/src/code/code_800430A0.c
@@ -30,7 +30,7 @@ void func_800430A0(CollisionContext* colCtx, s32 bgId, Actor* actor) {
 
                 osSyncPrintf(VT_FGCOL(RED));
                 //! @bug file and line are not passed to osSyncPrintf
-                // Position is not valid
+                // "Position is not valid"
                 osSyncPrintf(
                     "BGCheckCollection_typicalActorPos():位置が妥当ではありません。\npos (%f,%f,%f) file:%s line:%d\n",
                     pos.x, pos.y, pos.z);
diff --git a/src/code/db_camera.c b/src/code/db_camera.c
index d81b0267e2..57a20191ee 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -27,10 +27,10 @@ const char* D_8012CF48 = "\x8Cﾒﾓﾘ\x8Dｶﾞﾀﾘﾏｾﾝ";
 const char* D_8012CF4C = "p";
 const char* D_8012CF50[] = { "e", "s", "l", "c" };
 
-const char* D_8012CF60[] = { "\x8Cﾒﾓﾘﾊﾟｯｸ" }; // Mempak
-const char* D_8012CF64 = "\x8Cｾｰﾌﾞ";          // Save
-const char* D_8012CF68 = "\x8Cﾛｰﾄﾞ";          // Load
-const char* D_8012CF6C = "\x8Cｸﾘｱ-";          // Clear
+const char* D_8012CF60[] = { "\x8Cﾒﾓﾘﾊﾟｯｸ" }; // "Mempak"
+const char* D_8012CF64 = "\x8Cｾｰﾌﾞ";          // "Save"
+const char* D_8012CF68 = "\x8Cﾛｰﾄﾞ";          // "Load"
+const char* D_8012CF6C = "\x8Cｸﾘｱ-";          // "Clear"
 const char* D_8012CF70 = "\x8Dｦﾇｶﾅｲﾃﾞﾈ";
 
 const char* D_8012CF74 = "FREE      BYTE";
@@ -1519,14 +1519,14 @@ char DbCamera_InitCut(s32 idx, DbCameraSub* sub) {
     i = sub->nPoints * sizeof(CutsceneCameraPoint);
     sDbCameraCuts[idx].lookAt = DebugArena_MallocDebug(i, "../db_camera.c", 2748);
     if (sDbCameraCuts[idx].lookAt == NULL) {
-        // Debug camera memory allocation failure
+        // "Debug camera memory allocation failure"
         osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2751);
         return '?';
     }
 
     sDbCameraCuts[idx].position = DebugArena_MallocDebug(i, "../db_camera.c", 2754);
     if (sDbCameraCuts[idx].position == NULL) {
-        // Debug camera memory allocation failure
+        // "Debug camera memory allocation failure"
         osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2757);
         DebugArena_FreeDebug(sDbCameraCuts[idx].lookAt, "../db_camera.c", 2758);
         sDbCameraCuts[idx].lookAt = NULL;
@@ -1604,7 +1604,7 @@ s32 DbCamera_LoadCallback(char* c) {
 
             sDbCameraCuts[i].lookAt = DebugArena_MallocDebug(ALIGN32(size), "../db_camera.c", 2844);
             if (sDbCameraCuts[i].lookAt == NULL) {
-                // Debug camera memory allocation failure
+                // "Debug camera memory allocation failure"
                 osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2847);
                 return false;
             }
@@ -1615,7 +1615,7 @@ s32 DbCamera_LoadCallback(char* c) {
 
             sDbCameraCuts[i].position = DebugArena_MallocDebug(ALIGN32(size), "../db_camera.c", 2855);
             if (sDbCameraCuts[i].position == NULL) {
-                // Debug camera memory allocation failure
+                // "Debug camera memory allocation failure"
                 osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2858);
                 return false;
             }
diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c
index 73ae713216..ac67e507b7 100644
--- a/src/code/debug_malloc.c
+++ b/src/code/debug_malloc.c
@@ -24,40 +24,40 @@ void DebugArena_CheckPointer(void* ptr, u32 size, const char* name, const char*
 void* DebugArena_Malloc(u32 size) {
     void* ptr = __osMalloc(&sDebugArena, size);
 
-    DebugArena_CheckPointer(ptr, size, "debug_malloc", "確保"); // Secure
+    DebugArena_CheckPointer(ptr, size, "debug_malloc", "確保"); // "Secure"
     return ptr;
 }
 
 void* DebugArena_MallocDebug(u32 size, const char* file, s32 line) {
     void* ptr = __osMallocDebug(&sDebugArena, size, file, line);
 
-    DebugArena_CheckPointer(ptr, size, "debug_malloc_DEBUG", "確保"); // Secure
+    DebugArena_CheckPointer(ptr, size, "debug_malloc_DEBUG", "確保"); // "Secure"
     return ptr;
 }
 
 void* DebugArena_MallocR(u32 size) {
     void* ptr = __osMallocR(&sDebugArena, size);
 
-    DebugArena_CheckPointer(ptr, size, "debug_malloc_r", "確保"); // Secure
+    DebugArena_CheckPointer(ptr, size, "debug_malloc_r", "確保"); // "Secure"
     return ptr;
 }
 
 void* DebugArena_MallocRDebug(u32 size, const char* file, s32 line) {
     void* ptr = __osMallocRDebug(&sDebugArena, size, file, line);
 
-    DebugArena_CheckPointer(ptr, size, "debug_malloc_r_DEBUG", "確保"); // Secure
+    DebugArena_CheckPointer(ptr, size, "debug_malloc_r_DEBUG", "確保"); // "Secure"
     return ptr;
 }
 
 void* DebugArena_Realloc(void* ptr, u32 newSize) {
     ptr = __osRealloc(&sDebugArena, ptr, newSize);
-    DebugArena_CheckPointer(ptr, newSize, "debug_realloc", "再確保"); // Re-securing
+    DebugArena_CheckPointer(ptr, newSize, "debug_realloc", "再確保"); // "Re-securing"
     return ptr;
 }
 
 void* DebugArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) {
     ptr = __osReallocDebug(&sDebugArena, ptr, newSize, file, line);
-    DebugArena_CheckPointer(ptr, newSize, "debug_realloc_DEBUG", "再確保"); // Re-securing
+    DebugArena_CheckPointer(ptr, newSize, "debug_realloc_DEBUG", "再確保"); // "Re-securing"
     return ptr;
 }
 
diff --git a/src/code/graph.c b/src/code/graph.c
index ad960cf063..aa35b5287c 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -324,14 +324,14 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
         if (pool->headMagic != GFXPOOL_HEAD_MAGIC) {
             //! @bug (?) : devs might've forgotten "problem = true;"
             osSyncPrintf("%c", 7);
-            // Dynamic area head is destroyed
+            // "Dynamic area head is destroyed"
             osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST);
             Fault_AddHungupAndCrash("../graph.c", 1070);
         }
         if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) {
             problem = true;
             osSyncPrintf("%c", 7);
-            // Dynamic region tail is destroyed
+            // "Dynamic region tail is destroyed"
             osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域末尾が破壊されています\n" VT_RST);
             Fault_AddHungupAndCrash("../graph.c", 1076);
         }
@@ -340,19 +340,19 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
     if (THGA_IsCrash(&gfxCtx->polyOpa)) {
         problem = true;
         osSyncPrintf("%c", 7);
-        // Zelda 0 is dead
+        // "Zelda 0 is dead"
         osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ0は死んでしまった(graph_alloc is empty)\n" VT_RST);
     }
     if (THGA_IsCrash(&gfxCtx->polyXlu)) {
         problem = true;
         osSyncPrintf("%c", 7);
-        // Zelda 1 is dead
+        // "Zelda 1 is dead"
         osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ1は死んでしまった(graph_alloc is empty)\n" VT_RST);
     }
     if (THGA_IsCrash(&gfxCtx->overlay)) {
         problem = true;
         osSyncPrintf("%c", 7);
-        // Zelda 4 is dead
+        // "Zelda 4 is dead"
         osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ4は死んでしまった(graph_alloc is empty)\n" VT_RST);
     }
 
@@ -389,7 +389,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
     }
 
     if (D_8012DBC0 && PreNmiBuff_IsResetting(gAppNmiBufferPtr) && !gameState->unk_A0) {
-        // To reset mode
+        // "To reset mode"
         osSyncPrintf(VT_COL(YELLOW, BLACK) "PRE-NMIによりリセットモードに移行します\n" VT_RST);
         SET_NEXT_GAMESTATE(gameState, PreNMI_Init, PreNMIContext);
         gameState->running = false;
diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c
index 782a247789..6f5fe105bd 100644
--- a/src/code/irqmgr.c
+++ b/src/code/irqmgr.c
@@ -71,7 +71,7 @@ void IrqMgr_SendMesgForClient(IrqMgr* this, OSMesg msg) {
 
     while (iter != NULL) {
         if (iter->queue->validCount >= iter->queue->msgCount) {
-            // irqmgr_SendMesgForClient: Message queue is overflowing mq=%08x cnt=%d
+            // "irqmgr_SendMesgForClient: Message queue is overflowing mq=%08x cnt=%d"
             osSyncPrintf(
                 VT_COL(RED, WHITE) "irqmgr_SendMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST,
                 iter->queue, iter->queue->validCount);
@@ -88,7 +88,7 @@ void IrqMgr_JamMesgForClient(IrqMgr* this, OSMesg msg) {
 
     while (iter != NULL) {
         if (iter->queue->validCount >= iter->queue->msgCount) {
-            // irqmgr_JamMesgForClient: Message queue is overflowing mq=%08x cnt=%d
+            // "irqmgr_JamMesgForClient: Message queue is overflowing mq=%08x cnt=%d"
             osSyncPrintf(
                 VT_COL(RED, WHITE) "irqmgr_JamMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST,
                 iter->queue, iter->queue->validCount);
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index e7303e830a..02477e205d 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -75,7 +75,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) {
                             if (osSetRumble(&padMgr->pfs[i], temp) != 0) {
                                 padMgr->pakType[i] = 0;
                                 osSyncPrintf(VT_FGCOL(YELLOW));
-                                // "A communication error has occurred with the vibraton pack"
+                                // "A communication error has occurred with the vibration pack"
                                 osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パックで通信エラーが発生しました");
                                 osSyncPrintf(VT_RST);
                             } else {
diff --git a/src/code/sched.c b/src/code/sched.c
index 95385f1272..c478114f64 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -436,7 +436,7 @@ void Sched_ThreadEntry(void* arg) {
 
     while (true) {
         if (sLogScheduler) {
-            // %08d: standby
+            // "%08d: standby"
             osSyncPrintf("%08d:待機中\n", (u32)OS_CYCLES_TO_USEC(osGetTime()));
         }
 
diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c
index c0fb70bc2c..d9085c12f1 100644
--- a/src/code/system_malloc.c
+++ b/src/code/system_malloc.c
@@ -24,40 +24,40 @@ void SystemArena_CheckPointer(void* ptr, u32 size, const char* name, const char*
 void* SystemArena_Malloc(u32 size) {
     void* ptr = __osMalloc(&gSystemArena, size);
 
-    SystemArena_CheckPointer(ptr, size, "malloc", "確保"); // Secure
+    SystemArena_CheckPointer(ptr, size, "malloc", "確保"); // "Secure"
     return ptr;
 }
 
 void* SystemArena_MallocDebug(u32 size, const char* file, s32 line) {
     void* ptr = __osMallocDebug(&gSystemArena, size, file, line);
 
-    SystemArena_CheckPointer(ptr, size, "malloc_DEBUG", "確保"); // Secure
+    SystemArena_CheckPointer(ptr, size, "malloc_DEBUG", "確保"); // "Secure"
     return ptr;
 }
 
 void* SystemArena_MallocR(u32 size) {
     void* ptr = __osMallocR(&gSystemArena, size);
 
-    SystemArena_CheckPointer(ptr, size, "malloc_r", "確保"); // Secure
+    SystemArena_CheckPointer(ptr, size, "malloc_r", "確保"); // "Secure"
     return ptr;
 }
 
 void* SystemArena_MallocRDebug(u32 size, const char* file, s32 line) {
     void* ptr = __osMallocRDebug(&gSystemArena, size, file, line);
 
-    SystemArena_CheckPointer(ptr, size, "malloc_r_DEBUG", "確保"); // Secure
+    SystemArena_CheckPointer(ptr, size, "malloc_r_DEBUG", "確保"); // "Secure"
     return ptr;
 }
 
 void* SystemArena_Realloc(void* ptr, u32 newSize) {
     ptr = __osRealloc(&gSystemArena, ptr, newSize);
-    SystemArena_CheckPointer(ptr, newSize, "realloc", "再確保"); // Re-securing
+    SystemArena_CheckPointer(ptr, newSize, "realloc", "再確保"); // "Re-securing"
     return ptr;
 }
 
 void* SystemArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) {
     ptr = __osReallocDebug(&gSystemArena, ptr, newSize, file, line);
-    SystemArena_CheckPointer(ptr, newSize, "realloc_DEBUG", "再確保"); // Re-securing
+    SystemArena_CheckPointer(ptr, newSize, "realloc_DEBUG", "再確保"); // "Re-securing"
     return ptr;
 }
 
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index ece32d45a9..9f64831867 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -5529,7 +5529,7 @@ s32 Camera_Demo1(Camera* camera) {
             anim->keyframe = 0;
             anim->curFrame = 0.0f;
             camera->animState++;
-            // absolute / relative
+            // "absolute" : "relative"
             osSyncPrintf(VT_SGR("1") "%06u:" VT_RST " camera: spline demo: start %s \n",
                          camera->globalCtx->state.frames, *relativeToPlayer == 0 ? "絶対" : "相対");
 
diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c
index 79c922c731..518c31c332 100644
--- a/src/code/z_fbdemo_fade.c
+++ b/src/code/z_fbdemo_fade.c
@@ -56,7 +56,7 @@ void TransitionFade_Update(void* thisx, s32 updateRate) {
                 this->isDone = 1;
             }
             if (!gSaveContext.fadeDuration) {
-                // Divide by 0! Zero is included in ZCommonGet fade_speed
+                // "Divide by 0! Zero is included in ZCommonGet fade_speed"
                 osSyncPrintf(VT_COL(RED, WHITE) "０除算! ZCommonGet fade_speed に０がはいってる" VT_RST);
             }
 
diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c
index 8dd991a157..6f57e12ace 100644
--- a/src/code/z_jpeg.c
+++ b/src/code/z_jpeg.c
@@ -179,9 +179,9 @@ void Jpeg_ParseMarkers(u8* ptr, JpegContext* ctx) {
                     // Start of Frame, stores important metadata of the image.
                     // Only used for extracting the sampling factors (ctx->mode).
                     osSyncPrintf("MARKER_SOF   %d "
-                                 "精度%02x " // accuracy
-                                 "垂直%d "   // vertical
-                                 "水平%d "   // horizontal
+                                 "精度%02x " // "accuracy"
+                                 "垂直%d "   // "vertical"
+                                 "水平%d "   // "horizontal"
                                  "compo%02x "
                                  "(1:Y)%d (H0=2,V0=1(422) or 2(420))%02x (量子化テーブル)%02x "
                                  "(2:Cb)%d (H1=1,V1=1)%02x (量子化テーブル)%02x "
diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
index 00f8ccae6f..b06cb6e1b1 100644
--- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
+++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
@@ -93,7 +93,7 @@ void BgBombwall_InitDynapoly(BgBombwall* this, GlobalContext* globalCtx) {
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG login failed
+        // "Warning : move BG login failed"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_bombwall.c", 243,
                      this->dyna.actor.params);
     }
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index 6259fb0711..e001ab6120 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -90,12 +90,12 @@ void BgDyYoseizo_Init(Actor* thisx, GlobalContext* globalCtx2) {
     this->actor.focus.pos = this->actor.world.pos;
 
     if (globalCtx->sceneNum == SCENE_DAIYOUSEI_IZUMI) {
-        // Great Fairy Fountain
+        // "Great Fairy Fountain"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, globalCtx->curSpawn);
         SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGreatFairySkel, &gGreatFairySittingTransitionAnim,
                            this->jointTable, this->morphTable, 28);
     } else {
-        // Stone/Jewel Fairy Fountain
+        // "Stone/Jewel Fairy Fountain"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, globalCtx->curSpawn);
         SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGreatFairySkel, &gGreatFairyLayingDownTransitionAnim,
                            this->jointTable, this->morphTable, 28);
@@ -210,7 +210,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
     s32 givingReward;
 
     func_8002DF54(globalCtx, &this->actor, 1);
-    // Mode
+    // "Mode"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" VT_RST, globalCtx->msgCtx.unk_E3EE);
     givingReward = false;
 
@@ -236,7 +236,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
         switch (this->fountainType) {
             case FAIRY_UPGRADE_MAGIC:
                 if (!gSaveContext.magicAcquired || BREG(2)) {
-                    // Spin Attack speed UP
+                    // "Spin Attack speed UP"
                     osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n" VT_RST);
                     this->givingSpell = true;
                     givingReward = true;
@@ -244,7 +244,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
                 break;
             case FAIRY_UPGRADE_DOUBLE_MAGIC:
                 if (!gSaveContext.doubleMagic) {
-                    // Magic Meter doubled
+                    // "Magic Meter doubled"
                     osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n" VT_RST);
                     this->givingSpell = true;
                     givingReward = true;
@@ -252,7 +252,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, GlobalContext* globalCtx) {
                 break;
             case FAIRY_UPGRADE_HALF_DAMAGE:
                 if (!gSaveContext.doubleDefense) {
-                    // Damage halved
+                    // "Damage halved"
                     osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n" VT_RST);
                     this->givingSpell = true;
                     givingReward = true;
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
index 21d90193ea..9c75f4e491 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
@@ -76,7 +76,7 @@ void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
     Actor_SetFocus(&this->actor, 20.0f);
     this->type = (thisx->params >> 0xC) & 0xF;
     if (this->type > 6) {
-        // Type is not set
+        // "Type is not set"
         osSyncPrintf("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_hidan_curtain.c",
                      352, this->actor.params);
         Actor_Kill(&this->actor);
@@ -89,7 +89,7 @@ void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
     thisx->params &= 0x3F;
 
     if ((this->actor.params < 0) || (this->actor.params > 0x3F)) {
-        // Save bit is not set
+        // "Save bit is not set"
         osSyncPrintf("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n",
                      "../z_bg_hidan_curtain.c", 373, this->actor.params);
     }
diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
index 8516d4b7fc..fc4da74626 100644
--- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
+++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
@@ -110,7 +110,7 @@ void func_80890874(BgIceShelter* this, GlobalContext* globalCtx, CollisionHeader
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG registration failed
+        // "Warning : move BG registration failed"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_ice_shelter.c", 362,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
index 4cfa724e6a..386ec49cc9 100644
--- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
+++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
@@ -78,7 +78,7 @@ void BgJya1flift_InitDynapoly(BgJya1flift* this, GlobalContext* globalCtx, Colli
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG login failed
+        // "Warning : move BG login failed"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_1flift.c", 179,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
@@ -94,7 +94,7 @@ void BgJya1flift_InitCollision(Actor* thisx, GlobalContext* globalCtx) {
 
 void BgJya1flift_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgJya1flift* this = THIS;
-    // 1 F lift
+    // "1 F lift"
     osSyncPrintf("(１Ｆリフト)(flag %d)(room %d)\n", sIsSpawned, globalCtx->roomCtx.curRoom.num);
     this->hasInitialized = false;
     if (sIsSpawned) {
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
index 82a7f0a80f..c187ec6128 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
@@ -77,7 +77,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, GlobalContext* globalCtx) {
                 }
 
                 if (curCobraInfo->cobra->dyna.actor.update == NULL) {
-                    // Cobra deleted
+                    // "Cobra deleted"
                     osSyncPrintf("Error : コブラ削除された (%s %d)\n", "../z_bg_jya_bigmirror.c", 203);
                 }
             } else {
@@ -87,7 +87,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, GlobalContext* globalCtx) {
                 this->actor.child = NULL;
 
                 if (&curCobraInfo->cobra->dyna.actor == NULL) {
-                    // Cobra generation failed
+                    // "Cobra generation failed"
                     osSyncPrintf("Error : コブラ発生失敗 (%s %d)\n", "../z_bg_jya_bigmirror.c", 221);
                 }
             }
@@ -159,7 +159,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, GlobalContext* globalCtx) {
                                                       sMirRayPoss[i].y, sMirRayPoss[i].z, 0, 0, 0, sMirRayParamss[i]);
 
                     if (this->lightBeams[i] == NULL) {
-                        // Mir Ray generation failed
+                        // "Mir Ray generation failed"
                         osSyncPrintf("Error : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_bigmirror.c", 310);
                     }
                 }
@@ -190,7 +190,7 @@ void BgJyaBigmirror_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->spawned = true;
     this->mirRayObjIndex = -1;
 
-    // jya Bigmirror
+    // "jya Bigmirror"
     osSyncPrintf("(jya 大鏡)(arg_data 0x%04x)\n", this->actor.params);
 }
 
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
index 5b703bac86..1e5bbd5444 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
@@ -183,7 +183,7 @@ void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, GlobalContext* globalC
     BgJyaBombchuiwa_SetDrawFlags(this, 4);
     if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_MIR_RAY, this->actor.world.pos.x, this->actor.world.pos.y,
                     this->actor.world.pos.z, 0, 0, 0, 0) == NULL) {
-        // Occurrence failure
+        // "Occurrence failure"
         osSyncPrintf("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombchuiwa.c", 410,
                      this->actor.params);
     }
diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
index 2a72829431..7e64b9e040 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
@@ -74,7 +74,7 @@ void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, GlobalContext* globalCtx, Co
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
     if (this->dyna.bgId == BG_ACTOR_MAX) {
 
-        // Warning: move BG registration failed
+        // "Warning: move BG registration failed"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombiwa.c", 174,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
@@ -93,7 +93,7 @@ void BgJyaBombiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
     if ((this->dyna.actor.params & 0x3F) != 0x29) {
         osSyncPrintf(VT_COL(YELLOW, BLACK));
 
-        // Warning: Switch Number changed (%s %d)(SW %d
+        // "Warning: Switch Number changed (%s %d)(SW %d)"
         osSyncPrintf("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n", "../z_bg_jya_bombiwa.c", 218,
                      this->dyna.actor.params & 0x3F);
         osSyncPrintf(VT_RST);
@@ -105,7 +105,7 @@ void BgJyaBombiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
     } else {
         Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
 
-        // Rock destroyed by jya bomb
+        // "Rock destroyed by jya bomb"
         osSyncPrintf("(jya 爆弾で破壊岩)(arg_data 0x%04x)\n", this->dyna.actor.params);
     }
 }
diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
index d5cd94e169..0b87417ab8 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
@@ -141,7 +141,7 @@ void BgJyaCobra_InitDynapoly(BgJyaCobra* this, GlobalContext* globalCtx, Collisi
     CollisionHeader_GetVirtual(collision, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG Registration Failure
+        // "Warning : move BG Registration Failure"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_cobra.c", 247,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
@@ -152,7 +152,7 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, GlobalContext* globalCtx) {
                        this->dyna.actor.world.pos.y + 57.0f, this->dyna.actor.world.pos.z, 0, 0, 0, 6);
     if (this->dyna.actor.child == NULL) {
         osSyncPrintf(VT_FGCOL(RED));
-        // Ｅｒｒｏｒ : Mir Ray occurrence failure
+        // "Ｅｒｒｏｒ : Mir Ray occurrence failure"
         osSyncPrintf("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_cobra.c", 270);
         osSyncPrintf(VT_RST);
     }
@@ -434,7 +434,7 @@ void BgJyaCobra_Init(Actor* thisx, GlobalContext* globalCtx) {
         BgJyaCobra_UpdateShadowFromTop(this);
     }
 
-    // (jya cobra)
+    // "(jya cobra)"
     osSyncPrintf("(jya コブラ)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n", this->dyna.actor.params, this,
                  &this->shadowTexture, ALIGN16((s32)(&this->shadowTexture)));
 }
diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
index 3fab698122..eecd5ce5f4 100644
--- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
@@ -61,7 +61,7 @@ void BgJyaLift_Init(Actor* thisx, GlobalContext* globalCtx) {
         return;
     }
 
-    // Goddess lift CT
+    // "Goddess lift CT"
     osSyncPrintf("女神リフト CT\n");
     BgJyaLift_InitDynapoly(this, globalCtx, &gLiftCol, DPM_UNK);
     Actor_ProcessInitChain(thisx, sInitChain);
@@ -80,7 +80,7 @@ void BgJyaLift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
 
     if (this->isSpawned) {
 
-        // Goddess Lift DT
+        // "Goddess Lift DT"
         osSyncPrintf("女神リフト DT\n");
         sIsSpawned = false;
         DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
index 83acc31b55..34ddb31ac4 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
@@ -61,7 +61,7 @@ void BgMoriBigst_InitDynapoly(BgMoriBigst* this, GlobalContext* globalCtx, Colli
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG login failed
+        // "Warning : move BG login failed"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_bigst.c", 190,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
@@ -71,7 +71,7 @@ void BgMoriBigst_Init(Actor* thisx, GlobalContext* globalCtx) {
     s32 pad;
     BgMoriBigst* this = THIS;
 
-    // mori (bigST.keyceiling)
+    // "mori (bigST.keyceiling)"
     osSyncPrintf("mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n", this->dyna.actor.params,
                  Flags_GetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0x3F),
                  Flags_GetTempClear(globalCtx, this->dyna.actor.room), Flags_GetClear(globalCtx, this->dyna.actor.room),
@@ -80,7 +80,7 @@ void BgMoriBigst_Init(Actor* thisx, GlobalContext* globalCtx) {
     Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
     this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
-        // 【Big Stalfos key ceiling】 bank danger!
+        // "【Big Stalfos key ceiling】 bank danger!"
         osSyncPrintf("【ビッグスタルフォス鍵型天井】 バンク危険！\n");
         osSyncPrintf("%s %d\n", "../z_bg_mori_bigst.c", 234);
         Actor_Kill(&this->dyna.actor);
@@ -138,7 +138,7 @@ void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, GlobalContext* globalCtx)
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
     } else {
-        // Second Stalfos failure
+        // "Second Stalfos failure"
         osSyncPrintf("Warning : 第２スタルフォス発生失敗\n");
     }
     Flags_SetClear(globalCtx, this->dyna.actor.room);
@@ -199,7 +199,7 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, GlobalContext* globalC
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
     } else {
-        // Warning: 3-1 Stalfos failure
+        // "Warning: 3-1 Stalfos failure"
         osSyncPrintf("Warning : 第３-1スタルフォス発生失敗\n");
     }
     stalfos2 = Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_TEST, 170.0f, 827.0f,
@@ -208,7 +208,7 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, GlobalContext* globalC
         this->dyna.actor.child = NULL;
         this->dyna.actor.home.rot.z++;
     } else {
-        // Warning: 3-2 Stalfos failure
+        // "Warning: 3-2 Stalfos failure"
         osSyncPrintf("Warning : 第３-2スタルフォス発生失敗\n");
     }
     Flags_SetClear(globalCtx, this->dyna.actor.room);
diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
index 6c7fdd2fea..308417405d 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
@@ -92,12 +92,12 @@ void BgMoriElevator_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
         Actor_Kill(thisx);
-        // Forest Temple obj elevator Bank Danger!
+        // "Forest Temple obj elevator Bank Danger!"
         osSyncPrintf("Error : 森の神殿 obj elevator バンク危険！(%s %d)\n", "../z_bg_mori_elevator.c", 277);
     } else {
         switch (sIsSpawned) {
             case false:
-                // Forest Temple elevator CT
+                // "Forest Temple elevator CT"
                 osSyncPrintf("森の神殿 elevator CT\n");
                 sIsSpawned = true;
                 this->dyna.actor.room = -1;
@@ -118,7 +118,7 @@ void BgMoriElevator_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     BgMoriElevator* this = THIS;
 
     if (this->unk_172 == 0) {
-        // Forest Temple elevator DT
+        // "Forest Temple elevator DT"
         osSyncPrintf("森の神殿 elevator DT\n");
         DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
         sIsSpawned = false;
@@ -141,7 +141,7 @@ void BgMoriElevator_WaitAfterInit(BgMoriElevator* this, GlobalContext* globalCtx
                 this->dyna.actor.world.pos.y = 73.0f;
                 BgMoriElevator_SetupSetPosition(this);
             } else {
-                // Error: Forest Temple obj elevator Room setting is dangerous
+                // "Error: Forest Temple obj elevator Room setting is dangerous"
                 osSyncPrintf("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "../z_bg_mori_elevator.c", 371);
             }
         } else {
@@ -202,7 +202,7 @@ void BgMoriElevator_SetPosition(BgMoriElevator* this, GlobalContext* globalCtx)
             this->targetY = 233.0f;
             BgMoriElevator_StopMovement(this);
         } else {
-            // Error:Forest Temple obj elevator Room setting is dangerous(% s % d)
+            // "Error:Forest Temple obj elevator Room setting is dangerous(%s %d)"
             osSyncPrintf("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "../z_bg_mori_elevator.c", 479);
         }
     } else if ((globalCtx->roomCtx.curRoom.num == 2) && (this->dyna.actor.world.pos.y < -275.0f)) {
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
index 24ceceb38a..2f3aab3912 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
@@ -90,7 +90,7 @@ void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, GlobalContext* globalCtx, C
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG login failed
+        // "Warning : move BG login failed"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 164,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
@@ -127,7 +127,7 @@ s32 BgMoriHashigo_SpawnLadder(BgMoriHashigo* this, GlobalContext* globalCtx) {
     if (ladder != NULL) {
         return true;
     } else {
-        // Ladder failure
+        // "Ladder failure"
         osSyncPrintf("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 220,
                      this->dyna.actor.params);
         return false;
@@ -169,13 +169,13 @@ void BgMoriHashigo_Init(Actor* thisx, GlobalContext* globalCtx) {
     }
     this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
-        // Bank danger!
+        // "Bank danger!"
         osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
                      "../z_bg_mori_hashigo.c", 312);
         Actor_Kill(&this->dyna.actor);
     } else {
         BgMoriHashigo_SetupWaitForMoriTex(this);
-        // (Forest Temple Ladder and its clasp)
+        // "(Forest Temple Ladder and its clasp)"
         osSyncPrintf("(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n", this->dyna.actor.params);
     }
 }
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
index c21a740f71..f3c7600449 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
@@ -62,7 +62,7 @@ void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, GlobalContext* globalCtx,
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG login failed
+        // "Warning : move BG login failed"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashira4.c", 155,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
@@ -84,7 +84,7 @@ void BgMoriHashira4_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
         Actor_Kill(&this->dyna.actor);
-        // Bank danger!
+        // "Bank danger!"
         osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
                      "../z_bg_mori_hashira4.c", 196);
         return;
@@ -95,7 +95,7 @@ void BgMoriHashira4_Init(Actor* thisx, GlobalContext* globalCtx) {
     }
     Actor_SetFocus(&this->dyna.actor, 50.0f);
     BgMoriHashira4_SetupWaitForMoriTex(this);
-    // (4 pillars of the Forest Temple) Bank danger
+    // "(4 pillars of the Forest Temple) Bank danger"
     osSyncPrintf("(森の神殿 ４本柱)(arg_data 0x%04x)\n", this->dyna.actor.params);
     sUnkTimer = 0;
 }
diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
index e8ebb1efb8..cadeab284c 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
@@ -71,7 +71,7 @@ void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
         Actor_Kill(&this->actor);
-        // Bank danger!
+        // "Bank danger!"
         osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_bg_mori_idomizu.c",
                      202);
         return;
@@ -80,7 +80,7 @@ void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) {
     sIsSpawned = true;
     this->isLoaded = true;
     this->actor.room = -1;
-    // Forest Temple well water
+    // "Forest Temple well water"
     osSyncPrintf("(森の神殿 井戸水)(arg_data 0x%04x)\n", this->actor.params);
 }
 
diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
index c29e99f763..b641b830e9 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
@@ -52,7 +52,7 @@ void BgMoriKaitenkabe_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgMoriKaitenkabe* this = THIS;
     CollisionHeader* colHeader = NULL;
 
-    // Forest Temple object 【Rotating Wall (arg_data: 0x% 04x)】 appears
+    // "Forest Temple object 【Rotating Wall (arg_data: 0x% 04x)】 appears"
     osSyncPrintf("◯◯◯森の神殿オブジェクト【回転壁(arg_data : 0x%04x)】出現 \n", this->dyna.actor.params);
     Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
     DynaPolyActor_Init(&this->dyna, DPM_UNK);
@@ -61,7 +61,7 @@ void BgMoriKaitenkabe_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
         Actor_Kill(&this->dyna.actor);
-        // 【Rotating wall】 Bank danger!
+        // "【Rotating wall】 Bank danger!"
         osSyncPrintf("【回転壁】 バンク危険！(%s %d)\n", "../z_bg_mori_kaitenkabe.c", 176);
     } else {
         this->actionFunc = BgMoriKaitenkabe_WaitForMoriTex;
diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
index c3961135fd..13e4f0e36e 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
@@ -53,21 +53,21 @@ void BgMoriRakkatenjo_Init(Actor* thisx, GlobalContext* globalCtx) {
     CollisionHeader* colHeader = NULL;
 
     DynaPolyActor_Init(&this->dyna, DPM_PLAYER);
-    // Forest Temple obj. Falling Ceiling
+    // "Forest Temple obj. Falling Ceiling"
     osSyncPrintf("森の神殿 obj. 落下天井 (home posY %f)\n", this->dyna.actor.home.pos.y);
     if ((fabsf(1991.0f - this->dyna.actor.home.pos.x) > 0.001f) ||
         (fabsf(683.0f - this->dyna.actor.home.pos.y) > 0.001f) ||
         (fabsf(-2520.0f - this->dyna.actor.home.pos.z) > 0.001f)) {
-        // The set position has been changed. Let's fix the program.
+        // "The set position has been changed. Let's fix the program."
         osSyncPrintf("Warning : セット位置が変更されています。プログラムを修正しましょう。\n");
     }
     if (this->dyna.actor.home.rot.y != 0x8000) {
-        // The set Angle has changed. Let's fix the program.
+        // "The set Angle has changed. Let's fix the program."
         osSyncPrintf("Warning : セット Angle が変更されています。プログラムを修正しましょう。\n");
     }
     this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
-        // Forest Temple obj Falling Ceiling Bank Danger!
+        // "Forest Temple obj Falling Ceiling Bank Danger!"
         osSyncPrintf("Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n", "../z_bg_mori_rakkatenjo.c", 205);
         Actor_Kill(&this->dyna.actor);
         return;
diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
index 145795b59b..e2ca2c8ec7 100644
--- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
+++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
@@ -60,7 +60,7 @@ void BgSpot01Objects2_Init(Actor* thisx, GlobalContext* globalCtx) {
     if (this->objectId >= 0) {
         this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, this->objectId);
         if (this->objBankIndex < 0) {
-            // There was no bank setting.
+            // "There was no bank setting."
             osSyncPrintf("-----------------------------バンク設定ありませんでした.");
             Actor_Kill(&this->dyna.actor);
             return;
@@ -91,7 +91,7 @@ void func_808AC2BC(BgSpot01Objects2* this, GlobalContext* globalCtx) {
     Vec3f position;
 
     if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) {
-        // ---- Successful bank switching!!
+        // "---- Successful bank switching!!"
         osSyncPrintf("-----バンク切り換え成功！！\n");
         gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objBankIndex].segment);
 
diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
index 3821559375..c36cbab393 100644
--- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
+++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
@@ -50,7 +50,7 @@ void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, GlobalContext* global
     CollisionHeader_GetVirtual(collision, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning: move BG registration failed
+        // "Warning: move BG registration failed"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xD9,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
@@ -63,7 +63,7 @@ void BgSpot08Iceblock_CheckParams(BgSpot08Iceblock* this) {
             this->dyna.actor.params = 0x10;
             break;
         default:
-            // Error: arg_data setting error
+            // "Error: arg_data setting error"
             osSyncPrintf("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xF6,
                          this->dyna.actor.params);
             this->dyna.actor.params = 0x10;
@@ -286,7 +286,7 @@ void BgSpot08Iceblock_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgSpot08Iceblock* this = THIS;
     CollisionHeader* colHeader;
 
-    // spot08 ice floe
+    // "spot08 ice floe"
     osSyncPrintf("(spot08 流氷)(arg_data 0x%04x)\n", this->dyna.actor.params);
     BgSpot08Iceblock_CheckParams(this);
 
diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
index 5715cfe624..721449b6fe 100644
--- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
+++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
@@ -323,7 +323,7 @@ void func_808B43D0(BgSpot15Rrbox* this, GlobalContext* globalCtx) {
     Actor_MoveForward(actor);
 
     if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) {
-        // Lon Lon wooden crate fell too much
+        // "Lon Lon wooden crate fell too much"
         osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 599,
                      actor->params);
 
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index da926a8b78..6cbdb3891b 100644
--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -1745,19 +1745,19 @@ void BossMo_CoreCollisionCheck(BossMo* this, GlobalContext* globalCtx) {
     }
     if (this->coreCollider.base.acFlags & AC_HIT) {
         ColliderInfo* hurtbox = this->coreCollider.info.acHitInfo;
-        // hit!!
+        // "hit!!"
         osSyncPrintf("Core_Damage_check 当り！！\n");
         this->coreCollider.base.acFlags &= ~AC_HIT;
         if ((hurtbox->toucher.dmgFlags & 0x00020000) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) {
             this->work[MO_TENT_ACTION_STATE] = MO_CORE_RETREAT;
         }
-        // hit 2 !!
+        // "hit 2 !!"
         osSyncPrintf("Core_Damage_check 当り 2 ！！\n");
         if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_UNDERWATER) && (this->work[MO_TENT_INVINC_TIMER] == 0)) {
             u8 damage = CollisionCheck_GetSwordDamage(hurtbox->toucher.dmgFlags);
 
             if ((damage != 0) && (this->work[MO_TENT_ACTION_STATE] < MO_CORE_ATTACK)) {
-                // sword hit !!
+                // "sword hit !!"
                 osSyncPrintf("Core_Damage_check 剣 当り！！\n");
                 this->work[MO_TENT_ACTION_STATE] = MO_CORE_STUNNED;
                 this->timers[0] = 25;
@@ -1826,7 +1826,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, GlobalContext* globalCtx) {
             }
         }
     }
-    // end !!
+    // "end !!"
     osSyncPrintf("Core_Damage_check 終わり ！！\n");
     osSyncPrintf(VT_RST);
 }
diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
index a60de41bfd..fb0bb690fa 100644
--- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
+++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
@@ -900,7 +900,7 @@ void DemoDu_CsCredits_HandleSubscenesByNpcAction(DemoDu* this, GlobalContext* gl
                     DemoDu_CsCredits_AdvanceTo04(this);
                     break;
                 default:
-                    // Demo_Du_inEnding_Check_DemoMode:There is no such operation!!!!!!!!
+                    // "Demo_Du_inEnding_Check_DemoMode:There is no such operation!!!!!!!!"
                     osSyncPrintf("Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n");
                     break;
             }
@@ -957,7 +957,7 @@ void DemoDu_Update(Actor* thisx, GlobalContext* globalCtx) {
     DemoDu* this = THIS;
 
     if (this->updateIndex < 0 || this->updateIndex >= 29 || sUpdateFuncs[this->updateIndex] == NULL) {
-        // The main mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!
+        // "The main mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!"
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
@@ -1029,7 +1029,7 @@ void DemoDu_Draw(Actor* thisx, GlobalContext* globalCtx) {
     DemoDu* this = THIS;
 
     if (this->drawIndex < 0 || this->drawIndex >= 3 || sDrawFuncs[this->drawIndex] == NULL) {
-        // The drawing mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!
+        // "The drawing mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!"
         osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
index 5f9d6aa7ac..ec45bee8a7 100644
--- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
+++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
@@ -1209,7 +1209,7 @@ void DemoEc_InitNpc(DemoEc* this, GlobalContext* globalCtx) {
     s16 type = this->actor.params;
 
     if (sInitFuncs[type] == NULL) {
-        // Demo_Ec_main_init: Initialization process is wrong arg_data
+        // "Demo_Ec_main_init: Initialization process is wrong arg_data"
         osSyncPrintf(VT_FGCOL(RED) " Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, type);
         Actor_Kill(&this->actor);
         return;
@@ -1234,7 +1234,7 @@ void DemoEc_InitCommon(DemoEc* this, GlobalContext* globalCtx) {
     secondaryBankIndex = Object_GetIndex(&globalCtx->objectCtx, sp28);
 
     if ((secondaryBankIndex < 0) || (primaryBankIndex < 0)) {
-        // Demo_Ec_main_bank: Bank unreadable arg_data =%
+        // "Demo_Ec_main_bank: Bank unreadable arg_data = %d!"
         osSyncPrintf(VT_FGCOL(RED) "Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, type);
         Actor_Kill(&this->actor);
         return;
@@ -1287,7 +1287,7 @@ void DemoEc_Update(Actor* thisx, GlobalContext* globalCtx) {
     s32 updateMode = this->updateMode;
 
     if ((updateMode < 0) || (updateMode >= ARRAY_COUNT(sUpdateFuncs)) || sUpdateFuncs[updateMode] == NULL) {
-        // The main mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!
+        // "The main mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!"
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
     } else {
         if (updateMode != EC_UPDATE_COMMON) {
@@ -1320,7 +1320,7 @@ void DemoEc_Draw(Actor* thisx, GlobalContext* globalCtx) {
     s32 drawConfig = this->drawConfig;
 
     if ((drawConfig < 0) || (drawConfig >= ARRAY_COUNT(sDrawFuncs)) || sDrawFuncs[drawConfig] == NULL) {
-        // The main mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!
+        // "The main mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!"
         osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
     } else {
         if (drawConfig != EC_DRAW_COMMON) {
diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
index a5b9b617c3..f2e5efa0e0 100644
--- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
+++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
@@ -110,7 +110,7 @@ void DemoExt_CheckCsMode(DemoExt* this, GlobalContext* globalCtx) {
                     DemoExt_SetupDispellVortex(this);
                     break;
                 default:
-                    // Demo_Ext_Check_DemoMode: there is no such action!
+                    // "Demo_Ext_Check_DemoMode: there is no such action!"
                     osSyncPrintf("Demo_Ext_Check_DemoMode:そんな動作は無い!!!!!!!!\n");
                     break;
             }
@@ -173,7 +173,7 @@ void DemoExt_Update(Actor* thisx, GlobalContext* globalCtx) {
     DemoExt* this = THIS;
 
     if ((this->action < EXT_WAIT) || (this->action > EXT_DISPELL) || sActionFuncs[this->action] == NULL) {
-        // Main mode is abnormal!
+        // "Main mode is abnormal!"
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
     } else {
         sActionFuncs[this->action](this, globalCtx);
@@ -228,7 +228,7 @@ void DemoExt_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     if ((this->drawMode < EXT_DRAW_NOTHING) || (this->drawMode > EXT_DRAW_VORTEX) ||
         sDrawFuncs[this->drawMode] == NULL) {
-        // Draw mode is abnormal!
+        // "Draw mode is abnormal!"
         osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
     } else {
         sDrawFuncs[this->drawMode](thisx, globalCtx);
diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
index 6f08e9fe1c..2466dab68d 100644
--- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
+++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
@@ -221,14 +221,14 @@ s32 DemoGj_FindGanon(DemoGj* this, GlobalContext* globalCtx) {
             if (actor->id == ACTOR_BOSS_GANON2) {
                 this->ganon = (BossGanon2*)actor;
 
-                // Demo_Gj_Search_Boss_Ganon %d: Discover Ganon !!!!
+                // "Demo_Gj_Search_Boss_Ganon %d: Discover Ganon !!!!"
                 osSyncPrintf("Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n", this->dyna.actor.params);
                 return true;
             }
             actor = actor->next;
         }
 
-        // Demo_Gj_Search_Boss_Ganon %d: I couldn't find Ganon
+        // "Demo_Gj_Search_Boss_Ganon %d: I couldn't find Ganon"
         osSyncPrintf("Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n", this->dyna.actor.params);
         return false;
     }
@@ -386,7 +386,7 @@ void DemoGj_SetupRotation(DemoGj* this, GlobalContext* globalCtx) {
             break;
 
         default:
-            // Demo_Gj_common_Reflect : This arg_data is not supported = %d
+            // "Demo_Gj_common_Reflect : This arg_data is not supported = %d"
             osSyncPrintf(VT_FGCOL(RED) "Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n" VT_RST,
                          this->dyna.actor.params);
             return;
@@ -540,7 +540,7 @@ void DemoGj_SetupMovement(DemoGj* this, GlobalContext* globalCtx) {
                 break;
 
             default:
-                // Demo_Gj_Setup_Move_common : This arg_data is not supported = %d
+                // "Demo_Gj_Setup_Move_common : This arg_data is not supported = %d"
                 osSyncPrintf(VT_FGCOL(RED) "Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n" VT_RST,
                              actor->params);
                 break;
@@ -1347,7 +1347,7 @@ void DemoGj_Update(Actor* thisx, GlobalContext* globalCtx) {
 
     if (this->updateMode < 0 || this->updateMode >= ARRAY_COUNT(sUpdateFuncs) ||
         sUpdateFuncs[this->updateMode] == NULL) {
-        // The main mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!
+        // "The main mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!"
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
@@ -1404,7 +1404,7 @@ void DemoGj_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
 
         default:
-            // Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!
+            // "Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!"
             osSyncPrintf(VT_FGCOL(RED) "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST, globalCtx,
                          this);
             Actor_Kill(&this->dyna.actor);
@@ -1440,7 +1440,7 @@ void DemoGj_Draw(Actor* thisx, GlobalContext* globalCtx) {
     DemoGj* this = THIS;
 
     if (this->drawConfig < 0 || this->drawConfig >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawConfig] == NULL) {
-        // The drawing mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!
+        // "The drawing mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!"
         osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
index 2685623422..2cd32560ca 100644
--- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
+++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
@@ -1708,7 +1708,7 @@ void DemoGt_Update(Actor* thisx, GlobalContext* globalCtx) {
     DemoGtUpdateFunc updateFunc;
 
     if ((this->updateMode < 0) || (this->updateMode >= 19) || (updateFunc = sUpdateFuncs[this->updateMode]) == NULL) {
-        // The main mode is strange!
+        // "The main mode is strange!"
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
@@ -1745,7 +1745,7 @@ void DemoGt_Init(Actor* thisx, GlobalContext* globalCtx) {
             func_80982054_Init24(this, globalCtx);
             break;
         default:
-            // Demo_Gt_Actor_ct There is no such argument !
+            // "Demo_Gt_Actor_ct There is no such argument !"
             osSyncPrintf("Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
             Actor_Kill(&this->dyna.actor);
     }
@@ -1764,7 +1764,7 @@ void DemoGt_Draw(Actor* thisx, GlobalContext* globalCtx) {
     DemoGtDrawFunc drawFunc;
 
     if ((this->drawConfig < 0) || (this->drawConfig >= 9) || (drawFunc = sDrawFuncs[this->drawConfig]) == NULL) {
-        // The drawing mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!
+        // "The drawing mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!"
         osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
index 24c762202f..5b8d6b6741 100644
--- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
+++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
@@ -231,7 +231,7 @@ void func_809839D0(DemoIk* this, GlobalContext* globalCtx) {
                 case 6:
                     break;
                 default:
-                    // there is no such action
+                    // "there is no such action"
                     osSyncPrintf("Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n");
             }
             this->csAction = nextCsAction;
@@ -382,7 +382,7 @@ void func_80984048(DemoIk* this, GlobalContext* globalCtx) {
                     Actor_Kill(&this->actor);
                     break;
                 default:
-                    // there is no such action
+                    // "there is no such action"
                     osSyncPrintf("Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n");
             }
             this->csAction = nextCsAction;
@@ -475,7 +475,7 @@ void DemoIk_Update(Actor* thisx, GlobalContext* globalCtx) {
 
     if (this->actionMode < 0 || this->actionMode >= ARRAY_COUNT(sActionFuncs) ||
         sActionFuncs[this->actionMode] == NULL) {
-        // The main mode is strange
+        // "The main mode is strange"
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
@@ -496,7 +496,7 @@ void DemoIk_Draw(Actor* thisx, GlobalContext* globalCtx) {
     DemoIk* this = THIS;
 
     if (this->drawMode < 0 || this->drawMode >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawMode] == NULL) {
-        // The draw mode is strange
+        // "The draw mode is strange"
         osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
index d3f6402c1d..1591644a3c 100644
--- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
+++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
@@ -252,7 +252,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, GlobalContext* globalCtx) {
     CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider1.base);
     if (this->collider2.base.acFlags & AC_HIT) {
         func_80078884(NA_SE_SY_CORRECT_CHIME);
-        // I got it
+        // "I got it"
         LOG_STRING("当ったよ", "../z_demo_kekkai.c", 572);
         this->actor.update = DemoKekkai_TrialBarrierDispel;
         this->timer = 0;
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
index 39df520dc7..d4f22f9603 100644
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
+++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
@@ -51,7 +51,7 @@ void DemoTreLgt_Init(Actor* thisx, GlobalContext* globalCtx) {
     DemoTreLgt* this = THIS;
 
     if (!SkelCurve_Init(globalCtx, &this->skelCurve, &gTreasureChestCurveSkel, sTransformUpdIdx[0])) {
-        // Demo_Tre_Lgt_Actor_ct (); Construct failed
+        // "Demo_Tre_Lgt_Actor_ct (); Construct failed"
         osSyncPrintf("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n");
     }
 
diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
index 02ff9966cc..61200b1282 100644
--- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
+++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
@@ -128,7 +128,7 @@ void EnAnubice_Init(Actor* thisx, GlobalContext* globalCtx) {
                    16);
 
     osSyncPrintf("\n\n");
-    // ☆☆☆☆☆ Anubis occurence ☆☆☆☆☆
+    // "☆☆☆☆☆ Anubis occurence ☆☆☆☆☆"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n" VT_RST);
 
     this->actor.naviEnemyId = 0x3A;
@@ -177,7 +177,7 @@ void EnAnubice_FindFlameCircles(EnAnubice* this, GlobalContext* globalCtx) {
                     currentProp = currentProp->next;
                 } else {
                     this->flameCircles[flameCirclesFound] = (BgHidanCurtain*)currentProp;
-                    // ☆☆☆☆☆ How many fires? ☆☆☆☆☆
+                    // "☆☆☆☆☆ How many fires? ☆☆☆☆☆"
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %d\n" VT_RST, flameCirclesFound);
                     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %x\n" VT_RST,
                                  this->flameCircles[flameCirclesFound]);
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
index bcbc7535e9..da1cf32060 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
@@ -60,9 +60,9 @@ void EnBomBowlMan_Init(Actor* thisx, GlobalContext* globalCtx2) {
     ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
     SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gChuGirlSkel, &gChuGirlNoddingOffAnim, this->jointTable,
                        this->morphTable, 11);
-    // ☆ Man, my shoulders hurt~ ☆
+    // "☆ Man, my shoulders hurt~ ☆"
     osSyncPrintf(VT_FGCOL(GREEN) "☆ もー 肩こっちゃうよねぇ〜 \t\t ☆ \n" VT_RST);
-    // ☆ Isn't there some sort of job that will pay better and be more relaxing? ☆ %d
+    // "☆ Isn't there some sort of job that will pay better and be more relaxing? ☆ %d"
     osSyncPrintf(VT_FGCOL(GREEN) "☆ もっとラクしてもうかるバイトないかしら？ ☆ %d\n" VT_RST,
                  globalCtx->bombchuBowlingStatus);
     this->posCopy = this->actor.world.pos;
@@ -222,11 +222,11 @@ void EnBomBowMan_RunGame(EnBomBowlMan* this, GlobalContext* globalCtx) {
 
     if (BREG(3)) {
         osSyncPrintf(VT_FGCOL(RED) "☆ game_play->bomchu_game_flag ☆ %d\n" VT_RST, globalCtx->bombchuBowlingStatus);
-        //  HOW'S THE FIRST WALL DOING?
+        // "HOW'S THE FIRST WALL DOING?"
         osSyncPrintf(VT_FGCOL(RED) "☆ 壁１の状態どう？ ☆ %d\n" VT_RST, this->wallStatus[0]);
-        //  HOW'S THE SECOND WALL DOING?
+        // "HOW'S THE SECOND WALL DOING?"
         osSyncPrintf(VT_FGCOL(RED) "☆ 壁２の状態どう？ ☆ %d\n" VT_RST, this->wallStatus[1]);
-        // HOLE INFORMATION
+        // "HOLE INFORMATION"
         osSyncPrintf(VT_FGCOL(RED) "☆ 穴情報\t     ☆ %d\n" VT_RST, this->bowlPit->status);
         osSyncPrintf("\n\n");
     }
@@ -237,7 +237,7 @@ void EnBomBowMan_RunGame(EnBomBowlMan* this, GlobalContext* globalCtx) {
         if ((this->wallStatus[0] != 1) && (this->wallStatus[1] != 1) && (this->bowlPit->status == 2)) {
             this->gameResult = 1; // Won
             this->bowlPit->status = 0;
-            // Center HIT!
+            // "Center HIT!"
             osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 中央ＨＩＴ！！！！ ☆☆☆☆☆ \n" VT_RST);
         }
 
@@ -245,7 +245,7 @@ void EnBomBowMan_RunGame(EnBomBowlMan* this, GlobalContext* globalCtx) {
             (globalCtx->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length == 0) && (this->bowlPit->status == 0) &&
             (this->wallStatus[0] != 1) && (this->wallStatus[1] != 1)) {
             this->gameResult = 2; // Lost
-            // Bombchu lost
+            // "Bombchu lost"
             osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ ボムチュウ消化 ☆☆☆☆☆ \n" VT_RST);
         }
     }
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
index 2628d5a84d..3bea2c6672 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
@@ -200,11 +200,11 @@ void EnBomBowlPit_WaitTillPrizeGiven(EnBomBowlPit* this, GlobalContext* globalCt
 
 void EnBomBowlPit_Reset(EnBomBowlPit* this, GlobalContext* globalCtx) {
     if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && (func_80106BC8(globalCtx) != 0)) {
-        // Normal termination/completion
+        // "Normal termination"/"completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         if (this->getItemId == GI_HEART_PIECE) {
             gSaveContext.healthAccumulator = 0x140;
-            // Ah recovery! (?)
+            // "Ah recovery!" (?)
             osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ あぁ回復！ ☆☆☆☆☆ \n" VT_RST);
         }
         this->exItemDone = 0;
diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
index a9c19dfe9b..cd15ac0053 100644
--- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c
+++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c
@@ -90,13 +90,13 @@ void EnChanger_Init(Actor* thisx, GlobalContext* globalCtx2) {
     }
 
     osSyncPrintf("\n\n");
-    // Treasure generation (which room is it?)
+    // "Treasure generation (which room is it?)"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 宝発生(部屋はどれ？) %d\n" VT_RST, globalCtx->roomCtx.curRoom.num);
-    // How is the Bit?
+    // "How is the Bit?"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ビットは？ \t     %x\n" VT_RST, globalCtx->actorCtx.flags.chest);
-    // How is the Save BIT?
+    // "How is the Save BIT?"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セーブＢＩＴは？     %x\n" VT_RST, sTreasureFlags[minigameRoomNum]);
-    // Is it already a zombie?
+    // "Is it already a zombie?"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ もう、ゾンビ？\t     %d\n" VT_RST, this->roomChestsOpened);
     osSyncPrintf("\n\n");
 
@@ -118,7 +118,7 @@ void EnChanger_Init(Actor* thisx, GlobalContext* globalCtx2) {
                                0xFF;
                 Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_ETCETERA, 20.0f, 20.0f, -2500.0f, 0, 0, 0,
                             ((sTreasureFlags[5] & 0x1F) << 8) + rewardParams);
-                // Central treasure instance/occurrence (GREAT)
+                // "Central treasure instance/occurrence (GREAT)"
                 osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 中央宝発生(ＧＲＥＡＴ) ☆☆☆☆☆ %x\n" VT_RST, rewardChestParams);
                 this->actionFunc = EnChanger_SetHeartPieceFlag;
                 return;
@@ -157,13 +157,13 @@ void EnChanger_Init(Actor* thisx, GlobalContext* globalCtx2) {
         leftChestParams);
 
     if (this->leftChest != NULL) {
-        // Left treasure generation (what does it contain?)
+        // "Left treasure generation (what does it contain?)"
         osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 左宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" VT_RST, leftChestParams);
-        // What is the room number?
+        // "What is the room number?"
         osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 部屋番号は？  %x\n" VT_RST, globalCtx->roomCtx.curRoom.num);
-        // What is the bit?
+        // "What is the bit?"
         osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ ビットはなぁに？  %x\n" VT_RST, this->rightChestNum);
-        // Sukesuke-kun (something to do with being invisible)
+        // "Sukesuke-kun" (something to do with being invisible)
         osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ すけすけ君？ %x\n" VT_RST, rightChestItem);
         osSyncPrintf("\n\n");
         if (this->roomChestsOpened) {
@@ -182,13 +182,13 @@ void EnChanger_Init(Actor* thisx, GlobalContext* globalCtx2) {
         0, rightChestParams);
 
     if (this->rightChest != NULL) {
-        // Right treasure generation (what does it contain?)
+        // "Right treasure generation (what does it contain?)"
         osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 右宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" VT_RST, rightChestParams);
-        // What is the room number?
+        // "What is the room number?"
         osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 部屋番号は？  %d\n" VT_RST, globalCtx->roomCtx.curRoom.num);
-        // What is the bit?
+        // "What is the bit?"
         osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ ビットはなぁに？  %x\n" VT_RST, this->leftChestNum);
-        // Sukesuke-kun (something to do with being invisible)
+        // "Sukesuke-kun" (something to do with being invisible)
         osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ すけすけ君？ %x\n" VT_RST, leftChestItem);
         osSyncPrintf("\n\n");
 
@@ -248,7 +248,7 @@ void EnChanger_OpenChests(EnChanger* this, GlobalContext* globalCtx) {
                     Flags_SetSwitch(globalCtx, 0x32);
                 } else {
                     temp_s0_2 = (s16)(this->rightChestGetItemId - GI_RUPEE_GREEN_LOSE) + EXITEM_CHEST;
-                    // Open right treasure (chest)
+                    // "Open right treasure (chest)"
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 右宝開く ☆☆☆☆☆ %d\n" VT_RST, temp_s0_2);
                     Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_EX_ITEM, xPos, yPos, zPos, 0, 0, 0,
                                 temp_s0_2);
@@ -264,7 +264,7 @@ void EnChanger_OpenChests(EnChanger* this, GlobalContext* globalCtx) {
                     Flags_SetSwitch(globalCtx, 0x32);
                 } else {
                     temp_s0_2 = (s16)(this->leftChestGetItemId - 0x72) + 0xA;
-                    // Open left treasure (chest)
+                    // "Open left treasure (chest)"
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 左宝開く ☆☆☆☆☆ %d\n" VT_RST, temp_s0_2);
                     Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_EX_ITEM, xPos, yPos, zPos, 0, 0, 0,
                                 temp_s0_2);
diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c
index feafc52398..567659b177 100644
--- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c
+++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c
@@ -80,9 +80,9 @@ static u16 D_809F040C[] = {
     0x10A0, 0x10A1, 0x10A2, 0x10CA, 0x10CB, 0x10CC, 0x10CD, 0x10CE, 0x10CF, 0x10DC, 0x10DD,
 };
 
-// Debug text: sells  { Deku Nuts, Deku Sticks, Piece of Heart, Deku Seeds,
-//                      Deku Shield, Bombs, Arrows, Red Potion,
-//                      Green Potion, Deku Stick Upgrade, Deku Nut Upgrade }
+// Debug text: "sells"  { "Deku Nuts",    "Deku Sticks",        "Piece of Heart",  "Deku Seeds",
+//                        "Deku Shield",  "Bombs",              "Arrows",          "Red Potion",
+//                        "Green Potion", "Deku Stick Upgrade", "Deku Nut Upgrade" }
 static char* D_809F0424[] = {
     "デクの実売り            ", "デクの棒売り            ", "ハートの欠片売り        ", "デクの種売り            ",
     "デクの盾売り            ", "バクダン売り            ", "矢売り                  ", "赤のくすり売り          ",
@@ -147,7 +147,7 @@ void EnDns_Init(Actor* thisx, GlobalContext* globalCtx) {
     if ((this->actor.params == 0x0006) && (LINK_AGE_IN_YEARS == YEARS_CHILD)) {
         this->actor.params = 0x0003;
     }
-    // Deku Salesman
+    // "Deku Salesman"
     osSyncPrintf(VT_FGCOL(GREEN) "◆◆◆ 売りナッツ『%s』 ◆◆◆" VT_RST "\n", D_809F0424[this->actor.params],
                  this->actor.params);
     Actor_ProcessInitChain(&this->actor, sInitChain);
diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
index c55d859c7b..aba828feb0 100644
--- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
+++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
@@ -77,7 +77,7 @@ void EnDntDemo_Init(Actor* thisx, GlobalContext* globalCtx2) {
     s32 pad;
 
     osSyncPrintf("\n\n");
-    // Deku Scrub mask show start
+    // "Deku Scrub mask show start"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n" VT_RST);
     for (i = 0; i < 9; i++) {
         this->scrubPos[i] = sScrubPos[i];
@@ -85,7 +85,7 @@ void EnDntDemo_Init(Actor* thisx, GlobalContext* globalCtx2) {
                                                           ACTOR_EN_DNT_NOMAL, this->scrubPos[i].x, this->scrubPos[i].y,
                                                           this->scrubPos[i].z, 0, 0, 0, i + ENDNTNOMAL_STAGE);
         if (this->scrubs[i] != NULL) {
-            // zako zako [small fries]
+            // "zako zako" [small fries]
             osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n" VT_RST, this->scrubs[i]);
         }
     }
@@ -96,7 +96,7 @@ void EnDntDemo_Init(Actor* thisx, GlobalContext* globalCtx2) {
     this->leader = (EnDntJiji*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_DNT_JIJI,
                                                   this->leaderPos.x, this->leaderPos.y, this->leaderPos.z, 0, 0, 0, 0);
     if (this->leader != NULL) {
-        // jiji jiji jiji jiji jiji [onomatopoeia for the scrub sound?]
+        // "jiji jiji jiji jiji jiji" [onomatopoeia for the scrub sound?]
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n" VT_RST, this->leader);
     }
     this->subCamera = 0;
@@ -146,7 +146,7 @@ void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) {
             }
         }
         if (this->judgeTimer > 40) {
-            // gera gera [onomatopoeia for loud giggling]
+            // "gera gera" [onomatopoeia for loud giggling]
             osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ げらげら ☆☆☆☆☆ \n" VT_RST);
             func_800F436C(&this->actor.projectedPos, NA_SE_EV_CROWD - SFX_FLAG, 2.0f);
         }
@@ -191,11 +191,11 @@ void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) {
                         ignore = true;
                         delay = 8;
                         reaction = DNT_SIGNAL_HIDE;
-                        // Special!
+                        // "Special!"
                         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 特別！ ☆☆☆☆☆ \n" VT_RST);
                     } else {
                         if (maskIdx >= PLAYER_MASK_MAX - 1) {
-                            // This is dangerous!
+                            // "This is dangerous!"
                             osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST);
                             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST);
                             osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST);
@@ -222,16 +222,16 @@ void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) {
                                 break;
                         }
                         osSyncPrintf("\n\n");
-                        // Each index 1
+                        // "Each index 1"
                         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス１ ☆☆☆☆☆ %d\n" VT_RST, rand9);
-                        // Each index 2
+                        // "Each index 2"
                         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス２ ☆☆☆☆☆ %d\n" VT_RST, maskIdx);
-                        // Each index 3
+                        // "Each index 3"
                         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス３ ☆☆☆☆☆ %d\n" VT_RST, resultIdx);
                         osSyncPrintf("\n");
-                        // What kind of evaluation?
+                        // "What kind of evaluation?"
                         osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ どういう評価？  ☆☆☆☆☆☆ %d\n" VT_RST, reaction);
-                        // What kind of action?
+                        // "What kind of action?"
                         osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ どういうアクション？  ☆☆☆ %d\n" VT_RST, this->action);
                         osSyncPrintf("\n\n");
                         break;
diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
index 5def3984c9..9da320788d 100644
--- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
+++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
@@ -83,7 +83,7 @@ void EnDntJiji_Init(Actor* thisx, GlobalContext* globalCtx) {
     Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
     this->stage = (EnDntDemo*)this->actor.parent;
     osSyncPrintf("\n\n");
-    // Deku Scrub mask show elder
+    // "Deku Scrub mask show elder"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n" VT_RST, this->stage);
     this->actor.flags &= ~1;
     this->actor.colChkInfo.mass = 0xFF;
@@ -276,7 +276,7 @@ void EnDntJiji_GivePrize(EnDntJiji* this, GlobalContext* globalCtx) {
     SkelAnime_Update(&this->skelAnime);
     if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && func_80106BC8(globalCtx)) {
         if ((this->getItemId == GI_NUT_UPGRADE_30) || (this->getItemId == GI_NUT_UPGRADE_40)) {
-            // nut
+            // "nut"
             osSyncPrintf("実 \n");
             osSyncPrintf("実 \n");
             osSyncPrintf("実 \n");
@@ -287,7 +287,7 @@ void EnDntJiji_GivePrize(EnDntJiji* this, GlobalContext* globalCtx) {
             osSyncPrintf("実 \n");
             gSaveContext.itemGetInf[1] |= 0x8000;
         } else {
-            // stick
+            // "stick"
             osSyncPrintf("棒 \n");
             osSyncPrintf("棒 \n");
             osSyncPrintf("棒 \n");
@@ -377,7 +377,7 @@ void EnDntJiji_Update(Actor* thisx, GlobalContext* globalCtx) {
     Actor_SetScale(&this->actor, 0.015f);
     this->unkTimer++;
     if (BREG(0)) {
-        // time
+        // "time"
         osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n" VT_RST, this->timer);
     }
     if ((this->timer > 1) && (this->timer != 0)) {
diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
index 38cae751ec..324e6d90bc 100644
--- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
+++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
@@ -129,7 +129,7 @@ void EnDntNomal_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->objId = -1;
     if (this->type == ENDNTNOMAL_TARGET) {
         osSyncPrintf("\n\n");
-        // Deku Scrub target
+        // "Deku Scrub target"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n" VT_RST);
         Collider_InitQuad(globalCtx, &this->targetQuad);
         Collider_SetQuad(globalCtx, &this->targetQuad, &this->actor, &sTargetQuadInit);
@@ -137,7 +137,7 @@ void EnDntNomal_Init(Actor* thisx, GlobalContext* globalCtx) {
         this->objId = OBJECT_HINTNUTS;
     } else {
         osSyncPrintf("\n\n");
-        // Deku Scrub mask show audience
+        // "Deku Scrub mask show audience"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n" VT_RST);
         Collider_InitCylinder(globalCtx, &this->bodyCyl);
         Collider_SetCylinder(globalCtx, &this->bodyCyl, &this->actor, &sBodyCylinderInit);
@@ -147,9 +147,9 @@ void EnDntNomal_Init(Actor* thisx, GlobalContext* globalCtx) {
         this->objIndex = Object_GetIndex(&globalCtx->objectCtx, this->objId);
         if (this->objIndex < 0) {
             Actor_Kill(&this->actor);
-            // What?
+            // "What?"
             osSyncPrintf(VT_FGCOL(PURPLE) " なにみの？ %d\n" VT_RST "\n", this->objIndex);
-            // Bank is funny
+            // "Bank is funny"
             osSyncPrintf(VT_FGCOL(CYAN) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params);
             return;
         }
@@ -246,7 +246,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, GlobalContext* globalCtx) {
             EffectSsExtra_Spawn(globalCtx, &scorePos, &scoreVel, &scoreAccel, 4, 2);
             Audio_StopSfx(NA_SE_SY_TRE_BOX_APPEAR);
             func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
-            // Big hit
+            // "Big hit"
             osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter);
             if (!LINK_IS_ADULT && !(gSaveContext.itemGetInf[1] & 0x2000)) {
                 this->hitCounter++;
diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
index 91f5113c7f..913c8d3351 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
@@ -35,7 +35,7 @@ void EnEncount1_Init(Actor* thisx, GlobalContext* globalCtx) {
 
     if (this->actor.params <= 0) {
         osSyncPrintf("\n\n");
-        // Input error death!
+        // "Input error death!"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST);
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST);
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST);
@@ -54,15 +54,15 @@ void EnEncount1_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->spawnRange = spawnRange;
 
     osSyncPrintf("\n\n");
-    // It's an enemy spawner!
+    // "It's an enemy spawner!"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 敵発生ゾーンでた！ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params);
-    // Type
+    // "Type"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 種類\t\t   ☆☆☆☆☆ %d\n" VT_RST, this->spawnType);
-    // Maximum number of simultaneous spawns
+    // "Maximum number of simultaneous spawns"
     osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 最大同時発生数     ☆☆☆☆☆ %d\n" VT_RST, this->maxCurSpawns);
-    // Maximum number of spawns
+    // "Maximum number of spawns"
     osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 最大発生数  \t   ☆☆☆☆☆ %d\n" VT_RST, this->maxTotalSpawns);
-    // Spawn check range
+    // "Spawn check range"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生チェック範囲   ☆☆☆☆☆ %f\n" VT_RST, this->spawnRange);
     osSyncPrintf("\n\n");
 
@@ -165,7 +165,7 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, GlobalContext* globalCtx) {
                         this->maxCurSpawns = (s16)Rand_ZeroFloat(2.99f) + 1;
                     }
                 } else {
-                    // Cannot spawn!
+                    // "Cannot spawn!"
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
@@ -204,7 +204,7 @@ void EnEncount1_SpawnTektites(EnEncount1* this, GlobalContext* globalCtx) {
                     this->curNumSpawn++;
                     this->totalNumSpawn++;
                 } else {
-                    // Cannot spawn!
+                    // "Cannot spawn!"
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
@@ -304,7 +304,7 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, GlobalContext* globalCt
                     this->totalNumSpawn++;
                 }
             } else {
-                // Cannot spawn!
+                // "Cannot spawn!"
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST);
diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index 90449b3f7c..8c1e178df4 100644
--- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -57,9 +57,9 @@ void EnExItem_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->type = this->actor.params & 0xFF;
     this->unusedParam = (this->actor.params >> 8) & 0xFF;
     osSyncPrintf("\n\n");
-    // What will come out?
+    // "What will come out?"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n" VT_RST, this->type);
-    // What will come out?
+    // "What will come out?"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n" VT_RST, this->unusedParam);
     this->initPos = this->actor.world.pos;
     this->getItemObjId = -1;
@@ -109,9 +109,9 @@ void EnExItem_Init(Actor* thisx, GlobalContext* globalCtx) {
         this->actor.draw = NULL;
         if (this->objectIdx < 0) {
             Actor_Kill(&this->actor);
-            // What?
+            // "What?"
             osSyncPrintf("なにみの？ %d\n", this->actor.params);
-            // bank is funny
+            // "bank is funny"
             osSyncPrintf(VT_FGCOL(PURPLE) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params);
             return;
         }
@@ -123,7 +123,7 @@ void EnExItem_WaitForObject(EnExItem* this, GlobalContext* globalCtx) {
     s32 onCounter;
 
     if (Object_IsLoaded(&globalCtx->objectCtx, this->objectIdx)) {
-        // End of transfer
+        // "End of transfer"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this);
         osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this);
         osSyncPrintf(VT_FGCOL(BLUE) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this);
@@ -299,13 +299,13 @@ void EnExItem_BowlPrize(EnExItem* this, GlobalContext* globalCtx) {
             this->actor.world.pos.z += (tmpf3 / tmpf4) * 5.0f;
         }
     } else {
-        // parent
+        // "parent"
         osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 母親ー？     ☆☆☆☆☆ %x\n" VT_RST, this->actor.parent);
-        // Can it move?
+        // "Can it move?"
         osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 動いてねー？ ☆☆☆☆☆ %x\n" VT_RST, this->actor.parent->update);
         if ((this->actor.parent != NULL) && (this->actor.parent->update != NULL)) {
             ((EnBomBowlPit*)this->actor.parent)->exItemDone = 1;
-            // It can't move!
+            // "It can't move!"
             osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ さぁきえるぞ！ ☆☆☆☆☆ \n" VT_RST);
         }
         Actor_Kill(&this->actor);
@@ -411,7 +411,7 @@ void EnExItem_TargetPrizeGive(EnExItem* this, GlobalContext* globalCtx) {
 
 void EnExItem_TargetPrizeFinish(EnExItem* this, GlobalContext* globalCtx) {
     if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && func_80106BC8(globalCtx)) {
-        // Successful completion
+        // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         gSaveContext.itemGetInf[1] |= 0x2000;
         Actor_Kill(&this->actor);
diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
index b6199f5d26..cd9f860bd1 100644
--- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
+++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
@@ -634,7 +634,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, GlobalContext* globalCtx) {
             this->actor.speedXZ = 20.0f;
         }
         Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_FIRE - SFX_FLAG);
-        // Why ah ah ah ah
+        // "Why ah ah ah ah"
         osSyncPrintf("なぜだああああああああ      %d\n", this->work[FHGFIRE_VARIANCE_TIMER]);
     }
 }
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index f447aa2776..390eea944f 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -387,7 +387,7 @@ void EnFish_Dropped_Fall(EnFish* this, GlobalContext* globalCtx) {
     } else if ((this->timer <= 0) && (this->actor.params == FISH_DROPPED) &&
                (this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f)) {
         osSyncPrintf(VT_COL(YELLOW, BLACK));
-        // BG missing? Running Actor_delete
+        // "BG missing? Running Actor_delete"
         osSyncPrintf("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_sakana.c", 822);
         osSyncPrintf(VT_RST);
         Actor_Kill(&this->actor);
@@ -628,7 +628,7 @@ void EnFish_UpdateCutscene(EnFish* this, GlobalContext* globalCtx) {
     s32 bgId;
 
     if (csAction == NULL) {
-        // Warning : DEMO ended without dousa (action) 3 termination being called
+        // "Warning : DEMO ended without dousa (action) 3 termination being called"
         osSyncPrintf("Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c",
                      1169, this->actor.params);
         EnFish_ClearCutsceneData(this);
@@ -647,13 +647,13 @@ void EnFish_UpdateCutscene(EnFish* this, GlobalContext* globalCtx) {
             EnFish_Cutscene_WiggleFlyingThroughAir(this, globalCtx);
             break;
         case 3:
-            // DEMO fish termination
+            // "DEMO fish termination"
             osSyncPrintf("デモ魚消滅\n");
             EnFish_ClearCutsceneData(this);
             Actor_Kill(&this->actor);
             return;
         default:
-            // Improper DEMO action
+            // "Improper DEMO action"
             osSyncPrintf("不正なデモ動作(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c", 1200, this->actor.params);
             break;
     }
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index 2fe001b423..7fc4b2d430 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -135,7 +135,7 @@ void EnGe1_Init(Actor* thisx, GlobalContext* globalCtx) {
 
         case GE1_TYPE_VALLEY_FLOOR:
             if (LINK_IS_ADULT) {
-                // Valley floor Gerudo withdrawal
+                // "Valley floor Gerudo withdrawal"
                 osSyncPrintf(VT_FGCOL(CYAN) "谷底 ゲルド 撤退 \n" VT_RST);
                 Actor_Kill(&this->actor);
                 return;
@@ -151,7 +151,7 @@ void EnGe1_Init(Actor* thisx, GlobalContext* globalCtx) {
             }
             this->actor.targetMode = 3;
             this->hairstyle = GE1_HAIR_BOB;
-            // Horsback archery Gerudo EVENT_INF(0) =
+            // "Horseback archery Gerudo EVENT_INF(0) ="
             osSyncPrintf(VT_FGCOL(CYAN) "やぶさめ ゲルド EVENT_INF(0) = %x\n" VT_RST, gSaveContext.eventInf[0]);
 
             if (gSaveContext.eventInf[0] & 0x100) {
diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
index 8bb04c75a1..d80fd52560 100644
--- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
@@ -569,13 +569,13 @@ void EnGe2_Update(Actor* thisx, GlobalContext* globalCtx) {
 
         if (Ge2_DetectPlayerInUpdate(globalCtx, this, &this->actor.focus.pos, this->actor.shape.rot.y,
                                      this->yDetectRange)) {
-            // Discovered!
+            // "Discovered!"
             osSyncPrintf(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST);
             EnGe2_SetupCapturePlayer(this, globalCtx);
         }
 
         if (((this->actor.params & 0xFF) == GE2_TYPE_STATIONARY) && (this->actor.xzDistToPlayer < 100.0f)) {
-            // Discovered!
+            // "Discovered!"
             osSyncPrintf(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST);
             EnGe2_SetupCapturePlayer(this, globalCtx);
         }
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index e85d1dc5a2..cbd5222cdd 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -82,56 +82,56 @@ const ActorInit En_GirlA_InitVars = {
 };
 
 static char* sShopItemDescriptions[] = {
-    "デクの実×5   ",  // Deku nut x5
-    "矢×30        ",  // Arrow x30
-    "矢×50        ",  // Arrow x50
-    "爆弾×5       ",  // bomb
-    "デクの実×10  ",  // Deku nut x10
-    "デクの棒      ", // Deku stick
-    "爆弾×10      ",  // Bomb x10
-    "さかな        ", // Fish
-    "赤クスリ      ", // Red medicine
-    "緑クスリ      ", // Green medicine
-    "青クスリ      ", // Blue medicine
-    "巨人のナイフ  ", // Giant knife
-    "ハイリアの盾  ", // Hyria Shield
-    "デクの盾      ", // Deku Shield
-    "ゴロンの服    ", // Goron's clothes
-    "ゾ─ラの服    ",  // Zora's clothes
-    "回復のハート  ", // Heart of recovery
-    "ロンロン牛乳  ", // Ron Ron milk
-    "鶏の卵        ", // Chicken egg
-    "インゴー牛乳  ", // Ingo milk
-    "インゴー卵    ", // Ingo egg
-    "もだえ石      ", // Modae stone
-    "大人の財布    ", // Adult wallet
-    "ハートの欠片  ", // Heart fragment
-    "ボムチュウ    ", // Bombchu
-    "ボムチュウ    ", // Bombchu
-    "ボムチュウ    ", // Bombchu
-    "ボムチュウ    ", // Bombchu
-    "ボムチュウ    ", // Bombchu
-    "デクのタネ    ", // Deku seeds
-    "キータンのお面", // Ketan's mask
-    "こわそなお面  ", // Scary face
-    "ドクロのお面  ", // Skull mask
-    "ウサギずきん  ", // Rabbit hood
-    "まことの仮面  ", // True mask
-    "ゾーラのお面  ", // Zora's mask
-    "ゴロンのお面  ", // Goron's mask
-    "ゲルドのお面  ", // Gerd's mask
-    "ＳＯＬＤＯＵＴ", //
-    "炎            ", // Flame
-    "虫            ", // Bugs
-    "チョウチョ    ", // Butterfly
-    "ポウ          ", // Poe
-    "妖精の魂      ", // Fairy soul
-    "矢×10        ",  // Arrow
-    "爆弾×20      ",  // Bomb x20
-    "爆弾×30      ",  // Bomb x30
-    "爆弾×5       ",  // Bomb x5
-    "赤クスリ      ", // Red medicine
-    "赤クスリ      "  // Red medicine
+    "デクの実×5   ",  // "Deku nut x5"
+    "矢×30        ",  // "Arrow x30"
+    "矢×50        ",  // "Arrow x50"
+    "爆弾×5       ",  // "bomb"
+    "デクの実×10  ",  // "Deku nut x10"
+    "デクの棒      ", // "Deku stick"
+    "爆弾×10      ",  // "Bomb x10"
+    "さかな        ", // "Fish"
+    "赤クスリ      ", // "Red medicine"
+    "緑クスリ      ", // "Green medicine"
+    "青クスリ      ", // "Blue medicine"
+    "巨人のナイフ  ", // "Giant knife"
+    "ハイリアの盾  ", // "Hyria Shield"
+    "デクの盾      ", // "Deku Shield"
+    "ゴロンの服    ", // "Goron's clothes"
+    "ゾ─ラの服    ",  // "Zora's clothes"
+    "回復のハート  ", // "Heart of recovery"
+    "ロンロン牛乳  ", // "Ron Ron milk"
+    "鶏の卵        ", // "Chicken egg"
+    "インゴー牛乳  ", // "Ingo milk"
+    "インゴー卵    ", // "Ingo egg"
+    "もだえ石      ", // "Modae stone"
+    "大人の財布    ", // "Adult wallet"
+    "ハートの欠片  ", // "Heart fragment"
+    "ボムチュウ    ", // "Bombchu"
+    "ボムチュウ    ", // "Bombchu"
+    "ボムチュウ    ", // "Bombchu"
+    "ボムチュウ    ", // "Bombchu"
+    "ボムチュウ    ", // "Bombchu"
+    "デクのタネ    ", // "Deku seeds"
+    "キータンのお面", // "Ketan's mask"
+    "こわそなお面  ", // "Scary face"
+    "ドクロのお面  ", // "Skull mask"
+    "ウサギずきん  ", // "Rabbit hood"
+    "まことの仮面  ", // "True mask"
+    "ゾーラのお面  ", // "Zora's mask"
+    "ゴロンのお面  ", // "Goron's mask"
+    "ゲルドのお面  ", // "Gerd's mask"
+    "ＳＯＬＤＯＵＴ",
+    "炎            ", // "Flame"
+    "虫            ", // "Bugs"
+    "チョウチョ    ", // "Butterfly"
+    "ポウ          ", // "Poe"
+    "妖精の魂      ", // "Fairy soul"
+    "矢×10        ",  // "Arrow"
+    "爆弾×20      ",  // "Bomb x20"
+    "爆弾×30      ",  // "Bomb x30"
+    "爆弾×5       ",  // "Bomb x5"
+    "赤クスリ      ", // "Red medicine"
+    "赤クスリ      "  // "Red medicine"
 };
 
 static s16 sMaskShopItems[8] = {
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 6f19afb9f0..43d5584447 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -69,7 +69,7 @@ void EnGm_Init(Actor* thisx, GlobalContext* globalCtx) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
 
-    // Medi Goron"
+    // "Medi Goron"
     osSyncPrintf(VT_FGCOL(GREEN) "%s[%d] : 中ゴロン[%d]" VT_RST "\n", "../z_en_gm.c", 133, this->actor.params);
 
     this->objGmBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GM);
diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c
index 1abba207fb..d7544dca82 100644
--- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c
+++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c
@@ -62,7 +62,7 @@ void EnGuest_Init(Actor* thisx, GlobalContext* globalCtx) {
         this->osAnimeBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_OS_ANIME);
         if (this->osAnimeBankIndex < 0) {
             osSyncPrintf(VT_COL(RED, WHITE));
-            // No such bank!!
+            // "No such bank!!"
             osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_guest.c", 129);
             osSyncPrintf(VT_RST);
             ASSERT(0, "0", "../z_en_guest.c", 132);
diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
index ecbee0dfa6..41ce0c538e 100644
--- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
+++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
@@ -672,7 +672,7 @@ void func_80A5455C(EnHeishi2* this, GlobalContext* globalCtx) {
             bomb->actor.velocity.y = Rand_CenteredFloat(5.0f) + 10.0f;
         }
 
-        // This is down!
+        // "This is down!"
         osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ これでダウンだ！ ☆☆☆☆☆ \n" VT_RST);
         this->actionFunc = func_80A546DC;
     }
diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
index 8234f6698a..d9b3b6cc10 100644
--- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
+++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
@@ -304,7 +304,7 @@ void EnHorseGameCheck_FinishMalonRace(EnHorseGameCheckMalonRace* this, GlobalCon
         globalCtx->fadeTransition = 0x2E;
         globalCtx->sceneLoadFlag = 0x14;
     } else {
-        // not supported
+        // "not supported"
         osSyncPrintf("En_HGC_Spot20_Ta_end():対応せず\n");
         gSaveContext.cutsceneIndex = 0;
         globalCtx->nextEntranceIndex = 0x157;
diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index 6ee8fb0595..1e34e69f4a 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -76,16 +76,16 @@ void EnHs_Init(Actor* thisx, GlobalContext* globalCtx) {
     }
 
     if (this->actor.params == 1) {
-        // chicken shop (adult era)
+        // "chicken shop (adult era)"
         osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST);
         func_80A6E3A0(this, func_80A6E9AC);
         if (gSaveContext.itemGetInf[3] & 1) {
-            // chicken shop closed
+            // "chicken shop closed"
             osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST);
             Actor_Kill(&this->actor);
         }
     } else {
-        // chicken shop (child era)
+        // "chicken shop (child era)"
         osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST);
         func_80A6E3A0(this, func_80A6E9AC);
     }
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index 4d126280b6..6104c8fbba 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -580,7 +580,7 @@ void func_80A7D460(EnInsect* this, GlobalContext* globalCtx) {
     } else {
         if (this->unk_314 & 0x10) {
             osSyncPrintf(VT_COL(YELLOW, BLACK));
-            // warning: target Actor is NULL
+            // "warning: target Actor is NULL"
             osSyncPrintf("warning:目標 Actor が NULL (%s %d)\n", "../z_en_mushi.c", 1046);
             osSyncPrintf(VT_RST);
         }
@@ -705,7 +705,7 @@ void func_80A7D460(EnInsect* this, GlobalContext* globalCtx) {
     } else if ((sp3A == 2 || sp3A == 3) && (this->unk_314 & 1) && this->unk_31C <= 0 && this->unk_31A <= 0 &&
                this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f) {
         osSyncPrintf(VT_COL(YELLOW, BLACK));
-        // BG missing? To do Actor_delete
+        // "BG missing? To do Actor_delete"
         osSyncPrintf("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_mushi.c", 1197);
         osSyncPrintf(VT_RST);
         Actor_Kill(&this->actor);
diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
index 28b2852967..f8f8323830 100644
--- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
+++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
@@ -239,7 +239,7 @@ void func_80A8F8D0(EnKakasi* this, GlobalContext* globalCtx) {
     Player* player = GET_PLAYER(globalCtx);
 
     if (globalCtx->msgCtx.unk_E3EE == 4 && globalCtx->msgCtx.msgMode == 0) {
-        // end?
+        // "end?"
         osSyncPrintf(VT_FGCOL(BLUE) "☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n" VT_RST);
 
         if (this->unk_19A != 0) {
@@ -344,7 +344,7 @@ void EnKakasi_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     if (BREG(3) != 0) {
         osSyncPrintf("\n\n");
-        // flag!
+        // "flag!"
         osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.scarecrowCustomSongSet);
     }
     func_80093D18(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
index c3d4c5bd75..4726708e5f 100644
--- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
@@ -62,7 +62,7 @@ void EnKakasi2_Init(Actor* thisx, GlobalContext* globalCtx) {
     f32 spawnRangeXZ;
 
     osSyncPrintf("\n\n");
-    // Visit Umeda
+    // "Visit Umeda"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n" VT_RST);
 
     this->switchFlag = this->actor.params & 0x3F;
@@ -75,15 +75,15 @@ void EnKakasi2_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->maxSpawnDistance.x = (spawnRangeY * 40.0f) + 40.0f;
     this->maxSpawnDistance.y = (spawnRangeXZ * 40.0f) + 40.0f;
 
-    // Former? (Argument 0)
+    // "Former? (Argument 0)"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n" VT_RST, spawnRangeY);
-    // Former? (Z angle)
+    // "Former? (Z angle)"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n" VT_RST, spawnRangeXZ);
-    // Correction coordinates X
+    // "Correction coordinates X"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x);
-    // Correction coordinates Y
+    // "Correction coordinates Y"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.y);
-    // Correction coordinates Z
+    // "Correction coordinates Z"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.z);
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ SAVE       ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
     osSyncPrintf("\n\n");
diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
index 5f2458db38..eb6392cc2d 100644
--- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
+++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
@@ -346,7 +346,7 @@ void func_80A918E4(EnKakasi3* this, GlobalContext* globalCtx) {
     Player* player = GET_PLAYER(globalCtx);
 
     if (BREG(3) != 0) {
-        // No way!
+        // "No way!"
         osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n" VT_RST, globalCtx->msgCtx.unk_E3EE);
     }
     if ((globalCtx->msgCtx.unk_E3EE == 4 || (globalCtx->msgCtx.unk_E3EE >= 5 && globalCtx->msgCtx.unk_E3EE < 11)) &&
@@ -365,7 +365,7 @@ void func_80A918E4(EnKakasi3* this, GlobalContext* globalCtx) {
         globalCtx->msgCtx.unk_E3EE = 4;
         if (BREG(3) != 0) {
             osSyncPrintf("\n\n");
-            // With this, other guys are OK! That's it!
+            // "With this, other guys are OK! That's it!"
             osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" VT_RST,
                          globalCtx->msgCtx.unk_E3EE);
         }
@@ -414,7 +414,7 @@ void EnKakasi3_Update(Actor* thisx, GlobalContext* globalCtx) {
 
     if (BREG(2) != 0) {
         osSyncPrintf("\n\n");
-        // flag!
+        // "flag!"
         osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.scarecrowSpawnSongSet);
     }
 
diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c
index 4b2dc3987b..ed6e79c6aa 100644
--- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c
+++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c
@@ -1097,7 +1097,7 @@ void func_80A99048(EnKo* this, GlobalContext* globalCtx) {
         Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
         CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
         if (ENKO_TYPE == ENKO_TYPE_CHILD_7) {
-            // Angle Z
+            // "Angle Z"
             osSyncPrintf(VT_BGCOL(BLUE) "  アングルＺ->(%d)\n" VT_RST, this->actor.shape.rot.z);
             if (LINK_IS_ADULT && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)) {
                 if (this->actor.shape.rot.z != 1) {
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 9e0bd84e2d..5ac56299d7 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -257,7 +257,7 @@ void EnKusa_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->kusaTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, sObjectIds[thisx->params & 3]);
 
     if (this->kusaTexObjIndex < 0) {
-        // Bank danger!
+        // "Bank danger!"
         osSyncPrintf("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", thisx->params, "../z_en_kusa.c", 561);
         Actor_Kill(&this->actor);
         return;
diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
index 8d060c7ec6..9819d9e308 100644
--- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
+++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
@@ -210,7 +210,7 @@ void func_80ABA244(EnNiwLady* this, GlobalContext* globalCtx) {
                 if (this->unk_26C == 0) {
                     gSaveContext.infTable[25] |= D_80ABB3B4[currentCucco->unk_2AA];
                     if (BREG(1) != 0) {
-                        // GET inside the chicken fence!
+                        // "GET inside the chicken fence!"
                         osSyncPrintf(VT_FGCOL(GREEN) "☆ 鶏柵内ＧＥＴ！☆ %x\n" VT_RST,
                                      D_80ABB3B4[currentCucco->unk_2AA]);
                     }
@@ -321,7 +321,7 @@ static s16 sTradeItemTextIds[] = { 0x503E, 0x503F, 0x5047, 0x5040, 0x5042, 0x504
                                    0x5044, 0x00CF, 0x5045, 0x5042, 0x5027 };
 
 void func_80ABA778(EnNiwLady* this, GlobalContext* globalCtx) {
-    //☆☆☆☆☆ Adult message check ☆☆☆☆☆
+    // "☆☆☆☆☆ Adult message check ☆☆☆☆☆"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ アダルトメッセージチェック ☆☆☆☆☆ \n" VT_RST);
     this->unk_262 = 6;
     this->unk_273 = 0;
diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c
index 2780c33bfd..d579984af7 100644
--- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c
+++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c
@@ -128,7 +128,7 @@ void EnNy_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->unk_1E8 = 0.0f;
     this->unk_1E0 = 0.25f;
     if (this->actor.params == 0) {
-        // New initials
+        // "New initials"
         osSyncPrintf("ニュウ イニシャル[ %d ] ！！\n", this->actor.params);
         this->actor.colChkInfo.mass = 0;
         this->unk_1D4 = 0;
@@ -137,7 +137,7 @@ void EnNy_Init(Actor* thisx, GlobalContext* globalCtx) {
         func_80ABCDBC(this);
     } else {
         // This mode is unused in the final game
-        // Dummy new initials
+        // "Dummy new initials"
         osSyncPrintf("ダミーニュウ イニシャル[ %d ] ！！\n", this->actor.params);
         osSyncPrintf("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused);
         this->actor.colChkInfo.mass = 0xFF;
diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c
index 451033c02c..6a03a9796e 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c
@@ -134,11 +134,11 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) {
         owlType = OWL_OUTSIDE_KOKIRI;
         switchFlag = 0x20;
     }
-    osSyncPrintf(VT_FGCOL(CYAN) " 会話フクロウ %4x no = %d, sv = %d\n" VT_RST, this->actor.params, owlType,
-                 switchFlag); // conversation owl %4x no = %d, sv = %d
+    // "conversation owl %4x no = %d, sv = %d"
+    osSyncPrintf(VT_FGCOL(CYAN) " 会話フクロウ %4x no = %d, sv = %d\n" VT_RST, this->actor.params, owlType, switchFlag);
 
     if ((owlType != OWL_DEFAULT) && (switchFlag < 0x20) && Flags_GetSwitch(globalCtx, switchFlag)) {
-        osSyncPrintf("savebitでフクロウ退避\n"); // Save owl with savebit
+        osSyncPrintf("savebitでフクロウ退避\n"); // "Save owl with savebit"
         Actor_Kill(&this->actor);
         return;
     }
@@ -163,7 +163,7 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) {
         case OWL_KAKARIKO:
             if (gSaveContext.eventChkInf[4] & 1) {
                 // has zelda's letter
-                osSyncPrintf("フクロウ退避\n"); // Owl evacuation
+                osSyncPrintf("フクロウ退避\n"); // "Owl evacuation"
                 Actor_Kill(&this->actor);
                 return;
             }
@@ -173,7 +173,7 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) {
         case OWL_HYLIA_GERUDO:
             if (gSaveContext.eventChkInf[4] & 8) {
                 // has ocarina of time
-                osSyncPrintf("フクロウ退避\n"); // Owl evacuation
+                osSyncPrintf("フクロウ退避\n"); // "Owl evacuation"
                 Actor_Kill(&this->actor);
                 return;
             }
@@ -185,7 +185,7 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) {
         case OWL_ZORA_RIVER:
             if ((gSaveContext.eventChkInf[3] & 0x200) || !(gSaveContext.eventChkInf[4] & 1)) {
                 // opened zora's domain or has zelda's letter
-                osSyncPrintf("フクロウ退避\n"); // Owl evacuation
+                osSyncPrintf("フクロウ退避\n"); // "Owl evacuation"
                 Actor_Kill(&this->actor);
                 return;
             }
@@ -207,7 +207,7 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
         case OWL_LOST_WOODS_PRESARIA:
             if (!CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) {
-                osSyncPrintf("フクロウ退避\n"); // Owl evacuation
+                osSyncPrintf("フクロウ退避\n"); // "Owl evacuation"
                 Actor_Kill(&this->actor);
                 return;
             }
@@ -215,7 +215,7 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
         case OWL_LOST_WOODS_POSTSARIA:
             if (!CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) {
-                osSyncPrintf("フクロウ退避\n"); // Owl evacuation
+                osSyncPrintf("フクロウ退避\n"); // "Owl evacuation"
                 Actor_Kill(&this->actor);
                 return;
             }
@@ -225,8 +225,8 @@ void EnOwl_Init(Actor* thisx, GlobalContext* globalCtx) {
             // Outside kokiri forest
             osSyncPrintf(VT_FGCOL(CYAN));
             osSyncPrintf("no = %d  \n", owlType);
-            osSyncPrintf(
-                "未完成のフクロウ未完成のフクロウ未完成のフクロウ\n"); // Unfinished owl unfinished owl unfinished owl
+            // "Unfinished owl unfinished owl unfinished owl"
+            osSyncPrintf("未完成のフクロウ未完成のフクロウ未完成のフクロウ\n");
             osSyncPrintf(VT_RST);
             this->actionFlags |= 2;
             this->unk_3EE = 0x20;
@@ -937,7 +937,7 @@ void func_80ACC00C(EnOwl* this, GlobalContext* globalCtx) {
             switch (owlType) {
                 case 7:
                     osSyncPrintf(VT_FGCOL(CYAN));
-                    osSyncPrintf("SPOT 06 の デモがはしった\n"); // Demo of SPOT 06
+                    osSyncPrintf("SPOT 06 の デモがはしった\n"); // "Demo of SPOT 06 has been completed"
                     osSyncPrintf(VT_RST);
                     globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gLakeHyliaOwlCs);
                     this->actor.draw = NULL;
@@ -1088,7 +1088,7 @@ void EnOwl_Update(Actor* thisx, GlobalContext* globalCtx) {
     this->actionFlags &= ~8;
     this->actionFunc(this, globalCtx);
     if (this->actor.update == NULL) {
-        // Owl disappears
+        // "Owl disappears"
         osSyncPrintf("フクロウ消滅!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
         return;
     }
diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
index be837d6622..cbb5b2618a 100644
--- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
+++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
@@ -487,7 +487,7 @@ void func_80AE5C38(EnReeba* this, GlobalContext* globalCtx) {
                     if (spawner->killCount < 10) {
                         spawner->killCount++;
                     }
-                    // How many are dead?
+                    // "How many are dead?"
                     osSyncPrintf("\n\n");
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" VT_RST, spawner->killCount);
                     osSyncPrintf("\n\n");
diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c
index 71ee1e8f92..6c3b78608f 100644
--- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c
+++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c
@@ -417,7 +417,7 @@ void EnRr_CollisionCheck(EnRr* this, GlobalContext* globalCtx) {
 
     if (this->collider2.base.acFlags & AC_HIT) {
         this->collider2.base.acFlags &= ~AC_HIT;
-        // Kakin (not sure what this means)
+        // "Kakin" (not sure what this means)
         osSyncPrintf(VT_FGCOL(GREEN) "カキン(%d)！！" VT_RST "\n", this->frameCount);
         hitPos.x = this->collider2.info.bumper.hitPos.x;
         hitPos.y = this->collider2.info.bumper.hitPos.y;
@@ -444,7 +444,7 @@ void EnRr_CollisionCheck(EnRr* this, GlobalContext* globalCtx) {
                 case RR_DMG_SPRT_ARROW:
                     dropType++; // magic jar
                 case RR_DMG_NORMAL:
-                    // ouch
+                    // "ouch"
                     osSyncPrintf(VT_FGCOL(RED) "いてっ( %d : LIFE %d : DAMAGE %d : %x )！！" VT_RST "\n",
                                  this->frameCount, this->actor.colChkInfo.health, this->actor.colChkInfo.damage,
                                  this->actor.colChkInfo.damageEffect);
@@ -501,7 +501,7 @@ void EnRr_CollisionCheck(EnRr* this, GlobalContext* globalCtx) {
             ((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
+            // "catch"
             osSyncPrintf(VT_FGCOL(GREEN) "キャッチ(%d)！！" VT_RST "\n", this->frameCount);
             if (globalCtx->grabPlayer(globalCtx, player)) {
                 player->actor.parent = &this->actor;
@@ -683,7 +683,7 @@ void EnRr_Death(EnRr* this, GlobalContext* globalCtx) {
                 Item_DropCollectible(globalCtx, &dropPos, ITEM00_TUNIC_ZORA);
                 break;
         }
-        // dropped
+        // "dropped"
         osSyncPrintf(VT_FGCOL(GREEN) "「%s」が出た！！" VT_RST "\n", sDropNames[this->dropType]);
         switch (this->dropType) {
             case RR_DROP_MAGIC:
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
index c02257c31b..5a2fa3b77e 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@@ -301,7 +301,7 @@ BgBdanObjects* EnRu1_FindSwitch(GlobalContext* globalCtx) {
         }
         actorIt = actorIt->next;
     }
-    // There is no stand
+    // "There is no stand"
     osSyncPrintf(VT_FGCOL(RED) "お立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
     return NULL;
 }
@@ -2187,10 +2187,10 @@ void func_80AEFF94(EnRu1* this, GlobalContext* globalCtx) {
         this->roomNum1 = actorRoom;
         this->roomNum3 = actorRoom;
         this->roomNum2 = actorRoom;
-        // Ruto switch set
+        // "Ruto switch set"
         osSyncPrintf("スイッチルトセット!!!!!!!!!!!!!!!!!!!!!!\n");
     } else {
-        // Ruto switch not set
+        // "Ruto switch not set"
         osSyncPrintf("スイッチルトセットしない!!!!!!!!!!!!!!!!!!!!!!\n");
         Actor_Kill(&this->actor);
     }
@@ -2208,7 +2208,7 @@ void EnRu1_Update(Actor* thisx, GlobalContext* globalCtx) {
     EnRu1* this = THIS;
 
     if (this->action < 0 || this->action >= ARRAY_COUNT(sActionFuncs) || sActionFuncs[this->action] == NULL) {
-        // Main mode is improper!
+        // "Main mode is improper!"
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
@@ -2250,7 +2250,7 @@ void EnRu1_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
         default:
             Actor_Kill(&this->actor);
-            // Relevant arge_data = %d unacceptable
+            // "Relevant arge_data = %d unacceptable"
             osSyncPrintf("該当 arge_data = %d 無し\n", func_80AEADF0(this));
             break;
     }
@@ -2277,7 +2277,7 @@ s32 EnRu1_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
     EnRu1* this = THIS;
 
     if ((this->unk_290 < 0) || (this->unk_290 > 0) || (*sPreLimbDrawFuncs[this->unk_290] == NULL)) {
-        // Neck rotation mode is improper!
+        // "Neck rotation mode is improper!"
         osSyncPrintf(VT_FGCOL(RED) "首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
     } else {
         sPreLimbDrawFuncs[this->unk_290](this, globalCtx, limbIndex, rot);
@@ -2359,7 +2359,7 @@ void EnRu1_Draw(Actor* thisx, GlobalContext* globalCtx) {
     EnRu1* this = THIS;
 
     if (this->drawConfig < 0 || this->drawConfig >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawConfig] == 0) {
-        // Draw mode is improper!
+        // "Draw mode is improper!"
         osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
index 7a5428c044..e15734ef23 100644
--- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
@@ -554,7 +554,7 @@ void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) {
                     func_80AF34F0(this);
                     break;
                 default:
-                    // There is no such action!
+                    // "There is no such action!"
                     osSyncPrintf("En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n");
                     break;
             }
@@ -670,12 +670,12 @@ void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) {
 
     if (dialogState == 3) {
         if (this->unk_2C3 != 3) {
-            // I'm Komatsu! (cinema scene dev)
+            // "I'm Komatsu!" (cinema scene dev)
             osSyncPrintf("おれが小松だ！ \n");
             this->unk_2C2++;
             if (this->unk_2C2 % 6 == 3) {
                 player = GET_PLAYER(globalCtx);
-                // uorya-! (screeming sound)
+                // "uorya-!" (screeming sound)
                 osSyncPrintf("うおりゃー！ \n");
                 func_8005B1A4(GET_ACTIVE_CAM(globalCtx));
                 player->actor.world.pos.x = 820.0f;
@@ -759,7 +759,7 @@ void EnRu2_Update(Actor* thisx, GlobalContext* globalCtx) {
     EnRu2* this = THIS;
 
     if ((this->action < 0) || (this->action >= ARRAY_COUNT(sActionFuncs)) || (sActionFuncs[this->action] == NULL)) {
-        // Main Mode is improper!
+        // "Main Mode is improper!"
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
@@ -821,7 +821,7 @@ void EnRu2_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     if ((this->drawConfig < 0) || (this->drawConfig >= ARRAY_COUNT(sDrawFuncs)) ||
         (sDrawFuncs[this->drawConfig] == 0)) {
-        // Draw Mode is improper!
+        // "Draw Mode is improper!"
         osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
     }
diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c
index ce28dc65e7..361e7e1591 100644
--- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c
+++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c
@@ -268,7 +268,7 @@ void EnSb_TurnAround(EnSb* this, GlobalContext* globalCtx) {
         EnSb_SpawnBubbles(globalCtx, this);
         this->bouncesLeft = 3;
         EnSb_SetupLunge(this);
-        // Attack!!
+        // "Attack!!"
         osSyncPrintf("アタァ〜ック！！\n");
     }
 }
diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
index 988e48d38e..835d6c89e4 100644
--- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
+++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
@@ -77,7 +77,7 @@ void EnSyatekiItm_Init(Actor* thisx, GlobalContext* globalCtx2) {
     this->man = (EnSyatekiMan*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_SYATEKI_MAN,
                                                   140.0f, 0.0f, 255.0f, 0, -0x4000, 0, 0);
     if (this->man == NULL) {
-        // Spawn error
+        // "Spawn error"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ エラー原 ☆☆☆☆ \n" VT_RST);
         Actor_Kill(&this->actor);
         return;
@@ -87,7 +87,7 @@ void EnSyatekiItm_Init(Actor* thisx, GlobalContext* globalCtx2) {
             (EnExRuppy*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_EX_RUPPY,
                                            sRupeePos[i].x, sRupeePos[i].y, sRupeePos[i].z, 0, 0, 0, 4);
         if (this->markers[i] == NULL) {
-            // Second spawn error
+            // "Second spawn error"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n" VT_RST);
             Actor_Kill(&this->actor);
             return;
@@ -239,7 +239,7 @@ void EnSyatekiItm_SpawnTargets(EnSyatekiItm* this, GlobalContext* globalCtx) {
                 &globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_G_SWITCH, this->targetHome[i].x,
                 this->targetHome[i].y, this->targetHome[i].z, 0, 0, 0, (ENGSWITCH_TARGET_RUPEE << 0xC) | 0x3F);
             if (this->targets[i] == NULL) {
-                // Rupee spawn error
+                // "Rupee spawn error"
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n" VT_RST);
                 Actor_Kill(&this->actor);
                 return;
@@ -317,7 +317,7 @@ void EnSyatekiItm_EndGame(EnSyatekiItm* this, GlobalContext* globalCtx) {
         this->actionFunc = EnSyatekiItm_Idle;
     }
     if (this->signal == ENSYATEKI_START) {
-        // 1 frame attack and defense!
+        // "1 frame attack and defense!"
         osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST);
         osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST);
         osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST);
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index 7cf180e0f1..4a3dad8085 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -73,7 +73,7 @@ void EnSyatekiMan_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnSyatekiMan* this = THIS;
 
     osSyncPrintf("\n\n");
-    // Old man appeared!! Muhohohohohohohon
+    // "Old man appeared!! Muhohohohohohohon"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 親父登場！！むほほほほほほほーん ☆☆☆☆☆ \n" VT_RST);
     this->actor.targetMode = 1;
     Actor_SetScale(&this->actor, 0.01f);
@@ -320,7 +320,7 @@ void EnSyatekiMan_GivePrize(EnSyatekiMan* this, GlobalContext* globalCtx) {
 void EnSyatekiMan_FinishPrize(EnSyatekiMan* this, GlobalContext* globalCtx) {
     SkelAnime_Update(&this->skelAnime);
     if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && func_80106BC8(globalCtx)) {
-        // Successful completion
+        // "Successful completion"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST);
         if (!LINK_IS_ADULT) {
             gSaveContext.itemGetInf[0] |= 0x2000;
@@ -343,7 +343,7 @@ void EnSyatekiMan_RestartGame(EnSyatekiMan* this, GlobalContext* globalCtx) {
             gallery->signal = ENSYATEKI_START;
             this->gameResult = SYATEKI_RESULT_NONE;
             this->actionFunc = EnSyatekiMan_WaitForGame;
-            // Let's try again! Baby!
+            // "Let's try again! Baby!"
             osSyncPrintf(VT_FGCOL(BLUE) "再挑戦だぜ！ベイビー！" VT_RST "\n", this);
         }
     }
diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
index 394c90bed8..e149ee4515 100644
--- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
+++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
@@ -83,12 +83,12 @@ void EnSyatekiNiw_Init(Actor* thisx, GlobalContext* globalCtx) {
     Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
     if (this->unk_29E == 0) {
         osSyncPrintf("\n\n");
-        // Archery range chicken
+        // "Archery range chicken"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n" VT_RST);
         Actor_SetScale(&this->actor, 0.01f);
     } else {
         osSyncPrintf("\n\n");
-        // Bomb chicken
+        // "Bomb chicken"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ボムにわ！ ☆☆☆☆☆ \n" VT_RST);
         this->actor.colChkInfo.mass = MASS_IMMOVABLE;
         Actor_SetScale(&this->actor, 0.01f);
diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
index 28d6f9924b..eddb41afa1 100644
--- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
+++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
@@ -52,8 +52,8 @@ void EnTakaraMan_Init(Actor* thisx, GlobalContext* globalCtx) {
 
     sTakaraIsInitialized = true;
     osSyncPrintf("\n\n");
-    osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n" VT_RST,
-                 globalCtx->actorCtx.flags.chest); // "Bun! %x" (needs a better translation)
+    // "Bun! %x" (needs a better translation)
+    osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n" VT_RST, globalCtx->actorCtx.flags.chest);
     globalCtx->actorCtx.flags.chest = 0;
     gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] = -1;
     SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_ts_Skel_004FE0, &object_ts_Anim_000498, this->jointTable,
diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
index 766077929b..a0ff1156d6 100644
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
@@ -213,7 +213,7 @@ void EnTite_Destroy(Actor* thisx, GlobalContext* globalCtx) {
             spawner->curNumSpawn--;
         }
         osSyncPrintf("\n\n");
-        // "Number of simultaneous occourances"
+        // "Number of simultaneous occurrences"
         osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, spawner->curNumSpawn);
         osSyncPrintf("\n\n");
     }
diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
index fe1c9ea5e5..f63b91f23f 100644
--- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
+++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c
@@ -38,7 +38,7 @@ void EnWallTubo_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnWallTubo* this = THIS;
 
     osSyncPrintf("\n\n");
-    // Wall Target
+    // "Wall Target"
     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n" VT_RST);
     this->unk_164 = this->actor.world.pos;
     this->actionFunc = EnWallTubo_FindGirl;
@@ -127,7 +127,7 @@ void EnWallTubo_SetWallFall(EnWallTubo* this, GlobalContext* globalCtx) {
 
         if ((wall != NULL) && (wall->dyna.actor.update != NULL)) {
             wall->isHit = true;
-            //  You did it field! (repeated 5 times)
+            // "You did it field!" (repeated 5 times)
             osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST);
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST);
             osSyncPrintf(VT_FGCOL(BLUE) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST);
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
index eae2c4f006..bd8125b7d1 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
@@ -60,13 +60,13 @@ void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx) {
     switch (this->actor.params & 0xF) {
         case EN_WEATHER_TAG_TYPE_CLOUDY_MARKET:
             osSyncPrintf("\n\n");
-            //"☆☆☆☆☆ (;o;) About ☆☆☆☆☆☆"
+            // "☆☆☆☆☆ (;o;) About ☆☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n" VT_RST);
             EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyHyruleMarket);
             break;
         case EN_WEATHER_TAG_TYPE_CLOUDY_LON_LON_RANCH:
             osSyncPrintf("\n\n");
-            //"☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆"
+            // "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST);
             if (Flags_GetEventChkInf(0x18)) {
                 Actor_Kill(&this->actor);
@@ -75,7 +75,7 @@ void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
         case EN_WEATHER_TAG_TYPE_SNOW_ZORAS_DOMAIN:
             osSyncPrintf("\n\n");
-            //"☆☆☆☆☆ Yukigafuru You won't come (._.) ☆☆☆☆☆"
+            // "☆☆☆☆☆ Yukigafuru You won't come (._.) ☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" VT_RST);
 
             if (gSaveContext.eventChkInf[4] & 0x400) {
@@ -85,7 +85,7 @@ void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
         case EN_WEATHER_TAG_TYPE_RAIN_LAKE_HYLIA:
             osSyncPrintf("\n\n");
-            //"☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆"
+            // "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST);
 
             if (gSaveContext.eventChkInf[4] & 0x400) {
@@ -95,7 +95,7 @@ void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
         case EN_WEATHER_TAG_TYPE_CLOUDY_DEATH_MOUNTAIN:
             osSyncPrintf("\n\n");
-            //"☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆"
+            // "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST);
             if (gSaveContext.eventChkInf[4] & 0x200) {
                 Actor_Kill(&this->actor);
@@ -104,7 +104,7 @@ void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
         case EN_WEATHER_TAG_TYPE_THUNDERSTORM_KAKARIKO:
             osSyncPrintf("\n\n");
-            //"☆☆☆☆☆ Cloudy Rain Thunder (;O;) Uo Melancholy ☆☆☆☆☆"
+            // "☆☆☆☆☆ Cloudy Rain Thunder (;O;) Uo Melancholy ☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" VT_RST);
 
             if (!(gSaveContext.eventChkInf[4] & 0x100) || !(gSaveContext.eventChkInf[4] & 0x200) ||
@@ -115,13 +115,13 @@ void EnWeatherTag_Init(Actor* thisx, GlobalContext* globalCtx) {
             break;
         case EN_WEATHER_TAG_TYPE_SANDSTORM_INTENSITY:
             osSyncPrintf("\n\n");
-            //"☆☆☆☆☆ The desert becomes thicker ☆☆☆☆☆"
+            // "☆☆☆☆☆ The desert becomes thicker ☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n" VT_RST);
             EnWeatherTag_SetupAction(this, EnWeatherTag_SetSandstormIntensity);
             break;
         case EN_WEATHER_TAG_TYPE_THUNDERSTORM_GRAVEYARD:
             osSyncPrintf("\n\n");
-            //"☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆"
+            // "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST);
 
             EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledRainThunder);
diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
index bb0ef61072..f3c146b589 100644
--- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
+++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c
@@ -115,7 +115,7 @@ void EnWonderItem_Init(Actor* thisx, GlobalContext* globalCtx) {
     s16 tagIndex;
 
     osSyncPrintf("\n\n");
-    // Mysterious mystery, very mysterious
+    // "Mysterious mystery, very mysterious"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 不思議不思議まか不思議 \t   ☆☆☆☆☆ %x\n" VT_RST, this->actor.params);
     this->actor.flags &= ~1;
 
@@ -311,7 +311,7 @@ void EnWonderItem_BombSoldier(EnWonderItem* this, GlobalContext* globalCtx) {
         if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HEISHI2, this->actor.world.pos.x,
                         this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.yawTowardsPlayer, 0,
                         9) != NULL) {
-            // Careless soldier spawned
+            // "Careless soldier spawned"
             osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ うっかり兵セット完了 ☆☆☆☆☆ \n" VT_RST);
         }
         if (this->switchFlag >= 0) {
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
index c6117b90a9..417d7639fb 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
+++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c
@@ -38,7 +38,7 @@ void EnWonderTalk_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnWonderTalk* this = THIS;
 
     osSyncPrintf("\n\n");
-    // Special conversation
+    // "Special conversation"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 特殊会話くん ☆☆☆☆☆ %x\n" VT_RST, this->actor.params);
 
     this->unk_150 = (this->actor.params >> 0xB) & 0x1F;
@@ -63,18 +63,18 @@ void func_80B391CC(EnWonderTalk* this, GlobalContext* globalCtx) {
     if (this->switchFlag < 0 || !Flags_GetSwitch(globalCtx, this->switchFlag)) {
         switch (this->unk_150) {
             case 1:
-                // Slate GO!
+                // "Slate GO!"
                 osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 石板ＧＯ！ ☆☆☆☆☆ \n" VT_RST);
                 this->height = 0.0f;
                 this->unk_15C = 80.0f;
-                // Attention coordinates
+                // "Attention coordinates"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 注目座標\t       \t☆☆☆☆☆ %f\n" VT_RST, 0.0f);
                 if (!LINK_IS_ADULT) {
                     this->actor.textId = 0x7040;
-                    // Children
+                    // "Children"
                     osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ こども ☆☆☆☆☆ \n" VT_RST);
                 } else {
-                    // Adult
+                    // "Adult"
                     osSyncPrintf(VT_FGCOL(CYAN) " ☆☆☆☆☆ おとな ☆☆☆☆☆ \n" VT_RST);
                     this->actor.textId = 0x7088;
                 }
@@ -83,13 +83,13 @@ void func_80B391CC(EnWonderTalk* this, GlobalContext* globalCtx) {
                 osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ this->actor.talk_message    ☆☆☆☆☆ %x\n" VT_RST, this->actor.textId);
                 break;
             case 2:
-                // Diary start!
+                // "Diary start!"
                 osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 日記帳スタート！ ☆☆☆☆☆ \n" VT_RST);
                 this->actor.textId = 0x5002;
                 this->unk_156 = 4;
                 this->height = 30.0f;
                 this->unk_15C = 40.0f;
-                // Attention coordinates
+                // "Attention coordinates"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 注目座標\t       \t☆☆☆☆☆ %f\n" VT_RST, 30.0f);
                 break;
             case 3:
@@ -97,14 +97,14 @@ void func_80B391CC(EnWonderTalk* this, GlobalContext* globalCtx) {
                 this->unk_156 = 5;
                 this->height = 0.0f;
                 this->unk_15C = 110.0f;
-                // Attention coordinates
+                // "Attention coordinates"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 注目座標\t       \t☆☆☆☆☆ %f\n" VT_RST, 0.0f);
                 break;
             case 4:
                 this->actor.textId = 0x5020;
                 this->unk_156 = 6;
                 this->height = 0.0f;
-                // Attention coordinates
+                // "Attention coordinates"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 注目座標\t       \t☆☆☆☆☆ %f\n" VT_RST, 0.0f);
                 this->unk_15C = 120.0f;
                 if (gSaveContext.eventChkInf[1] & 0x2000) {
@@ -116,7 +116,7 @@ void func_80B391CC(EnWonderTalk* this, GlobalContext* globalCtx) {
                 this->unk_156 = 5;
                 this->height = 0.0f;
                 this->unk_15C = 110.0f;
-                // Attention coordinates
+                // "Attention coordinates"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 注目座標\t       \t☆☆☆☆☆ %f\n" VT_RST, 0.0f);
                 break;
             default:
@@ -157,13 +157,13 @@ void func_80B3943C(EnWonderTalk* this, GlobalContext* globalCtx) {
             if (yawDiff < 0x4000) {
                 if (this->unk_15A >= 2) {
                     osSyncPrintf("\n\n");
-                    // Save information
+                    // "Save information"
                     osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報\t\t☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
-                    // Type index
+                    // "Type index"
                     osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 種類インデックス\t☆☆☆☆☆ %d\n" VT_RST, this->unk_150);
-                    // Actual message type
+                    // "Actual message type"
                     osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類     %x\n" VT_RST, this->actor.textId);
-                    // Specified range
+                    // "Specified range"
                     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲               %d\n" VT_RST, this->actor.world.rot.z);
                     osSyncPrintf("\n\n");
                 }
@@ -190,17 +190,17 @@ void func_80B395F0(EnWonderTalk* this, GlobalContext* globalCtx) {
                     switch (globalCtx->msgCtx.choiceIndex) {
                         case 0:
                             if (!LINK_IS_ADULT) {
-                                // I'm still a child!
+                                // "I'm still a child!"
                                 osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ まだコドモなの！ ☆☆☆☆☆ \n" VT_RST);
                                 this->actor.textId = 0x5001;
                             } else {
-                                // I'm an adult. .. ..
+                                // "I'm an adult. .. .."
                                 osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ アダルトなの。。。 ☆☆☆☆☆ \n" VT_RST);
                                 this->actor.textId = 0x5003;
                             }
                             break;
                         case 1:
-                            // Out!
+                            // "Out!"
                             osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆☆☆☆ はずれ！ ☆☆☆☆☆ \n" VT_RST);
                             this->actor.textId = 0x5004;
                             break;
diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
index 14d6e58993..a8cfe4d246 100644
--- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
+++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
@@ -43,7 +43,7 @@ void EnWonderTalk2_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnWonderTalk2* this = THIS;
 
     osSyncPrintf("\n\n");
-    // Transparent message
+    // "Transparent message"
     osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params);
     this->baseMsgId = (this->actor.params >> 6) & 0xFF;
     if (this->actor.world.rot.z > 0) {
@@ -63,11 +63,11 @@ void EnWonderTalk2_Init(Actor* thisx, GlobalContext* globalCtx) {
         this->actor.targetMode = D_80B3A8E0[rangeIndex];
 
         osSyncPrintf("\n\n");
-        // originally?
+        // "originally?"
         osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元は？       ☆☆☆☆☆ %d\n" VT_RST, this->actor.world.rot.z);
-        // The range is?
+        // "The range is?"
         osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ レンジは？   ☆☆☆☆☆ %d\n" VT_RST, this->actor.targetMode);
-        // Is the range?
+        // "Is the range?"
         osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n" VT_RST, this->triggerRange);
         osSyncPrintf("\n\n");
         osSyncPrintf("\n\n");
@@ -122,7 +122,7 @@ void func_80B3A15C(EnWonderTalk2* this, GlobalContext* globalCtx) {
     } else if (func_8002F194(&this->actor, globalCtx)) {
         if ((this->switchFlag >= 0) && (this->talkMode != 2)) {
             Flags_SetSwitch(globalCtx, this->switchFlag);
-            // I saved it! All of it!
+            // "I saved it! All of it!"
             osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag);
         }
 
@@ -134,29 +134,29 @@ void func_80B3A15C(EnWonderTalk2* this, GlobalContext* globalCtx) {
               (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) > 100.0f) || (yawDiff >= 0x4000))) {
             if (this->unk_158 >= 2) {
                 osSyncPrintf("\n\n");
-                // Transparent Message Kimi Set
+                // "Transparent Message Kimi Set"
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params);
-                // Save Information
+                // "Save Information"
                 osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t           %x\n" VT_RST, this->switchFlag);
-                // Specified message type
+                // "Specified message type"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 指定メッセージ種類     %x\n" VT_RST, this->baseMsgId);
-                // Actual message type
+                // "Actual message type"
                 osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類     %x\n" VT_RST, this->actor.textId);
-                // Specified range
+                // "Specified range"
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲               %d\n" VT_RST, this->actor.world.rot.z);
-                // Processing range
+                // "Processing range"
                 osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲               %f\n" VT_RST, this->triggerRange);
                 switch (this->talkMode) {
                     case 0:
-                        // Normal
+                        // "Normal"
                         osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ 通常 ☆☆ \n" VT_RST);
                         break;
                     case 2:
-                        // Check only
+                        // "Check only"
                         osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ チェックのみ ☆☆ \n" VT_RST);
                         break;
                     case 3:
-                        // Lock only
+                        // "Lock only"
                         osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ ロックのみ ☆☆ \n" VT_RST);
                         break;
                 }
@@ -170,7 +170,7 @@ void func_80B3A15C(EnWonderTalk2* this, GlobalContext* globalCtx) {
 
 void func_80B3A3D4(EnWonderTalk2* this, GlobalContext* globalCtx) {
     if (BREG(2) != 0) {
-        // Oh
+        // "Oh"
         osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ わー %d\n" VT_RST, func_8010BDBC(&globalCtx->msgCtx));
     }
 
@@ -187,7 +187,7 @@ void func_80B3A3D4(EnWonderTalk2* this, GlobalContext* globalCtx) {
         case 0:
             if ((this->switchFlag >= 0) && (this->talkMode != 4)) {
                 Flags_SetSwitch(globalCtx, this->switchFlag);
-                // (Forced) I saved it! All of it!
+                // "(Forced) I saved it! All of it!"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag);
             }
 
@@ -214,7 +214,7 @@ void func_80B3A4F8(EnWonderTalk2* this, GlobalContext* globalCtx) {
         }
     } else if ((this->talkMode != 4) || !this->unk_15A) {
         if (BREG(2) != 0) {
-            // distance
+            // "distance"
             osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ きょり %f\n" VT_RST, this->actor.xzDistToPlayer);
         }
         if (((this->actor.xzDistToPlayer < (40.0f + this->triggerRange)) &&
@@ -222,29 +222,29 @@ void func_80B3A4F8(EnWonderTalk2* this, GlobalContext* globalCtx) {
             !Gameplay_InCsMode(globalCtx)) {
             if (this->unk_158 >= 2) {
                 osSyncPrintf("\n\n");
-                // Transparent Message Kimi Seto
+                // "Transparent Message Kimi Seto"
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params);
-                // Save Information
+                // "Save Information"
                 osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t           %x\n" VT_RST, this->switchFlag);
-                // Specified message type
+                // "Specified message type"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 指定メッセージ種類     %x\n" VT_RST, this->baseMsgId);
-                // Real message type
+                // "Real message type"
                 osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類     %x\n" VT_RST, this->actor.textId);
-                // Specified range
+                // "Specified range"
                 osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲               %d\n" VT_RST, this->actor.world.rot.z);
-                //  Processing range
+                // "Processing range"
                 osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲               %f\n" VT_RST, this->triggerRange);
-                // What is your range?
+                // "What is your range?"
                 osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ レンジは？ \t\t   %d\n" VT_RST, this->actor.targetMode);
                 osSyncPrintf("\n\n");
                 osSyncPrintf("\n\n");
                 switch (this->talkMode) {
                     case 1:
-                        // Compulsion
+                        // "Compulsion"
                         osSyncPrintf(VT_FGCOL(PURPLE) " ☆☆ 強制 ☆☆ \n" VT_RST);
                         break;
                     case 4:
-                        // Gerudo Training Grounds Forced Check Only
+                        // "Gerudo Training Grounds Forced Check Only"
                         osSyncPrintf(VT_FGCOL(RED) " ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n" VT_RST);
                         break;
                 }
diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
index 03b6138dbc..a26af637c1 100644
--- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
+++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
@@ -131,7 +131,7 @@ void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) {
     Player* player = GET_PLAYER(globalCtx);
 
     if (SkelCurve_Init(globalCtx, &this->skelCurve, &sLimbList, &sTransformUpdIdx) == 0) {
-        // Magic_Wind_Actor_ct (): Construct failed
+        // "Magic_Wind_Actor_ct (): Construct failed"
         osSyncPrintf("Magic_Wind_Actor_ct():コンストラクト失敗\n");
     }
     this->actor.room = -1;
@@ -144,7 +144,7 @@ void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) {
         case 1:
             SkelCurve_SetAnim(&this->skelCurve, &sTransformUpdIdx, 60.0f, 0.0f, 60.0f, -1.0f);
             MagicWind_SetupAction(this, MagicWind_Shrink);
-            // Means start
+            // "Means start"
             LOG_STRING("表示開始", "../z_magic_wind.c", 486);
             func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_WIND_WARP);
             break;
@@ -155,7 +155,7 @@ void MagicWind_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     MagicWind* this = THIS;
     SkelCurve_Destroy(globalCtx, &this->skelCurve);
     func_800876C8(globalCtx);
-    // wipe out
+    // "wipe out"
     LOG_STRING("消滅", "../z_magic_wind.c", 505);
 }
 
@@ -174,7 +174,7 @@ void MagicWind_WaitForTimer(MagicWind* this, GlobalContext* globalCtx) {
         return;
     }
 
-    // Means start
+    // "Means start"
     LOG_STRING("表示開始", "../z_magic_wind.c", 539);
     func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_WIND_NORMAL);
     MagicWind_UpdateAlpha(1.0f);
diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
index 6fb87d264d..a531a71a95 100644
--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
@@ -167,12 +167,12 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) {
 
     Actor_ProcessInitChain(&this->actor, sInitChain);
     ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
-    // Generation of reflectable light!
+    // "Generation of reflectable light!"
     osSyncPrintf("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
     LOG_NUM("this->actor.arg_data", this->actor.params, "../z_mir_ray.c", 518);
 
     if (this->actor.params >= 0xA) {
-        // Reflected light generation failure
+        // "Reflected light generation failure"
         LOG_STRING("反射光 発生失敗", "../z_mir_ray.c", 521);
         Actor_Kill(&this->actor);
     }
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
index 20c797131c..707add3fc0 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
@@ -476,7 +476,7 @@ void ObjBean_Init(Actor* thisx, GlobalContext* globalCtx) {
             path = (this->dyna.actor.params >> 8) & 0x1F;
             if (path == 0x1F) {
                 osSyncPrintf(VT_COL(RED, WHITE));
-                // No path data?
+                // "No path data?"
                 osSyncPrintf("パスデータが無い？(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 909,
                              this->dyna.actor.params);
                 osSyncPrintf(VT_RST);
@@ -485,7 +485,7 @@ void ObjBean_Init(Actor* thisx, GlobalContext* globalCtx) {
             }
             if (globalCtx->setupPathList[path].count < 3) {
                 osSyncPrintf(VT_COL(RED, WHITE));
-                // Incorrect number of path data
+                // "Incorrect number of path data"
                 osSyncPrintf("パスデータ数が不正(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 921,
                              this->dyna.actor.params);
                 osSyncPrintf(VT_RST);
@@ -515,7 +515,7 @@ void ObjBean_Init(Actor* thisx, GlobalContext* globalCtx) {
         ObjBean_SetupWaitForBean(this);
     }
     this->dyna.actor.world.rot.z = this->dyna.actor.home.rot.z = this->dyna.actor.shape.rot.z = 0;
-    // Magic bean tree lift
+    // "Magic bean tree lift"
     osSyncPrintf("(魔法の豆の木リフト)(arg_data 0x%04x)\n", this->dyna.actor.params);
 }
 
@@ -893,7 +893,7 @@ void ObjBean_Update(Actor* thisx, GlobalContext* globalCtx) {
 
         if (ObjBean_CheckForHorseTrample(this, globalCtx)) {
             osSyncPrintf(VT_FGCOL(CYAN));
-            // Horse and bean tree lift collision
+            // "Horse and bean tree lift collision"
             osSyncPrintf("馬と豆の木リフト衝突！！！\n");
             osSyncPrintf(VT_RST);
             ObjBean_Break(this, globalCtx);
diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
index 664aba6370..84a4651f38 100644
--- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
+++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
@@ -100,7 +100,7 @@ void ObjKibako_Init(Actor* thisx, GlobalContext* globalCtx) {
     ObjKibako_InitCollider(&this->actor, globalCtx);
     CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sCCInfoInit);
     ObjKibako_SetupIdle(this);
-    // wooden box
+    // "wooden box"
     osSyncPrintf("(dungeon keep 木箱)(arg_data 0x%04x)\n", this->actor.params);
 }
 
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
index ec5f44b3ac..68257cbd1d 100644
--- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
+++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
@@ -132,7 +132,7 @@ void ObjKibako2_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->actionFunc = ObjKibako2_Idle;
     this->dyna.actor.home.rot.z = this->dyna.actor.world.rot.z = this->dyna.actor.shape.rot.z =
         this->dyna.actor.world.rot.x = this->dyna.actor.shape.rot.x = 0;
-    // Wooden box (stationary)
+    // "Wooden box (stationary)"
     osSyncPrintf("木箱(据置)(arg %04xH)(item %04xH %d)\n", this->dyna.actor.params, this->collectibleFlag,
                  this->dyna.actor.home.rot.x);
 }
diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
index a34787b06e..f3dd42eb8e 100644
--- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
+++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
@@ -191,7 +191,7 @@ void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx) {
                                this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, 0,
                                this->actor.home.rot.y, 0, (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) {
             osSyncPrintf(VT_COL(RED, WHITE));
-            // Push-pull block occurrence failure
+            // "Push-pull block occurrence failure"
             osSyncPrintf("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_obj_lightswitch.c", 452,
                          this->actor.params);
             osSyncPrintf(VT_RST);
@@ -203,7 +203,7 @@ void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx) {
     if (removeSelf) {
         Actor_Kill(&this->actor);
     }
-    // Light switch
+    // "Light switch"
     osSyncPrintf("(光スイッチ)(arg_data 0x%04x)\n", this->actor.params);
 }
 
diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
index 6992cee738..f3547a912d 100644
--- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
+++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c
@@ -68,7 +68,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) {
     if (Actor_SpawnAsChild(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y,
                            spawnPos->z, 0, block->rotY, 0,
                            ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) {
-        // Push-pull block failure
+        // "Push-pull block failure"
         osSyncPrintf(VT_COL(RED, WHITE));
         osSyncPrintf("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194);
         osSyncPrintf(VT_RST);
diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
index 02e25611d4..cea3632d77 100644
--- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
+++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
@@ -95,7 +95,7 @@ void ObjOshihiki_InitDynapoly(ObjOshihiki* this, GlobalContext* globalCtx, Colli
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG registration failure
+        // "Warning : move BG registration failure"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 280,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
@@ -213,7 +213,7 @@ void ObjOshihiki_CheckType(ObjOshihiki* this, GlobalContext* globalCtx) {
             ObjOshihiki_InitDynapoly(this, globalCtx, &gPushBlockCol, 1);
             break;
         default:
-            // Error : type cannot be determined
+            // "Error : type cannot be determined"
             osSyncPrintf("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 444,
                          this->dyna.actor.params);
             break;
@@ -304,7 +304,7 @@ void ObjOshihiki_Init(Actor* thisx, GlobalContext* globalCtx2) {
     ObjOshihiki_SetColor(this, globalCtx);
     ObjOshihiki_ResetFloors(this);
     ObjOshihiki_SetupOnActor(this, globalCtx);
-    // (dungeon keep push-pull block)
+    // "(dungeon keep push-pull block)"
     osSyncPrintf("(dungeon keep 押し引きブロック)(arg_data 0x%04x)\n", this->dyna.actor.params);
 }
 
@@ -390,7 +390,7 @@ s32 ObjOshihiki_CheckFloor(ObjOshihiki* this, GlobalContext* globalCtx) {
 
 s32 ObjOshihiki_CheckGround(ObjOshihiki* this, GlobalContext* globalCtx) {
     if (this->dyna.actor.world.pos.y <= BGCHECK_Y_MIN + 10.0f) {
-        // Warning : Push-pull block fell too much
+        // "Warning : Push-pull block fell too much"
         osSyncPrintf("Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 809,
                      this->dyna.actor.params);
         Actor_Kill(&this->dyna.actor);
diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
index 9138be63dc..89e54efe74 100644
--- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
+++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
@@ -194,7 +194,7 @@ void ObjSwitch_InitDynapoly(ObjSwitch* this, GlobalContext* globalCtx, Collision
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
 
     if (this->dyna.bgId == BG_ACTOR_MAX) {
-        // Warning : move BG registration failure
+        // "Warning : move BG registration failure"
         osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_switch.c", 531,
                      this->dyna.actor.id, this->dyna.actor.params);
     }
diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
index aab9ed06ee..65f54a1250 100644
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
@@ -86,14 +86,14 @@ void OceffSpot_End(OceffSpot* this, GlobalContext* globalCtx) {
             if (globalCtx->msgCtx.unk_E3F0 != 0x31 || globalCtx->msgCtx.unk_E3EE != 8) {
                 gSaveContext.sunsSongState = SUNSSONG_START;
                 osSyncPrintf(VT_FGCOL(YELLOW));
-                // Sun's Song Flag
+                // "Sun's Song Flag"
                 osSyncPrintf("z_oceff_spot  太陽の歌フラグ\n");
                 osSyncPrintf(VT_RST);
             }
         } else {
             globalCtx->msgCtx.unk_E3EE = 4;
             osSyncPrintf(VT_FGCOL(YELLOW));
-            // Ocarina End
+            // "Ocarina End"
             osSyncPrintf("z_oceff_spot  オカリナ終了\n");
             osSyncPrintf(VT_RST);
         }