From 81830a6e8bfa62681924c0b535cfd1adf0423860 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Sat, 4 Sep 2021 15:33:19 +0200 Subject: [PATCH] Cleanup translation comments (#924) * `// Translates to:` -> `//` * `// Translation: ([^"].*)` -> `// "$1"` * Manual cleanup * Manual cleanup in `src/code/` * Use more lowercase for some all caps translations * Move translations to end of lines where it fits under 100 bytes * Move one translation to end of line manually * Run formatter * Cleanup in EnHeishi1 as suggested by Roman * Update src/code/z_play.c Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> --- src/code/__osMalloc.c | 36 +++++----- src/code/audioMgr.c | 5 +- src/code/code_80097A00.c | 2 +- src/code/code_800FC620.c | 13 ++-- src/code/debug_malloc.c | 2 +- src/code/game.c | 50 +++++-------- src/code/graph.c | 12 ++-- src/code/irqmgr.c | 35 ++++++---- src/code/main.c | 17 ++--- src/code/padmgr.c | 18 ++--- src/code/sched.c | 5 +- src/code/sys_cfb.c | 11 ++- src/code/sys_math3d.c | 9 ++- src/code/system_malloc.c | 3 +- src/code/title_setup.c | 3 +- src/code/ucode_disas.c | 3 +- src/code/z_DLF.c | 6 +- src/code/z_actor.c | 70 ++++++++----------- src/code/z_bgcheck.c | 22 +++--- src/code/z_collision_btltbls.c | 3 +- src/code/z_collision_check.c | 39 +++++------ src/code/z_construct.c | 15 ++-- src/code/z_demo.c | 9 +-- src/code/z_eff_blure.c | 14 ++-- src/code/z_eff_spark.c | 5 +- src/code/z_effect.c | 5 +- src/code/z_effect_soft_sprite.c | 12 ++-- src/code/z_elf_message.c | 6 +- src/code/z_fcurve_data_skelanime.c | 2 +- src/code/z_horse.c | 6 +- src/code/z_jpeg.c | 13 ++-- src/code/z_kaleido_manager.c | 2 +- src/code/z_kaleido_scope_call.c | 15 ++-- src/code/z_malloc.c | 15 ++-- src/code/z_map_exp.c | 14 ++-- src/code/z_map_mark.c | 2 +- src/code/z_parameter.c | 54 ++++++-------- src/code/z_play.c | 16 +++-- src/code/z_room.c | 25 +++---- src/code/z_scene.c | 11 ++- src/code/z_skelanime.c | 31 ++++---- src/code/z_sram.c | 26 +++---- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 3 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 3 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 3 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 6 +- .../z_bg_hidan_kowarerukabe.c | 5 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 4 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 6 +- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 9 +-- src/overlays/actors/ovl_En_Eg/z_en_eg.c | 2 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 3 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 3 +- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 8 +-- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 11 ++- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 12 +--- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 6 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 2 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 4 +- .../z_en_okarina_effect.c | 5 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 3 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 7 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 4 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 4 +- .../actors/ovl_Obj_Mure2/z_obj_mure2.c | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 2 +- .../z_eff_ss_dead_sound.c | 3 +- 70 files changed, 348 insertions(+), 440 deletions(-) diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 089ee59758..b42effe081 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -574,13 +574,13 @@ void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { } else { node = (ArenaNode*)((u32)ptr - sizeof(ArenaNode)); if (newSize == node->size) { - // Does nothing because the memory block size does not change + // "Does nothing because the memory block size does not change" osSyncPrintf("メモリブロックサイズが変わらないためなにもしません\n"); } else if (node->size < newSize) { next = ArenaImpl_GetNextBlock(node); sizeDiff = newSize - node->size; if ((u32)next == ((u32)node + node->size + sizeof(ArenaNode)) && next->isFree && next->size >= sizeDiff) { - // Merge because there is a free block after the current memory block + // "Merge because there is a free block after the current memory block" osSyncPrintf("現メモリブロックの後ろにフリーブロックがあるので結合します\n"); next->size -= sizeDiff; overNext = ArenaImpl_GetNextBlock(next); @@ -592,7 +592,7 @@ void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { node->size = newSize; func_801068B0(newNext, next, sizeof(ArenaNode)); // memcpy } else { - // Allocate a new memory block and move the contents + // "Allocate a new memory block and move the contents" osSyncPrintf("新たにメモリブロックを確保して内容を移動します\n"); newAlloc = __osMalloc_NoLock(arena, newSize); if (newAlloc != NULL) { @@ -605,7 +605,7 @@ void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { next2 = ArenaImpl_GetNextBlock(node); if (next2 != NULL && next2->isFree) { blockSize = ALIGN16(newSize) + sizeof(ArenaNode); - // Increased free block behind current memory block + // "Increased free block behind current memory block" osSyncPrintf("現メモリブロックの後ろのフリーブロックを大きくしました\n"); newNext2 = (ArenaNode*)((u32)node + blockSize); localCopy = *next2; @@ -619,7 +619,7 @@ void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { } } else if (newSize + sizeof(ArenaNode) < node->size) { blockSize = ALIGN16(newSize) + sizeof(ArenaNode); - // Generated because there is no free block after the current memory block + // "Generated because there is no free block after the current memory block" osSyncPrintf("現メモリブロックの後ろにフリーブロックがないので生成します\n"); newNext2 = (ArenaNode*)((u32)node + blockSize); newNext2->next = ArenaImpl_GetNextBlock(node); @@ -634,7 +634,7 @@ void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { overNext2->prev = newNext2; } } else { - // There is no room to generate free blocks + // "There is no room to generate free blocks" osSyncPrintf("フリーブロック生成するだけの空きがありません\n"); ptr = NULL; } @@ -683,8 +683,7 @@ void __osDisplayArena(Arena* arena) { ArenaNode* next; if (!__osMallocIsInitalized(arena)) { - // Arena is not initalized - osSyncPrintf("アリーナは初期化されていません\n"); + osSyncPrintf("アリーナは初期化されていません\n"); // "Arena is not initalized" return; } @@ -694,9 +693,8 @@ void __osDisplayArena(Arena* arena) { freeSize = 0; allocatedSize = 0; - // Arena contents (0x%08x) - osSyncPrintf("アリーナの内容 (0x%08x)\n", arena); - // Memory node range status size [time s ms us ns: TID: src: line] + osSyncPrintf("アリーナの内容 (0x%08x)\n", arena); // "Arena contents (0x%08x)" + // "Memory node range status size [time s ms us ns: TID: src: line]" osSyncPrintf("メモリブロック範囲 status サイズ [時刻 s ms us ns: TID:src:行]\n"); iter = arena->head; @@ -730,9 +728,12 @@ void __osDisplayArena(Arena* arena) { iter = next; } - osSyncPrintf("確保ブロックサイズの合計 0x%08x バイト\n", allocatedSize); // Total reserved node size 0x%08x bytes - osSyncPrintf("空きブロックサイズの合計 0x%08x バイト\n", freeSize); // Total free node size 0x%08x bytes - osSyncPrintf("最大空きブロックサイズ 0x%08x バイト\n", maxFree); // Maximum free node size 0x%08x bytes + // "Total reserved node size 0x%08x bytes" + osSyncPrintf("確保ブロックサイズの合計 0x%08x バイト\n", allocatedSize); + // "Total free node size 0x%08x bytes" + osSyncPrintf("空きブロックサイズの合計 0x%08x バイト\n", freeSize); + // "Maximum free node size 0x%08x bytes" + osSyncPrintf("最大空きブロックサイズ 0x%08x バイト\n", maxFree); ArenaImpl_Unlock(arena); } @@ -792,12 +793,12 @@ u32 __osCheckArena(Arena* arena) { u32 error = 0; ArenaImpl_Lock(arena); - // Checking the contents of the arena. . ． (%08x) + // "Checking the contents of the arena. . ． (%08x)" osSyncPrintf("アリーナの内容をチェックしています．．． (%08x)\n", arena); iter = arena->head; while (iter != NULL) { if (iter && iter->magic == NODE_MAGIC) { - // Oops!! (%08x %08x) + // "Oops!! (%08x %08x)" osSyncPrintf(VT_COL(RED, WHITE) "おおっと！！ (%08x %08x)\n" VT_RST, iter, iter->magic); error = 1; break; @@ -805,8 +806,7 @@ u32 __osCheckArena(Arena* arena) { iter = ArenaImpl_GetNextBlock(iter); } if (error == 0) { - // The arena is still going well - osSyncPrintf("アリーナはまだ、いけそうです\n"); + osSyncPrintf("アリーナはまだ、いけそうです\n"); // "The arena is still going well" } ArenaImpl_Unlock(arena); diff --git a/src/code/audioMgr.c b/src/code/audioMgr.c index f64f4ba914..202e9c57f3 100644 --- a/src/code/audioMgr.c +++ b/src/code/audioMgr.c @@ -44,7 +44,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) { } void AudioMgr_HandlePRENMI(AudioMgr* audioMgr) { - // Audio manager received OS_SC_PRE_NMI_MSG + // "Audio manager received OS_SC_PRE_NMI_MSG" osSyncPrintf("オーディオマネージャが OS_SC_PRE_NMI_MSG を受け取りました\n"); Audio_PreNMI(); } @@ -54,8 +54,7 @@ void AudioMgr_ThreadEntry(void* arg0) { IrqMgrClient irqClient; s16* msg = NULL; - // Start running audio manager thread - osSyncPrintf("オーディオマネージャスレッド実行開始\n"); + osSyncPrintf("オーディオマネージャスレッド実行開始\n"); // "Start running audio manager thread" func_800F70F8(); func_800E301C(DmaMgr_DmaCallback0); func_800F711C(); diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index f8b8e4e288..b60b986358 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -193,7 +193,7 @@ u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) { s32 pad; u16 sp26 = gSaveContext.equips.equipment & gEquipMasks[equipment]; - // Translates to: "Erasing equipment item = %d zzz=%d" + // "Erasing equipment item = %d zzz=%d" osSyncPrintf("装備アイテム抹消 = %d zzz=%d\n", equipment, sp26); if (sp26) { diff --git a/src/code/code_800FC620.c b/src/code/code_800FC620.c index 5e2532ae34..a3b1475abd 100644 --- a/src/code/code_800FC620.c +++ b/src/code/code_800FC620.c @@ -30,13 +30,13 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, voi u32 size; if (gOverlayLogSeverity >= 3) { - // Start loading dynamic link function + // "Start loading dynamic link function" osSyncPrintf("\nダイナミックリンクファンクションのロードを開始します\n"); } if (gOverlayLogSeverity >= 3) { size = vRomEnd - vRomStart; - // DMA transfer of TEXT, DATA, RODATA + rel (%08x-%08x) + // "DMA transfer of TEXT, DATA, RODATA + rel (%08x-%08x)" osSyncPrintf("TEXT,DATA,RODATA+relをＤＭＡ転送します(%08x-%08x)\n", allocatedVRamAddr, (u32)allocatedVRamAddr + size); } @@ -54,8 +54,7 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, voi } if (gOverlayLogSeverity >= 3) { - // Relocate - osSyncPrintf("リロケーションします\n"); + osSyncPrintf("リロケーションします\n"); // "Relocate" } Overlay_Relocate(allocatedVRamAddr, ovl, vRamStart); @@ -63,7 +62,7 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, voi bssSize = ovl->bssSize; if (bssSize != 0) { if (gOverlayLogSeverity >= 3) { - // Clear BSS area (% 08x-% 08x) + // "Clear BSS area (% 08x-% 08x)" osSyncPrintf("BSS領域をクリアします(%08x-%08x)\n", end, end + ovl->bssSize); } @@ -76,7 +75,7 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, voi size = (u32)&ovl->relocations[ovl->nRelocations] - (u32)ovl; if (gOverlayLogSeverity >= 3) { - // Clear REL area (%08x-%08x) + // "Clear REL area (%08x-%08x)" osSyncPrintf("REL領域をクリアします(%08x-%08x)\n", ovl, (u32)ovl + size); } @@ -87,7 +86,7 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, voi osInvalICache(allocatedVRamAddr, size); if (gOverlayLogSeverity >= 3) { - // Finish loading dynamic link function + // "Finish loading dynamic link function" osSyncPrintf("ダイナミックリンクファンクションのロードを終了します\n\n"); } return size; diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index d92ec42bf3..73ae713216 100644 --- a/src/code/debug_malloc.c +++ b/src/code/debug_malloc.c @@ -83,7 +83,7 @@ void* DebugArena_Calloc(u32 num, u32 size) { } void DebugArena_Display(void) { - // Zelda heap display (devs forgot to change "Zelda" to "Debug" apparently) + // "Zelda heap display" (devs forgot to change "Zelda" to "Debug" apparently) osSyncPrintf("ゼルダヒープ表示\n"); __osDisplayArena(&sDebugArena); } diff --git a/src/code/game.c b/src/code/game.c index adb833bb42..663ebd5898 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -173,7 +173,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { DebugArena_Display(); SystemArena_Display(); - //% 08x bytes left until the death of Hyrule (game_alloc) + // "%08x bytes left until the death of Hyrule (game_alloc)" osSyncPrintf("ハイラル滅亡まであと %08x バイト(game_alloc)\n", THA_GetSize(&gameState->tha)); R_ENABLE_ARENA_DBG = 0; } @@ -321,17 +321,14 @@ void GameState_Update(GameState* gameState) { void GameState_InitArena(GameState* gameState, size_t size) { void* arena; - // Hyrule reserved size =% u bytes - osSyncPrintf("ハイラル確保 サイズ＝%u バイト\n"); + osSyncPrintf("ハイラル確保 サイズ＝%u バイト\n"); // "Hyrule reserved size = %u bytes" arena = GameAlloc_MallocDebug(&gameState->alloc, size, "../game.c", 992); if (arena != NULL) { THA_Ct(&gameState->tha, arena, size); - // Successful Hyral - osSyncPrintf("ハイラル確保成功\n"); + osSyncPrintf("ハイラル確保成功\n"); // "Successful Hyral" } else { THA_Ct(&gameState->tha, NULL, 0); - // Failure to secure Hyrule - osSyncPrintf("ハイラル確保失敗\n"); + osSyncPrintf("ハイラル確保失敗\n"); // "Failure to secure Hyrule" Fault_AddHungupAndCrash("../game.c", 999); } } @@ -346,31 +343,27 @@ void GameState_Realloc(GameState* gameState, size_t size) { THA_Dt(&gameState->tha); GameAlloc_Free(alloc, thaBufp); - // Hyrule temporarily released !! - osSyncPrintf("ハイラル一時解放!!\n"); + osSyncPrintf("ハイラル一時解放!!\n"); // "Hyrule temporarily released!!" SystemArena_GetSizes(&systemMaxFree, &systemFree, &systemAlloc); if ((systemMaxFree - 0x10) < size) { osSyncPrintf("%c", 7); osSyncPrintf(VT_FGCOL(RED)); - // Not enough memory. Change the hyral size to the largest possible value + // "Not enough memory. Change the hyral size to the largest possible value" osSyncPrintf("メモリが足りません。ハイラルサイズを可能な最大値に変更します\n"); osSyncPrintf("(hyral=%08x max=%08x free=%08x alloc=%08x)\n", size, systemMaxFree, systemFree, systemAlloc); osSyncPrintf(VT_RST); size = systemMaxFree - 0x10; } - // Hyral reallocate size =% u bytes - osSyncPrintf("ハイラル再確保 サイズ＝%u バイト\n", size); + osSyncPrintf("ハイラル再確保 サイズ＝%u バイト\n", size); // "Hyral reallocate size = %u bytes" gameArena = GameAlloc_MallocDebug(alloc, size, "../game.c", 1033); if (gameArena != NULL) { THA_Ct(&gameState->tha, gameArena, size); - // Successful reacquisition of Hyrule - osSyncPrintf("ハイラル再確保成功\n"); + osSyncPrintf("ハイラル再確保成功\n"); // "Successful reacquisition of Hyrule" } else { THA_Ct(&gameState->tha, NULL, 0); - // Failure to secure Hyral - osSyncPrintf("ハイラル再確保失敗\n"); + osSyncPrintf("ハイラル再確保失敗\n"); // "Failure to secure Hyral" SystemArena_Display(); Fault_AddHungupAndCrash("../game.c", 1044); } @@ -380,8 +373,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g OSTime startTime; OSTime endTime; - // game constructor start - osSyncPrintf("game コンストラクタ開始\n"); + osSyncPrintf("game コンストラクタ開始\n"); // "game constructor start" gameState->gfxCtx = gfxCtx; gameState->frames = 0; gameState->main = NULL; @@ -392,13 +384,13 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g gameState->init = NULL; endTime = osGetTime(); - // game_set_next_game_null processing time% d us + // "game_set_next_game_null processing time %d us" osSyncPrintf("game_set_next_game_null 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); startTime = endTime; GameAlloc_Init(&gameState->alloc); endTime = osGetTime(); - // gamealloc_init processing time% d us + // "gamealloc_init processing time %d us" osSyncPrintf("gamealloc_init 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); startTime = endTime; @@ -407,7 +399,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g init(gameState); endTime = osGetTime(); - // init processing time% d us + // "init processing time %d us" osSyncPrintf("init 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); startTime = endTime; @@ -423,18 +415,16 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g osSendMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK); endTime = osGetTime(); - // Other initialization processing time% d us + // "Other initialization processing time %d us" osSyncPrintf("その他初期化 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); Fault_AddClient(&sGameFaultClient, &GameState_FaultPrint, NULL, NULL); - // game constructor end - osSyncPrintf("game コンストラクタ終了\n"); + osSyncPrintf("game コンストラクタ終了\n"); // "game constructor end" } void GameState_Destroy(GameState* gameState) { - // game destructor start - osSyncPrintf("game デストラクタ開始\n"); + osSyncPrintf("game デストラクタ開始\n"); // "game destructor start" func_800C3C20(); func_800F3054(); osRecvMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK); @@ -455,8 +445,7 @@ void GameState_Destroy(GameState* gameState) { SystemArena_Display(); Fault_RemoveClient(&sGameFaultClient); - // game destructor end - osSyncPrintf("game デストラクタ終了\n"); + osSyncPrintf("game デストラクタ終了\n"); // "game destructor end" } GameStateFunc GameState_GetInit(GameState* gameState) { @@ -478,15 +467,14 @@ void* GameState_Alloc(GameState* gameState, size_t size, char* file, s32 line) { osSyncPrintf("ハイラルは滅亡している\n"); ret = NULL; } else if ((u32)THA_GetSize(&gameState->tha) < size) { - // Hyral on the verge of extinction does not have% d bytes left (% d bytes until extinction) + // "Hyral on the verge of extinction does not have %d bytes left (%d bytes until extinction)" osSyncPrintf("滅亡寸前のハイラルには %d バイトの余力もない（滅亡まであと %d バイト）\n", size, THA_GetSize(&gameState->tha)); ret = NULL; } else { ret = THA_AllocEndAlign16(&gameState->tha, size); if (THA_IsCrash(&gameState->tha)) { - // Hyrule has been destroyed - osSyncPrintf("ハイラルは滅亡してしまった\n"); + osSyncPrintf("ハイラルは滅亡してしまった\n"); // "Hyrule has been destroyed" ret = NULL; } } diff --git a/src/code/graph.c b/src/code/graph.c index ea477077ee..d11b2e22eb 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -406,8 +406,7 @@ void Graph_ThreadEntry(void* arg0) { nextOvl = &gGameStateOverlayTable[0]; - // Start graphic thread execution - osSyncPrintf("グラフィックスレッド実行開始\n"); + osSyncPrintf("グラフィックスレッド実行開始\n"); // "Start graphic thread execution" Graph_Init(&gfxCtx); while (nextOvl) { @@ -415,14 +414,12 @@ void Graph_ThreadEntry(void* arg0) { Overlay_LoadGameState(ovl); size = ovl->instanceSize; - // Class size =%d bytes - osSyncPrintf("クラスサイズ＝%dバイト\n", size); + osSyncPrintf("クラスサイズ＝%dバイト\n", size); // "Class size = %d bytes" gameState = SystemArena_MallocDebug(size, "../graph.c", 1196); if (!gameState) { - // Failure to secure - osSyncPrintf("確保失敗\n"); + osSyncPrintf("確保失敗\n"); // "Failure to secure" sprintf(faultMsg, "CLASS SIZE= %d bytes", size); Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg); @@ -439,8 +436,7 @@ void Graph_ThreadEntry(void* arg0) { Overlay_FreeGameState(ovl); } Graph_Destroy(&gfxCtx); - // End of graphic thread execution - osSyncPrintf("グラフィックスレッド実行終了\n"); + osSyncPrintf("グラフィックスレッド実行終了\n"); // "End of graphic thread execution" } void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size) { diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index 525a5b9228..782a247789 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -112,16 +112,16 @@ void IrqMgr_HandlePreNMI(IrqMgr* this) { } void IrqMgr_CheckStack() { - osSyncPrintf("irqmgr.c: PRENMIから0.5秒経過\n"); // 0.5 seconds after PRENMI + osSyncPrintf("irqmgr.c: PRENMIから0.5秒経過\n"); // "0.5 seconds after PRENMI" if (StackCheck_Check(NULL) == 0) { - osSyncPrintf("スタックは大丈夫みたいです\n"); // The stack looks ok + osSyncPrintf("スタックは大丈夫みたいです\n"); // "The stack looks ok" } else { osSyncPrintf("%c", 7); osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("スタックがオーバーフローしたか危険な状態です\n"); // Stack overflow or dangerous - osSyncPrintf( - "早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n"); // Increase stack size early or - // don't consume stack + // "Stack overflow or dangerous" + osSyncPrintf("スタックがオーバーフローしたか危険な状態です\n"); + // "Increase stack size early or don't consume stack" + osSyncPrintf("早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n"); osSyncPrintf(VT_RST); } } @@ -141,7 +141,8 @@ void IrqMgr_HandlePRENMI480(IrqMgr* this) { osSetTimer(&this->timer, OS_USEC_TO_CYCLES(20000), 0ull, &this->queue, (OSMesg)PRENMI500_MSG); ret = osAfterPreNMI(); if (ret) { - osSyncPrintf("osAfterPreNMIが %d を返しました！？\n", ret); // osAfterPreNMI returned %d !? + // "osAfterPreNMI returned %d !?" + osSyncPrintf("osAfterPreNMIが %d を返しました！？\n", ret); osSetTimer(&this->timer, OS_USEC_TO_CYCLES(1000), 0ull, &this->queue, (OSMesg)PRENMI480_MSG); } } @@ -168,7 +169,7 @@ void IrqMgr_ThreadEntry(void* arg0) { u8 exit; msg = 0; - osSyncPrintf("ＩＲＱマネージャスレッド実行開始\n"); // Start IRQ manager thread execution + osSyncPrintf("ＩＲＱマネージャスレッド実行開始\n"); // "Start IRQ manager thread execution" exit = false; while (!exit) { @@ -179,33 +180,37 @@ void IrqMgr_ThreadEntry(void* arg0) { break; case PRE_NMI_MSG: osSyncPrintf("PRE_NMI_MSG\n"); - osSyncPrintf("スケジューラ：PRE_NMIメッセージを受信\n"); // Scheduler: Receives PRE_NMI message + // "Scheduler: Receives PRE_NMI message" + osSyncPrintf("スケジューラ：PRE_NMIメッセージを受信\n"); IrqMgr_HandlePreNMI(this); break; case PRENMI450_MSG: osSyncPrintf("PRENMI450_MSG\n"); - osSyncPrintf("スケジューラ：PRENMI450メッセージを受信\n"); // Scheduler: Receives PRENMI450 message + // "Scheduler: Receives PRENMI450 message" + osSyncPrintf("スケジューラ：PRENMI450メッセージを受信\n"); IrqMgr_HandlePRENMI450(this); break; case PRENMI480_MSG: osSyncPrintf("PRENMI480_MSG\n"); - osSyncPrintf("スケジューラ：PRENMI480メッセージを受信\n"); // Scheduler: Receives PRENMI480 message + // "Scheduler: Receives PRENMI480 message" + osSyncPrintf("スケジューラ：PRENMI480メッセージを受信\n"); IrqMgr_HandlePRENMI480(this); break; case PRENMI500_MSG: osSyncPrintf("PRENMI500_MSG\n"); - osSyncPrintf("スケジューラ：PRENMI500メッセージを受信\n"); // Scheduler: Receives PRENMI500 message + // "Scheduler: Receives PRENMI500 message" + osSyncPrintf("スケジューラ：PRENMI500メッセージを受信\n"); exit = true; IrqMgr_HandlePRENMI500(this); break; default: - osSyncPrintf("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n", - msg); // Unexpected message received + // "Unexpected message received" + osSyncPrintf("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n", msg); break; } } - osSyncPrintf("ＩＲＱマネージャスレッド実行終了\n"); // End of IRQ manager thread execution + osSyncPrintf("ＩＲＱマネージャスレッド実行終了\n"); // "End of IRQ manager thread execution" } void IrqMgr_Init(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount) { diff --git a/src/code/main.c b/src/code/main.c index 7e05463735..932114df52 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -27,7 +27,7 @@ OSMesg sSiIntMsgBuf[1]; void Main_LogSystemHeap(void) { osSyncPrintf(VT_FGCOL(GREEN)); - // System heap size% 08x (% dKB) Start address% 08x + // "System heap size% 08x (% dKB) Start address% 08x" osSyncPrintf("システムヒープサイズ %08x(%dKB) 開始アドレス %08x\n", gSystemHeapSize, gSystemHeapSize / 1024, gSystemHeap); osSyncPrintf(VT_RST); @@ -43,7 +43,7 @@ void Main(void* arg) { s32 debugHeapSize; s16* msg; - osSyncPrintf("mainproc 実行開始\n"); // Start running + osSyncPrintf("mainproc 実行開始\n"); // "Start running" gScreenWidth = SCREEN_WIDTH; gScreenHeight = SCREEN_HEIGHT; gAppNmiBufferPtr = (PreNmiBuff*)osAppNmiBuffer; @@ -53,8 +53,9 @@ void Main(void* arg) { sysHeap = (u32)gSystemHeap; fb = SysCfb_GetFbPtr(0); gSystemHeapSize = (fb - sysHeap); - osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", sysHeap, fb, gSystemHeapSize); // System heap initalization - SystemHeap_Init(sysHeap, gSystemHeapSize); // initializes the system heap + // "System heap initalization" + osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", sysHeap, fb, gSystemHeapSize); + SystemHeap_Init(sysHeap, gSystemHeapSize); // initializes the system heap if (osMemSize >= 0x800000U) { debugHeap = SysCfb_GetFbEnd(); debugHeapSize = (s32)(0x80600000 - debugHeap); @@ -77,7 +78,7 @@ void Main(void* arg) { StackCheck_Init(&sIrqMgrStackInfo, sIrqMgrStack, sIrqMgrStack + sizeof(sIrqMgrStack), 0, 0x100, "irqmgr"); IrqMgr_Init(&gIrqMgr, &sGraphStackInfo, Z_PRIORITY_IRQMGR, 1); - osSyncPrintf("タスクスケジューラの初期化\n"); // Initialize the task scheduler + osSyncPrintf("タスクスケジューラの初期化\n"); // "Initialize the task scheduler" StackCheck_Init(&sSchedStackInfo, sSchedStack, sSchedStack + sizeof(sSchedStack), 0, 0x100, "sched"); Sched_Init(&gSchedContext, &sAudioStack, Z_PRIORITY_SCHED, D_80013960, 1, &gIrqMgr); @@ -103,13 +104,13 @@ void Main(void* arg) { break; } if (*msg == OS_SC_PRE_NMI_MSG) { - osSyncPrintf("main.c: リセットされたみたいだよ\n"); // Looks like it's been reset + osSyncPrintf("main.c: リセットされたみたいだよ\n"); // "Looks like it's been reset" PreNmiBuff_SetReset(gAppNmiBufferPtr); } } - osSyncPrintf("mainproc 後始末\n"); // Cleanup + osSyncPrintf("mainproc 後始末\n"); // "Cleanup" osDestroyThread(&sGraphThread); func_800FBFD8(); - osSyncPrintf("mainproc 実行終了\n"); // End of execution + osSyncPrintf("mainproc 実行終了\n"); // "End of execution" } diff --git a/src/code/padmgr.c b/src/code/padmgr.c index e180c9f7f9..e7303e830a 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -167,7 +167,8 @@ void PadMgr_RumbleStop(PadMgr* padMgr) { if (osProbeRumblePak(ctrlrQ, &padMgr->pfs[i], i) == 0) { if ((gFaultStruct.msgId == 0) && (padMgr->rumbleOnFrames != 0)) { osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック 停止"); // "Stop vibration pack" + // "Stop vibration pack" + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック 停止"); osSyncPrintf(VT_RST); } @@ -227,7 +228,8 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) { input->cur = input->prev; LOG_NUM("this->Key_switch[i]", padMgr->ctrlrIsConnected[i], "../padmgr.c", 380); osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "オーバーランエラーが発生"); // "Overrun error occurred" + // "Overrun error occurred" + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "オーバーランエラーが発生"); osSyncPrintf(VT_RST); break; case 8: @@ -240,7 +242,8 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) { padMgr->pakType[i] = 0; padMgr->rumbleCounter[i] = 0xFF; osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "応答しません"); // "Do not respond"? + // "Do not respond"? + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "応答しません"); osSyncPrintf(VT_RST); } break; @@ -351,8 +354,7 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) { s16* mesg = NULL; s32 exit; - // "Controller thread execution start" - osSyncPrintf("コントローラスレッド実行開始\n"); + osSyncPrintf("コントローラスレッド実行開始\n"); // "Controller thread execution start" exit = false; while (!exit) { @@ -388,13 +390,11 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) { IrqMgr_RemoveClient(padMgr->irqMgr, &padMgr->irqClient); - // "Controller thread execution end" - osSyncPrintf("コントローラスレッド実行終了\n"); + osSyncPrintf("コントローラスレッド実行終了\n"); // "Controller thread execution end" } void PadMgr_Init(PadMgr* padMgr, OSMesgQueue* siIntMsgQ, IrqMgr* irqMgr, OSId id, OSPri priority, void* stack) { - // "Pad Manager creation" - osSyncPrintf("パッドマネージャ作成 padmgr_Create()\n"); + osSyncPrintf("パッドマネージャ作成 padmgr_Create()\n"); // "Pad Manager creation" bzero(padMgr, sizeof(PadMgr)); padMgr->irqMgr = irqMgr; diff --git a/src/code/sched.c b/src/code/sched.c index cce050822c..95385f1272 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -106,7 +106,7 @@ void Sched_QueueTask(SchedContext* sc, OSScTask* task) { if (type == M_AUDTASK) { if (sLogScheduler) { - // You have entered an audio task + // "You have entered an audio task" osSyncPrintf("オーディオタスクをエントリしました\n"); } if (sc->audioListTail != NULL) { @@ -118,8 +118,7 @@ void Sched_QueueTask(SchedContext* sc, OSScTask* task) { sc->doAudio = 1; } else { if (sLogScheduler) { - // Entered graph task - osSyncPrintf("グラフタスクをエントリしました\n"); + osSyncPrintf("グラフタスクをエントリしました\n"); // "Entered graph task" } if (sc->gfxListTail != NULL) { diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 8d3c280401..4e81327eaf 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -8,15 +8,14 @@ void SysCfb_Init(s32 n64dd) { u32 tmpFbEnd; if (osMemSize >= 0x800000U) { - // 8MB or more memory is installed + // "8MB or more memory is installed" osSyncPrintf("８Ｍバイト以上のメモリが搭載されています\n"); tmpFbEnd = 0x8044BE80; if (n64dd == 1) { - // RAM 8M mode (N64DD compatible) - osSyncPrintf("RAM 8M mode (N64DD対応)\n"); + osSyncPrintf("RAM 8M mode (N64DD対応)\n"); // "RAM 8M mode (N64DD compatible)" sSysCfbEnd = 0x805FB000; } else { - // The margin for this version is% dK bytes + // "The margin for this version is %dK bytes" osSyncPrintf("このバージョンのマージンは %dK バイトです\n", (0x4BC00 / 1024)); sSysCfbEnd = tmpFbEnd; } @@ -29,11 +28,11 @@ void SysCfb_Init(s32 n64dd) { screenSize = SCREEN_WIDTH * SCREEN_HEIGHT; sSysCfbEnd &= ~0x3f; - // The final address used by the system is% 08x + // "The final address used by the system is %08x" osSyncPrintf("システムが使用する最終アドレスは %08x です\n", sSysCfbEnd); sSysCfbFbPtr[0] = sSysCfbEnd - (screenSize * 4); sSysCfbFbPtr[1] = sSysCfbEnd - (screenSize * 2); - // Frame buffer addresses are% 08x and% 08x + // "Frame buffer addresses are %08x and %08x" osSyncPrintf("フレームバッファのアドレスは %08x と %08x です\n", sSysCfbFbPtr[0], sSysCfbFbPtr[1]); } diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index b3509751a1..d442b7c4a0 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -121,10 +121,9 @@ void Math3D_LineClosestToPoint(Linef* line, Vec3f* pos, Vec3f* closestPoint) { dirVectorSize = Math3D_Vec3fMagnitudeSq(&line->b); if (IS_ZERO(dirVectorSize)) { osSyncPrintf(VT_COL(YELLOW, BLACK)); - // Math3D_lineVsPosSuisenCross(): No straight line length + // "Math3D_lineVsPosSuisenCross(): No straight line length" osSyncPrintf("Math3D_lineVsPosSuisenCross():直線の長さがありません\n"); - // Returns cross = pos. - osSyncPrintf("cross = pos を返します。\n"); + osSyncPrintf("cross = pos を返します。\n"); // "Returns cross = pos." osSyncPrintf(VT_RST); Math_Vec3f_Copy(closestPoint, pos); } @@ -924,7 +923,7 @@ f32 Math3D_UDistPlaneToPos(f32 nx, f32 ny, f32 nz, f32 originDist, Vec3f* p) { if (IS_ZERO(sqrtf(SQ(nx) + SQ(ny) + SQ(nz)))) { osSyncPrintf(VT_COL(YELLOW, BLACK)); - // Math3DLengthPlaneAndPos(): Normal size is near zero %f %f %f + // "Math3DLengthPlaneAndPos(): Normal size is near zero %f %f %f" osSyncPrintf("Math3DLengthPlaneAndPos():法線size がゼロ近いです%f %f %f\n", nx, ny, nz); osSyncPrintf(VT_RST); return 0.0f; @@ -942,7 +941,7 @@ f32 Math3D_DistPlaneToPos(f32 nx, f32 ny, f32 nz, f32 originDist, Vec3f* p) { normMagnitude = sqrtf(SQ(nx) + SQ(ny) + SQ(nz)); if (IS_ZERO(normMagnitude)) { osSyncPrintf(VT_COL(YELLOW, BLACK)); - // Math3DSignedLengthPlaneAndPos(): Normal size is close to zero %f %f %f + // "Math3DSignedLengthPlaneAndPos(): Normal size is close to zero %f %f %f" osSyncPrintf("Math3DSignedLengthPlaneAndPos():法線size がゼロ近いです%f %f %f\n", nx, ny, nz); osSyncPrintf(VT_RST); return 0.0f; diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c index 7311ce102b..c0fb70bc2c 100644 --- a/src/code/system_malloc.c +++ b/src/code/system_malloc.c @@ -83,8 +83,7 @@ void* SystemArena_Calloc(u32 num, u32 size) { } void SystemArena_Display(void) { - // System heap display - osSyncPrintf("システムヒープ表示\n"); + osSyncPrintf("システムヒープ表示\n"); // "System heap display" __osDisplayArena(&gSystemArena); } diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 94c5366250..1e709dc12b 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -1,8 +1,7 @@ #include "global.h" void TitleSetup_InitImpl(GameState* gameState) { - // Zelda common data initalization - osSyncPrintf("ゼルダ共通データ初期化\n"); + osSyncPrintf("ゼルダ共通データ初期化\n"); // "Zelda common data initalization" SaveContext_Init(); gameState->running = false; SET_NEXT_GAMESTATE(gameState, Title_Init, TitleContext); diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 00335dd20f..1db6b7e6ae 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -155,8 +155,7 @@ void UCodeDisas_SetCurUCodeImpl(UCodeDisas* this, void* ptr) { } } if (i >= this->ucodeInfoCount) { - // Microcode did not match - DISAS_LOG("マイクロコードが一致しなかった\n"); + DISAS_LOG("マイクロコードが一致しなかった\n"); // "Microcode did not match" this->ucodeType = UCODE_NULL; } } diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c index a8e8a13fcb..b51cfee434 100644 --- a/src/code/z_DLF.c +++ b/src/code/z_DLF.c @@ -3,8 +3,7 @@ void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { if (overlayEntry->loadedRamAddr != NULL) { - // Translates to: "ALREADY LINKED" - osSyncPrintf("既にリンクされています\n"); + osSyncPrintf("既にリンクされています\n"); // "Already linked" return; } @@ -15,8 +14,7 @@ void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { overlayEntry->vramStart, overlayEntry->vramEnd); if (overlayEntry->loadedRamAddr == NULL) { - // Translates to: "LOADING FAILED" - osSyncPrintf("ロードに失敗しました\n"); + osSyncPrintf("ロードに失敗しました\n"); // "Loading failed" return; } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 588c10c9d4..77ac238062 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -842,7 +842,7 @@ void Actor_Destroy(Actor* actor, GlobalContext* globalCtx) { overlayEntry = actor->overlayEntry; name = overlayEntry->name != NULL ? overlayEntry->name : ""; - // Translates to: "NO Actor CLASS DESTRUCT [%s]" + // "No Actor class destruct [%s]" osSyncPrintf("Ａｃｔｏｒクラス デストラクトがありません [%s]\n" VT_RST, name); } } @@ -2170,12 +2170,10 @@ void Actor_FaultPrint(Actor* actor, char* command) { overlayEntry = actor->overlayEntry; name = overlayEntry->name != NULL ? overlayEntry->name : ""; - // Translates to: "ACTOR NAME(%08x:%s)" - osSyncPrintf("アクターの名前(%08x:%s)\n", actor, name); + osSyncPrintf("アクターの名前(%08x:%s)\n", actor, name); // "Actor name (%08x:%s)" if (command != NULL) { - // Translates to: "COMMAND:%s" - osSyncPrintf("コメント:%s\n", command); + osSyncPrintf("コメント:%s\n", command); // "Command:%s" } FaultDrawer_SetCursor(48, 24); @@ -2284,8 +2282,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv OPEN_DISPS(gfxCtx, "../z_actor.c", 6197); - // Translates to: "MAGIC LENS START" - gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ START", 0); + gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ START", 0); // "Magic lens START" gDPPipeSync(POLY_XLU_DISP++); @@ -2312,22 +2309,21 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv func_80030FA8(gfxCtx); - // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY START" + // "Magic lens invisible Actor display START" gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 START", numInvisibleActors); invisibleActor = &invisibleActors[0]; for (i = 0; i < numInvisibleActors; i++) { - // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY" + // "Magic lens invisible Actor display" gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示", i); Actor_Draw(globalCtx, *(invisibleActor++)); } - // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY END" + // "Magic lens invisible Actor display END" gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ 見えないＡcｔｏｒ表示 END", numInvisibleActors); if (globalCtx->roomCtx.curRoom.showInvisActors != 0) { - // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 0); + gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 0); // "Blue spectacles (exterior)" gDPPipeSync(POLY_XLU_DISP++); @@ -2340,12 +2336,10 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv func_80030FA8(gfxCtx); - // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 1); + gDPNoOpString(POLY_OPA_DISP++, "青い眼鏡(外側)", 1); // "Blue spectacles (exterior)" } - // Translates to: "MAGIC LENS END" - gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ END", 0); + gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ END", 0); // "Magic lens END" CLOSE_DISPS(gfxCtx, "../z_actor.c", 6284); } @@ -2544,8 +2538,7 @@ void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx) { } if (HREG(20) != 0) { - // Translates to: "ABSOLUTE MAGIC FIELD DEALLOCATION" - osSyncPrintf("絶対魔法領域解放\n"); + osSyncPrintf("絶対魔法領域解放\n"); // "Absolute magic field deallocation" } if (actorCtx->absoluteSpace != NULL) { @@ -2617,33 +2610,30 @@ void Actor_FreeOverlay(ActorOverlay* actorOverlay) { if (actorOverlay->numLoaded == 0) { if (HREG(20) != 0) { - // Translates to: "ACTOR CLIENT IS NOW 0" - osSyncPrintf("アクタークライアントが０になりました\n"); + osSyncPrintf("アクタークライアントが０になりました\n"); // "Actor client is now 0" } if (actorOverlay->loadedRamAddr != NULL) { if (actorOverlay->allocType & ALLOCTYPE_PERMANENT) { if (HREG(20) != 0) { - // Translates to: "OVERLAY WILL NOT BE DEALLOCATED" - osSyncPrintf("オーバーレイ解放しません\n"); + osSyncPrintf("オーバーレイ解放しません\n"); // "Overlay will not be deallocated" } } else if (actorOverlay->allocType & ALLOCTYPE_ABSOLUTE) { if (HREG(20) != 0) { - // Translates to: "ABSOLUTE MAGIC FIELD RESERVED, SO DEALLOCATION WILL NOT OCCUR" + // "Absolute magic field reserved, so deallocation will not occur" osSyncPrintf("絶対魔法領域確保なので解放しません\n"); } actorOverlay->loadedRamAddr = NULL; } else { if (HREG(20) != 0) { - // Translates to: "OVERLAY DEALLOCATED" - osSyncPrintf("オーバーレイ解放します\n"); + osSyncPrintf("オーバーレイ解放します\n"); // "Overlay deallocated" } ZeldaArena_FreeDebug(actorOverlay->loadedRamAddr, "../z_actor.c", 6834); actorOverlay->loadedRamAddr = NULL; } } } else if (HREG(20) != 0) { - // Translates to: "%d OF ACTOR CLIENT REMAINS" + // "%d of actor client remains" osSyncPrintf("アクタークライアントはあと %d 残っています\n", actorOverlay->numLoaded); } @@ -2668,38 +2658,36 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart; if (HREG(20) != 0) { - // Translates to: "ACTOR CLASS ADDITION [%d:%s]" + // "Actor class addition [%d:%s]" osSyncPrintf("アクタークラス追加 [%d:%s]\n", actorId, name); } if (actorCtx->total > ACTOR_NUMBER_MAX) { - // Translates to: "Ａｃｔｏｒ SET NUMBER EXCEEDED" + // "Ａｃｔｏｒ set number exceeded" osSyncPrintf(VT_COL(YELLOW, BLACK) "Ａｃｔｏｒセット数オーバー\n" VT_RST); return NULL; } if (overlayEntry->vramStart == 0) { if (HREG(20) != 0) { - // Translates to: "NOT AN OVERLAY" - osSyncPrintf("オーバーレイではありません\n"); + osSyncPrintf("オーバーレイではありません\n"); // "Not an overlay" } actorInit = overlayEntry->initInfo; } else { if (overlayEntry->loadedRamAddr != NULL) { if (HREG(20) != 0) { - // Translates to: "ALREADY LOADED" - osSyncPrintf("既にロードされています\n"); + osSyncPrintf("既にロードされています\n"); // "Already loaded" } } else { if (overlayEntry->allocType & ALLOCTYPE_ABSOLUTE) { ASSERT(overlaySize <= AM_FIELD_SIZE, "actor_segsize <= AM_FIELD_SIZE", "../z_actor.c", 6934); if (actorCtx->absoluteSpace == NULL) { - // Translates to: "AMF: ABSOLUTE MAGIC FIELD" + // "AMF: absolute magic field" actorCtx->absoluteSpace = ZeldaArena_MallocRDebug(AM_FIELD_SIZE, "AMF:絶対魔法領域", 0); if (HREG(20) != 0) { - // Translates to: "ABSOLUTE MAGIC FIELD RESERVATION - %d BYTES RESERVED" + // "Absolute magic field reservation - %d bytes reserved" osSyncPrintf("絶対魔法領域確保 %d バイト確保\n", AM_FIELD_SIZE); } } @@ -2712,7 +2700,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId } if (overlayEntry->loadedRamAddr == NULL) { - // Translates to: "CANNOT RESERVE ACTOR PROGRAM MEMORY" + // "Cannot reserve actor program memory" osSyncPrintf(VT_COL(RED, WHITE) "Ａｃｔｏｒプログラムメモリが確保できません\n" VT_RST); return NULL; } @@ -2740,7 +2728,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId if ((objBankIndex < 0) || ((actorInit->category == ACTORCAT_ENEMY) && (Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)))) { - // Translates to: "NO DATA BANK!! (profilep->bank=%d)" + // "No data bank!! (profilep->bank=%d)" osSyncPrintf(VT_COL(RED, WHITE) "データバンク無し！！<データバンク＝%d>(profilep->bank=%d)\n" VT_RST, objBankIndex, actorInit->objectId); Actor_FreeOverlay(overlayEntry); @@ -2750,7 +2738,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId actor = ZeldaArena_MallocDebug(actorInit->instanceSize, name, 1); if (actor == NULL) { - // Translates to: "ACTOR CLASS CANNOT BE RESERVED! %s " + // "Actor class cannot be reserved! %s " osSyncPrintf(VT_COL(RED, WHITE) "Ａｃｔｏｒクラス確保できません！ %s <サイズ＝%dバイト>\n", VT_RST, name, actorInit->instanceSize); Actor_FreeOverlay(overlayEntry); @@ -2762,7 +2750,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId overlayEntry->numLoaded++; if (HREG(20) != 0) { - // Translates to: "ACTOR CLIENT No. %d" + // "Actor client No. %d" osSyncPrintf("アクタークライアントは %d 個目です\n", overlayEntry->numLoaded); } @@ -2862,8 +2850,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC name = overlayEntry->name != NULL ? overlayEntry->name : ""; if (HREG(20) != 0) { - // Translates to: "ACTOR CLASS DELETED [%s]" - osSyncPrintf("アクタークラス削除 [%s]\n", name); + osSyncPrintf("アクタークラス削除 [%s]\n", name); // "Actor class deleted [%s]" } if ((player != NULL) && (actor == player->unk_664)) { @@ -2892,8 +2879,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC if (overlayEntry->vramStart == 0) { if (HREG(20) != 0) { - // Translates to: "NOT AN OVERLAY" - osSyncPrintf("オーバーレイではありません\n"); + osSyncPrintf("オーバーレイではありません\n"); // "Not an overlay" } } else { ASSERT(overlayEntry->loadedRamAddr != NULL, "actor_dlftbl->allocp != NULL", "../z_actor.c", 7251); diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 4c13653c1b..fb9a3afd26 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -45,7 +45,7 @@ s32 BgCheck_PosErrorCheck(Vec3f* pos, char* file, s32 line) { if (pos->x >= BGCHECK_XYZ_ABSMAX || pos->x <= -BGCHECK_XYZ_ABSMAX || pos->y >= BGCHECK_XYZ_ABSMAX || pos->y <= -BGCHECK_XYZ_ABSMAX || pos->z >= BGCHECK_XYZ_ABSMAX || pos->z <= -BGCHECK_XYZ_ABSMAX) { osSyncPrintf(VT_FGCOL(RED)); - // "Translates to: Position is invalid." + // "Position is invalid." osSyncPrintf("T_BGCheck_PosErrorCheck():位置が妥当ではありません。pos (%f,%f,%f) file:%s line:%d\n", pos->x, pos->y, pos->z, file, line); osSyncPrintf(VT_RST); @@ -268,7 +268,7 @@ void CollisionPoly_GetVerticesByBgId(CollisionPoly* poly, s32 bgId, CollisionCon if (poly == NULL || bgId > BG_ACTOR_MAX || dest == NULL) { osSyncPrintf(VT_COL(RED, WHITE)); - // translates to: "Argument not appropriate. Processing terminated." + // "Argument not appropriate. Processing terminated." osSyncPrintf("T_Polygon_GetVertex_bg_ai(): Error %d %d %d 引数が適切ではありません。処理を終了します。\n", poly == NULL, bgId > BG_ACTOR_MAX, dest == NULL); osSyncPrintf(VT_RST); @@ -1505,16 +1505,16 @@ void BgCheck_Allocate(CollisionContext* colCtx, GlobalContext* globalCtx, Collis colCtx->colHeader = colHeader; customNodeListMax = -1; - // /*---------------- BGCheck Buffer Memory Size -------------*/\n + // "/*---------------- BGCheck Buffer Memory Size -------------*/\n" osSyncPrintf("/*---------------- BGCheck バッファーメモリサイズ -------------*/\n"); if (YREG(15) == 0x10 || YREG(15) == 0x20 || YREG(15) == 0x30 || YREG(15) == 0x40) { if (globalCtx->sceneNum == SCENE_MALON_STABLE) { - // /* BGCheck LonLon Size %dbyte */\n + // "/* BGCheck LonLon Size %dbyte */\n" osSyncPrintf("/* BGCheck LonLonサイズ %dbyte */\n", 0x3520); colCtx->memSize = 0x3520; } else { - // /* BGCheck Mini Size %dbyte */\n + // "/* BGCheck Mini Size %dbyte */\n" osSyncPrintf("/* BGCheck ミニサイズ %dbyte */\n", 0x4E20); colCtx->memSize = 0x4E20; } @@ -1526,7 +1526,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, GlobalContext* globalCtx, Collis colCtx->subdivAmount.z = 2; } else if (BgCheck_IsSpotScene(globalCtx) == true) { colCtx->memSize = 0xF000; - // /* BGCheck Spot Size %dbyte */\n + // "/* BGCheck Spot Size %dbyte */\n" osSyncPrintf("/* BGCheck Spot用サイズ %dbyte */\n", 0xF000); colCtx->dyna.polyNodesMax = 1000; colCtx->dyna.polyListMax = 512; @@ -1540,7 +1540,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, GlobalContext* globalCtx, Collis } else { colCtx->memSize = 0x1CC00; } - // /* BGCheck Normal Size %dbyte */\n + // "/* BGCheck Normal Size %dbyte */\n" osSyncPrintf("/* BGCheck ノーマルサイズ %dbyte */\n", colCtx->memSize); colCtx->dyna.polyNodesMax = 1000; colCtx->dyna.polyListMax = 512; @@ -2700,17 +2700,17 @@ void DynaPoly_DeleteBgActor(GlobalContext* globalCtx, DynaCollisionContext* dyna if (bgId == -1) { osSyncPrintf(VT_FGCOL(GREEN)); + // "The index that should have been deleted(? ) was(== -1), processing aborted." osSyncPrintf( "DynaPolyInfo_delReserve():削除されているはずの(?)\nインデックス(== -1)のため,処理を中止します。\n"); - // The index that should have been deleted(? ) was(== -1), processing aborted. osSyncPrintf(VT_RST); return; } else { osSyncPrintf(VT_FGCOL(RED)); + // "Unable to deallocate index / index unallocated, processing aborted." osSyncPrintf("DynaPolyInfo_delReserve():" "確保していない／出来なかったインデックスの解放のため、処理を中止します。index == %d\n", bgId); - // Unable to deallocate index / index unallocated, processing aborted. osSyncPrintf(VT_RST); return; } @@ -2768,14 +2768,14 @@ void DynaPoly_ExpandSRT(GlobalContext* globalCtx, DynaCollisionContext* dyna, s3 if (!(dyna->polyListMax >= *polyStartIndex + pbgdata->numPolygons)) { osSyncPrintf(VT_FGCOL(RED)); - // do not use if %d[*polyStartIndex + pbgdata->numPolygons] exceeds %d[dyna->polyListMax] + // "do not use if %d exceeds %d" osSyncPrintf("DynaPolyInfo_expandSRT():polygon over %dが%dを越えるとダメ\n", *polyStartIndex + pbgdata->numPolygons, dyna->polyListMax); } if (!(dyna->vtxListMax >= *vtxStartIndex + pbgdata->numVertices)) { osSyncPrintf(VT_FGCOL(RED)); - // do not use if %d[*vtxStartIndex + pbgdata->numVertices] exceeds %d[dyna->vtxListMax] + // "do not use if %d exceeds %d" osSyncPrintf("DynaPolyInfo_expandSRT():vertex over %dが%dを越えるとダメ\n", *vtxStartIndex + pbgdata->numVertices, dyna->vtxListMax); } diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index a99f6becbd..2d8a32ce3d 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -811,8 +811,7 @@ static DamageTable sDamageTablePresets[] = { // Gets the pointer to one of the 23 preset damage tables. Returns NULL if index is out of range. DamageTable* DamageTable_Get(s32 index) { if (!(0 <= index && index < ARRAY_COUNT(sDamageTablePresets))) { - // Index over - osSyncPrintf("CollisionBtlTbl_get():インデックスオーバー\n"); + osSyncPrintf("CollisionBtlTbl_get():インデックスオーバー\n"); // "Index over" return NULL; } return &sDamageTablePresets[index]; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index d5237bb960..0368803829 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -372,8 +372,7 @@ s32 Collider_SetJntSphToActor(GlobalContext* globalCtx, ColliderJntSph* dest, Co if (dest->elements == NULL) { dest->count = 0; osSyncPrintf(VT_FGCOL(RED)); - // Can not. - osSyncPrintf("ClObjJntSph_set():zelda_malloc()出来ません。\n"); + osSyncPrintf("ClObjJntSph_set():zelda_malloc()出来ません。\n"); // "Can not." osSyncPrintf(VT_RST); return 0; } @@ -402,8 +401,7 @@ s32 Collider_SetJntSphAllocType1(GlobalContext* globalCtx, ColliderJntSph* dest, if (dest->elements == NULL) { dest->count = 0; osSyncPrintf(VT_FGCOL(RED)); - // Can not. - osSyncPrintf("ClObjJntSph_set3():zelda_malloc_出来ません。\n"); + osSyncPrintf("ClObjJntSph_set3():zelda_malloc_出来ません。\n"); // "Can not." osSyncPrintf(VT_RST); return 0; } @@ -431,8 +429,7 @@ s32 Collider_SetJntSphAlloc(GlobalContext* globalCtx, ColliderJntSph* dest, Acto if (dest->elements == NULL) { dest->count = 0; osSyncPrintf(VT_FGCOL(RED)); - // Can not. - osSyncPrintf("ClObjJntSph_set5():zelda_malloc出来ません\n"); + osSyncPrintf("ClObjJntSph_set5():zelda_malloc出来ません\n"); // "Can not." osSyncPrintf(VT_RST); return 0; } @@ -741,8 +738,7 @@ s32 Collider_SetTrisAllocType1(GlobalContext* globalCtx, ColliderTris* dest, Act if (dest->elements == NULL) { dest->count = 0; osSyncPrintf(VT_FGCOL(RED)); - // Can not. - osSyncPrintf("ClObjTris_set3():zelda_malloc()出来ません\n"); + osSyncPrintf("ClObjTris_set3():zelda_malloc()出来ません\n"); // "Can not." osSyncPrintf(VT_RST); return 0; } @@ -768,8 +764,7 @@ s32 Collider_SetTrisAlloc(GlobalContext* globalCtx, ColliderTris* dest, Actor* a if (dest->elements == NULL) { osSyncPrintf(VT_FGCOL(RED)); - // Can not. - osSyncPrintf("ClObjTris_set5():zelda_malloc出来ません\n"); + osSyncPrintf("ClObjTris_set5():zelda_malloc出来ません\n"); // "Can not." osSyncPrintf(VT_RST); dest->count = 0; return 0; @@ -1191,7 +1186,7 @@ s32 CollisionCheck_SetAT(GlobalContext* globalCtx, CollisionCheckContext* colChk return -1; } if (colChkCtx->colATCount >= COLLISION_CHECK_AT_MAX) { - // Index exceeded and cannot add more + // "Index exceeded and cannot add more" osSyncPrintf("CollisionCheck_setAT():インデックスがオーバーして追加不能\n"); return -1; } @@ -1220,14 +1215,14 @@ s32 CollisionCheck_SetAT_SAC(GlobalContext* globalCtx, CollisionCheckContext* co } if (colChkCtx->sacFlags & 1) { if (!(index < colChkCtx->colATCount)) { - // You are trying to register a location that is larger than the total number of data. + // "You are trying to register a location that is larger than the total number of data." osSyncPrintf("CollisionCheck_setAT_SAC():全データ数より大きいところに登録しようとしている。\n"); return -1; } colChkCtx->colAT[index] = collider; } else { if (!(colChkCtx->colATCount < COLLISION_CHECK_AT_MAX)) { - // Index exceeded and cannot add more + // "Index exceeded and cannot add more" osSyncPrintf("CollisionCheck_setAT():インデックスがオーバーして追加不能\n"); return -1; } @@ -1260,7 +1255,7 @@ s32 CollisionCheck_SetAC(GlobalContext* globalCtx, CollisionCheckContext* colChk return -1; } if (colChkCtx->colACCount >= COLLISION_CHECK_AC_MAX) { - // Index exceeded and cannot add more + // "Index exceeded and cannot add more" osSyncPrintf("CollisionCheck_setAC():インデックスがオーバして追加不能\n"); return -1; } @@ -1289,14 +1284,14 @@ s32 CollisionCheck_SetAC_SAC(GlobalContext* globalCtx, CollisionCheckContext* co } if (colChkCtx->sacFlags & 1) { if (!(index < colChkCtx->colACCount)) { - // You are trying to register a location that is larger than the total number of data. + // "You are trying to register a location that is larger than the total number of data." osSyncPrintf("CollisionCheck_setAC_SAC():全データ数より大きいところに登録しようとしている。\n"); return -1; } colChkCtx->colAC[index] = collider; } else { if (!(colChkCtx->colACCount < COLLISION_CHECK_AC_MAX)) { - // Index exceeded and cannot add more + // "Index exceeded and cannot add more" osSyncPrintf("CollisionCheck_setAC():インデックスがオーバして追加不能\n"); return -1; } @@ -1331,7 +1326,7 @@ s32 CollisionCheck_SetOC(GlobalContext* globalCtx, CollisionCheckContext* colChk return -1; } if (colChkCtx->colOCCount >= COLLISION_CHECK_OC_MAX) { - // Index exceeded and cannot add more + // "Index exceeded and cannot add more" osSyncPrintf("CollisionCheck_setOC():インデックスがオーバして追加不能\n"); return -1; } @@ -1360,7 +1355,7 @@ s32 CollisionCheck_SetOC_SAC(GlobalContext* globalCtx, CollisionCheckContext* co } if (colChkCtx->sacFlags & 1) { if (!(index < colChkCtx->colOCCount)) { - // You are trying to register a location that is larger than the total number of data. + // "You are trying to register a location that is larger than the total number of data." osSyncPrintf("CollisionCheck_setOC_SAC():全データ数より大きいところに登録しようとしている。\n"); return -1; } @@ -1368,7 +1363,7 @@ s32 CollisionCheck_SetOC_SAC(GlobalContext* globalCtx, CollisionCheckContext* co colChkCtx->colAT[index] = collider; } else { if (!(colChkCtx->colOCCount < COLLISION_CHECK_OC_MAX)) { - // Index exceeded and cannot add more + // "Index exceeded and cannot add more" osSyncPrintf("CollisionCheck_setOC():インデックスがオーバして追加不能\n"); return -1; } @@ -1390,7 +1385,7 @@ s32 CollisionCheck_SetOCLine(GlobalContext* globalCtx, CollisionCheckContext* co } Collider_ResetLineOC(globalCtx, collider); if (!(colChkCtx->colLineCount < COLLISION_CHECK_OC_LINE_MAX)) { - // Index exceeded and cannot add more + // "Index exceeded and cannot add more" osSyncPrintf("CollisionCheck_setOCLine():インデックスがオーバして追加不能\n"); return -1; } @@ -2904,7 +2899,7 @@ void CollisionCheck_OC(GlobalContext* globalCtx, CollisionCheckContext* colChkCt } vsFunc = sOCVsFuncs[(*left)->shape][(*right)->shape]; if (vsFunc == NULL) { - // Not compatible + // "Not compatible" osSyncPrintf("CollisionCheck_OC():未対応 %d, %d\n", (*left)->shape, (*right)->shape); continue; } @@ -3163,7 +3158,7 @@ s32 CollisionCheck_LineOC(GlobalContext* globalCtx, CollisionCheckContext* colCh } lineCheck = sOCLineCheckFuncs[(*col)->shape]; if (lineCheck == NULL) { - // type %d not supported + // "type %d not supported" osSyncPrintf("CollisionCheck_generalLineOcCheck():未対応 %dタイプ\n", (*col)->shape); } else { result = lineCheck(globalCtx, colChkCtx, (*col), a, b); diff --git a/src/code/z_construct.c b/src/code/z_construct.c index 324ce1d5e3..1d14c7c629 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -29,7 +29,7 @@ void func_801109B0(GlobalContext* globalCtx) { parameterSize = (u32)_parameter_staticSegmentRomEnd - (u32)_parameter_staticSegmentRomStart; - // Translates to: "Permanent PARAMETER Segment = %x" + // "Permanent PARAMETER Segment = %x" osSyncPrintf("常駐ＰＡＲＡＭＥＴＥＲセグメント=%x\n", parameterSize); interfaceCtx->parameterSegment = GameState_Alloc(&globalCtx->state, parameterSize, "../z_construct.c", 159); @@ -42,8 +42,7 @@ void func_801109B0(GlobalContext* globalCtx) { interfaceCtx->doActionSegment = GameState_Alloc(&globalCtx->state, 0x480, "../z_construct.c", 166); - // Translates to: "DO Action Texture Initialization" - osSyncPrintf("ＤＯアクション テクスチャ初期=%x\n", 0x480); + osSyncPrintf("ＤＯアクション テクスチャ初期=%x\n", 0x480); // "DO Action Texture Initialization" osSyncPrintf("parameter->do_actionSegment=%x\n", interfaceCtx->doActionSegment); ASSERT(interfaceCtx->doActionSegment != NULL, "parameter->do_actionSegment != NULL", "../z_construct.c", 169); @@ -72,7 +71,7 @@ void func_801109B0(GlobalContext* globalCtx) { interfaceCtx->iconItemSegment = GameState_Alloc(&globalCtx->state, 0x4000, "../z_construct.c", 190); - // Translates to: "Icon Item Texture Initialization = %x" + // "Icon Item Texture Initialization = %x" osSyncPrintf("アイコンアイテム テクスチャ初期=%x\n", 0x4000); osSyncPrintf("parameter->icon_itemSegment=%x\n", interfaceCtx->iconItemSegment); @@ -141,12 +140,11 @@ void func_801109B0(GlobalContext* globalCtx) { if ((gSaveContext.timer1State >= 11) && (gSaveContext.timer1State < 16)) { gSaveContext.timer1State = 0; - // Translates to: "Timer Stop!!!!!!!!!!!!!!!!!!!!!!" + // "Timer Stop!!!!!!!!!!!!!!!!!!!!!!" osSyncPrintf("タイマー停止！！！！！！！！！！！！！！！！！！！！！ = %d\n", gSaveContext.timer1State); } - // Translates to: "Parameter Area = %x" - osSyncPrintf("ＰＡＲＡＭＥＴＥＲ領域＝%x\n", parameterSize + 0x5300); + osSyncPrintf("ＰＡＲＡＭＥＴＥＲ領域＝%x\n", parameterSize + 0x5300); // "Parameter Area = %x" HealthMeter_Init(globalCtx); Map_Init(globalCtx); @@ -185,8 +183,7 @@ void func_80110F68(GlobalContext* globalCtx) { osSyncPrintf("message->fukidashiSegment=%x\n", msgCtx->textboxSegment); - // Translates to: "Textbox game_alloc=%x" - osSyncPrintf("吹き出しgame_alloc=%x\n", 0x2200); + osSyncPrintf("吹き出しgame_alloc=%x\n", 0x2200); // "Textbox game_alloc=%x" ASSERT(msgCtx->textboxSegment != NULL, "message->fukidashiSegment != NULL", "../z_construct.c", 352); Font_LoadOrderedFont(&globalCtx->msgCtx.font); diff --git a/src/code/z_demo.c b/src/code/z_demo.c index b0dd00118e..09ada34433 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -119,8 +119,7 @@ void func_800645A0(GlobalContext* globalCtx, CutsceneContext* csCtx) { } if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE)) { - // Translates to: "CUTSCENE START REQUEST ANNOUNCEMENT!" - osSyncPrintf("\nデモ開始要求 発令！"); + osSyncPrintf("\nデモ開始要求 発令！"); // "Cutscene start request announcement!" gSaveContext.cutsceneIndex = 0xFFFD; gSaveContext.cutsceneTrigger = 1; } @@ -460,8 +459,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt Audio_SetCutsceneFlag(0); gSaveContext.unk_1410 = 1; - // Translates to: "FUTURE FORK DESIGNATION=No. [%d]" - osSyncPrintf("\n分岐先指定！！=[%d]番", cmd->base); + osSyncPrintf("\n分岐先指定！！=[%d]番", cmd->base); // "Future fork designation=No. [%d]" if ((gSaveContext.gameMode != 0) && (csCtx->frames != cmd->startFrame)) { gSaveContext.unk_13E7 = 1; @@ -1902,8 +1900,7 @@ void func_80068DC0(GlobalContext* globalCtx, CutsceneContext* csCtx) { csCtx->npcActions[i] = NULL; } - // Translates to: "RIGHT HERE, HUH" - osSyncPrintf("\n\n\n\n\nやっぱりここかいな"); + osSyncPrintf("\n\n\n\n\nやっぱりここかいな"); // "Right here, huh" gSaveContext.cutsceneIndex = 0; gSaveContext.gameMode = 0; diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 2b70b4cb88..301f0adab5 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -18,7 +18,7 @@ void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) { if (this != NULL) { numElements = this->numElements; if (numElements >= 16) { - // Translates to: "Blure vertex addition processing: Table over %d" + // "Blure vertex addition processing: Table over %d" osSyncPrintf("ブラ─頂点追加処理:テーブルオーバー %d\n", numElements); return; } @@ -76,7 +76,7 @@ void EffectBlure_AddSpace(EffectBlure* this) { if (this != NULL) { numElements = this->numElements; if (numElements >= 16) { - // Translates to: "Blure space addition processing: Table over %d" + // "Blure space addition processing: Table over %d" osSyncPrintf("ブラ─空白追加処理:テーブルオーバー %d\n", numElements); return; } @@ -407,7 +407,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* vtx = Graph_Alloc(gfxCtx, sizeof(Vtx[4])); if (vtx == NULL) { - // Translates to: "Vertices cannot be secured." + // "Vertices cannot be secured." osSyncPrintf("z_eff_blure.c::SQ_NoInterpolate_disp() 頂点確保できず。\n"); } else { vtx[0].v = baseVtx; @@ -568,7 +568,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem vtx = Graph_Alloc(gfxCtx, sizeof(Vtx[16])); if (vtx == NULL) { - // Translates to: "Vertices cannot be secured." + // "Vertices cannot be secured." osSyncPrintf("z_eff_blure.c::SQ_HermiteInterpolate_disp() 頂点確保できず。\n"); } else { Math_Vec3f_Diff(&sp1CC, &sp138, &sp158); @@ -811,7 +811,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &sp94); if (mtx == NULL) { - // Translates to: "Forced termination because a matrix cannot be taken" + // "Forced termination because a matrix cannot be taken" osSyncPrintf("EffectBlureInfo2_disp_makeDisplayList()マトリックス取れないので,強制終了\n"); break; } @@ -863,7 +863,7 @@ void EffectBlure_DrawSimple(EffectBlure* this2, GraphicsContext* gfxCtx) { vtx = Graph_Alloc(gfxCtx, vtxCount * sizeof(Vtx)); if (vtx == NULL) { - // Translates to: "Vertices cannot be secured. Forced termination" + // "Vertices cannot be secured. Forced termination" osSyncPrintf("ブラ─表示:頂点確保できず。強制終了\n"); return; } @@ -957,7 +957,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { vtx = Graph_Alloc(gfxCtx, sizeof(Vtx[32])); if (vtx == NULL) { - // Translates to: "Blure display: Vertex table could not be secured" + // "Blure display: Vertex table could not be secured" osSyncPrintf("ブラ─表示:頂点テーブル確保できず\n"); } else { j = 0; diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index dae4d580fb..db0b000e80 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -11,8 +11,7 @@ void EffectSpark_Init(void* thisx, void* initParamsx) { if ((this != NULL) && (initParams != NULL)) { if ((initParams->uDiv == 0) || (initParams->vDiv == 0)) { - // Translates to: "u_div,v_div 0 is not good." - osSyncPrintf("spark():u_div,v_div 0では困る。\n"); + osSyncPrintf("spark():u_div,v_div 0では困る。\n"); // "u_div,v_div 0 is not good." return; } @@ -176,7 +175,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { vertices = Graph_Alloc(gfxCtx, this->numElements * sizeof(Vtx[4])); if (vertices == NULL) { - // Translates to: "Memory Allocation Failure graph_malloc" + // "Memory Allocation Failure graph_malloc" osSyncPrintf("EffectSparkInfo_disp():メモリー確保失敗 graph_malloc\n"); goto end; } diff --git a/src/code/z_effect.c b/src/code/z_effect.c index 391f1c2047..eeeecbd168 100644 --- a/src/code/z_effect.c +++ b/src/code/z_effect.c @@ -144,10 +144,9 @@ void Effect_Add(GlobalContext* globalCtx, s32* pIndex, s32 type, u8 arg3, u8 arg } if (!slotFound) { - // Translates to: "EffectAdd(): I cannot secure it. Be careful. Type %d" + // "EffectAdd(): I cannot secure it. Be careful. Type %d" osSyncPrintf("EffectAdd():確保できません。注意してください。Type%d\n", type); - // Translates to: "Exit without adding the effect." - osSyncPrintf("エフェクト追加せずに終了します。\n"); + osSyncPrintf("エフェクト追加せずに終了します。\n"); // "Exit without adding the effect." } else { sEffectInfoTable[type].init(effect, initParams); status->unk_02 = arg3; diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 22e0065ba8..decc148f0f 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -184,7 +184,7 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart; if (overlayEntry->vramStart == NULL) { - // Translates to: "Not an overlay" + // "Not an overlay" osSyncPrintf("EffectSoftSprite2_makeEffect():オーバーレイではありません。\n"); initInfo = overlayEntry->initInfo; } else { @@ -193,7 +193,7 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init if (overlayEntry->loadedRamAddr == NULL) { osSyncPrintf(VT_FGCOL(RED)); - // Translates to: "The memory of %d byte cannot be secured. Therefore, the program cannot be loaded. + // "The memory of %d byte cannot be secured. Therefore, the program cannot be loaded. // What a dangerous situation! Naturally, effects will not produced either." osSyncPrintf("EffectSoftSprite2_makeEffect():zelda_malloc_r()により,%" "dbyteのメモリ確保ができま\nせん。そのため、プログラムのロードも\n出来ません。ただいま危険" @@ -220,7 +220,7 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init } if (initInfo->init == NULL) { - // Translates to: "Effects have already been loaded, but the constructor is NULL so the addition will not occur. + // "Effects have already been loaded, but the constructor is NULL so the addition will not occur. // Please fix this. (Waste of memory) %08x %d" osSyncPrintf("EffectSoftSprite2_makeEffect():すでにエフェクトはロード済みで\nすが," "コンストラクターがNULLなので追加をやめます。\n直してください。（メモリーの無駄) %08x %d\n", @@ -236,7 +236,7 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init if (initInfo->init(globalCtx, index, &sEffectSsInfo.table[index], initParams) == 0) { osSyncPrintf(VT_FGCOL(GREEN)); - // Translates to: "Construction failed for some reason. The constructor returned an error. + // "Construction failed for some reason. The constructor returned an error. // Ceasing effect addition." osSyncPrintf("EffectSoftSprite2_makeEffect():" "何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。エフェクトの追加を中" @@ -302,7 +302,7 @@ void EffectSs_DrawAll(GlobalContext* globalCtx) { (sEffectSsInfo.table[i].pos.y > 32000.0f) || (sEffectSsInfo.table[i].pos.y < -32000.0f) || (sEffectSsInfo.table[i].pos.z > 32000.0f) || (sEffectSsInfo.table[i].pos.z < -32000.0f)) { osSyncPrintf(VT_FGCOL(RED)); - // Translates to: "Since the position is outside the area, delete it. + // "Since the position is outside the area, delete it. // Effect label No. %d: Please respond by the program. // Here is ==> pos (%f, %f, %f) and the label is in z_effect_soft_sprite_dlftbls.decl." osSyncPrintf("EffectSoftSprite2_disp():位置が領域外のため " @@ -311,7 +311,7 @@ void EffectSs_DrawAll(GlobalContext* globalCtx) { sEffectSsInfo.table[i].type, sEffectSsInfo.table[i].pos.x, sEffectSsInfo.table[i].pos.y, sEffectSsInfo.table[i].pos.z); osSyncPrintf(VT_FGCOL(GREEN)); - // Translates to: "If you are using pos for something else, consult me." + // "If you are using pos for something else, consult me." osSyncPrintf("もし、posを別のことに使っている場合相談に応じます。\n"); osSyncPrintf(VT_RST); diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index f6f3a22f5b..7d33b496d7 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -45,8 +45,7 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) { } } - // "Unplanned conditions" - LOG_STRING("企画外 条件", "../z_elf_message.c", 156); + LOG_STRING("企画外 条件", "../z_elf_message.c", 156); // "Unplanned conditions" ASSERT(0, "0", "../z_elf_message.c", 157); return false; @@ -129,8 +128,7 @@ u16 ElfMessage_GetTextFromMsgs(ElfMessage* msg) { case 0xE0: return msg->byte2 | 0x100; default: - // "Unplanned conditions" - LOG_STRING("企画外 条件", "../z_elf_message.c", 281); + LOG_STRING("企画外 条件", "../z_elf_message.c", 281); // "Unplanned conditions" ASSERT(0, "0", "../z_elf_message.c", 282); } msg++; diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index fb8ed97bd6..3891022383 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -150,7 +150,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* gSPDisplayList(POLY_XLU_DISP++, dList); } } else { - // FcSkeletonInfo_draw_child (): Not supported + // "FcSkeletonInfo_draw_child (): Not supported" osSyncPrintf("FcSkeletonInfo_draw_child():未対応\n"); } } diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 1ba9e37dc3..3a28701162 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -73,7 +73,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 389); } else if ((globalCtx->sceneNum == gSaveContext.horseData.scene) && (Flags_GetEventChkInf(0x18) != 0 || DREG(1) != 0)) { - // Translates to: "SET BY EXISTENCE OF HORSE %d %d %d" + // "Set by existence of horse %d %d %d" osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horseData.scene, Flags_GetEventChkInf(0x18), DREG(1)); @@ -87,7 +87,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { } } else { osSyncPrintf(VT_COL(RED, WHITE)); - // Translates to: "Horse_SetNormal():%d SET SPOT IS NO GOOD." + // "Horse_SetNormal():%d set spot is no good." osSyncPrintf("Horse_SetNormal():%d セットスポットまずいです。\n", gSaveContext.horseData.scene); osSyncPrintf(VT_RST); func_8006D074(globalCtx); @@ -238,7 +238,7 @@ void func_8006DC68(GlobalContext* globalCtx, Player* player) { if (LINK_IS_ADULT) { if (!func_8006CFC0(gSaveContext.horseData.scene)) { osSyncPrintf(VT_COL(RED, WHITE)); - // Translates to: "Horse_Set_Check():%d SET SPOT IS NO GOOD." + // "Horse_Set_Check():%d set spot is no good." osSyncPrintf("Horse_Set_Check():%d セットスポットまずいです。\n", gSaveContext.horseData.scene); osSyncPrintf(VT_RST); func_8006D074(globalCtx); diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 223b68d32a..4f12984f0e 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -220,8 +220,7 @@ void Jpeg_ParseMarkers(u8* ptr, JpegContext* ctx) { break; } default: { - // Unknown marker - osSyncPrintf("マーカー不明 %02x\n", ptr[-1]); + osSyncPrintf("マーカー不明 %02x\n", ptr[-1]); // "Unknown marker" ptr += Jpeg_GetUnalignedU16(ptr); break; } @@ -257,7 +256,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { curTime = osGetTime(); diff = curTime - time; time = curTime; - // Wait for synchronization of fifo buffer + // "Wait for synchronization of fifo buffer" osSyncPrintf("*** fifoバッファの同期待ち time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); ctx.workBuf = workBuff; @@ -266,7 +265,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { curTime = osGetTime(); diff = curTime - time; time = curTime; - // Check markers for each segment + // "Check markers for each segment" osSyncPrintf("*** 各セグメントのマーカーのチェック time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); switch (ctx.dqtCount) { @@ -290,7 +289,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { curTime = osGetTime(); diff = curTime - time; time = curTime; - // Create quantization table + // "Create quantization table" osSyncPrintf("*** 量子化テーブル作成 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); switch (ctx.dhtCount) { @@ -320,7 +319,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { curTime = osGetTime(); diff = curTime - time; time = curTime; - // Huffman table creation + // "Huffman table creation" osSyncPrintf("*** ハフマンテーブル作成 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); decoder.imageData = ctx.imageData; @@ -357,7 +356,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { curTime = osGetTime(); diff = curTime - time; time = curTime; - // Unfold & draw + // "Unfold & draw" osSyncPrintf("*** 展開 & 描画 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); return 0; diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index ba73331af0..1e74f49fd9 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -93,7 +93,7 @@ void* KaleidoManager_GetRamAddr(void* vram) { //! @bug Devs probably forgot iter++ here } - osSyncPrintf("異常\n"); // Abnormal + osSyncPrintf("異常\n"); // "Abnormal" return NULL; } diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 9ab95a8318..2a3def4653 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -31,7 +31,8 @@ void KaleidoScopeCall_LoadPlayer() { } void KaleidoScopeCall_Init(GlobalContext* globalCtx) { - osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n"); // "Kaleidoscope replacement construction" + // "Kaleidoscope replacement construction" + osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n"); sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(KaleidoScope_Update); sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(KaleidoScope_Draw); @@ -45,7 +46,8 @@ void KaleidoScopeCall_Init(GlobalContext* globalCtx) { } void KaleidoScopeCall_Destroy(GlobalContext* globalCtx) { - osSyncPrintf("カレイド・スコープ入れ替え デストラクト \n"); // "Kaleidoscope replacement destruction" + // "Kaleidoscope replacement destruction" + osSyncPrintf("カレイド・スコープ入れ替え デストラクト \n"); KaleidoSetup_Destroy(globalCtx); } @@ -81,14 +83,16 @@ void KaleidoScopeCall_Update(GlobalContext* globalCtx) { if (gKaleidoMgrCurOvl != kaleidoScopeOvl) { if (gKaleidoMgrCurOvl != NULL) { osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("カレイド領域 プレイヤー 強制排除\n"); // "Kaleido area Player Forced Elimination" + // "Kaleido area Player Forced Elimination" + osSyncPrintf("カレイド領域 プレイヤー 強制排除\n"); osSyncPrintf(VT_RST); KaleidoManager_ClearOvl(gKaleidoMgrCurOvl); } osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("カレイド領域 カレイドスコープ搬入\n"); // "Kaleido area Kaleidoscope loading" + // "Kaleido area Kaleidoscope loading" + osSyncPrintf("カレイド領域 カレイドスコープ搬入\n"); osSyncPrintf(VT_RST); KaleidoManager_LoadOvl(kaleidoScopeOvl); @@ -99,7 +103,8 @@ void KaleidoScopeCall_Update(GlobalContext* globalCtx) { if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0)) { osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("カレイド領域 カレイドスコープ排出\n"); // "Kaleido area Kaleidoscope Emission" + // "Kaleido area Kaleidoscope Emission" + osSyncPrintf("カレイド領域 カレイドスコープ排出\n"); osSyncPrintf(VT_RST); KaleidoManager_ClearOvl(kaleidoScopeOvl); diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index 15b5b4c4ca..f9fa2f310e 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -23,40 +23,40 @@ void ZeldaArena_CheckPointer(void* ptr, u32 size, const char* name, const char* void* ZeldaArena_Malloc(u32 size) { void* ptr = __osMalloc(&sZeldaArena, size); - ZeldaArena_CheckPointer(ptr, size, "zelda_malloc", "確保"); // Secure + ZeldaArena_CheckPointer(ptr, size, "zelda_malloc", "確保"); // "Secure" return ptr; } void* ZeldaArena_MallocDebug(u32 size, const char* file, s32 line) { void* ptr = __osMallocDebug(&sZeldaArena, size, file, line); - ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_DEBUG", "確保"); // Secure + ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_DEBUG", "確保"); // "Secure" return ptr; } void* ZeldaArena_MallocR(u32 size) { void* ptr = __osMallocR(&sZeldaArena, size); - ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_r", "確保"); // Secure + ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_r", "確保"); // "Secure" return ptr; } void* ZeldaArena_MallocRDebug(u32 size, const char* file, s32 line) { void* ptr = __osMallocRDebug(&sZeldaArena, size, file, line); - ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_r_DEBUG", "確保"); // Secure + ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_r_DEBUG", "確保"); // "Secure" return ptr; } void* ZeldaArena_Realloc(void* ptr, u32 newSize) { ptr = __osRealloc(&sZeldaArena, ptr, newSize); - ZeldaArena_CheckPointer(ptr, newSize, "zelda_realloc", "再確保"); // Re-securing + ZeldaArena_CheckPointer(ptr, newSize, "zelda_realloc", "再確保"); // "Re-securing" return ptr; } void* ZeldaArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) { ptr = __osReallocDebug(&sZeldaArena, ptr, newSize, file, line); - ZeldaArena_CheckPointer(ptr, newSize, "zelda_realloc_DEBUG", "再確保"); // Re-securing + ZeldaArena_CheckPointer(ptr, newSize, "zelda_realloc_DEBUG", "再確保"); // "Re-securing" return ptr; } @@ -82,8 +82,7 @@ void* ZeldaArena_Calloc(u32 num, u32 size) { } void ZeldaArena_Display() { - // Zelda heap display - osSyncPrintf("ゼルダヒープ表示\n"); + osSyncPrintf("ゼルダヒープ表示\n"); // "Zelda heap display" __osDisplayArena(&sZeldaArena); } diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 54ff428e52..fe13ea7675 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -28,7 +28,7 @@ void Map_SetPaletteData(GlobalContext* globalCtx, s16 room) { } osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "PALETE Set" + // "PALETE Set" osSyncPrintf("ＰＡＬＥＴＥセット 【 i=%x : room=%x 】Room_Inf[%d][4]=%x ( map_palete_no = %d )\n", paletteIndex, room, mapIndex, gSaveContext.sceneFlags[mapIndex].rooms, interfaceCtx->mapPaletteIndex); osSyncPrintf(VT_RST); @@ -154,7 +154,7 @@ void Map_InitData(GlobalContext* globalCtx, s16 room) { case SCENE_JYASINBOSS: case SCENE_HAKADAN_BS: osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "Deku Tree Dungeon MAP Texture DMA" + // "Deku Tree Dungeon MAP Texture DMA" osSyncPrintf("デクの樹ダンジョンＭＡＰ テクスチャＤＭＡ(%x) scene_id_offset=%d VREG(30)=%d\n", room, mapIndex, VREG(30)); osSyncPrintf(VT_RST); @@ -165,8 +165,7 @@ void Map_InitData(GlobalContext* globalCtx, s16 room) { R_COMPASS_OFFSET_X = gMapData->roomCompassOffsetX[mapIndex][room]; R_COMPASS_OFFSET_Y = gMapData->roomCompassOffsetY[mapIndex][room]; Map_SetFloorPalettesData(globalCtx, VREG(30)); - // Translates to: "MAP Individual Floor ON Check" - osSyncPrintf("ＭＡＰ 各階ＯＮチェック\n"); + osSyncPrintf("ＭＡＰ 各階ＯＮチェック\n"); // "MAP Individual Floor ON Check" break; } } @@ -233,7 +232,7 @@ void Map_Init(GlobalContext* globalCtx) { interfaceCtx->unk_25A = -1; interfaceCtx->mapSegment = GameState_Alloc(&globalCtx->state, 0x1000, "../z_map_exp.c", 457); - // Translates to "ＭＡＰ TEXTURE INITIALIZATION scene_data_ID=%d mapSegment=%x" + // "ＭＡＰ texture initialization scene_data_ID=%d mapSegment=%x" osSyncPrintf("\n\n\nＭＡＰ テクスチャ初期化 scene_data_ID=%d\nmapSegment=%x\n\n", globalCtx->sceneNum, interfaceCtx->mapSegment, globalCtx); ASSERT(interfaceCtx->mapSegment != NULL, "parameter->mapSegment != NULL", "../z_map_exp.c", 459); @@ -545,7 +544,7 @@ void Map_Update(GlobalContext* globalCtx) { if (1) {} // Appears to be necessary to match if (interfaceCtx->mapRoomNum != sLastRoomNum) { - // Translates to "Current floor = %d Current room = %x Number of rooms = %d" + // "Current floor = %d Current room = %x Number of rooms = %d" osSyncPrintf("現在階＝%d 現在部屋＝%x 部屋数＝%d\n", floor, interfaceCtx->mapRoomNum, gMapData->switchEntryCount[mapIndex]); sLastRoomNum = interfaceCtx->mapRoomNum; @@ -556,7 +555,8 @@ void Map_Update(GlobalContext* globalCtx) { (floor == gMapData->switchFromFloor[mapIndex][i])) { interfaceCtx->mapRoomNum = gMapData->switchToRoom[mapIndex][i]; osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("階層切替＝%x\n", interfaceCtx->mapRoomNum); // "Layer switching = %x" + // "Layer switching = %x" + osSyncPrintf("階層切替＝%x\n", interfaceCtx->mapRoomNum); osSyncPrintf(VT_RST); Map_InitData(globalCtx, interfaceCtx->mapRoomNum); gSaveContext.unk_1422 = 0; diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index ca25d4bbbf..8718b8de4b 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -87,7 +87,7 @@ void MapMark_DrawForDungeon(GlobalContext* globalCtx) { interfaceCtx = &globalCtx->interfaceCtx; if ((gMapData != NULL) && (globalCtx->interfaceCtx.mapRoomNum >= gMapData->dgnMinimapCount[dungeon])) { - // Translates to: "ROOM NUMBER EXCEEDED, YIKES %d/%d MapMarkDraw PROCESSING INTERRUPTED" + // "Room number exceeded, yikes %d/%d MapMarkDraw processing interrupted" osSyncPrintf(VT_COL(RED, WHITE) "部屋番号がオーバーしてるで,ヤバイで %d/%d \nMapMarkDraw の処理を中断します\n", VT_RST, globalCtx->interfaceCtx.mapRoomNum, gMapData->dgnMinimapCount[dungeon]); return; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 7fc6abef05..cb861de047 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1068,7 +1068,7 @@ void Interface_SetSceneRestrictions(GlobalContext* globalCtx) { i = 0; - // Translates to: "Data settings related to button display scene_data_ID=%d\n" + // "Data settings related to button display scene_data_ID=%d\n" osSyncPrintf("ボタン表示関係データ設定 scene_data_ID=%d\n", globalCtx->sceneNum); do { @@ -1319,8 +1319,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST]; osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "Seals = %x" - osSyncPrintf("封印 = %x\n", gSaveContext.inventory.questItems); + osSyncPrintf("封印 = %x\n", gSaveContext.inventory.questItems); // "Seals = %x" osSyncPrintf(VT_RST); if (item == ITEM_MEDALLION_WATER) { @@ -1332,9 +1331,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET]; osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "Musical scores = %x" - osSyncPrintf("楽譜 = %x\n", gSaveContext.inventory.questItems); - // Translates to: "Musical scores = %x (%x) (%x)" + osSyncPrintf("楽譜 = %x\n", gSaveContext.inventory.questItems); // "Musical scores = %x" + // "Musical scores = %x (%x) (%x)" osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.inventory.questItems, gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]); osSyncPrintf(VT_RST); @@ -1344,8 +1342,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_KOKIRI_EMERALD + QUEST_KOKIRI_EMERALD]; osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "Spiritual Stones = %x" - osSyncPrintf("精霊石 = %x\n", gSaveContext.inventory.questItems); + osSyncPrintf("精霊石 = %x\n", gSaveContext.inventory.questItems); // "Spiritual Stones = %x" osSyncPrintf(VT_RST); return ITEM_NONE; @@ -1353,8 +1350,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_STONE_OF_AGONY + QUEST_STONE_OF_AGONY]; osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "Items = %x" - osSyncPrintf("アイテム = %x\n", gSaveContext.inventory.questItems); + osSyncPrintf("アイテム = %x\n", gSaveContext.inventory.questItems); // "Items = %x" osSyncPrintf(VT_RST); return ITEM_NONE; @@ -1363,7 +1359,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.inventory.gsTokens++; osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "N Coins = %x(%d)" + // "N Coins = %x(%d)" osSyncPrintf("Ｎコイン = %x(%d)\n", gSaveContext.inventory.questItems, gSaveContext.inventory.gsTokens); osSyncPrintf(VT_RST); @@ -1550,7 +1546,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { if (gSaveContext.inventory.items[slot] == ITEM_NONE) { Inventory_ChangeUpgrade(UPG_NUTS, 1); AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5]; - // Translates to: "Deku Nuts %d(%d)=%d BS_count=%d" + // "Deku Nuts %d(%d)=%d BS_count=%d" osSyncPrintf("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_NUTS_5, item - ITEM_NUTS_5, sAmmoRefillCounts[item - ITEM_NUTS_5]); } else { @@ -1561,7 +1557,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { } item = ITEM_NUT; } else if (item == ITEM_BOMB) { - // Translates to: "Bomb Bomb Bomb Bomb Bomb Bomb Bomb" + // "Bomb Bomb Bomb Bomb Bomb Bomb Bomb" osSyncPrintf(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n"); if ((AMMO(ITEM_BOMB) += 1) > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); @@ -1667,8 +1663,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { gSaveContext.health += 0x10; return ITEM_NONE; } else if (item == ITEM_HEART) { - // Translates to: "Recovery Heart" - osSyncPrintf("回復ハート回復ハート回復ハート\n"); + osSyncPrintf("回復ハート回復ハート回復ハート\n"); // "Recovery Heart" Health_ChangeBy(globalCtx, 0x10); return item; } else if (item == ITEM_MAGIC_SMALL) { @@ -1720,7 +1715,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) { for (i = 0; i < 4; i++) { if (gSaveContext.inventory.items[temp + i] == ITEM_BOTTLE) { - // Translates to: "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d" + // "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d" osSyncPrintf("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n", gSaveContext.equips.cButtonSlots[0], gSaveContext.equips.cButtonSlots[1], gSaveContext.equips.cButtonSlots[2], temp + i, item); @@ -1872,7 +1867,7 @@ u8 Item_CheckObtainability(u8 item) { } else if (item == ITEM_HEART) { return ITEM_HEART; } else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) { - // Translates to: "Magic Pot Get_Inf_Table( 25, 0x0100)=%d" + // "Magic Pot Get_Inf_Table( 25, 0x0100)=%d" osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", gSaveContext.infTable[25] & 0x100); if (!(gSaveContext.infTable[25] & 0x100)) { return ITEM_NONE; @@ -1936,8 +1931,7 @@ s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u16 oldItem, u16 newItem) { for (i = 0; i < ARRAY_COUNT(gSaveContext.inventory.items); i++) { if (gSaveContext.inventory.items[i] == oldItem) { gSaveContext.inventory.items[i] = newItem; - // Translates to: "Item Purge (%d)" - osSyncPrintf("アイテム消去(%d)\n", i); + osSyncPrintf("アイテム消去(%d)\n", i); // "Item Purge (%d)" for (i = 1; i < 4; i++) { if (gSaveContext.equips.buttonItems[i] == oldItem) { gSaveContext.equips.buttonItems[i] = newItem; @@ -2020,8 +2014,7 @@ s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) { break; } } - // Translates to: "Fairy Usage＝%d" - osSyncPrintf("妖精使用＝%d\n", bottleSlot); + osSyncPrintf("妖精使用＝%d\n", bottleSlot); // "Fairy Usage＝%d" gSaveContext.inventory.items[bottleSlot + i] = ITEM_BOTTLE; return 1; } @@ -2128,7 +2121,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) { u16 heartCount; u16 healthLevel; - // Translates to: "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊" + // "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊" osSyncPrintf("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", healthChange, gSaveContext.health, gSaveContext.healthCapacity); @@ -2137,8 +2130,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) { &D_801333E0, &D_801333E0, &D_801333E8); } else if ((gSaveContext.doubleDefense != 0) && (healthChange < 0)) { healthChange >>= 1; - // Translates to: "Heart decrease halved!!＝%d" - osSyncPrintf("ハート減少半分！！＝%d\n", healthChange); + osSyncPrintf("ハート減少半分！！＝%d\n", healthChange); // "Heart decrease halved!!＝%d" } // clang-format on @@ -2161,7 +2153,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) { } } - // Translates to: "Life=%d ＊＊＊ %d ＊＊＊＊＊＊" + // "Life=%d ＊＊＊ %d ＊＊＊＊＊＊" osSyncPrintf(" ライフ=%d ＊＊＊ %d ＊＊＊＊＊＊\n", gSaveContext.health, healthLevel); if (gSaveContext.health <= 0) { @@ -2181,7 +2173,7 @@ void Rupees_ChangeBy(s16 rupeeChange) { } void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { - // Translates to: "Item = (%d) Amount = (%d + %d)" + // "Item = (%d) Amount = (%d + %d)" osSyncPrintf("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange); if (item == ITEM_STICK) { @@ -2236,8 +2228,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { AMMO(ITEM_BEAN) += ammoChange; } - // Translates to: "Total = (%d)" - osSyncPrintf("合計 = (%d)\n", AMMO(item)); + osSyncPrintf("合計 = (%d)\n", AMMO(item)); // "Total = (%d)" } void Magic_Fill(GlobalContext* globalCtx) { @@ -2385,7 +2376,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) { &D_801333E8); } - // Translates to: "Storage MAGIC_NOW=%d (%d)" + // "Storage MAGIC_NOW=%d (%d)" osSyncPrintf("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.magic, gSaveContext.unk_13F6); if (gSaveContext.magic >= gSaveContext.unk_13F6) { gSaveContext.magic = gSaveContext.unk_13F6; @@ -3976,7 +3967,7 @@ void Interface_Update(GlobalContext* globalCtx) { gSaveContext.rupees++; Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } else { - // Translates to: "Rupee Amount MAX = %d" + // "Rupee Amount MAX = %d" osSyncPrintf("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET)); gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET); gSaveContext.rupeeAccumulator = 0; @@ -4054,8 +4045,7 @@ void Interface_Update(GlobalContext* globalCtx) { gSaveContext.magicLevel = gSaveContext.doubleMagic + 1; gSaveContext.unk_13F0 = 8; osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "Magic Start!!!!!!!!!" - osSyncPrintf("魔法スター─────ト！！！！！！！！！\n"); + osSyncPrintf("魔法スター─────ト！！！！！！！！！\n"); // "Magic Start!!!!!!!!!" osSyncPrintf("MAGIC_MAX=%d\n", gSaveContext.magicLevel); osSyncPrintf("MAGIC_NOW=%d\n", gSaveContext.magic); osSyncPrintf("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.unk_13F6); diff --git a/src/code/z_play.c b/src/code/z_play.c index 8b90a835cd..8b13322274 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -362,8 +362,9 @@ void Gameplay_Init(GameState* thisx) { zAlloc = GameState_Alloc(&globalCtx->state, zAllocSize, "../z_play.c", 2918); zAllocAligned = (zAlloc + 8) & ~0xF; ZeldaArena_Init(zAllocAligned, zAllocSize - zAllocAligned + zAlloc); + // "Zelda Heap" osSyncPrintf("ゼルダヒープ %08x-%08x\n", zAllocAligned, - (s32)(zAllocAligned + zAllocSize) - (s32)(zAllocAligned - zAlloc)); // "Zelda Heap" + (s32)(zAllocAligned + zAllocSize) - (s32)(zAllocAligned - zAlloc)); Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL); func_800304DC(globalCtx, &globalCtx->actorCtx, globalCtx->linkActorEntry); @@ -475,9 +476,11 @@ void Gameplay_Update(GlobalContext* globalCtx) { } if (!(gEntranceTable[globalCtx->nextEntranceIndex + sp6E].field & 0x8000)) { // Continue BGM Off - osSyncPrintf("\n\n\nサウンドイニシャル来ました。111"); // "Sound initalized. 111" + // "Sound initalized. 111" + osSyncPrintf("\n\n\nサウンドイニシャル来ました。111"); if ((globalCtx->fadeTransition < 56) && (func_80077600() == 0)) { - osSyncPrintf("\n\n\nサウンドイニシャル来ました。222"); // "Sound initalized. 222" + // "Sound initalized. 222" + osSyncPrintf("\n\n\nサウンドイニシャル来ました。222"); func_800F6964(0x14); gSaveContext.seqIndex = 0xFF; gSaveContext.nightSeqIndex = 0xFF; @@ -716,7 +719,8 @@ void Gameplay_Update(GlobalContext* globalCtx) { globalCtx->envCtx.unk_E6 = 4; globalCtx->envCtx.unk_E7 = 0xFF; globalCtx->envCtx.unk_E8 = 0xFF; - LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", 3471); // "It's here!!!!!!!!!" + // "It's here!!!!!!!!!" + LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", 3471); globalCtx->transitionMode = 15; } else { globalCtx->transitionMode = 12; @@ -905,10 +909,10 @@ void Gameplay_Update(GlobalContext* globalCtx) { if (globalCtx->unk_1242B != 0) { if (CHECK_BTN_ALL(input[0].press.button, BTN_CUP)) { if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0)) { - // Translates to: "Changing viewpoint is prohibited due to the kaleidoscope" + // "Changing viewpoint is prohibited due to the kaleidoscope" osSyncPrintf(VT_FGCOL(CYAN) "カレイドスコープ中につき視点変更を禁止しております\n" VT_RST); } else if (Player_InCsMode(globalCtx)) { - // Translates to: "Changing viewpoint is prohibited during the cutscene" + // "Changing viewpoint is prohibited during the cutscene" osSyncPrintf(VT_FGCOL(CYAN) "デモ中につき視点変更を禁止しております\n" VT_RST); } else if (YREG(15) == 0x10) { Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); diff --git a/src/code/z_room.c b/src/code/z_room.c index 4e6448cccd..1aa2ac9b6f 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -227,28 +227,25 @@ s32 func_80096238(void* data) { OSTime time; if (*(u32*)data == JPEG_MARKER) { - // Translates to: "EXPANDING JPEG DATA" - osSyncPrintf("JPEGデータを展開します\n"); - // Translates to: "JPEG DATA ADDRESS %08x" - osSyncPrintf("JPEGデータアドレス %08x\n", data); - // Translates to: "WORK BUFFER ADDRESS (Z BUFFER) %08x" + osSyncPrintf("JPEGデータを展開します\n"); // "Expanding jpeg data" + osSyncPrintf("JPEGデータアドレス %08x\n", data); // "Jpeg data address %08x" + // "Work buffer address (Z buffer) %08x" osSyncPrintf("ワークバッファアドレス（Ｚバッファ）%08x\n", gZBuffer); time = osGetTime(); if (!Jpeg_Decode(data, gZBuffer, gGfxSPTaskOutputBuffer, sizeof(gGfxSPTaskOutputBuffer))) { time = osGetTime() - time; - // Translates to: "SUCCESS... I THINK. time = %6.3f ms" + // "Success... I think. time = %6.3f ms" osSyncPrintf("成功…だと思う。 time = %6.3f ms \n", OS_CYCLES_TO_USEC(time) / 1000.0f); - // Translates to: "WRITING BACK TO ORIGINAL ADDRESS FROM WORK BUFFER." + // "Writing back to original address from work buffer." osSyncPrintf("ワークバッファから元のアドレスに書き戻します。\n"); - // Translates to: "IF THE ORIGINAL BUFFER SIZE ISN'T AT LEAST 150KB, IT WILL BE OUT OF CONTROL." + // "If the original buffer size isn't at least 150kb, it will be out of control." osSyncPrintf("元のバッファのサイズが150キロバイト無いと暴走するでしょう。\n"); bcopy(gZBuffer, data, sizeof(gZBuffer)); } else { - // Translates to: "FAILURE! WHY IS IT 〜" - osSyncPrintf("失敗！なんで〜\n"); + osSyncPrintf("失敗！なんで〜\n"); // "Failure! Why is it 〜" } } @@ -403,7 +400,7 @@ BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) { bgImage++; } - // Translates to: "z_room.c: DATA CONSISTENT WITH CAMERA ID DOES NOT EXIST camid=%d" + // "z_room.c: Data consistent with camera id does not exist camid=%d" osSyncPrintf(VT_COL(RED, WHITE) "z_room.c:カメラＩＤに一致するデータが存在しません camid=%d\n" VT_RST, camId); LogUtils_HungupThread("../z_room.c", 726); @@ -530,13 +527,13 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { } osSyncPrintf(VT_FGCOL(YELLOW)); - // Translates to: "ROOM BUFFER SIZE=%08x(%5.1fK)" + // "Room buffer size=%08x(%5.1fK)" osSyncPrintf("部屋バッファサイズ=%08x(%5.1fK)\n", maxRoomSize, maxRoomSize / 1024.0f); roomCtx->bufPtrs[0] = GameState_Alloc(&globalCtx->state, maxRoomSize, "../z_room.c", 946); - // Translates to: "ROOM BUFFER INITIAL POINTER=%08x" + // "Room buffer initial pointer=%08x" osSyncPrintf("部屋バッファ開始ポインタ=%08x\n", roomCtx->bufPtrs[0]); roomCtx->bufPtrs[1] = (void*)((s32)roomCtx->bufPtrs[0] + maxRoomSize); - // Translates to: "ROOM BUFFER END POINTER=%08x" + // "Room buffer end pointer=%08x" osSyncPrintf("部屋バッファ終了ポインタ=%08x\n", roomCtx->bufPtrs[1]); osSyncPrintf(VT_RST); roomCtx->unk_30 = 0; diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 9920a27c0e..370a0eb0bc 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -64,7 +64,7 @@ void Object_InitBank(GlobalContext* globalCtx, ObjectContext* objectCtx) { } osSyncPrintf(VT_FGCOL(GREEN)); - // Translates to: "OBJECT EXCHANGE BANK DATA %8.3fKB" + // "Object exchange bank data %8.3fKB" osSyncPrintf("オブジェクト入れ替えバンク情報 %8.3fKB\n", spaceSize / 1024.0f); osSyncPrintf(VT_RST); @@ -152,7 +152,7 @@ void* func_800982FC(ObjectContext* objectCtx, s32 bankIndex, s16 objectId) { ASSERT(nextPtr < objectCtx->spaceEnd, "nextptr < this->endSegment", "../z_scene.c", 381); - // Translates to: "OBJECT EXCHANGE FREE SIZE=%08x" + // "Object exchange free size=%08x" osSyncPrintf("オブジェクト入れ替え空きサイズ=%08x\n", (s32)objectCtx->spaceEnd - (s32)nextPtr); return nextPtr; @@ -174,8 +174,7 @@ s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd) { gSceneCmdHandlers[cmdCode](globalCtx, sceneCmd); } else { osSyncPrintf(VT_FGCOL(RED)); - // Translates to: "code VARIABLE IS ABNORMAL" - osSyncPrintf("code の値が異常です\n"); + osSyncPrintf("code の値が異常です\n"); // "code variable is abnormal" osSyncPrintf(VT_RST); } sceneCmd++; @@ -449,14 +448,14 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) { Scene_ExecuteCommands(globalCtx, SEGMENTED_TO_VIRTUAL(altHeader)); (cmd + 1)->base.code = 0x14; } else { - // Translates to: "COUGHH! THERE IS NO SPECIFIED DATAAAAA!" + // "Coughh! There is no specified dataaaaa!" osSyncPrintf("\nげぼはっ！ 指定されたデータがないでええっす！"); if (gSaveContext.sceneSetupIndex == 3) { altHeader = ((SceneCmd**)SEGMENTED_TO_VIRTUAL(cmd->altHeaders.segment))[gSaveContext.sceneSetupIndex - 2]; - // Translates to: "USING ADULT DAY DATA THERE!" + // "Using adult day data there!" osSyncPrintf("\nそこで、大人の昼データを使用するでええっす！！"); if (altHeader != NULL) { diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index bbc9d24714..9e7f0ee3ab 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -79,8 +79,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - // skel is NULL. - osSyncPrintf("Si2_Lod_draw():skelがNULLです。\n"); + osSyncPrintf("Si2_Lod_draw():skelがNULLです。\n"); // "skel is NULL." osSyncPrintf(VT_RST); return; } @@ -193,8 +192,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - // skel is NULL. - osSyncPrintf("Si2_Lod_draw_SV():skelがNULLです。\n"); + osSyncPrintf("Si2_Lod_draw_SV():skelがNULLです。\n"); // "skel is NULL." osSyncPrintf(VT_RST); return; } @@ -299,8 +297,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - // skel is NULL. - osSyncPrintf("Si2_draw():skelがNULLです。\n"); + osSyncPrintf("Si2_draw():skelがNULLです。\n"); // "skel is NULL." osSyncPrintf(VT_RST); return; } @@ -412,8 +409,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - // skel is NULL. - osSyncPrintf("Si2_draw_SV():skelがNULLです。\n"); + osSyncPrintf("Si2_draw_SV():skelがNULLです。\n"); // "skel is NULL." osSyncPrintf(VT_RST); return; } @@ -566,7 +562,7 @@ Gfx* SkelAnime_Draw(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - // skel is NULL. Returns NULL. + // "skel is NULL. Returns NULL." osSyncPrintf("Si2_draw2():skelがNULLです。NULLを返します。\n"); osSyncPrintf(VT_RST); return NULL; @@ -676,7 +672,7 @@ Gfx* SkelAnime_DrawFlex(GlobalContext* globalCtx, void** skeleton, Vec3s* jointT if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); - // skel is NULL. Returns NULL. + // "skel is NULL. Returns NULL." osSyncPrintf("Si2_draw2_SV():skelがNULLです。NULLを返します。\n"); osSyncPrintf(VT_RST); return NULL; @@ -1083,7 +1079,7 @@ void SkelAnime_InitLink(GlobalContext* globalCtx, SkelAnime* skelAnime, FlexSkel if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { osSyncPrintf(VT_FGCOL(RED)); - // Memory allocation error + // "Memory allocation error" osSyncPrintf("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n"); osSyncPrintf(VT_RST); } @@ -1402,8 +1398,7 @@ s32 SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeade } if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { osSyncPrintf(VT_FGCOL(RED)); - // Memory allocation error - osSyncPrintf("Skeleton_Info2_ct メモリアロケーションエラー\n"); + osSyncPrintf("Skeleton_Info2_ct メモリアロケーションエラー\n"); // "Memory allocation error" osSyncPrintf(VT_RST); } @@ -1436,7 +1431,7 @@ s32 SkelAnime_InitFlex(GlobalContext* globalCtx, SkelAnime* skelAnime, FlexSkele } if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { osSyncPrintf(VT_FGCOL(RED)); - // Memory allocation error + // "Memory allocation error" osSyncPrintf("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n"); osSyncPrintf(VT_RST); } @@ -1461,7 +1456,7 @@ s32 SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonH ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->morphTable), "../z_skelanime.c", 3121); if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { osSyncPrintf(VT_FGCOL(RED)); - // Memory allocation error + // "Memory allocation error" osSyncPrintf("Skeleton_Info2_skin2_ct メモリアロケーションエラー\n"); osSyncPrintf(VT_RST); } @@ -1848,15 +1843,13 @@ void SkelAnime_Free(SkelAnime* skelAnime, GlobalContext* globalCtx) { if (skelAnime->jointTable != NULL) { ZeldaArena_FreeDebug(skelAnime->jointTable, "../z_skelanime.c", 3729); } else { - // now_joint is freed! ! - osSyncPrintf("now_joint あきまへん！！\n"); + osSyncPrintf("now_joint あきまへん！！\n"); // "now_joint is freed! !" } if (skelAnime->morphTable != NULL) { ZeldaArena_FreeDebug(skelAnime->morphTable, "../z_skelanime.c", 3731); } else { - // "morf_joint is freed !!" - osSyncPrintf("morf_joint あきまへん！！\n"); + osSyncPrintf("morf_joint あきまへん！！\n"); // "morf_joint is freed !!" } } diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 0241094071..a9312c0617 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -302,9 +302,9 @@ void Sram_OpenSave(SramContext* sramCtx) { u16 j; u8* ptr; - osSyncPrintf("個人Ｆｉｌｅ作成\n"); // Create personal file + osSyncPrintf("個人Ｆｉｌｅ作成\n"); // "Create personal file" i = gSramSlotOffsets[gSaveContext.fileNum]; - osSyncPrintf("ぽいんと＝%x(%d)\n", i, gSaveContext.fileNum); // Point= + osSyncPrintf("ぽいんと＝%x(%d)\n", i, gSaveContext.fileNum); // "Point=" MemCopy(&gSaveContext, sramCtx->readBuff + i, sizeof(Save)); @@ -532,7 +532,7 @@ void Sram_VerifyAndLoadAllSaves(FileChooseContext* fileChooseCtx, SramContext* s newChecksum += *ptr++; } - // SAVE checksum calculation + // "SAVE checksum calculation" osSyncPrintf("\nＳＡＶＥチェックサム計算 j=%x mmm=%x ", newChecksum, oldChecksum); if (newChecksum != oldChecksum) { @@ -549,7 +549,7 @@ void Sram_VerifyAndLoadAllSaves(FileChooseContext* fileChooseCtx, SramContext* s for (i = newChecksum = j = 0; i < CHECKSUM_SIZE; i++, offset += 2) { newChecksum += *ptr++; } - // (B) SAVE checksum calculation + // "(B) SAVE checksum calculation" osSyncPrintf("\n（Ｂ）ＳＡＶＥチェックサム計算 j=%x mmm=%x ", newChecksum, oldChecksum); if (newChecksum != oldChecksum) { @@ -608,8 +608,7 @@ void Sram_VerifyAndLoadAllSaves(FileChooseContext* fileChooseCtx, SramContext* s osSyncPrintf("ぽいんと＝%x(%d) check_sum=%x(%x)\n", i, slotNum, gSaveContext.checksum, newChecksum); } else { - // SAVE data OK! ! ! ! - osSyncPrintf("\nＳＡＶＥデータ ＯＫ！！！！\n"); + osSyncPrintf("\nＳＡＶＥデータ ＯＫ！！！！\n"); // "SAVE data OK! ! ! !" } } @@ -723,7 +722,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { } gSaveContext.checksum = checksum; - osSyncPrintf("\nチェックサム＝%x\n", gSaveContext.checksum); // Checksum = %x + osSyncPrintf("\nチェックサム＝%x\n", gSaveContext.checksum); // "Checksum = %x" offset = gSramSlotOffsets[gSaveContext.fileNum]; osSyncPrintf("I=%x no=%d\n", offset, gSaveContext.fileNum); @@ -735,8 +734,7 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_WRITE); - // SAVE end - osSyncPrintf("ＳＡＶＥ終了\n"); + osSyncPrintf("ＳＡＶＥ終了\n"); // "SAVE end" osSyncPrintf("z_common_data.file_no = %d\n", gSaveContext.fileNum); osSyncPrintf("SAVECT=%x, NAME=%x, LIFE=%x, ITEM=%x, SAVE_64DD=%x\n", DEATHS, NAME, HEALTH_CAP, QUEST, N64DD); @@ -818,7 +816,7 @@ void Sram_CopySave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) { osSyncPrintf("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileChooseCtx->n64ddFlags[gSaveContext.fileNum]); osSyncPrintf("heart_status[%d]=%d\n", gSaveContext.fileNum, fileChooseCtx->heartStatus[gSaveContext.fileNum]); - osSyncPrintf("ＣＯＰＹ終了\n"); // Copy end + osSyncPrintf("ＣＯＰＹ終了\n"); // "Copy end" } void Sram_Write16Bytes(SramContext* sramCtx) { @@ -833,8 +831,7 @@ void Sram_InitSram(GameState* gameState, SramContext* sramCtx) { for (i = 0; i < ARRAY_COUNTU(sZeldaMagic) - 3; i++) { if (sZeldaMagic[i + 3] != sramCtx->readBuff[i + 3]) { - // SRAM destruction! ! ! ! ! ! - osSyncPrintf("ＳＲＡＭ破壊！！！！！！\n"); + osSyncPrintf("ＳＲＡＭ破壊！！！！！！\n"); // "SRAM destruction! ! ! ! ! !" gSaveContext.language = sramCtx->readBuff[2]; MemCopy(sramCtx->readBuff, sZeldaMagic, sizeof(sZeldaMagic)); sramCtx->readBuff[2] = gSaveContext.language; @@ -858,11 +855,10 @@ void Sram_InitSram(GameState* gameState, SramContext* sramCtx) { sramCtx->readBuff[i] = i; } SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_WRITE); - // SRAM destruction! ! ! ! ! ! - osSyncPrintf("ＳＲＡＭ破壊！！！！！！\n"); + osSyncPrintf("ＳＲＡＭ破壊！！！！！！\n"); // "SRAM destruction! ! ! ! ! !" } - // GOOD! GOOD! Size =% d +% d =% d + // "GOOD! GOOD! Size = %d + %d = %d" osSyncPrintf("ＧＯＯＤ！ＧＯＯＤ！ サイズ＝%d + %d ＝ %d\n", sizeof(SaveInfo), 4, sizeof(SaveInfo) + 4); osSyncPrintf(VT_FGCOL(BLUE)); osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index aac6c00abe..1206ca8c2d 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -57,8 +57,7 @@ void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) { void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx) { func_800876C8(globalCtx); - // Translates to: "Disappearance" - LOG_STRING("消滅", "../z_arrow_fire.c", 421); + LOG_STRING("消滅", "../z_arrow_fire.c", 421); // "Disappearance" } void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index bf26aa0d29..f909f0d982 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -58,8 +58,7 @@ void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) { void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx) { func_800876C8(globalCtx); - // Translates to: "Disappearance" - LOG_STRING("消滅", "../z_arrow_ice.c", 415); + LOG_STRING("消滅", "../z_arrow_ice.c", 415); // "Disappearance" } void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 2866b09072..d5c8b80a65 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -58,8 +58,7 @@ void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) { void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx) { func_800876C8(globalCtx); - // Translates to: "Disappearance" - LOG_STRING("消滅", "../z_arrow_light.c", 403); + LOG_STRING("消滅", "../z_arrow_light.c", 403); // "Disappearance" } void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 5a53e25036..7170621c10 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -180,12 +180,12 @@ void BgHidanHamstep_Init(Actor* thisx, GlobalContext* globalCtx) { this->dyna.actor.minVelocityY = -12.0f; if ((this->dyna.actor.params & 0xFF) == 0) { - // Translation: Fire Temple Object [Hammer Step] appears + // "Fire Temple Object [Hammer Step] appears" osSyncPrintf("◯◯◯炎の神殿オブジェクト【ハンマーステップ】出現\n"); if (BgHidanHamstep_SpawnChildren(this, globalCtx) == 0) { step = this; - // Translation: [Hammer Step] I can't create a step! + // "[Hammer Step] I can't create a step!" osSyncPrintf("【ハンマーステップ】 足場産れない！！\n"); osSyncPrintf("%s %d\n", "../z_bg_hidan_hamstep.c", 425); @@ -349,7 +349,7 @@ void func_80888A58(BgHidanHamstep* this, GlobalContext* globalCtx) { func_80888694(this, (BgHidanHamstep*)this->dyna.actor.parent); if (((this->dyna.actor.params & 0xFF) <= 0) || ((this->dyna.actor.params & 0xFF) >= 6)) { - // Translation: [Hammer Step] arg_data strange (arg_data = %d) + // "[Hammer Step] arg_data strange (arg_data = %d)" osSyncPrintf("【ハンマーステップ】 arg_data おかしい (arg_data = %d)", this->dyna.actor.params); osSyncPrintf("%s %d\n", "../z_bg_hidan_hamstep.c", 696); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 4d909fa74b..e9c2390185 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -119,8 +119,7 @@ void BgHidanKowarerukabe_Init(Actor* thisx, GlobalContext* globalCtx) { if (((this->dyna.actor.params & 0xFF) < CRACKED_STONE_FLOOR) || ((this->dyna.actor.params & 0xFF) > LARGE_BOMBABLE_WALL)) { - // Translation: Error: Fire Temple Breakable Walls. arg_data I can't determine the (%s %d)(arg_data - // 0x%04x) + // "Error: Fire Temple Breakable Walls. arg_data I can't determine the (%s %d)(arg_data 0x%04x)" osSyncPrintf("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", "../z_bg_hidan_kowarerukabe.c", 254, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); @@ -136,7 +135,7 @@ void BgHidanKowarerukabe_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_SetScale(&this->dyna.actor, 0.1f); BgHidanKowarerukabe_InitColliderSphere(this, globalCtx); BgHidanKowarerukabe_OffsetActorYPos(this); - // Translation: (fire walls, floors, destroyed by bombs)(arg_data 0x%04x) + // "(fire walls, floors, destroyed by bombs)(arg_data 0x%04x)" osSyncPrintf("(hidan 爆弾で壊れる 壁 床)(arg_data 0x%04x)\n", this->dyna.actor.params); } diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index 10acb51fc4..99e7236f89 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -91,7 +91,7 @@ void BgZg_Update(Actor* thisx, GlobalContext* globalCtx) { s32 action = this->action; if (((action < 0) || (1 < action)) || (sActionFuncs[action] == NULL)) { - // Translates to: "Main Mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" + // "Main Mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sActionFuncs[action](this, globalCtx); @@ -139,7 +139,7 @@ void BgZg_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 drawConfig = this->drawConfig; if (((drawConfig < 0) || (drawConfig > 0)) || sDrawFuncs[drawConfig] == NULL) { - // Translates to: "Drawing mode is wrong !!!!!!!!!!!!!!!!!!!!!!!!!" + // "Drawing mode is wrong !!!!!!!!!!!!!!!!!!!!!!!!!" osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sDrawFuncs[drawConfig](this, globalCtx); diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 12bfb380a4..83fca32de9 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -99,16 +99,14 @@ s32 ElfMsg_KillCheck(ElfMsg* this, GlobalContext* globalCtx) { if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && (Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1))) { - // "Mutual destruction" - LOG_STRING("共倒れ", "../z_elf_msg.c", 161); + LOG_STRING("共倒れ", "../z_elf_msg.c", 161); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); } Actor_Kill(&this->actor); return 1; } else if ((this->actor.world.rot.y == -1) && (Flags_GetClear(globalCtx, this->actor.room))) { - // "Mutual destruction" - LOG_STRING("共倒れ", "../z_elf_msg.c", 172); + LOG_STRING("共倒れ", "../z_elf_msg.c", 172); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); } diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index b9a5073d2a..43c8027951 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -76,16 +76,14 @@ s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) { if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && (Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1))) { - // "Mutual destruction" - LOG_STRING("共倒れ", "../z_elf_msg2.c", 171); + LOG_STRING("共倒れ", "../z_elf_msg2.c", 171); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); } Actor_Kill(&this->actor); return 1; } else if ((this->actor.world.rot.y == -1) && (Flags_GetClear(globalCtx, this->actor.room))) { - // "Mutual destruction 2" - LOG_STRING("共倒れ２", "../z_elf_msg2.c", 182); + LOG_STRING("共倒れ２", "../z_elf_msg2.c", 182); // "Mutual destruction 2" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); } @@ -94,8 +92,7 @@ s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) { } else if (((this->actor.params >> 8) & 0x3F) == 0x3F) { return 0; } else if (Flags_GetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F))) { - // "Mutual destruction" - LOG_STRING("共倒れ", "../z_elf_msg2.c", 192); + LOG_STRING("共倒れ", "../z_elf_msg2.c", 192); // "Mutual destruction" Actor_Kill(&this->actor); return 1; } diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index fd973e7093..62aaa8fc3a 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -66,7 +66,7 @@ void EnEg_Update(Actor* thisx, GlobalContext* globalCtx) { s32 action = this->action; if (((action < 0) || (0 < action)) || (sActionFuncs[action] == NULL)) { - // Translates to: "Main Mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" + // "Main Mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sActionFuncs[action](this, globalCtx); diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 3dfca7cbce..6a11cf72b5 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -331,8 +331,7 @@ void EnExRuppy_WaitToBlowUp(EnExRuppy* this, GlobalContext* globalCtx) { // "That idiot! error" osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ そ、そんなばかな！エラー！！！！！ ☆☆☆☆☆ \n" VT_RST); } - // "Stupid!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ バカめ！ ☆☆☆☆☆ \n" VT_RST); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ バカめ！ ☆☆☆☆☆ \n" VT_RST); // "Stupid!" explosionScale = 100; explosionScaleStep = 30; if (this->type == 2) { 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 39c7cc2ad0..9c97f060cd 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 @@ -120,8 +120,7 @@ void EnFhgFire_Init(Actor* thisx, GlobalContext* globalCtx) { this->collider.dim.height = this->actor.world.rot.x * 0.13f; this->collider.dim.yShift = 0; } else if (this->actor.params == FHGFIRE_SPEAR_LIGHT) { - // "light spear" - osSyncPrintf("yari hikari ct 1\n"); + osSyncPrintf("yari hikari ct 1\n"); // "light spear" EnFhgFire_SetUpdate(this, EnFhgFire_SpearLight); osSyncPrintf("yari hikari ct 2\n"); this->work[FHGFIRE_TIMER] = this->actor.world.rot.x; diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 6c770d9a56..db3b7a4d3d 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -235,7 +235,7 @@ void EnFr_Init(Actor* thisx, GlobalContext* globalCtx) { } else { if ((this->actor.params >= 6) || (this->actor.params < 0)) { osSyncPrintf(VT_COL(RED, WHITE)); - // Translation: The argument is wrong!! + // "The argument is wrong!!" osSyncPrintf("%s[%d] : 引数が間違っている！！(%d)\n", "../z_en_fr.c", 370, this->actor.params); osSyncPrintf(VT_RST); ASSERT(0, "0", "../z_en_fr.c", 372); @@ -245,7 +245,7 @@ void EnFr_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->objBankIndex < 0) { Actor_Kill(&this->actor); osSyncPrintf(VT_COL(RED, WHITE)); - // Translation: There is no bank!! + // "There is no bank!!" osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_fr.c", 380); osSyncPrintf(VT_RST); ASSERT(0, "0", "../z_en_fr.c", 382); @@ -979,7 +979,7 @@ void EnFr_Deactivate(EnFr* this, GlobalContext* globalCtx) { frogLoop1 = sEnFrPointers.frogs[frogIndex]; if (frogLoop1 == NULL) { osSyncPrintf(VT_COL(RED, WHITE)); - // Translation: There are no frogs!? + // "There are no frogs!?" osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1604); osSyncPrintf(VT_RST); return; @@ -992,7 +992,7 @@ void EnFr_Deactivate(EnFr* this, GlobalContext* globalCtx) { frogLoop2 = sEnFrPointers.frogs[frogIndex]; if (frogLoop2 == NULL) { osSyncPrintf(VT_COL(RED, WHITE)); - // Translation: There are no frogs!? + // "There are no frogs!?" osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1618); osSyncPrintf(VT_RST); return; diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index a8c40adcdf..c440f72737 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -244,7 +244,7 @@ s32 EnGoroiwa_GetAscendDirection(EnGoroiwa* this, GlobalContext* globalCtx) { if (nextPointPos->x == currentPointPos->x && nextPointPos->z == currentPointPos->z) { if (nextPointPos->y == currentPointPos->y) { - // Translation: Error: Invalid path data (points overlap) + // "Error: Invalid path data (points overlap)" osSyncPrintf("Error : レールデータ不正(点が重なっている)"); osSyncPrintf("(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 559, this->actor.params); } @@ -536,14 +536,14 @@ void EnGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx) { EnGoroiwa_InitCollider(this, globalCtx); pathIdx = this->actor.params & 0xFF; if (pathIdx == 0xFF) { - // Translation: Error: Invalid arg_data + // "Error: Invalid arg_data" osSyncPrintf("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 1033, this->actor.params); Actor_Kill(&this->actor); return; } if (globalCtx->setupPathList[pathIdx].count < 2) { - // Translation: Error: Invalid Path Data + // "Error: Invalid Path Data" osSyncPrintf("Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n", "../z_en_gr.c", 1043); Actor_Kill(&this->actor); return; @@ -557,7 +557,7 @@ void EnGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx) { EnGoroiwa_InitRotation(this); EnGoroiwa_FaceNextWaypoint(this, globalCtx); EnGoroiwa_SetupRoll(this); - // Translation: (Goroiwa) + // "(Goroiwa)" osSyncPrintf("(ごろ岩)(arg 0x%04x)(rail %d)(end %d)(bgc %d)(hit %d)\n", this->actor.params, this->actor.params & 0xFF, (this->actor.params >> 8) & 3, (this->actor.params >> 10) & 1, this->actor.home.rot.z & 1); @@ -597,8 +597,7 @@ void EnGoroiwa_Roll(EnGoroiwa* this, GlobalContext* globalCtx) { } func_8002F6D4(globalCtx, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0); osSyncPrintf(VT_FGCOL(CYAN)); - // Translation: Player knocked down - osSyncPrintf("Player ぶっ飛ばし\n"); + osSyncPrintf("Player ぶっ飛ばし\n"); // "Player knocked down" osSyncPrintf(VT_RST); onHitSetupFuncs[(this->actor.params >> 10) & 1](this); func_8002F7DC(&GET_PLAYER(globalCtx)->actor, NA_SE_PL_BODY_HIT); diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index a1a782fb77..4d248e10c3 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -70,7 +70,6 @@ void EnHeishi1_Init(Actor* thisx, GlobalContext* globalCtx) { EnHeishi1* this = THIS; Vec3f rupeePos; s32 i; - u16 time; Actor_SetScale(&this->actor, 0.01f); SkelAnime_Init(globalCtx, &this->skelAnime, &gEnHeishiSkel, &gEnHeishiIdleAnim, this->jointTable, this->morphTable, @@ -102,12 +101,8 @@ void EnHeishi1_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf(VT_FGCOL(PURPLE) " (頭)反転アングルスピード加算値 %f\n" VT_RST, this->headTurnSpeedScale); // "(head) maximum turning angle speed" osSyncPrintf(VT_FGCOL(PURPLE) " (頭)反転アングルスピード最大☆ %f\n" VT_RST, this->headTurnSpeedMax); - // "current time" - // clang-format off - time = gSaveContext.dayTime; osSyncPrintf(VT_FGCOL(GREEN) " 今時間 %d\n" VT_RST, time); - // clang-format on - // "check time" - osSyncPrintf(VT_FGCOL(YELLOW) " チェック時間 %d\n" VT_RST, 0xBAAA); + osSyncPrintf(VT_FGCOL(GREEN) " 今時間 %d\n" VT_RST, ((void)0, gSaveContext.dayTime)); // "current time" + osSyncPrintf(VT_FGCOL(YELLOW) " チェック時間 %d\n" VT_RST, 0xBAAA); // "check time" osSyncPrintf("\n\n"); if (this->path == 3) { @@ -379,8 +374,7 @@ void EnHeishi1_WaitNight(EnHeishi1* this, GlobalContext* globalCtx) { if (this->actor.xzDistToPlayer < 100.0f) { func_8010B680(globalCtx, 0x702D, &this->actor); func_80078884(NA_SE_SY_FOUND); - // "Discovered!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" func_8002DF54(globalCtx, &this->actor, 1); this->actionFunc = EnHeishi1_SetupKick; } diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 4b9b6a09ff..2c23151489 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -174,8 +174,7 @@ void EnIceHono_Init(Actor* thisx, GlobalContext* globalCtx) { this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); this->unk_154 = Rand_ZeroOne() * (0x1FFFF / 2.0f); this->unk_156 = Rand_ZeroOne() * (0x1FFFF / 2.0f); - // Translates to: "(ice flame)" - osSyncPrintf("(ice 炎)(arg_data 0x%04x)\n", this->actor.params); + osSyncPrintf("(ice 炎)(arg_data 0x%04x)\n", this->actor.params); // "(ice flame)" } } @@ -361,8 +360,7 @@ void EnIceHono_Update(Actor* thisx, GlobalContext* globalCtx) { sin154 = Math_SinS(this->unk_154); intensity = (Rand_ZeroOne() * 0.05f) + ((sin154 * 0.125f) + (sin156 * 0.1f)) + 0.425f; if ((intensity > 0.7f) || (intensity < 0.2f)) { - // Translates to: "impossible value(ratio = %f)" - osSyncPrintf("ありえない値(ratio = %f)\n", intensity); + osSyncPrintf("ありえない値(ratio = %f)\n", intensity); // "impossible value(ratio = %f)" } Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, (s16)this->actor.world.pos.y + 10, this->actor.world.pos.z, (s32)(155.0f * intensity), (s32)(210.0f * intensity), diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 2191bbb906..a3f2088e83 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -127,7 +127,7 @@ s32 EnIshi_SnapToFloor(EnIshi* this, GlobalContext* globalCtx, f32 arg2) { return true; } else { osSyncPrintf(VT_COL(YELLOW, BLACK)); - // Translation: Failure attaching to ground + // "Failure attaching to ground" osSyncPrintf("地面に付着失敗(%s %d)\n", "../z_en_ishi.c", 388); osSyncPrintf(VT_RST); return false; 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 6045a18b84..5f2458db38 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -71,7 +71,7 @@ void EnKakasi3_Init(Actor* thisx, GlobalContext* globalCtx) { EnKakasi3* this = THIS; osSyncPrintf("\n\n"); - // Translates to: Obonur -- Related to the name of the scarecrow (Bonooru) + // "Obonur" -- Related to the name of the scarecrow (Bonooru) osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n" VT_RST); this->actor.targetMode = 6; 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 d0a3f69241..e628ce9d6e 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -118,7 +118,7 @@ s32 EnKusa_SnapToFloor(EnKusa* this, GlobalContext* globalCtx, f32 yOffset) { return true; } else { osSyncPrintf(VT_COL(YELLOW, BLACK)); - // Translation: Failure attaching to ground + // "Failure attaching to ground" osSyncPrintf("地面に付着失敗(%s %d)\n", "../z_en_kusa.c", 323); osSyncPrintf(VT_RST); return false; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 7d96b0ce47..dbdd66225e 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -873,7 +873,7 @@ void EnNb_CheckConfrontationCsMode(EnNb* this, GlobalContext* globalCtx) { EnNb_SetupConfrontationDestroy(this); break; default: - // "En_Nb_Confrontion_Check_DemoMode: OPERATION DOESN'T EXIST!!!!!!!!" + // "En_Nb_Confrontion_Check_DemoMode: Operation doesn't exist!!!!!!!!" osSyncPrintf("En_Nb_Confrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } @@ -1060,7 +1060,7 @@ void EnNb_CheckCreditsCsModeImpl(EnNb* this, GlobalContext* globalCtx) { EnNb_SetupCreditsHeadTurn(this); break; default: - // "En_Nb_inEnding_Check_DemoMode: OPERATION DOESN'T EXIST!!!!!!!!" + // "En_Nb_inEnding_Check_DemoMode: Operation doesn't exist!!!!!!!!" osSyncPrintf("En_Nb_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index b1c425ac32..377598bca3 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -81,9 +81,8 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx } osSyncPrintf("\nthis->timer=[%d]", this->timer); if (this->timer == 308) { - // "Let's grow some beans" - osSyncPrintf("\n\n\n豆よ のびろ 指定\n\n\n"); - Flags_SetEnv(globalCtx, 5); // set storms env flag + osSyncPrintf("\n\n\n豆よ のびろ 指定\n\n\n"); // "Let's grow some beans" + Flags_SetEnv(globalCtx, 5); // set storms env flag } } 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 de43fe6e98..ce28dc65e7 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -313,8 +313,7 @@ void EnSb_Bounce(EnSb* this, GlobalContext* globalCtx) { this->actor.speedXZ = 0.0f; this->timer = 1; EnSb_SetupWaitClosed(this); - // "Attack Complete!" - osSyncPrintf(VT_FGCOL(RED) "攻撃終了！！" VT_RST "\n"); + osSyncPrintf(VT_FGCOL(RED) "攻撃終了！！" VT_RST "\n"); // "Attack Complete!" } } } diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 396d18e8ab..ee591e47d6 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -98,18 +98,17 @@ void EnSth_Init(Actor* thisx, GlobalContext* globalCtx) { s32 params = this->actor.params; s32 objectBankIdx; - // Translation: Gold Skulltula Shop - osSyncPrintf(VT_FGCOL(BLUE) "金スタル屋 no = %d\n" VT_RST, params); + osSyncPrintf(VT_FGCOL(BLUE) "金スタル屋 no = %d\n" VT_RST, params); // "Gold Skulltula Shop" if (this->actor.params == 0) { if (gSaveContext.inventory.gsTokens < 100) { Actor_Kill(&this->actor); - // Translation: Gold Skulltula Shop I still can't be a human + // "Gold Skulltula Shop I still can't be a human" osSyncPrintf("金スタル屋 まだ 人間に戻れない \n"); return; } } else if (gSaveContext.inventory.gsTokens < (this->actor.params * 10)) { Actor_Kill(&this->actor); - // Translation: Gold Skulltula Shop I still can't be a human + // "Gold Skulltula Shop I still can't be a human" osSyncPrintf(VT_FGCOL(BLUE) "金スタル屋 まだ 人間に戻れない \n" VT_RST); return; } diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index d6b2eae2a4..f2697d65f4 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -2399,7 +2399,7 @@ void EnXc_Draw(Actor* thisx, GlobalContext* globalCtx) { EnXc* this = THIS; if (this->drawMode < 0 || this->drawMode > 5 || 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_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 0578549790..c1da357070 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -34,12 +34,12 @@ void ObjMakekinsuta_Init(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.params & 0x6000) == 0x4000) { osSyncPrintf(VT_FGCOL(BLUE)); - // Translation: Gold Star Enemy(arg_data %x) + // "Gold Star Enemy(arg_data %x)" osSyncPrintf("金スタ発生敵(arg_data %x)\n", this->actor.params); osSyncPrintf(VT_RST); } else { osSyncPrintf(VT_COL(YELLOW, BLACK)); - // Translation: Invalid Argument (arg_data %x)(%s %d) + // "Invalid Argument (arg_data %x)(%s %d)" osSyncPrintf("引数不正 (arg_data %x)(%s %d)\n", this->actor.params, "../z_obj_makekinsuta.c", 119); osSyncPrintf(VT_RST); } diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index c1eeaece54..5a257eabda 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -72,7 +72,7 @@ s32 ObjMure_SetCullingImpl(Actor* thisx, GlobalContext* globalCtx) { result = true; break; default: - // Translation: "Error : Culling is not set.(%s %d)(arg_data 0x%04x)" + // "Error : Culling is not set.(%s %d)(arg_data 0x%04x)" osSyncPrintf("Error : カリングの設定がされていません。(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 204, this->actor.params); return false; @@ -142,7 +142,7 @@ void ObjMure_SpawnActors0(ObjMure* this, GlobalContext* globalCtx) { for (i = 0; i < maxChildren; i++) { if (this->children[i] != NULL) { - // Translation: "Error: I already have a child(%s %d)(arg_data 0x%04x) + // "Error: I already have a child(%s %d)(arg_data 0x%04x)" osSyncPrintf("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 333, this->actor.params); } diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 716cc44a40..8d212295a2 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -113,7 +113,7 @@ void ObjMure2_SpawnActors(ObjMure2* this, GlobalContext* globalCtx) { for (i = 0; i < D_80B9A818[actorNum]; i++) { if (this->actorSpawnPtrList[i] != NULL) { - // Translation: Warning : I already have a child (%s %d)(arg_data 0x%04x) + // "Warning : I already have a child (%s %d)(arg_data 0x%04x)" osSyncPrintf("Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure2.c", 269, this->actor.params); continue; diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 2dd2de11e5..211e921492 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -58,7 +58,7 @@ void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx) { ShotSun* this = THIS; s32 params; - // Translation: Ocarina secret occurrence + // "Ocarina secret occurrence" osSyncPrintf("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", this->actor.params); params = this->actor.params & 0xFF; if (params == 0x40 || params == 0x41) { diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c index 2f780c3af5..b15f991a25 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c @@ -29,8 +29,7 @@ u32 EffectSsDeadSound_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, this->update = EffectSsDeadSound_Update; this->rRepeatMode = initParams->repeatMode; this->rSfxId = initParams->sfxId; - // "constructor 3" - osSyncPrintf("コンストラクター3\n"); + osSyncPrintf("コンストラクター3\n"); // "constructor 3" return 1; }