mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00
Code Issues Projects Releases Wiki Activity

T() macro 8 (#2142)

Browse source 
* T() macro in fault

* T() macro in game.c, gfxprint.c

* T() macro in ucode_disas.c

* T() macro in z_actor.c

* T() macro in z_message.c

* push fault key combo T()

* z_message T: koko -> "here"

* format
This commit is contained in:
Dragorn421 2024-09-07 04:00:12 +02:00 • committed by GitHub
parent a8151899cf
commit 02816c410c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 166 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/code/fault_gc.c
View file

@ -215,7 +215,9 @@ void Fault_AddClient(FaultClient* client, void* callback, void* arg0, void* arg1
end: end:
osSetIntMask(mask); osSetIntMask(mask);
if (alreadyExists) { if (alreadyExists) {
osSyncPrintf(VT_COL(RED, WHITE) "fault_AddClient: %08x は既にリスト中にある\n" VT_RST, client); osSyncPrintf(VT_COL(RED, WHITE) T("fault_AddClient: %08x は既にリスト中にある\n",
"fault_AddClient: %08x is already in the list\n") VT_RST,
client);
} }
} }
@ -251,7 +253,9 @@ void Fault_RemoveClient(FaultClient* client) {
osSetIntMask(mask); osSetIntMask(mask);
if (listIsEmpty) { if (listIsEmpty) {
osSyncPrintf(VT_COL(RED, WHITE) "fault_RemoveClient: %08x リスト不整合です\n" VT_RST, client); osSyncPrintf(VT_COL(RED, WHITE) T("fault_RemoveClient: %08x リスト不整合です\n",
"fault_RemoveClient: %08x list inconsistency\n") VT_RST,
client);
} }
} }
@ -293,7 +297,9 @@ void Fault_AddAddrConvClient(FaultAddrConvClient* client, void* callback, void*
end: end:
osSetIntMask(mask); osSetIntMask(mask);
if (alreadyExists) { if (alreadyExists) {
osSyncPrintf(VT_COL(RED, WHITE) "fault_AddressConverterAddClient: %08x は既にリスト中にある\n" VT_RST, client); osSyncPrintf(VT_COL(RED, WHITE) T("fault_AddressConverterAddClient: %08x は既にリスト中にある\n",
"fault_AddressConverterAddClient: %08x is already in the list\n") VT_RST,
client);
} }
} }
@ -327,7 +333,8 @@ void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
osSetIntMask(mask); osSetIntMask(mask);
if (listIsEmpty) { if (listIsEmpty) {
osSyncPrintf(VT_COL(RED, WHITE) "fault_AddressConverterRemoveClient: %08x は既にリスト中にある\n" VT_RST, osSyncPrintf(VT_COL(RED, WHITE) T("fault_AddressConverterRemoveClient: %08x は既にリスト中にある\n",
"fault_AddressConverterRemoveClient: %08x is already in the list\n") VT_RST,
client); client);
} }
} }
@ -675,14 +682,16 @@ void Fault_WaitForButtonCombo(void) {
if (1) {} if (1) {}
if (1) {} if (1) {}
// KeyWaitB (LRZ Up Down Up Down Left Left Right Right B A START) // "KeyWaitB (L R Z Up Down Up Down Left Left Right Right B A START)"
osSyncPrintf( osSyncPrintf(VT_FGCOL(WHITE) T("KeyWaitB (ＬＲＺ ", "KeyWaitB (L R Z ") VT_FGCOL(WHITE) T("上", "Up ")
VT_FGCOL(WHITE) "KeyWaitB (ＬＲＺ " VT_FGCOL(WHITE) "上" VT_FGCOL(YELLOW) "下 " VT_FGCOL(YELLOW) "上" VT_FGCOL(WHITE) "下 " VT_FGCOL(WHITE) "左" VT_FGCOL( VT_FGCOL(YELLOW) T("下 ", "Down ") VT_FGCOL(YELLOW) T("上", "Up ") VT_FGCOL(WHITE)
YELLOW) "左 " VT_FGCOL(YELLOW) "右" VT_FGCOL(WHITE) "右 " VT_FGCOL(GREEN) "Ｂ" VT_FGCOL(BLUE) "Ａ" VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST T("下 ", "Down ") VT_FGCOL(WHITE) T("左", "Left ") VT_FGCOL(YELLOW) T("左 ", "Left ")
"\n"); VT_FGCOL(YELLOW) T("右", "Right ") VT_FGCOL(WHITE) T("右 ", "Right ") VT_FGCOL(GREEN)
// KeyWaitB'(LR Left Right START) T("Ｂ", "B ") VT_FGCOL(BLUE) T("Ａ", "A ")
osSyncPrintf(VT_FGCOL(WHITE) "KeyWaitB'(ＬＲ左" VT_FGCOL(YELLOW) "右 +" VT_FGCOL(RED) "START" VT_FGCOL( VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST "\n");
WHITE) ")" VT_RST "\n"); // "KeyWaitB'(L R Left Right +START)"
osSyncPrintf(VT_FGCOL(WHITE) T("KeyWaitB'(ＬＲ左", "KeyWaitB'(L R Left ") VT_FGCOL(YELLOW) T("右 +", "Right +")
VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST "\n");
Fault_SetForeColor(GPACK_RGBA5551(255, 255, 255, 1)); Fault_SetForeColor(GPACK_RGBA5551(255, 255, 255, 1));
Fault_SetBackColor(GPACK_RGBA5551(0, 0, 0, 1)); Fault_SetBackColor(GPACK_RGBA5551(0, 0, 0, 1));
@ -1185,20 +1194,20 @@ void Fault_ThreadEntry(void* arg) {
if (msg == FAULT_MSG_CPU_BREAK) { if (msg == FAULT_MSG_CPU_BREAK) {
sFaultInstance->msgId = (u32)FAULT_MSG_CPU_BREAK; sFaultInstance->msgId = (u32)FAULT_MSG_CPU_BREAK;
// Fault Manager: OS_EVENT_CPU_BREAK received osSyncPrintf(T("フォルトマネージャ:OS_EVENT_CPU_BREAKを受信しました\n",
osSyncPrintf("フォルトマネージャ:OS_EVENT_CPU_BREAKを受信しました\n"); "Fault Manager: OS_EVENT_CPU_BREAK received\n"));
} else if (msg == FAULT_MSG_FAULT) { } else if (msg == FAULT_MSG_FAULT) {
sFaultInstance->msgId = (u32)FAULT_MSG_FAULT; sFaultInstance->msgId = (u32)FAULT_MSG_FAULT;
// Fault Manager: OS_EVENT_FAULT received osSyncPrintf(
osSyncPrintf("フォルトマネージャ:OS_EVENT_FAULTを受信しました\n"); T("フォルトマネージャ:OS_EVENT_FAULTを受信しました\n", "Fault Manager: OS_EVENT_FAULT received\n"));
} else if (msg == FAULT_MSG_UNK) { } else if (msg == FAULT_MSG_UNK) {
Fault_UpdatePad(); Fault_UpdatePad();
faultedThread = NULL; faultedThread = NULL;
continue; continue;
} else { } else {
sFaultInstance->msgId = (u32)FAULT_MSG_UNK; sFaultInstance->msgId = (u32)FAULT_MSG_UNK;
// Fault Manager: Unknown message received osSyncPrintf(T("フォルトマネージャ:不明なメッセージを受信しました\n",
osSyncPrintf("フォルトマネージャ:不明なメッセージを受信しました\n"); "Fault Manager: Unknown message received\n"));
} }
faultedThread = __osGetCurrFaultedThread(); faultedThread = __osGetCurrFaultedThread();

28
src/code/fault_n64.c
View file

@ -449,11 +449,14 @@ void Fault_WaitForButtonCombo(void) {
s32 count; s32 count;
s32 pad[4]; s32 pad[4];
// KeyWaitB (LRZ Up Down Up Down Left Left Right Right B A START) // "KeyWaitB (L R Z Up Down Up Down Left Left Right Right B A START)"
osSyncPrintf( osSyncPrintf(VT_FGCOL(WHITE) T("KeyWaitB (ＬＲＺ ", "KeyWaitB (L R Z ") VT_FGCOL(WHITE) T("上", "Up ")
VT_FGCOL(WHITE) "KeyWaitB (ＬＲＺ " VT_FGCOL(WHITE) "上" VT_FGCOL(YELLOW) "下 " VT_FGCOL(YELLOW) "上" VT_FGCOL(WHITE) "下 " VT_FGCOL(WHITE) "左" VT_FGCOL( VT_FGCOL(YELLOW) T("下 ", "Down ") VT_FGCOL(YELLOW) T("上", "Up ") VT_FGCOL(WHITE)
YELLOW) "左 " VT_FGCOL(YELLOW) "右" VT_FGCOL(WHITE) "右 " VT_FGCOL(GREEN) "Ｂ" VT_FGCOL(BLUE) "Ａ" VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST T("下 ", "Down ") VT_FGCOL(WHITE) T("左", "Left ") VT_FGCOL(YELLOW) T("左 ", "Left ")
"\n"); VT_FGCOL(YELLOW) T("右", "Right ") VT_FGCOL(WHITE) T("右 ", "Right ") VT_FGCOL(GREEN)
T("Ｂ", "B ") VT_FGCOL(BLUE) T("Ａ", "A ")
VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST "\n");
x = 0; x = 0;
y = 0; y = 0;
count = 0; count = 0;
@ -585,8 +588,7 @@ void Fault_WaitForButtonCombo(void) {
if ((btnCur == (BTN_A | BTN_B | BTN_START)) && (btnPress == BTN_START)) { if ((btnCur == (BTN_A | BTN_B | BTN_START)) && (btnPress == BTN_START)) {
f32 comboTimeSeconds = OS_CYCLES_TO_USEC(osGetTime() - comboStartTime) / 1000000.0f; f32 comboTimeSeconds = OS_CYCLES_TO_USEC(osGetTime() - comboStartTime) / 1000000.0f;
// Input time %f seconds osSyncPrintf(T("入力時間 %f 秒\n", "Input time %f seconds\n"), comboTimeSeconds);
osSyncPrintf("入力時間 %f 秒\n", comboTimeSeconds);
if (comboTimeSeconds <= 50.0f) { if (comboTimeSeconds <= 50.0f) {
x = 11; x = 11;
} else { } else {
@ -750,16 +752,16 @@ void Fault_ThreadEntry(void* arg0) {
osRecvMesg(&gFaultMgr.queue, &msg, OS_MESG_BLOCK); osRecvMesg(&gFaultMgr.queue, &msg, OS_MESG_BLOCK);
if (msg == FAULT_MSG_CPU_BREAK) { if (msg == FAULT_MSG_CPU_BREAK) {
gFaultMsgId = (s32)FAULT_MSG_CPU_BREAK; gFaultMsgId = (s32)FAULT_MSG_CPU_BREAK;
// Fault Manager: OS_EVENT_CPU_BREAK received osSyncPrintf(T("フォルトマネージャ:OS_EVENT_CPU_BREAKを受信しました\n",
osSyncPrintf("フォルトマネージャ:OS_EVENT_CPU_BREAKを受信しました\n"); "Fault Manager: OS_EVENT_CPU_BREAK received\n"));
} else if (msg == FAULT_MSG_FAULT) { } else if (msg == FAULT_MSG_FAULT) {
gFaultMsgId = (s32)FAULT_MSG_FAULT; gFaultMsgId = (s32)FAULT_MSG_FAULT;
// Fault Manager: OS_EVENT_FAULT received osSyncPrintf(
osSyncPrintf("フォルトマネージャ:OS_EVENT_FAULTを受信しました\n"); T("フォルトマネージャ:OS_EVENT_FAULTを受信しました\n", "Fault Manager: OS_EVENT_FAULT received\n"));
} else { } else {
gFaultMsgId = (s32)FAULT_MSG_UNK; gFaultMsgId = (s32)FAULT_MSG_UNK;
// Fault Manager: Unknown message received osSyncPrintf(T("フォルトマネージャ:不明なメッセージを受信しました\n",
osSyncPrintf("フォルトマネージャ:不明なメッセージを受信しました\n"); "Fault Manager: Unknown message received\n"));
} }
faultedThread = __osGetCurrFaultedThread(); faultedThread = __osGetCurrFaultedThread();
osSyncPrintf("__osGetCurrFaultedThread()=%08x\n", faultedThread); osSyncPrintf("__osGetCurrFaultedThread()=%08x\n", faultedThread);

2
src/code/game.c
View file

@ -533,7 +533,7 @@ void* GameState_Alloc(GameState* gameState, size_t size, const char* file, int l
void* ret; void* ret;
if (THA_IsCrash(&gameState->tha)) { if (THA_IsCrash(&gameState->tha)) {
PRINTF("ハイラルは滅亡している\n"); PRINTF(T("ハイラルは滅亡している\n", "Hyrule is destroyed\n"));
ret = NULL; ret = NULL;
} else if ((u32)THA_GetRemaining(&gameState->tha) < size) { } else if ((u32)THA_GetRemaining(&gameState->tha) < size) {
PRINTF(T("滅亡寸前のハイラルには %d バイトの余力もない（滅亡まであと %d バイト）\n", PRINTF(T("滅亡寸前のハイラルには %d バイトの余力もない（滅亡まであと %d バイト）\n",

2
src/code/gfxprint.c
View file

@ -361,7 +361,7 @@ void GfxPrint_Open(GfxPrint* this, Gfx* dList) {
GfxPrint_Setup(this); GfxPrint_Setup(this);
} else { } else {
#if PLATFORM_N64 || OOT_DEBUG #if PLATFORM_N64 || OOT_DEBUG
osSyncPrintf("gfxprint_open:２重オープンです\n"); osSyncPrintf(T("gfxprint_open:２重オープンです\n", "gfxprint_open: Double open\n"));
#endif #endif
} }
} }

30
src/code/ucode_disas.c
View file

@ -222,7 +222,7 @@ void UCodeDisas_SetCurUCodeImpl(UCodeDisas* this, void* ptr) {
} }
} }
if (i >= this->ucodeInfoCount) { if (i >= this->ucodeInfoCount) {
DISAS_LOG("マイクロコードが一致しなかった\n"); // "Microcode did not match" DISAS_LOG(T("マイクロコードが一致しなかった\n", "Microcode did not match\n"));
this->ucodeType = UCODE_NULL; this->ucodeType = UCODE_NULL;
} }
} }
@ -413,7 +413,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
settile.shiftt, (settile.cs << 1) + settile.ms, settile.masks, settile.shifts); settile.shiftt, (settile.cs << 1) + settile.ms, settile.masks, settile.shifts);
if (this->tileSyncRequired) { if (this->tileSyncRequired) {
DISAS_LOG("### TileSyncが必要です。\n"); DISAS_LOG(T("### TileSyncが必要です。\n", "### TileSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -432,7 +432,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
loadtile.th); loadtile.th);
if (this->loadSyncRequired) { if (this->loadSyncRequired) {
DISAS_LOG("### LoadSyncが必要です。\n"); DISAS_LOG(T("### LoadSyncが必要です。\n", "### LoadSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
this->pipeSyncRequired = true; this->pipeSyncRequired = true;
@ -476,7 +476,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
UCodeDisas_GetCombineAlphaName(setcombine.Ad1, COMBINER_D)); UCodeDisas_GetCombineAlphaName(setcombine.Ad1, COMBINER_D));
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -529,7 +529,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
this->modeH |= s2; this->modeH |= s2;
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -571,7 +571,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
this->modeL |= s2; this->modeL |= s2;
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -582,7 +582,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
this->modeL = curGfx->words.w1; this->modeL = curGfx->words.w1;
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -632,7 +632,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
(curGfx->dma.len & 0xFFF) + 1, curGfx->setimg.dram, addr); (curGfx->dma.len & 0xFFF) + 1, curGfx->setimg.dram, addr);
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -641,7 +641,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
DISAS_LOG("gsDPSetDepthImage(0x%08x(0x%08x)),", curGfx->setimg.dram, addr); DISAS_LOG("gsDPSetDepthImage(0x%08x(0x%08x)),", curGfx->setimg.dram, addr);
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -668,7 +668,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
curGfx->setcolor.b, curGfx->setcolor.a); curGfx->setcolor.b, curGfx->setcolor.a);
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -678,7 +678,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
curGfx->setcolor.b, curGfx->setcolor.a); curGfx->setcolor.b, curGfx->setcolor.a);
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -688,7 +688,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
curGfx->setcolor.b, curGfx->setcolor.a); curGfx->setcolor.b, curGfx->setcolor.a);
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -697,7 +697,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
DISAS_LOG("gsDPSetFillColor(0x%08x),", curGfx->setcolor.color); DISAS_LOG("gsDPSetFillColor(0x%08x),", curGfx->setcolor.color);
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -706,7 +706,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
DISAS_LOG("gsDPSetPrimDepth(%d, %d),", curGfx->setprimdepth.z, curGfx->setprimdepth.dz); DISAS_LOG("gsDPSetPrimDepth(%d, %d),", curGfx->setprimdepth.z, curGfx->setprimdepth.dz);
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;
@ -721,7 +721,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) {
DISAS_LOG("gsDPFullSync(),"); DISAS_LOG("gsDPFullSync(),");
if (this->pipeSyncRequired) { if (this->pipeSyncRequired) {
DISAS_LOG("### PipeSyncが必要です。\n"); DISAS_LOG(T("### PipeSyncが必要です。\n", "### PipeSync is required.\n"));
this->syncErr++; this->syncErr++;
} }
} break; } break;

65
src/code/z_actor.c
View file

@ -911,8 +911,7 @@ void Actor_Destroy(Actor* actor, PlayState* play) {
overlayEntry = actor->overlayEntry; overlayEntry = actor->overlayEntry;
name = overlayEntry->name != NULL ? overlayEntry->name : ""; name = overlayEntry->name != NULL ? overlayEntry->name : "";
// "No Actor class destruct [%s]" PRINTF(T("Ａｃｔｏｒクラス デストラクトがありません [%s]\n", "No Actor class destruct [%s]\n") VT_RST, name);
PRINTF("Ａｃｔｏｒクラス デストラクトがありません [%s]\n" VT_RST, name);
#endif #endif
} }
} }
@ -2420,13 +2419,13 @@ void Actor_FaultPrint(Actor* actor, char* command) {
overlayEntry = actor->overlayEntry; overlayEntry = actor->overlayEntry;
name = overlayEntry->name != NULL ? overlayEntry->name : ""; name = overlayEntry->name != NULL ? overlayEntry->name : "";
PRINTF("アクターの名前(%08x:%s)\n", actor, name); // "Actor name (%08x:%s)" PRINTF(T("アクターの名前(%08x:%s)\n", "Actor name (%08x:%s)\n"), actor, name);
#else #else
name = ""; name = "";
#endif #endif
if (command != NULL) { if (command != NULL) {
PRINTF("コメント:%s\n", command); // "Command:%s" PRINTF(T("コメント:%s\n", "Command: %s\n"), command);
} }
Fault_SetCursor(48, 24); Fault_SetCursor(48, 24);
@ -2830,7 +2829,7 @@ void func_80031C3C(ActorContext* actorCtx, PlayState* play) {
} }
} }
ACTOR_DEBUG_PRINTF("絶対魔法領域解放\n"); // "Absolute magic field deallocation" ACTOR_DEBUG_PRINTF(T("絶対魔法領域解放\n", "Absolute magic field deallocation\n"));
if (actorCtx->absoluteSpace != NULL) { if (actorCtx->absoluteSpace != NULL) {
ZELDA_ARENA_FREE(actorCtx->absoluteSpace, "../z_actor.c", 6731); ZELDA_ARENA_FREE(actorCtx->absoluteSpace, "../z_actor.c", 6731);
@ -2900,24 +2899,24 @@ void Actor_FreeOverlay(ActorOverlay* actorOverlay) {
PRINTF(VT_FGCOL(CYAN)); PRINTF(VT_FGCOL(CYAN));
if (actorOverlay->numLoaded == 0) { if (actorOverlay->numLoaded == 0) {
ACTOR_DEBUG_PRINTF("アクタークライアントが０になりました\n"); // "Actor client is now 0" ACTOR_DEBUG_PRINTF(T("アクタークライアントが０になりました\n", "Actor clients are now 0\n"));
if (actorOverlay->loadedRamAddr != NULL) { if (actorOverlay->loadedRamAddr != NULL) {
if (actorOverlay->allocType & ACTOROVL_ALLOC_PERSISTENT) { if (actorOverlay->allocType & ACTOROVL_ALLOC_PERSISTENT) {
ACTOR_DEBUG_PRINTF("オーバーレイ解放しません\n"); // "Overlay will not be deallocated" ACTOR_DEBUG_PRINTF(T("オーバーレイ解放しません\n", "Overlay will not be deallocated\n"));
} else if (actorOverlay->allocType & ACTOROVL_ALLOC_ABSOLUTE) { } else if (actorOverlay->allocType & ACTOROVL_ALLOC_ABSOLUTE) {
// "Absolute magic field reserved, so deallocation will not occur" ACTOR_DEBUG_PRINTF(T("絶対魔法領域確保なので解放しません\n",
ACTOR_DEBUG_PRINTF("絶対魔法領域確保なので解放しません\n"); "Absolute magic field reserved, so deallocation will not occur\n"));
actorOverlay->loadedRamAddr = NULL; actorOverlay->loadedRamAddr = NULL;
} else { } else {
ACTOR_DEBUG_PRINTF("オーバーレイ解放します\n"); // "Overlay deallocated" ACTOR_DEBUG_PRINTF(T("オーバーレイ解放します\n", "Overlay deallocated\n"));
ZELDA_ARENA_FREE(actorOverlay->loadedRamAddr, "../z_actor.c", 6834); ZELDA_ARENA_FREE(actorOverlay->loadedRamAddr, "../z_actor.c", 6834);
actorOverlay->loadedRamAddr = NULL; actorOverlay->loadedRamAddr = NULL;
} }
} }
} else { } else {
// "%d of actor client remains" ACTOR_DEBUG_PRINTF(T("アクタークライアントはあと %d 残っています\n", "%d of actor client remaining\n"),
ACTOR_DEBUG_PRINTF("アクタークライアントはあと %d 残っています\n", actorOverlay->numLoaded); actorOverlay->numLoaded);
} }
PRINTF(VT_RST); PRINTF(VT_RST);
@ -2943,32 +2942,31 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos
overlaySize = (uintptr_t)overlayEntry->vramEnd - (uintptr_t)overlayEntry->vramStart; overlaySize = (uintptr_t)overlayEntry->vramEnd - (uintptr_t)overlayEntry->vramStart;
// "Actor class addition [%d:%s]" ACTOR_DEBUG_PRINTF(T("アクタークラス追加 [%d:%s]\n", "Actor class addition [%d:%s]\n"), actorId, name);
ACTOR_DEBUG_PRINTF("アクタークラス追加 [%d:%s]\n", actorId, name);
if (actorCtx->total > ACTOR_NUMBER_MAX) { if (actorCtx->total > ACTOR_NUMBER_MAX) {
// "Ａｃｔｏｒ set number exceeded" PRINTF(VT_COL(YELLOW, BLACK) T("Ａｃｔｏｒセット数オーバー\n", "Actor set number exceeded\n") VT_RST);
PRINTF(VT_COL(YELLOW, BLACK) "Ａｃｔｏｒセット数オーバー\n" VT_RST);
return NULL; return NULL;
} }
if (overlayEntry->vramStart == NULL) { if (overlayEntry->vramStart == NULL) {
ACTOR_DEBUG_PRINTF("オーバーレイではありません\n"); // "Not an overlay" ACTOR_DEBUG_PRINTF(T("オーバーレイではありません\n", "Not an overlay\n"));
profile = overlayEntry->profile; profile = overlayEntry->profile;
} else { } else {
if (overlayEntry->loadedRamAddr != NULL) { if (overlayEntry->loadedRamAddr != NULL) {
ACTOR_DEBUG_PRINTF("既にロードされています\n"); // "Already loaded" ACTOR_DEBUG_PRINTF(T("既にロードされています\n", "Already loaded\n"));
} else { } else {
if (overlayEntry->allocType & ACTOROVL_ALLOC_ABSOLUTE) { if (overlayEntry->allocType & ACTOROVL_ALLOC_ABSOLUTE) {
ASSERT(overlaySize <= ACTOROVL_ABSOLUTE_SPACE_SIZE, "actor_segsize <= AM_FIELD_SIZE", "../z_actor.c", ASSERT(overlaySize <= ACTOROVL_ABSOLUTE_SPACE_SIZE, "actor_segsize <= AM_FIELD_SIZE", "../z_actor.c",
6934); 6934);
if (actorCtx->absoluteSpace == NULL) { if (actorCtx->absoluteSpace == NULL) {
// "AMF: absolute magic field" actorCtx->absoluteSpace = ZELDA_ARENA_MALLOC_R(
actorCtx->absoluteSpace = ZELDA_ARENA_MALLOC_R(ACTOROVL_ABSOLUTE_SPACE_SIZE, "AMF:絶対魔法領域", 0); ACTOROVL_ABSOLUTE_SPACE_SIZE, T("AMF:絶対魔法領域", "AMF: absolute magic field"), 0);
// "Absolute magic field reservation - %d bytes reserved" ACTOR_DEBUG_PRINTF(
ACTOR_DEBUG_PRINTF("絶対魔法領域確保 %d バイト確保\n", ACTOROVL_ABSOLUTE_SPACE_SIZE); T("絶対魔法領域確保 %d バイト確保\n", "Absolute magic field allocation %d bytes allocated\n"),
ACTOROVL_ABSOLUTE_SPACE_SIZE);
} }
overlayEntry->loadedRamAddr = actorCtx->absoluteSpace; overlayEntry->loadedRamAddr = actorCtx->absoluteSpace;
@ -2979,8 +2977,8 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos
} }
if (overlayEntry->loadedRamAddr == NULL) { if (overlayEntry->loadedRamAddr == NULL) {
// "Cannot reserve actor program memory" PRINTF(VT_COL(RED, WHITE) T("Ａｃｔｏｒプログラムメモリが確保できません\n",
PRINTF(VT_COL(RED, WHITE) "Ａｃｔｏｒプログラムメモリが確保できません\n" VT_RST); "Cannot reserve actor program memory\n") VT_RST);
return NULL; return NULL;
} }
@ -3009,9 +3007,9 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos
if ((objectSlot < 0) || if ((objectSlot < 0) ||
((profile->category == ACTORCAT_ENEMY) && Flags_GetClear(play, play->roomCtx.curRoom.num))) { ((profile->category == ACTORCAT_ENEMY) && Flags_GetClear(play, play->roomCtx.curRoom.num))) {
// "No data bank!! <data bank＝%d> (profilep->bank=%d)" PRINTF(VT_COL(RED, WHITE) T("データバンク無し！！<データバンク＝%d>(profilep->bank=%d)\n",
PRINTF(VT_COL(RED, WHITE) "データバンク無し！！<データバンク＝%d>(profilep->bank=%d)\n" VT_RST, objectSlot, "No data bank!! <data bank=%d> (profilep->bank=%d)\n") VT_RST,
profile->objectId); objectSlot, profile->objectId);
Actor_FreeOverlay(overlayEntry); Actor_FreeOverlay(overlayEntry);
return NULL; return NULL;
} }
@ -3019,9 +3017,9 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos
actor = ZELDA_ARENA_MALLOC(profile->instanceSize, name, 1); actor = ZELDA_ARENA_MALLOC(profile->instanceSize, name, 1);
if (actor == NULL) { if (actor == NULL) {
// "Actor class cannot be reserved! %s <size＝%d bytes>" PRINTF(VT_COL(RED, WHITE) T("Ａｃｔｏｒクラス確保できません！ %s <サイズ＝%dバイト>\n",
PRINTF(VT_COL(RED, WHITE) "Ａｃｔｏｒクラス確保できません！ %s <サイズ＝%dバイト>\n", VT_RST, name, "Actor class cannot be reserved! %s <size=%d bytes>\n"),
profile->instanceSize); VT_RST, name, profile->instanceSize);
Actor_FreeOverlay(overlayEntry); Actor_FreeOverlay(overlayEntry);
return NULL; return NULL;
} }
@ -3032,8 +3030,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos
if (1) {} if (1) {}
// "Actor client No. %d" ACTOR_DEBUG_PRINTF(T("アクタークライアントは %d 個目です\n", "Actor client No. %d\n"), overlayEntry->numLoaded);
ACTOR_DEBUG_PRINTF("アクタークライアントは %d 個目です\n", overlayEntry->numLoaded);
Lib_MemSet((u8*)actor, profile->instanceSize, 0); Lib_MemSet((u8*)actor, profile->instanceSize, 0);
actor->overlayEntry = overlayEntry; actor->overlayEntry = overlayEntry;
@ -3135,7 +3132,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) {
overlayEntry = actor->overlayEntry; overlayEntry = actor->overlayEntry;
name = overlayEntry->name != NULL ? overlayEntry->name : ""; name = overlayEntry->name != NULL ? overlayEntry->name : "";
ACTOR_DEBUG_PRINTF("アクタークラス削除 [%s]\n", name); // "Actor class deleted [%s]" ACTOR_DEBUG_PRINTF(T("アクタークラス削除 [%s]\n", "Actor class deleted [%s]\n"), name);
if ((player != NULL) && (actor == player->focusActor)) { if ((player != NULL) && (actor == player->focusActor)) {
func_8008EDF0(player); func_8008EDF0(player);
@ -3162,7 +3159,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) {
ZELDA_ARENA_FREE(actor, "../z_actor.c", 7242); ZELDA_ARENA_FREE(actor, "../z_actor.c", 7242);
if (overlayEntry->vramStart == NULL) { if (overlayEntry->vramStart == NULL) {
ACTOR_DEBUG_PRINTF("オーバーレイではありません\n"); // "Not an overlay" ACTOR_DEBUG_PRINTF(T("オーバーレイではありません\n", "Not an overlay\n"));
} else { } else {
ASSERT(overlayEntry->loadedRamAddr != NULL, "actor_dlftbl->allocp != NULL", "../z_actor.c", 7251); ASSERT(overlayEntry->loadedRamAddr != NULL, "actor_dlftbl->allocp != NULL", "../z_actor.c", 7251);
ASSERT(overlayEntry->numLoaded > 0, "actor_dlftbl->clients > 0", "../z_actor.c", 7252); ASSERT(overlayEntry->numLoaded > 0, "actor_dlftbl->clients > 0", "../z_actor.c", 7252);

178
src/code/z_message.c
View file

@ -463,9 +463,8 @@ void Message_FindMessagePAL(PlayState* play, u16 textId) {
nextSeg = messageTableEntry->segment; nextSeg = messageTableEntry->segment;
font->msgOffset = foundSeg - seg; font->msgOffset = foundSeg - seg;
font->msgLength = nextSeg - foundSeg; font->msgLength = nextSeg - foundSeg;
// "Message found!!!" PRINTF(T(" メッセージが,見つかった！！！ = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n",
PRINTF(" メッセージが,見つかった！！！ = %x " "Message found!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n"),
"(data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n",
textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg);
return; return;
} }
@ -484,9 +483,8 @@ void Message_FindMessagePAL(PlayState* play, u16 textId) {
nextSeg = *languageSegmentTable; nextSeg = *languageSegmentTable;
font->msgOffset = foundSeg - seg; font->msgOffset = foundSeg - seg;
font->msgLength = nextSeg - foundSeg; font->msgLength = nextSeg - foundSeg;
// "Message found!!!" PRINTF(T(" メッセージが,見つかった！！！ = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n",
PRINTF(" メッセージが,見つかった！！！ = %x " "Message found!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n"),
"(data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n",
textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg);
return; return;
} }
@ -494,8 +492,7 @@ void Message_FindMessagePAL(PlayState* play, u16 textId) {
languageSegmentTable++; languageSegmentTable++;
} }
} }
// "Message not found!!!" PRINTF(T(" メッセージが,見つからなかった！！！ = %x\n", "Message not found!!! = %x\n"), textId);
PRINTF(" メッセージが,見つからなかった！！！ = %x\n", textId);
messageTableEntry = sNesMessageEntryTablePtr; messageTableEntry = sNesMessageEntryTablePtr;
if (gSaveContext.language == LANGUAGE_ENG) { if (gSaveContext.language == LANGUAGE_ENG) {
@ -533,8 +530,8 @@ void Message_FindCreditsMessage(PlayState* play, u16 textId) {
nextSeg = messageTableEntry->segment; nextSeg = messageTableEntry->segment;
font->msgOffset = foundSeg - seg; font->msgOffset = foundSeg - seg;
font->msgLength = nextSeg - foundSeg; font->msgLength = nextSeg - foundSeg;
// "Message found!!!" PRINTF(T(" メッセージが,見つかった！！！ = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n",
PRINTF(" メッセージが,見つかった！！！ = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n", "Message found!!! = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n"),
textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg);
return; return;
} }
@ -939,11 +936,11 @@ void Message_HandleOcarina(PlayState* play) {
if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_LONG_RECORDING) { if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_LONG_RECORDING) {
msgCtx->msgMode = MSGMODE_SCARECROW_LONG_RECORDING_START; msgCtx->msgMode = MSGMODE_SCARECROW_LONG_RECORDING_START;
// "Recording Start / Recording Start / Recording Start / Recording Start -> " PRINTF(T("録音開始 録音開始 録音開始 録音開始 -> ",
PRINTF("録音開始 録音開始 録音開始 録音開始 -> "); "Recording Start Recording Start Recording Start Recording Start -> "));
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_LONG_PLAYBACK) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_LONG_PLAYBACK) {
// "Recording Playback / Recording Playback / Recording Playback / Recording Playback -> " PRINTF(T("録音再生 録音再生 録音再生 録音再生 -> ",
PRINTF("録音再生 録音再生 録音再生 録音再生 -> "); "Recording Playback Recording Playback Recording Playback Recording Playback -> "));
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff();
@ -955,11 +952,10 @@ void Message_HandleOcarina(PlayState* play) {
AudioOcarina_SetPlaybackSong(OCARINA_SONG_SCARECROW_LONG + 1, 1); AudioOcarina_SetPlaybackSong(OCARINA_SONG_SCARECROW_LONG + 1, 1);
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_SPAWN_RECORDING) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_SPAWN_RECORDING) {
msgCtx->msgMode = MSGMODE_SCARECROW_SPAWN_RECORDING_START; msgCtx->msgMode = MSGMODE_SCARECROW_SPAWN_RECORDING_START;
// "8 Note Recording Start / 8 Note Recording Start / 8 Note Recording Start -> " PRINTF(T("８音録音開始 ８音録音開始 ８音録音開始 -> ",
PRINTF("８音録音開始 ８音録音開始 ８音録音開始 -> "); "8 Note Recording Start 8 Note Recording Start 8 Note Recording Start -> "));
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_SPAWN_PLAYBACK) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_SPAWN_PLAYBACK) {
// "8 Note Playback / 8 Note Playback / 8 Note Playback -> " PRINTF(T("８音再生 ８音再生 ８音再生 -> ", "8 Note Playback 8 Note Playback 8 Note Playback -> "));
PRINTF("８音再生 ８音再生 ８音再生 -> ");
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff();
@ -971,15 +967,13 @@ void Message_HandleOcarina(PlayState* play) {
AudioOcarina_SetPlaybackSong(OCARINA_SONG_SCARECROW_SPAWN + 1, 1); AudioOcarina_SetPlaybackSong(OCARINA_SONG_SCARECROW_SPAWN + 1, 1);
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_MEMORY_GAME) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_MEMORY_GAME) {
msgCtx->msgMode = MSGMODE_MEMORY_GAME_START; msgCtx->msgMode = MSGMODE_MEMORY_GAME_START;
// "Musical Round Start / Musical Round Start / Musical Round Start / Musical Round Start -> " PRINTF(T("輪唱開始 輪唱開始 輪唱開始 輪唱開始 -> ",
PRINTF("輪唱開始 輪唱開始 輪唱開始 輪唱開始 -> "); "Musical Round Start Musical Round Start Musical Round Start Musical Round Start -> "));
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_FROGS) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_FROGS) {
msgCtx->msgMode = MSGMODE_FROGS_START; msgCtx->msgMode = MSGMODE_FROGS_START;
// "Frog Chorus / Frog Chorus -> " PRINTF(T("カエルの合唱 カエルの合唱 -> ", "Frog Chorus Frog Chorus -> "));
PRINTF("カエルの合唱 カエルの合唱 -> ");
} else { } else {
// "Ocarina（%d）" PRINTF(T("オカリナ（%d） ", "Ocarina (%d)"), msgCtx->ocarinaAction);
PRINTF("オカリナ（%d） ", msgCtx->ocarinaAction);
if (msgCtx->ocarinaAction == OCARINA_ACTION_UNK_0 || msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY || if (msgCtx->ocarinaAction == OCARINA_ACTION_UNK_0 || msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY ||
msgCtx->ocarinaAction >= OCARINA_ACTION_CHECK_SARIA) { msgCtx->ocarinaAction >= OCARINA_ACTION_CHECK_SARIA) {
msgCtx->msgMode = MSGMODE_OCARINA_STARTING; msgCtx->msgMode = MSGMODE_OCARINA_STARTING;
@ -1445,20 +1439,18 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) {
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) { if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING) {
msgCtx->msgMode = MSGMODE_TEXT_DONE; msgCtx->msgMode = MSGMODE_TEXT_DONE;
msgCtx->textboxEndType = TEXTBOX_ENDTYPE_FADING; msgCtx->textboxEndType = TEXTBOX_ENDTYPE_FADING;
// "Timer" PRINTF(T("タイマー (%x) (%x)", "Timer (%x) (%x)"), msgCtx->msgBufDecoded[i + 1],
PRINTF("タイマー (%x) (%x)", msgCtx->msgBufDecoded[i + 1], msgCtx->msgBufDecoded[i + 2]); msgCtx->msgBufDecoded[i + 2]);
msgCtx->stateTimer = msgCtx->msgBufDecoded[++i] << 8; msgCtx->stateTimer = msgCtx->msgBufDecoded[++i] << 8;
msgCtx->stateTimer |= msgCtx->msgBufDecoded[++i]; msgCtx->stateTimer |= msgCtx->msgBufDecoded[++i];
// "Total wct" PRINTF(T("合計wct=%x(%d)\n", " Total wct=%x(%d)\n"), msgCtx->stateTimer, msgCtx->stateTimer);
PRINTF("合計wct=%x(%d)\n", msgCtx->stateTimer, msgCtx->stateTimer);
} }
*gfxP = gfx; *gfxP = gfx;
return; return;
case MESSAGE_SFX: case MESSAGE_SFX:
if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING && !sMessageHasSetSfx) { if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING && !sMessageHasSetSfx) {
sMessageHasSetSfx = true; sMessageHasSetSfx = true;
// "Sound (SE)" PRINTF(T("サウンド（ＳＥ）\n", "Sound (SE)\n"));
PRINTF("サウンド（ＳＥ）\n");
sfxHi = msgCtx->msgBufDecoded[i + 1]; sfxHi = msgCtx->msgBufDecoded[i + 1];
sfxHi <<= 8; sfxHi <<= 8;
Audio_PlaySfxGeneral(sfxHi | msgCtx->msgBufDecoded[i + 2], &gSfxDefaultPos, 4, Audio_PlaySfxGeneral(sfxHi | msgCtx->msgBufDecoded[i + 2], &gSfxDefaultPos, 4,
@ -1642,16 +1634,14 @@ void Message_LoadItemIcon(PlayState* play, u16 itemId, s16 y) {
R_TEXTBOX_ICON_DIMENSION = ITEM_ICON_WIDTH; // assumes the image is square R_TEXTBOX_ICON_DIMENSION = ITEM_ICON_WIDTH; // assumes the image is square
DMA_REQUEST_SYNC(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, GET_ITEM_ICON_VROM(itemId), ITEM_ICON_SIZE, DMA_REQUEST_SYNC(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, GET_ITEM_ICON_VROM(itemId), ITEM_ICON_SIZE,
"../z_message_PAL.c", 1473); "../z_message_PAL.c", 1473);
// "Item 32-0" PRINTF(T("アイテム32-0\n", "Item 32-0\n"));
PRINTF("アイテム32-0\n");
} else { } else {
R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem24XOffsets[gSaveContext.language]; R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem24XOffsets[gSaveContext.language];
R_TEXTBOX_ICON_YPOS = y + ((44 - QUEST_ICON_HEIGHT) / 2); R_TEXTBOX_ICON_YPOS = y + ((44 - QUEST_ICON_HEIGHT) / 2);
R_TEXTBOX_ICON_DIMENSION = QUEST_ICON_WIDTH; // assumes the image is square R_TEXTBOX_ICON_DIMENSION = QUEST_ICON_WIDTH; // assumes the image is square
DMA_REQUEST_SYNC(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, GET_QUEST_ICON_VROM(itemId), QUEST_ICON_SIZE, DMA_REQUEST_SYNC(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, GET_QUEST_ICON_VROM(itemId), QUEST_ICON_SIZE,
"../z_message_PAL.c", 1482); "../z_message_PAL.c", 1482);
// "Item 24" PRINTF(T("アイテム24＝%d (%d) {%d}\n", "Item 24=%d (%d) {%d}\n"), itemId, itemId - ITEM_KOKIRI_EMERALD, 84);
PRINTF("アイテム24＝%d (%d) {%d}\n", itemId, itemId - ITEM_KOKIRI_EMERALD, 84);
} }
msgCtx->msgBufPos++; msgCtx->msgBufPos++;
msgCtx->choiceNum = 1; msgCtx->choiceNum = 1;
@ -2060,8 +2050,7 @@ void Message_Decode(PlayState* play) {
break; break;
} }
} }
// "Name" PRINTF(T("\n名前 ＝ ", "\nName = "));
PRINTF("\n名前 ＝ ");
for (i = 0; i < playerNameLen; i++) { for (i = 0; i < playerNameLen; i++) {
curChar = gSaveContext.save.info.playerData.playerName[i]; curChar = gSaveContext.save.info.playerData.playerName[i];
if (curChar == FILENAME_SPACE) { if (curChar == FILENAME_SPACE) {
@ -2092,8 +2081,7 @@ void Message_Decode(PlayState* play) {
} else if (curChar == MESSAGE_MARATHON_TIME || curChar == MESSAGE_RACE_TIME) { } else if (curChar == MESSAGE_MARATHON_TIME || curChar == MESSAGE_RACE_TIME) {
// Convert the values of the appropriate timer to digits and add the // Convert the values of the appropriate timer to digits and add the
// digits to the decoded buffer in place of the control character. // digits to the decoded buffer in place of the control character.
// "EVENT timer" PRINTF(T("\nＥＶＥＮＴタイマー ＝ ", "\nEVENT timer = "));
PRINTF("\nＥＶＥＮＴタイマー ＝ ");
digits[0] = digits[1] = digits[2] = 0; digits[0] = digits[1] = digits[2] = 0;
if (curChar == MESSAGE_RACE_TIME) { if (curChar == MESSAGE_RACE_TIME) {
digits[3] = gSaveContext.timerSeconds; digits[3] = gSaveContext.timerSeconds;
@ -2133,8 +2121,7 @@ void Message_Decode(PlayState* play) {
} else if (curChar == MESSAGE_POINTS) { } else if (curChar == MESSAGE_POINTS) {
// Convert the values of the current minigame score to digits and // Convert the values of the current minigame score to digits and
// add the digits to the decoded buffer in place of the control character. // add the digits to the decoded buffer in place of the control character.
// "Yabusame score" PRINTF(T("\n流鏑馬スコア ＝ %d\n", "\nYabusame score = %d\n"), gSaveContext.minigameScore);
PRINTF("\n流鏑馬スコア ＝ %d\n", gSaveContext.minigameScore);
digits[0] = digits[1] = digits[2] = 0; digits[0] = digits[1] = digits[2] = 0;
digits[3] = gSaveContext.minigameScore; digits[3] = gSaveContext.minigameScore;
@ -2167,8 +2154,8 @@ void Message_Decode(PlayState* play) {
} else if (curChar == MESSAGE_TOKENS) { } else if (curChar == MESSAGE_TOKENS) {
// Convert the current number of collected gold skulltula tokens to digits and // Convert the current number of collected gold skulltula tokens to digits and
// add the digits to the decoded buffer in place of the control character. // add the digits to the decoded buffer in place of the control character.
// "Total number of gold stars" PRINTF(T("\n金スタ合計数 ＝ %d", "\nTotal number of gold stars = %d"),
PRINTF("\n金スタ合計数 ＝ %d", gSaveContext.save.info.inventory.gsTokens); gSaveContext.save.info.inventory.gsTokens);
digits[0] = digits[1] = 0; digits[0] = digits[1] = 0;
digits[2] = gSaveContext.save.info.inventory.gsTokens; digits[2] = gSaveContext.save.info.inventory.gsTokens;
@ -2196,8 +2183,7 @@ void Message_Decode(PlayState* play) {
} }
decodedBufPos--; decodedBufPos--;
} else if (curChar == MESSAGE_FISH_INFO) { } else if (curChar == MESSAGE_FISH_INFO) {
// "Fishing hole fish size" PRINTF(T("\n釣り堀魚サイズ ＝ ", "\nFishing hole fish size = "));
PRINTF("\n釣り堀魚サイズ ＝ ");
digits[0] = 0; digits[0] = 0;
digits[1] = gSaveContext.minigameScore; digits[1] = gSaveContext.minigameScore;
@ -2218,8 +2204,7 @@ void Message_Decode(PlayState* play) {
decodedBufPos--; decodedBufPos--;
} else if (curChar == MESSAGE_HIGHSCORE) { } else if (curChar == MESSAGE_HIGHSCORE) {
value = HIGH_SCORE((u8)font->msgBuf[++msgCtx->msgBufPos]); value = HIGH_SCORE((u8)font->msgBuf[++msgCtx->msgBufPos]);
// "Highscore" PRINTF(T("ランキング＝%d\n", "Highscore=%d\n"), font->msgBuf[msgCtx->msgBufPos]);
PRINTF("ランキング＝%d\n", font->msgBuf[msgCtx->msgBufPos]);
if ((font->msgBuf[msgCtx->msgBufPos] & 0xFF) == 2) { if ((font->msgBuf[msgCtx->msgBufPos] & 0xFF) == 2) {
if (LINK_AGE_IN_YEARS == YEARS_CHILD) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
value &= 0x7F; value &= 0x7F;
@ -2305,8 +2290,7 @@ void Message_Decode(PlayState* play) {
break; break;
} }
} else if (curChar == MESSAGE_TIME) { } else if (curChar == MESSAGE_TIME) {
// "Zelda time" PRINTF(T("\nゼルダ時間 ＝ ", "\nZelda time = "));
PRINTF("\nゼルダ時間 ＝ ");
digits[0] = 0; digits[0] = 0;
timeInSeconds = gSaveContext.save.dayTime * (24.0f * 60.0f / 0x10000); timeInSeconds = gSaveContext.save.dayTime * (24.0f * 60.0f / 0x10000);
@ -2525,8 +2509,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
msgCtx->textBoxType = msgCtx->textBoxProperties >> 4; msgCtx->textBoxType = msgCtx->textBoxProperties >> 4;
msgCtx->textBoxPos = msgCtx->textBoxProperties & 0xF; msgCtx->textBoxPos = msgCtx->textBoxProperties & 0xF;
textBoxType = msgCtx->textBoxType; textBoxType = msgCtx->textBoxType;
// "Text Box Type" PRINTF(T("吹き出し種類＝%d\n", "Text Box Type = %d\n"), msgCtx->textBoxType);
PRINTF("吹き出し種類＝%d\n", msgCtx->textBoxType);
if (textBoxType < TEXTBOX_TYPE_NONE_BOTTOM) { if (textBoxType < TEXTBOX_TYPE_NONE_BOTTOM) {
DMA_REQUEST_SYNC(msgCtx->textboxSegment, DMA_REQUEST_SYNC(msgCtx->textboxSegment,
(uintptr_t)_message_staticSegmentRomStart + (uintptr_t)_message_staticSegmentRomStart +
@ -2566,8 +2549,7 @@ void Message_StartTextbox(PlayState* play, u16 textId, Actor* actor) {
MessageContext* msgCtx = &play->msgCtx; MessageContext* msgCtx = &play->msgCtx;
PRINTF(VT_FGCOL(BLUE)); PRINTF(VT_FGCOL(BLUE));
// "Message" PRINTF(T("めっせーじ＝%x(%d)\n", "Message=%x(%d)\n"), textId, actor);
PRINTF("めっせーじ＝%x(%d)\n", textId, actor);
PRINTF(VT_RST); PRINTF(VT_RST);
msgCtx->ocarinaAction = 0xFFFF; msgCtx->ocarinaAction = 0xFFFF;
@ -2587,8 +2569,7 @@ void Message_ContinueTextbox(PlayState* play, u16 textId) {
#endif #endif
PRINTF(VT_FGCOL(GREEN)); PRINTF(VT_FGCOL(GREEN));
// "Message" PRINTF(T("めっせーじ＝%x message->msg_data\n", "Message=%x message->msg_data\n"), textId, msgCtx->msgLength);
PRINTF("めっせーじ＝%x message->msg_data\n", textId, msgCtx->msgLength);
PRINTF(VT_RST); PRINTF(VT_RST);
msgCtx->msgLength = 0; msgCtx->msgLength = 0;
@ -2650,8 +2631,8 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) {
Message_ResetOcarinaNoteState(); Message_ResetOcarinaNoteState();
sLastPlayedSong = msgCtx->unk_E3F2 = msgCtx->lastOcarinaButtonIndex = 0xFF; sLastPlayedSong = msgCtx->unk_E3F2 = msgCtx->lastOcarinaButtonIndex = 0xFF;
// "Ocarina Number" PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ オカリナ番号＝%d(%d) ☆☆☆☆☆\n", "☆☆☆☆☆ Ocarina Number = %d(%d) ☆☆☆☆☆\n") VT_RST,
PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ オカリナ番号＝%d(%d) ☆☆☆☆☆\n" VT_RST, ocarinaActionId, 2); ocarinaActionId, 2);
noStopDoAction = false; noStopDoAction = false;
if (ocarinaActionId >= 0x893) { if (ocarinaActionId >= 0x893) {
Message_OpenText(play, ocarinaActionId); // You played the [song name] Message_OpenText(play, ocarinaActionId); // You played the [song name]
@ -2688,8 +2669,7 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) {
} }
} }
msgCtx->talkActor = NULL; msgCtx->talkActor = NULL;
// "Ocarina Mode" PRINTF(T("オカリナモード = %d (%x)\n", "Ocarina Mode = %d (%x)\n"), msgCtx->ocarinaAction, textId);
PRINTF("オカリナモード = %d (%x)\n", msgCtx->ocarinaAction, textId);
msgCtx->textDelayTimer = 0; msgCtx->textDelayTimer = 0;
play->msgCtx.ocarinaMode = OCARINA_MODE_00; play->msgCtx.ocarinaMode = OCARINA_MODE_00;
R_TEXTBOX_X = 34; R_TEXTBOX_X = 34;
@ -2712,8 +2692,7 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) {
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_B_ALT); Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_B_ALT);
gSaveContext.hudVisibilityMode = noStopDoAction; gSaveContext.hudVisibilityMode = noStopDoAction;
} }
// "Music Performance Start" PRINTF(T("演奏開始\n", "Music Performance Start\n"));
PRINTF("演奏開始\n");
if (ocarinaActionId == OCARINA_ACTION_FREE_PLAY || ocarinaActionId == OCARINA_ACTION_CHECK_NOWARP) { if (ocarinaActionId == OCARINA_ACTION_FREE_PLAY || ocarinaActionId == OCARINA_ACTION_CHECK_NOWARP) {
msgCtx->msgMode = MSGMODE_OCARINA_STARTING; msgCtx->msgMode = MSGMODE_OCARINA_STARTING;
msgCtx->textBoxType = 0x63; msgCtx->textBoxType = 0x63;
@ -2725,8 +2704,8 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) {
Message_Decode(play); Message_Decode(play);
msgCtx->msgMode = MSGMODE_MEMORY_GAME_START; msgCtx->msgMode = MSGMODE_MEMORY_GAME_START;
} else if (ocarinaActionId == OCARINA_ACTION_SCARECROW_LONG_PLAYBACK) { } else if (ocarinaActionId == OCARINA_ACTION_SCARECROW_LONG_PLAYBACK) {
// "?????Recording Playback / Recording Playback / Recording Playback / Recording Playback -> " PRINTF(T("?????録音再生 録音再生 録音再生 録音再生 -> ",
PRINTF("?????録音再生 録音再生 録音再生 録音再生 -> "); "????? Recording Playback Recording Playback Recording Playback Recording Playback -> "));
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff();
@ -2957,8 +2936,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
msgCtx->ocarinaAction == OCARINA_ACTION_CHECK_NOWARP) { msgCtx->ocarinaAction == OCARINA_ACTION_CHECK_NOWARP) {
AudioOcarina_Start(sOcarinaSongBitFlags + 0xC000); AudioOcarina_Start(sOcarinaSongBitFlags + 0xC000);
} else { } else {
// "On Stage Performance" PRINTF(T("台上演奏\n", "On Stage Performance\n"));
PRINTF("台上演奏\n");
AudioOcarina_Start(sOcarinaSongBitFlags); AudioOcarina_Start(sOcarinaSongBitFlags);
} }
} else { } else {
@ -2971,8 +2949,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
msgCtx->msgMode = MSGMODE_SONG_DEMONSTRATION_SELECT_INSTRUMENT; msgCtx->msgMode = MSGMODE_SONG_DEMONSTRATION_SELECT_INSTRUMENT;
} else { } else {
AudioOcarina_Start((1 << (msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET)) + 0x8000); AudioOcarina_Start((1 << (msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET)) + 0x8000);
// "Performance Check" PRINTF(T("演奏チェック=%d\n", "Performance Check = %d\n"),
PRINTF("演奏チェック=%d\n", msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET); msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET);
msgCtx->msgMode = MSGMODE_SONG_PLAYBACK; msgCtx->msgMode = MSGMODE_SONG_PLAYBACK;
} }
if (msgCtx->ocarinaAction != OCARINA_ACTION_FREE_PLAY && if (msgCtx->ocarinaAction != OCARINA_ACTION_FREE_PLAY &&
@ -3010,8 +2988,9 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
&gSfxDefaultReverb); &gSfxDefaultReverb);
msgCtx->msgMode = MSGMODE_OCARINA_STARTING; msgCtx->msgMode = MSGMODE_OCARINA_STARTING;
} else { } else {
// "Ocarina_Flog Correct Example Performance" PRINTF(T("Ocarina_Flog 正解模範演奏=%x\n",
PRINTF("Ocarina_Flog 正解模範演奏=%x\n", msgCtx->lastPlayedSong); "Ocarina_Flog Correct Example Performance = %x\n"),
msgCtx->lastPlayedSong);
Message_ContinueTextbox(play, 0x86F); // Ocarina Message_ContinueTextbox(play, 0x86F); // Ocarina
msgCtx->msgMode = MSGMODE_SONG_PLAYED; msgCtx->msgMode = MSGMODE_SONG_PLAYED;
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA; msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
@ -3030,8 +3009,9 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
msgCtx->stateTimer = 10; msgCtx->stateTimer = 10;
msgCtx->msgMode = MSGMODE_OCARINA_FAIL; msgCtx->msgMode = MSGMODE_OCARINA_FAIL;
} else { } else {
// "Ocarina_Flog Correct Example Performance" PRINTF(T("Ocarina_Flog 正解模範演奏=%x\n",
PRINTF("Ocarina_Flog 正解模範演奏=%x\n", msgCtx->lastPlayedSong); "Ocarina_Flog Correct Example Performance = %x\n"),
msgCtx->lastPlayedSong);
Message_ContinueTextbox(play, 0x86F); // Ocarina Message_ContinueTextbox(play, 0x86F); // Ocarina
msgCtx->msgMode = MSGMODE_SONG_PLAYED; msgCtx->msgMode = MSGMODE_SONG_PLAYED;
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA; msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
@ -3042,8 +3022,9 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_NOTHING); Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_NOTHING);
} }
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY) {
// "Ocarina_Free Correct Example Performance" PRINTF(
PRINTF("Ocarina_Free 正解模範演奏=%x\n", msgCtx->lastPlayedSong); T("Ocarina_Free 正解模範演奏=%x\n", "Ocarina_Free Correct Example Performance = %x\n"),
msgCtx->lastPlayedSong);
Message_ContinueTextbox(play, 0x86F); // Ocarina Message_ContinueTextbox(play, 0x86F); // Ocarina
msgCtx->msgMode = MSGMODE_SONG_PLAYED; msgCtx->msgMode = MSGMODE_SONG_PLAYED;
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA; msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
@ -3196,8 +3177,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
if (msgCtx->stateTimer == 0) { if (msgCtx->stateTimer == 0) {
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
if (msgCtx->msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) { if (msgCtx->msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) {
// "Correct Example Performance" PRINTF(T("正解模範演奏=%x\n", "Correct Example Performance = %x\n"), msgCtx->lastPlayedSong);
PRINTF("正解模範演奏=%x\n", msgCtx->lastPlayedSong);
Message_ContinueTextbox(play, 0x86F); // Ocarina Message_ContinueTextbox(play, 0x86F); // Ocarina
msgCtx->msgMode = MSGMODE_SONG_PLAYED; msgCtx->msgMode = MSGMODE_SONG_PLAYED;
msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA; msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA;
@ -3228,16 +3208,14 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
if (msgCtx->stateTimer == 0) { if (msgCtx->stateTimer == 0) {
R_OCARINA_BUTTONS_YPOS_OFFSET = 1; R_OCARINA_BUTTONS_YPOS_OFFSET = 1;
if (msgCtx->msgMode == MSGMODE_SONG_PLAYBACK_FAIL) { if (msgCtx->msgMode == MSGMODE_SONG_PLAYBACK_FAIL) {
// "kokokokokoko" PRINTF(T("ここここここ\n", "Here here here\n"));
PRINTF("ここここここ\n");
Message_ContinueTextbox(play, 0x88B); // red X background Message_ContinueTextbox(play, 0x88B); // red X background
Message_Decode(play); Message_Decode(play);
msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_NOTES_DROP; msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_NOTES_DROP;
} else { } else {
msgCtx->msgMode = MSGMODE_OCARINA_NOTES_DROP; msgCtx->msgMode = MSGMODE_OCARINA_NOTES_DROP;
} }
// "Cancel" PRINTF(T("キャンセル\n", "Cancel\n"));
PRINTF("キャンセル\n");
} }
break; break;
case MSGMODE_OCARINA_NOTES_DROP: case MSGMODE_OCARINA_NOTES_DROP:
@ -3304,8 +3282,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
case MSGMODE_SONG_DEMONSTRATION_SELECT_INSTRUMENT: case MSGMODE_SONG_DEMONSTRATION_SELECT_INSTRUMENT:
msgCtx->stateTimer--; msgCtx->stateTimer--;
if (msgCtx->stateTimer == 0) { if (msgCtx->stateTimer == 0) {
// "ocarina_no=%d Song Chosen=%d" PRINTF(T("ocarina_no=%d 選曲=%d\n", "ocarina_no=%d Song Chosen=%d\n"), msgCtx->ocarinaAction,
PRINTF("ocarina_no=%d 選曲=%d\n", msgCtx->ocarinaAction, 0x16); 0x16);
if (msgCtx->ocarinaAction < OCARINA_ACTION_TEACH_SARIA) { if (msgCtx->ocarinaAction < OCARINA_ACTION_TEACH_SARIA) {
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_HARP); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_HARP);
} else if (msgCtx->ocarinaAction == OCARINA_ACTION_TEACH_EPONA) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_TEACH_EPONA) {
@ -3317,8 +3295,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
} else { } else {
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
} }
// "Example Performance" PRINTF(T("模範演奏=%x\n", "Example Performance = %x\n"),
PRINTF("模範演奏=%x\n", msgCtx->ocarinaAction - OCARINA_ACTION_TEACH_MINUET); msgCtx->ocarinaAction - OCARINA_ACTION_TEACH_MINUET);
AudioOcarina_SetPlaybackSong(msgCtx->ocarinaAction - OCARINA_ACTION_TEACH_MINUET + 1, 2); AudioOcarina_SetPlaybackSong(msgCtx->ocarinaAction - OCARINA_ACTION_TEACH_MINUET + 1, 2);
sOcarinaButtonIndexBufPos = 0; sOcarinaButtonIndexBufPos = 0;
msgCtx->msgMode = MSGMODE_SONG_DEMONSTRATION; msgCtx->msgMode = MSGMODE_SONG_DEMONSTRATION;
@ -3441,8 +3419,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_SUCCESS; msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_SUCCESS;
Item_Give(play, ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state]); Item_Give(play, ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state]);
PRINTF(VT_FGCOL(YELLOW)); PRINTF(VT_FGCOL(YELLOW));
// "z_message.c Song Acquired" PRINTF(T("z_message.c 取得メロディ＝%d\n", "z_message.c Song Acquired = %d\n"),
PRINTF("z_message.c 取得メロディ＝%d\n", ITEM_SONG_MINUET + msgCtx->ocarinaStaff->state); ITEM_SONG_MINUET + msgCtx->ocarinaStaff->state);
PRINTF(VT_RST); PRINTF(VT_RST);
msgCtx->stateTimer = 20; msgCtx->stateTimer = 20;
Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
@ -3462,8 +3440,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
} }
break; break;
case MSGMODE_SCARECROW_LONG_RECORDING_START: case MSGMODE_SCARECROW_LONG_RECORDING_START:
// "Scarecrow Recording Initialization" PRINTF(T("案山子録音 初期化\n", "Scarecrow Recording Initialization\n"));
PRINTF("案山子録音 初期化\n");
AudioOcarina_SetRecordingState(OCARINA_RECORD_SCARECROW_LONG); AudioOcarina_SetRecordingState(OCARINA_RECORD_SCARECROW_LONG);
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
msgCtx->ocarinaStaff = AudioOcarina_GetRecordingStaff(); msgCtx->ocarinaStaff = AudioOcarina_GetRecordingStaff();
@ -3484,8 +3461,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
} }
sOcarinaButtonIndexBufLen--; sOcarinaButtonIndexBufLen--;
} }
// "Button Entered" PRINTF(T(" 入力ボタン【%d】=%d", " Button Entered[%d]=%d"), sOcarinaButtonIndexBufLen,
PRINTF(" 入力ボタン【%d】=%d", sOcarinaButtonIndexBufLen, msgCtx->ocarinaStaff->buttonIndex); msgCtx->ocarinaStaff->buttonIndex);
msgCtx->lastOcarinaButtonIndex = sOcarinaButtonIndexBuf[sOcarinaButtonIndexBufLen] = msgCtx->lastOcarinaButtonIndex = sOcarinaButtonIndexBuf[sOcarinaButtonIndexBufLen] =
msgCtx->ocarinaStaff->buttonIndex; msgCtx->ocarinaStaff->buttonIndex;
sOcarinaButtonIndexBufLen++; sOcarinaButtonIndexBufLen++;
@ -3498,8 +3475,9 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
if (msgCtx->ocarinaStaff->state == OCARINA_RECORD_OFF || if (msgCtx->ocarinaStaff->state == OCARINA_RECORD_OFF ||
CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) { CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) {
if (sOcarinaButtonIndexBufLen != 0) { if (sOcarinaButtonIndexBufLen != 0) {
// "Recording complete！！！！！！！！！" PRINTF(T("録音終了！！！！！！！！！ message->info->status=%d \n",
PRINTF("録音終了！！！！！！！！！ message->info->status=%d \n", msgCtx->ocarinaStaff->state); "Recording complete!!!!!!!!! message->info->status=%d \n"),
msgCtx->ocarinaStaff->state);
gSaveContext.save.info.scarecrowLongSongSet = true; gSaveContext.save.info.scarecrowLongSongSet = true;
} }
Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
@ -3509,8 +3487,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
msgCtx->stateTimer = 10; msgCtx->stateTimer = 10;
play->msgCtx.ocarinaMode = OCARINA_MODE_04; play->msgCtx.ocarinaMode = OCARINA_MODE_04;
Message_CloseTextbox(play); Message_CloseTextbox(play);
// "Recording complete！！！！！！！！！Recording Complete" PRINTF(
PRINTF("録音終了！！！！！！！！！録音終了\n"); T("録音終了！！！！！！！！！録音終了\n", "Recording complete!!!!!!!!! Recording Complete\n"));
PRINTF(VT_FGCOL(YELLOW)); PRINTF(VT_FGCOL(YELLOW));
PRINTF("\n====================================================================\n"); PRINTF("\n====================================================================\n");
MemCpy(gSaveContext.save.info.scarecrowLongSong, gScarecrowLongSongPtr, MemCpy(gSaveContext.save.info.scarecrowLongSong, gScarecrowLongSongPtr,
@ -3570,8 +3548,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
sOcarinaButtonIndexBuf[sOcarinaButtonIndexBufPos] = OCARINA_BTN_INVALID; sOcarinaButtonIndexBuf[sOcarinaButtonIndexBufPos] = OCARINA_BTN_INVALID;
} }
if (msgCtx->ocarinaStaff->state == OCARINA_RECORD_OFF) { if (msgCtx->ocarinaStaff->state == OCARINA_RECORD_OFF) {
// "8 Note Recording ＯＫ！" PRINTF(T("８音録音ＯＫ！\n", "8 Note Recording OK!\n"));
PRINTF("８音録音ＯＫ！\n");
msgCtx->stateTimer = 20; msgCtx->stateTimer = 20;
gSaveContext.save.info.scarecrowSpawnSongSet = true; gSaveContext.save.info.scarecrowSpawnSongSet = true;
msgCtx->msgMode = MSGMODE_SCARECROW_SPAWN_RECORDING_DONE; msgCtx->msgMode = MSGMODE_SCARECROW_SPAWN_RECORDING_DONE;
@ -3588,8 +3565,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
PRINTF("\n====================================================================\n"); PRINTF("\n====================================================================\n");
} else if (msgCtx->ocarinaStaff->state == OCARINA_RECORD_REJECTED || } else if (msgCtx->ocarinaStaff->state == OCARINA_RECORD_REJECTED ||
CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) { CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) {
// "Played an existing song！！！" PRINTF(T("すでに存在する曲吹いた！！！ \n", "Played an existing song!!! \n"));
PRINTF("すでに存在する曲吹いた！！！ \n");
AudioOcarina_SetRecordingState(OCARINA_RECORD_OFF); AudioOcarina_SetRecordingState(OCARINA_RECORD_OFF);
Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
@ -3662,16 +3638,14 @@ void Message_DrawMain(PlayState* play, Gfx** p) {
sOcarinaButtonIndexBufPos++; sOcarinaButtonIndexBufPos++;
} }
if (msgCtx->ocarinaStaff->state == 0xFF) { if (msgCtx->ocarinaStaff->state == 0xFF) {
// "Musical round failed！！！！！！！！！" PRINTF(T("輪唱失敗！！！！！！！！！\n", "Musical round failed!!!!!!!!!\n"));
PRINTF("輪唱失敗！！！！！！！！！\n");
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
msgCtx->stateTimer = 10; msgCtx->stateTimer = 10;
play->msgCtx.ocarinaMode = OCARINA_MODE_03; play->msgCtx.ocarinaMode = OCARINA_MODE_03;
} else if (msgCtx->ocarinaStaff->state == OCARINA_SONG_MEMORY_GAME) { } else if (msgCtx->ocarinaStaff->state == OCARINA_SONG_MEMORY_GAME) {
// "Musical round succeeded！！！！！！！！！" PRINTF(T("輪唱成功！！！！！！！！！\n", "Musical round succeeded!!!!!!!!!\n"));
PRINTF("輪唱成功！！！！！！！！！\n");
Audio_PlaySfxGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
msgCtx->msgMode = MSGMODE_MEMORY_GAME_ROUND_SUCCESS; msgCtx->msgMode = MSGMODE_MEMORY_GAME_ROUND_SUCCESS;
@ -3977,8 +3951,8 @@ void Message_Update(PlayState* play) {
while (entry->textId != 0xFFFD) { while (entry->textId != 0xFFFD) {
if (entry->textId == R_MESSAGE_DEBUGGER_TEXTID) { if (entry->textId == R_MESSAGE_DEBUGGER_TEXTID) {
// "The message was found! !! !!" PRINTF(T(" メッセージが,見つかった！！！ = %x\n", "The message was found!!! = %x\n"),
PRINTF(" メッセージが,見つかった！！！ = %x\n", R_MESSAGE_DEBUGGER_TEXTID); R_MESSAGE_DEBUGGER_TEXTID);
Message_StartTextbox(play, R_MESSAGE_DEBUGGER_TEXTID, NULL); Message_StartTextbox(play, R_MESSAGE_DEBUGGER_TEXTID, NULL);
R_MESSAGE_DEBUGGER_TEXTID++; R_MESSAGE_DEBUGGER_TEXTID++;
R_MESSAGE_DEBUGGER_SELECT = 0; R_MESSAGE_DEBUGGER_SELECT = 0;