diff --git a/Makefile b/Makefile index d04ec7fd3b..c201d2a358 100644 --- a/Makefile +++ b/Makefile @@ -134,8 +134,10 @@ ifeq ($(COMPILER),gcc) CFLAGS += -G 0 -nostdinc $(INC) -march=vr4300 -mfix4300 -mabi=32 -mno-abicalls -mdivide-breaks -fno-zero-initialized-in-bss -fno-toplevel-reorder -ffreestanding -fno-common -fno-merge-constants -mno-explicit-relocs -mno-split-addresses $(CHECK_WARNINGS) -funsigned-char MIPS_VERSION := -mips3 else - # we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff. - CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(INC) -Wab,-r4300_mul -woff 516,649,838,712 + # Suppress warnings for wrong number of macro arguments (to fake variadic + # macros) and Microsoft extensions such as anonymous structs (which the + # compiler does support but warns for their usage). + CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(INC) -Wab,-r4300_mul -woff 516,609,649,838,712 MIPS_VERSION := -mips2 endif diff --git a/docs/tutorial/helper_scripts.md b/docs/tutorial/helper_scripts.md index 49ca3925cd..cef356392d 100644 --- a/docs/tutorial/helper_scripts.md +++ b/docs/tutorial/helper_scripts.md @@ -120,7 +120,7 @@ Optional arguments are `-o output` to output to a different file and `-v` to giv ## vt_fmt -This turns the strange strings in the `osSyncPrintf`s into the human-readable equivalent instructions. Copy the contents, including the quotation marks, and run +This turns the strange strings in the `PRINTF`s into the human-readable equivalent instructions. Copy the contents, including the quotation marks, and run ```sh ./tools/vt_fmt.py "contents" ``` diff --git a/include/macros.h b/include/macros.h index f391e81ef2..46f7efdfd2 100644 --- a/include/macros.h +++ b/include/macros.h @@ -101,6 +101,21 @@ #define CHECK_FLAG_ALL(flags, mask) (((flags) & (mask)) == (mask)) #ifdef OOT_DEBUG +#define PRINTF osSyncPrintf +#else +#ifdef __GNUC__ +#define PRINTF(format, ...) (void)0 +#else +// IDO doesn't support variadic macros, but it merely throws a warning for the +// number of arguments not matching the definition (warning 609) instead of +// throwing an error. We suppress this warning and rely on GCC to catch macro +// argument errors instead. +#define PRINTF(args) (void)0 +#endif +#endif + +#ifdef OOT_DEBUG + #define LOG(exp, value, format, file, line) \ do { \ LogUtils_LogThreadId(file, line); \ diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 4fa6b50a96..d2bb37d1b5 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -326,9 +326,9 @@ void Audio_ChooseActiveSfx(u8 bankId) { } else { if (entry->dist > 0x7FFFFFD0) { entry->dist = 0x70000008; - osSyncPrintf(VT_COL(RED, WHITE) " dist over! " - "flag:%04X ptr:%08X pos:%f-%f-%f" VT_RST "\n", - entry->sfxId, entry->posX, entry->posZ, *entry->posX, *entry->posY, *entry->posZ); + PRINTF(VT_COL(RED, WHITE) " dist over! " + "flag:%04X ptr:%08X pos:%f-%f-%f" VT_RST "\n", + entry->sfxId, entry->posX, entry->posZ, *entry->posX, *entry->posY, *entry->posZ); } temp3 = entry->sfxId; // fake entry->priority = (u32)entry->dist + (SQ(0xFF - sfxImportance) * SQ(76)) + temp3 - temp3; diff --git a/src/boot/idle.c b/src/boot/idle.c index c5dd92bd28..9ef1a7cbaf 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -19,36 +19,35 @@ f32 gViConfigYScale = 1.0; void Main_ThreadEntry(void* arg) { OSTime time; - osSyncPrintf("mainx 実行開始\n"); + PRINTF("mainx 実行開始\n"); DmaMgr_Init(); - osSyncPrintf("codeセグメントロード中..."); + PRINTF("codeセグメントロード中..."); time = osGetTime(); DMA_REQUEST_SYNC(_codeSegmentStart, (uintptr_t)_codeSegmentRomStart, _codeSegmentRomEnd - _codeSegmentRomStart, "../idle.c", 238); time -= osGetTime(); - osSyncPrintf("\rcodeセグメントロード中...完了\n"); - osSyncPrintf("転送時間 %6.3f\n"); + PRINTF("\rcodeセグメントロード中...完了\n"); + PRINTF("転送時間 %6.3f\n"); bzero(_codeSegmentBssStart, _codeSegmentBssEnd - _codeSegmentBssStart); - osSyncPrintf("codeセグメントBSSクリア完了\n"); + PRINTF("codeセグメントBSSクリア完了\n"); Main(arg); - osSyncPrintf("mainx 実行終了\n"); + PRINTF("mainx 実行終了\n"); } void Idle_ThreadEntry(void* arg) { - osSyncPrintf("アイドルスレッド(idleproc)実行開始\n"); - osSyncPrintf("作製者 : %s\n", gBuildTeam); - osSyncPrintf("作成日時 : %s\n", gBuildDate); - osSyncPrintf("MAKEOPTION: %s\n", gBuildMakeOption); - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("ＲＡＭサイズは %d キロバイトです(osMemSize/osGetMemSize)\n", (s32)osMemSize / 1024); - osSyncPrintf("_bootSegmentEnd(%08x) 以降のＲＡＭ領域はクリアされました(boot)\n", _bootSegmentEnd); - osSyncPrintf("Ｚバッファのサイズは %d キロバイトです\n", 0x96); - osSyncPrintf("ダイナミックバッファのサイズは %d キロバイトです\n", 0x92); - osSyncPrintf("ＦＩＦＯバッファのサイズは %d キロバイトです\n", 0x60); - osSyncPrintf("ＹＩＥＬＤバッファのサイズは %d キロバイトです\n", 3); - osSyncPrintf("オーディオヒープのサイズは %d キロバイトです\n", - ((intptr_t)gSystemHeap - (intptr_t)gAudioHeap) / 1024); - osSyncPrintf(VT_RST); + PRINTF("アイドルスレッド(idleproc)実行開始\n"); + PRINTF("作製者 : %s\n", gBuildTeam); + PRINTF("作成日時 : %s\n", gBuildDate); + PRINTF("MAKEOPTION: %s\n", gBuildMakeOption); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("ＲＡＭサイズは %d キロバイトです(osMemSize/osGetMemSize)\n", (s32)osMemSize / 1024); + PRINTF("_bootSegmentEnd(%08x) 以降のＲＡＭ領域はクリアされました(boot)\n", _bootSegmentEnd); + PRINTF("Ｚバッファのサイズは %d キロバイトです\n", 0x96); + PRINTF("ダイナミックバッファのサイズは %d キロバイトです\n", 0x92); + PRINTF("ＦＩＦＯバッファのサイズは %d キロバイトです\n", 0x60); + PRINTF("ＹＩＥＬＤバッファのサイズは %d キロバイトです\n", 3); + PRINTF("オーディオヒープのサイズは %d キロバイトです\n", ((intptr_t)gSystemHeap - (intptr_t)gAudioHeap) / 1024); + PRINTF(VT_RST); osCreateViManager(OS_PRIORITY_VIMGR); diff --git a/src/boot/logutils.c b/src/boot/logutils.c index 9637b26e74..5b3d024b23 100644 --- a/src/boot/logutils.c +++ b/src/boot/logutils.c @@ -4,8 +4,8 @@ f32 LogUtils_CheckFloatRange(const char* exp, s32 line, const char* valueName, f32 value, const char* minName, f32 min, const char* maxName, f32 max) { if (value < min || max < value) { - osSyncPrintf("%s %d: range error %s(%f) < %s(%f) < %s(%f)\n", exp, line, minName, min, valueName, value, - maxName, max); + PRINTF("%s %d: range error %s(%f) < %s(%f) < %s(%f)\n", exp, line, minName, min, valueName, value, maxName, + max); } return value; } @@ -13,8 +13,8 @@ f32 LogUtils_CheckFloatRange(const char* exp, s32 line, const char* valueName, f s32 LogUtils_CheckIntRange(const char* exp, s32 line, const char* valueName, s32 value, const char* minName, s32 min, const char* maxName, s32 max) { if (value < min || max < value) { - osSyncPrintf("%s %d: range error %s(%d) < %s(%d) < %s(%d)\n", exp, line, minName, min, valueName, value, - maxName, max); + PRINTF("%s %d: range error %s(%d) < %s(%d) < %s(%d)\n", exp, line, minName, min, valueName, value, maxName, + max); } return value; } @@ -26,21 +26,21 @@ void LogUtils_LogHexDump(void* ptr, s32 size0) { s32 i; u32 off; - osSyncPrintf("dump(%08x, %u)\n", addr, size); - osSyncPrintf("address off +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +a +b +c +d +e +f 0123456789abcdef\n"); + PRINTF("dump(%08x, %u)\n", addr, size); + PRINTF("address off +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +a +b +c +d +e +f 0123456789abcdef\n"); off = 0; while (size > 0) { - osSyncPrintf("%08x %04x", addr, off); + PRINTF("%08x %04x", addr, off); rest = (size < 0x10) ? size : 0x10; i = 0; while (true) { if (i < rest) { - osSyncPrintf(" %02x", *((u8*)addr + i)); + PRINTF(" %02x", *((u8*)addr + i)); } else { - osSyncPrintf(" "); + PRINTF(" "); } i++; @@ -48,16 +48,16 @@ void LogUtils_LogHexDump(void* ptr, s32 size0) { break; } } - osSyncPrintf(" "); + PRINTF(" "); i = 0; while (true) { if (i < rest) { u8 a = *(addr + i); - osSyncPrintf("%c", (a >= 0x20 && a < 0x7F) ? a : '.'); + PRINTF("%c", (a >= 0x20 && a < 0x7F) ? a : '.'); } else { - osSyncPrintf(" "); + PRINTF(" "); } i++; @@ -65,7 +65,7 @@ void LogUtils_LogHexDump(void* ptr, s32 size0) { break; } } - osSyncPrintf("\n"); + PRINTF("\n"); size -= rest; addr += rest; off += rest; @@ -73,40 +73,39 @@ void LogUtils_LogHexDump(void* ptr, s32 size0) { } void LogUtils_LogPointer(s32 value, u32 max, void* ptr, const char* name, const char* file, s32 line) { - osSyncPrintf(VT_COL(RED, WHITE) "%s %d %s[%d] max=%u ptr=%08x\n" VT_RST, file, line, name, value, max, ptr); + PRINTF(VT_COL(RED, WHITE) "%s %d %s[%d] max=%u ptr=%08x\n" VT_RST, file, line, name, value, max, ptr); } void LogUtils_CheckBoundary(const char* name, s32 value, s32 unk, const char* file, s32 line) { u32 mask = (unk - 1); if (value & mask) { - osSyncPrintf(VT_COL(RED, WHITE) "%s %d:%s(%08x) は バウンダリ(%d)違反です\n" VT_RST, file, line, name, value, - unk); + PRINTF(VT_COL(RED, WHITE) "%s %d:%s(%08x) は バウンダリ(%d)違反です\n" VT_RST, file, line, name, value, unk); } } void LogUtils_CheckNullPointer(const char* exp, void* ptr, const char* file, s32 line) { if (ptr == NULL) { - osSyncPrintf(VT_COL(RED, WHITE) "%s %d:%s は はヌルポインタです\n" VT_RST, file, line, exp); + PRINTF(VT_COL(RED, WHITE) "%s %d:%s は はヌルポインタです\n" VT_RST, file, line, exp); } } void LogUtils_CheckValidPointer(const char* exp, void* ptr, const char* file, s32 line) { if (ptr == NULL || (u32)ptr < 0x80000000 || (0x80000000 + osMemSize) <= (u32)ptr) { - osSyncPrintf(VT_COL(RED, WHITE) "%s %d:ポインタ %s(%08x) が異常です\n" VT_RST, file, line, exp, ptr); + PRINTF(VT_COL(RED, WHITE) "%s %d:ポインタ %s(%08x) が異常です\n" VT_RST, file, line, exp, ptr); } } void LogUtils_LogThreadId(const char* name, s32 line) { - osSyncPrintf("<%d %s %d>", osGetThreadId(NULL), name, line); + PRINTF("<%d %s %d>", osGetThreadId(NULL), name, line); } void LogUtils_HungupThread(const char* name, s32 line) { - osSyncPrintf("*** HungUp in thread %d, [%s:%d] ***\n", osGetThreadId(NULL), name, line); + PRINTF("*** HungUp in thread %d, [%s:%d] ***\n", osGetThreadId(NULL), name, line); Fault_AddHungupAndCrash(name, line); } void LogUtils_ResetHungup(void) { - osSyncPrintf("*** Reset ***\n"); + PRINTF("*** Reset ***\n"); Fault_AddHungupAndCrash("Reset", 0); } diff --git a/src/boot/stackcheck.c b/src/boot/stackcheck.c index 0f98f0cc33..2ab424e200 100644 --- a/src/boot/stackcheck.c +++ b/src/boot/stackcheck.c @@ -20,7 +20,7 @@ void StackCheck_Init(StackEntry* entry, void* stackBottom, void* stackTop, u32 i iter = sStackInfoListStart; while (iter) { if (iter == entry) { - osSyncPrintf(VT_COL(RED, WHITE) "stackcheck_init: %08x は既にリスト中にある\n" VT_RST, entry); + PRINTF(VT_COL(RED, WHITE) "stackcheck_init: %08x は既にリスト中にある\n" VT_RST, entry); return; } iter = iter->next; @@ -68,7 +68,7 @@ void StackCheck_Cleanup(StackEntry* entry) { } } if (inconsistency) { - osSyncPrintf(VT_COL(RED, WHITE) "stackcheck_cleanup: %08x リスト不整合です\n" VT_RST, entry); + PRINTF(VT_COL(RED, WHITE) "stackcheck_cleanup: %08x リスト不整合です\n" VT_RST, entry); } } @@ -89,18 +89,18 @@ u32 StackCheck_GetState(StackEntry* entry) { if (free == 0) { ret = STACK_STATUS_OVERFLOW; - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); } else if (free < (u32)entry->minSpace && entry->minSpace != -1) { ret = STACK_STATUS_WARNING; - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); } else { - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); ret = STACK_STATUS_OK; } - osSyncPrintf("head=%08x tail=%08x last=%08x used=%08x free=%08x [%s]\n", entry->head, entry->tail, last, used, free, - entry->name != NULL ? entry->name : "(null)"); - osSyncPrintf(VT_RST); + PRINTF("head=%08x tail=%08x last=%08x used=%08x free=%08x [%s]\n", entry->head, entry->tail, last, used, free, + entry->name != NULL ? entry->name : "(null)"); + PRINTF(VT_RST); if (ret != STACK_STATUS_OK) { LogUtils_LogHexDump(entry->head, (uintptr_t)entry->tail - (uintptr_t)entry->head); diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c index 7266baf12a..4ac95122c7 100644 --- a/src/boot/viconfig.c +++ b/src/boot/viconfig.c @@ -8,7 +8,7 @@ void ViConfig_UpdateVi(u32 black) { if (black) { // Black the screen on next call to ViConfig_UpdateBlack, skip most VI configuration - osSyncPrintf(VT_COL(YELLOW, BLACK) "osViSetYScale1(%f);\n" VT_RST, 1.0f); + PRINTF(VT_COL(YELLOW, BLACK) "osViSetYScale1(%f);\n" VT_RST, 1.0f); if (osTvType == OS_TV_PAL) { osViSetMode(&osViModePalLan1); @@ -34,7 +34,7 @@ void ViConfig_UpdateVi(u32 black) { } if (gViConfigYScale != 1.0f) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "osViSetYScale3(%f);\n" VT_RST, gViConfigYScale); + PRINTF(VT_COL(YELLOW, BLACK) "osViSetYScale3(%f);\n" VT_RST, gViConfigYScale); osViSetYScale(gViConfigYScale); } } diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c index 6e041449c2..3be3e0e050 100644 --- a/src/boot/z_locale.c +++ b/src/boot/z_locale.c @@ -19,14 +19,14 @@ void Locale_Init(void) { gCurrentRegion = REGION_EU; break; default: - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("z_locale_init: 日本用かアメリカ用か判別できません\n"); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("z_locale_init: 日本用かアメリカ用か判別できません\n"); LogUtils_HungupThread("../z_locale.c", 118); - osSyncPrintf(VT_RST); + PRINTF(VT_RST); break; } - osSyncPrintf("z_locale_init:日本用かアメリカ用か３コンで判断させる\n"); + PRINTF("z_locale_init:日本用かアメリカ用か３コンで判断させる\n"); } void Locale_ResetRegion(void) { diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 417e7665a6..6b746c1627 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -109,8 +109,8 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size) { ioMsg.size = buffSize; if (gDmaMgrVerbose == 10) { - osSyncPrintf("%10lld ノーマルＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), ioMsg.dramAddr, - ioMsg.devAddr, ioMsg.size, MQ_GET_COUNT(&gPiMgrCmdQueue)); + PRINTF("%10lld ノーマルＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), ioMsg.dramAddr, + ioMsg.devAddr, ioMsg.size, MQ_GET_COUNT(&gPiMgrCmdQueue)); } ret = osEPiStartDma(gCartHandle, &ioMsg, OS_READ); @@ -119,14 +119,12 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size) { } if (gDmaMgrVerbose == 10) { - osSyncPrintf("%10lld ノーマルＤＭＡ START (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), - MQ_GET_COUNT(&gPiMgrCmdQueue)); + PRINTF("%10lld ノーマルＤＭＡ START (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), MQ_GET_COUNT(&gPiMgrCmdQueue)); } osRecvMesg(&queue, NULL, OS_MESG_BLOCK); if (gDmaMgrVerbose == 10) { - osSyncPrintf("%10lld ノーマルＤＭＡ END (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), - MQ_GET_COUNT(&gPiMgrCmdQueue)); + PRINTF("%10lld ノーマルＤＭＡ END (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), MQ_GET_COUNT(&gPiMgrCmdQueue)); } size -= buffSize; @@ -143,8 +141,8 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size) { ioMsg.size = size; if (gDmaMgrVerbose == 10) { - osSyncPrintf("%10lld ノーマルＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), ioMsg.dramAddr, - ioMsg.devAddr, ioMsg.size, MQ_GET_COUNT(&gPiMgrCmdQueue)); + PRINTF("%10lld ノーマルＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), ioMsg.dramAddr, + ioMsg.devAddr, ioMsg.size, MQ_GET_COUNT(&gPiMgrCmdQueue)); } ret = osEPiStartDma(gCartHandle, &ioMsg, OS_READ); @@ -154,7 +152,7 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, size_t size) { osRecvMesg(&queue, NULL, OS_MESG_BLOCK); if (gDmaMgrVerbose == 10) { - osSyncPrintf("%10lld ノーマルＤＭＡ END (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), MQ_GET_COUNT(&gPiMgrCmdQueue)); + PRINTF("%10lld ノーマルＤＭＡ END (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), MQ_GET_COUNT(&gPiMgrCmdQueue)); } end: @@ -182,13 +180,13 @@ s32 DmaMgr_AudioDmaHandler(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) { ASSERT(mb != NULL, "mb != NULL", "../z_std_dma.c", 532); if (gDmaMgrVerbose == 10) { - osSyncPrintf("%10lld サウンドＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), mb->dramAddr, - mb->devAddr, mb->size, MQ_GET_COUNT(&gPiMgrCmdQueue)); + PRINTF("%10lld サウンドＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), mb->dramAddr, mb->devAddr, + mb->size, MQ_GET_COUNT(&gPiMgrCmdQueue)); } ret = osEPiStartDma(pihandle, mb, direction); if (ret != 0) { - osSyncPrintf("OOPS!!\n"); + PRINTF("OOPS!!\n"); } return ret; } @@ -238,20 +236,20 @@ NORETURN void DmaMgr_Error(DmaRequest* req, const char* file, const char* errorN char buff1[80]; char buff2[80]; - osSyncPrintf("%c", BEL); - osSyncPrintf(VT_FGCOL(RED)); + PRINTF("%c", BEL); + PRINTF(VT_FGCOL(RED)); // "DMA Fatal Error" - osSyncPrintf("DMA致命的エラー(%s)\nROM:%X RAM:%X SIZE:%X %s\n", - errorDesc != NULL ? errorDesc : (errorName != NULL ? errorName : "???"), vrom, ram, size, - file != NULL ? file : "???"); + PRINTF("DMA致命的エラー(%s)\nROM:%X RAM:%X SIZE:%X %s\n", + errorDesc != NULL ? errorDesc : (errorName != NULL ? errorName : "???"), vrom, ram, size, + file != NULL ? file : "???"); if (req->filename != NULL) { // Source file name that issued the DMA request - osSyncPrintf("DMA ERROR: %s %d", req->filename, req->line); + PRINTF("DMA ERROR: %s %d", req->filename, req->line); } else if (sDmaMgrCurFileName != NULL) { - osSyncPrintf("DMA ERROR: %s %d", sDmaMgrCurFileName, sDmaMgrCurFileLine); + PRINTF("DMA ERROR: %s %d", sDmaMgrCurFileName, sDmaMgrCurFileLine); } - osSyncPrintf(VT_RST); + PRINTF(VT_RST); if (req->filename != NULL) { sprintf(buff1, "DMA ERROR: %s %d", req->filename, req->line); @@ -320,7 +318,7 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { // The string is defined in .rodata but not used, suggesting a debug print is here but was optimized out in // some way. The last arg of this print looks like it may be filename, but filename above this block does not // match. - osSyncPrintf("DMA ROM:%08X RAM:%08X SIZE:%08X %s\n"); + PRINTF("DMA ROM:%08X RAM:%08X SIZE:%08X %s\n"); } // Get the filename (for debugging) @@ -350,7 +348,7 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { found = true; if (0) { - osSyncPrintf("No Press ROM:%08X RAM:%08X SIZE:%08X\n", vrom, ram, size); + PRINTF("No Press ROM:%08X RAM:%08X SIZE:%08X\n", vrom, ram, size); } } else { // File is compressed. Files that are stored compressed must be loaded into RAM all at once. @@ -382,7 +380,7 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { found = true; if (0) { - osSyncPrintf(" Press ROM:%X RAM:%X SIZE:%X\n", vrom, ram, size); + PRINTF(" Press ROM:%X RAM:%X SIZE:%X\n", vrom, ram, size); } } break; @@ -404,7 +402,7 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { DmaMgr_DmaRomToRam(vrom, ram, size); if (0) { - osSyncPrintf("No Press ROM:%08X RAM:%08X SIZE:%08X (非公式)\n", vrom, ram, size); + PRINTF("No Press ROM:%08X RAM:%08X SIZE:%08X (非公式)\n", vrom, ram, size); } } } @@ -415,7 +413,7 @@ void DmaMgr_ThreadEntry(void* arg) { DmaRequest* req; // "DMA manager thread execution start" - osSyncPrintf("ＤＭＡマネージャスレッド実行開始\n"); + PRINTF("ＤＭＡマネージャスレッド実行開始\n"); while (true) { // Wait for DMA Requests to arrive from other threads @@ -426,7 +424,7 @@ void DmaMgr_ThreadEntry(void* arg) { } if (0) { - osSyncPrintf("ＤＭＡ登録受付 dmap=%08x\n", req); + PRINTF("ＤＭＡ登録受付 dmap=%08x\n", req); } // Process the DMA request @@ -436,13 +434,13 @@ void DmaMgr_ThreadEntry(void* arg) { if (req->notifyQueue != NULL) { osSendMesg(req->notifyQueue, req->notifyMsg, OS_MESG_NOBLOCK); if (0) { - osSyncPrintf("osSendMesg: dmap=%08x, mq=%08x, m=%08x \n", req, req->notifyQueue, req->notifyMsg); + PRINTF("osSendMesg: dmap=%08x, mq=%08x, m=%08x \n", req, req->notifyQueue, req->notifyMsg); } } } // "DMA manager thread execution end" - osSyncPrintf("ＤＭＡマネージャスレッド実行終了\n"); + PRINTF("ＤＭＡマネージャスレッド実行終了\n"); } /** @@ -477,13 +475,13 @@ s32 DmaMgr_RequestAsync(DmaRequest* req, void* ram, uintptr_t vrom, size_t size, if (1 && (sDmaMgrQueueFullLogged == 0) && MQ_IS_FULL(&sDmaMgrMsgQueue)) { sDmaMgrQueueFullLogged++; - osSyncPrintf("%c", BEL); - osSyncPrintf(VT_FGCOL(RED)); + PRINTF("%c", BEL); + PRINTF(VT_FGCOL(RED)); // "dmaEntryMsgQ is full. Reconsider your queue size." - osSyncPrintf("dmaEntryMsgQが一杯です。キューサイズの再検討をおすすめします。"); + PRINTF("dmaEntryMsgQが一杯です。キューサイズの再検討をおすすめします。"); LOG_NUM("(sizeof(dmaEntryMsgBufs) / sizeof(dmaEntryMsgBufs[0]))", ARRAY_COUNT(sDmaMgrMsgBuf), "../z_std_dma.c", 952); - osSyncPrintf(VT_RST); + PRINTF(VT_RST); } osSendMesg(&sDmaMgrMsgQueue, (OSMesg)req, OS_MESG_BLOCK); @@ -523,7 +521,7 @@ void DmaMgr_Init(void) { // DMA the dma data table to RAM DmaMgr_DmaRomToRam((uintptr_t)_dmadataSegmentRomStart, _dmadataSegmentStart, (u32)(_dmadataSegmentRomEnd - _dmadataSegmentRomStart)); - osSyncPrintf("dma_rom_ad[]\n"); + PRINTF("dma_rom_ad[]\n"); sDmaMgrIsRomCompressed = false; name = sDmaMgrFileNames; @@ -536,10 +534,9 @@ void DmaMgr_Init(void) { sDmaMgrIsRomCompressed = true; } - osSyncPrintf( - "%3d %08x %08x %08x %08x %08x %c %s\n", idx, iter->vromStart, iter->vromEnd, iter->romStart, iter->romEnd, - (iter->romEnd != 0) ? iter->romEnd - iter->romStart : iter->vromEnd - iter->vromStart, - (((iter->romEnd != 0) ? iter->romEnd - iter->romStart : 0) > 0x10000) ? '*' : ' ', name ? *name : ""); + PRINTF("%3d %08x %08x %08x %08x %08x %c %s\n", idx, iter->vromStart, iter->vromEnd, iter->romStart, + iter->romEnd, (iter->romEnd != 0) ? iter->romEnd - iter->romStart : iter->vromEnd - iter->vromStart, + (((iter->romEnd != 0) ? iter->romEnd - iter->romStart : 0) > 0x10000) ? '*' : ' ', name ? *name : ""); idx++; iter++; @@ -551,8 +548,8 @@ void DmaMgr_Init(void) { // Ensure that the boot segment always follows after the makerom segment. if ((uintptr_t)_bootSegmentRomStart != gDmaDataTable[0].vromEnd) { - osSyncPrintf("_bootSegmentRomStart(%08x) != dma_rom_ad[0].rom_b(%08x)\n", _bootSegmentRomStart, - gDmaDataTable[0].vromEnd); + PRINTF("_bootSegmentRomStart(%08x) != dma_rom_ad[0].rom_b(%08x)\n", _bootSegmentRomStart, + gDmaDataTable[0].vromEnd); //! @bug The main code file where fault.c resides is not yet loaded Fault_AddHungupAndCrash("../z_std_dma.c", 1055); } diff --git a/src/code/PreRender.c b/src/code/PreRender.c index fb40f6e381..fdfea81291 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -584,7 +584,7 @@ void PreRender_AntiAliasFilter(PreRender* this, s32 x, s32 y) { } if (buffCvg[7] == 7) { - osSyncPrintf("Error, should not be in here \n"); + PRINTF("Error, should not be in here \n"); return; } @@ -742,10 +742,10 @@ void PreRender_DivotFilter(PreRender* this) { if ((R_HREG_MODE == HREG_MODE_PRERENDER ? R_PRERENDER_DIVOT_CONTROL : 0) == PRERENDER_DIVOT_PRINT_COLOR) { - osSyncPrintf("red=%3d %3d %3d %3d grn=%3d %3d %3d %3d blu=%3d %3d %3d %3d \n", windowR[0], - windowR[1], windowR[2], MEDIAN3(windowR[0], windowR[1], windowR[2]), windowG[0], - windowG[1], windowG[2], MEDIAN3(windowG[0], windowG[1], windowG[2]), windowB[0], - windowB[1], windowB[2], MEDIAN3(windowB[0], windowB[1], windowB[2])); + PRINTF("red=%3d %3d %3d %3d grn=%3d %3d %3d %3d blu=%3d %3d %3d %3d \n", windowR[0], windowR[1], + windowR[2], MEDIAN3(windowR[0], windowR[1], windowR[2]), windowG[0], windowG[1], + windowG[2], MEDIAN3(windowG[0], windowG[1], windowG[2]), windowB[0], windowB[1], + windowB[2], MEDIAN3(windowB[0], windowB[1], windowB[2])); } // Sample the median value from the 3 pixel wide window diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c index 1593411537..04f20a8f5f 100644 --- a/src/code/audio_thread_manager.c +++ b/src/code/audio_thread_manager.c @@ -82,7 +82,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) { */ void AudioMgr_HandlePreNMI(AudioMgr* audioMgr) { // "Audio manager received OS_SC_PRE_NMI_MSG" - osSyncPrintf("オーディオマネージャが OS_SC_PRE_NMI_MSG を受け取りました\n"); + PRINTF("オーディオマネージャが OS_SC_PRE_NMI_MSG を受け取りました\n"); Audio_PreNMI(); } @@ -92,7 +92,7 @@ void AudioMgr_ThreadEntry(void* arg) { s16* msg = NULL; // "Start running audio manager thread" - osSyncPrintf("オーディオマネージャスレッド実行開始\n"); + PRINTF("オーディオマネージャスレッド実行開始\n"); // Initialize audio driver Audio_Init(); diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c index 98068012f6..4c6ae7af63 100644 --- a/src/code/code_800430A0.c +++ b/src/code/code_800430A0.c @@ -39,13 +39,13 @@ void DynaPolyActor_UpdateCarriedActorPos(CollisionContext* colCtx, s32 bgId, Act if (BGCHECK_XYZ_ABSMAX <= pos.x || pos.x <= -BGCHECK_XYZ_ABSMAX || BGCHECK_XYZ_ABSMAX <= pos.y || pos.y <= -BGCHECK_XYZ_ABSMAX || BGCHECK_XYZ_ABSMAX <= pos.z || pos.z <= -BGCHECK_XYZ_ABSMAX) { - osSyncPrintf(VT_FGCOL(RED)); - //! @bug file and line are not passed to osSyncPrintf + PRINTF(VT_FGCOL(RED)); + //! @bug file and line are not passed to PRINTF // "Position is not valid" - osSyncPrintf( + PRINTF( "BGCheckCollection_typicalActorPos():位置が妥当ではありません。\npos (%f,%f,%f) file:%s line:%d\n", pos.x, pos.y, pos.z); - osSyncPrintf(VT_RST); + PRINTF(VT_RST); } } } diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index 9c491bf104..eecf74099a 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -286,7 +286,7 @@ u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) { u16 equipValue = gSaveContext.save.info.equips.equipment & gEquipMasks[equipment]; // "Erasing equipment item = %d zzz=%d" - osSyncPrintf("装備アイテム抹消 = %d zzz=%d\n", equipment, equipValue); + PRINTF("装備アイテム抹消 = %d zzz=%d\n", equipment, equipValue); if (equipValue) { equipValue >>= gEquipShifts[equipment]; diff --git a/src/code/code_800D31A0.c b/src/code/code_800D31A0.c index a6540c429b..7109fa9c2f 100644 --- a/src/code/code_800D31A0.c +++ b/src/code/code_800D31A0.c @@ -4,7 +4,7 @@ u32 gIsCtrlr2Valid = false; NORETURN void func_800D31A0(void) { - osSyncPrintf(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST); + PRINTF(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST); while (true) { Sleep_Msec(1000); } diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 05fcd43666..795b6f5efc 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -408,24 +408,24 @@ void func_800B44E0(DebugCam* debugCam, Camera* cam) { void DebugCamera_PrintPoints(const char* name, s16 count, CutsceneCameraPoint* points) { s32 i; - osSyncPrintf("@@@static SplinedatZ %s[] = {\n", name); + PRINTF("@@@static SplinedatZ %s[] = {\n", name); for (i = 0; i < count; i++) { - osSyncPrintf("@@@ /* key frame %2d */ {\n", i); - osSyncPrintf("@@@ /* code */ %d,\n", points[i].continueFlag); - osSyncPrintf("@@@ /* z */ %d,\n", points[i].cameraRoll); - osSyncPrintf("@@@ /* T */ %d,\n", points[i].nextPointFrame); - osSyncPrintf("@@@ /* zoom */ %f,\n", points[i].viewAngle); - osSyncPrintf("@@@ /* pos */ { %d, %d, %d }\n", points[i].pos.x, points[i].pos.y, points[i].pos.z); - osSyncPrintf("@@@ },\n"); + PRINTF("@@@ /* key frame %2d */ {\n", i); + PRINTF("@@@ /* code */ %d,\n", points[i].continueFlag); + PRINTF("@@@ /* z */ %d,\n", points[i].cameraRoll); + PRINTF("@@@ /* T */ %d,\n", points[i].nextPointFrame); + PRINTF("@@@ /* zoom */ %f,\n", points[i].viewAngle); + PRINTF("@@@ /* pos */ { %d, %d, %d }\n", points[i].pos.x, points[i].pos.y, points[i].pos.z); + PRINTF("@@@ },\n"); } - osSyncPrintf("@@@};\n@@@\n"); + PRINTF("@@@};\n@@@\n"); } void DebugCamera_PrintF32Bytes(f32 value) { f32 b = value; char* a = (char*)&b; - osSyncPrintf("\n@@@%d,%d,%d,%d,", a[0], a[1], a[2], a[3]); + PRINTF("\n@@@%d,%d,%d,%d,", a[0], a[1], a[2], a[3]); } void DebugCamera_PrintU16Bytes(u16 value) { @@ -433,7 +433,7 @@ void DebugCamera_PrintU16Bytes(u16 value) { u16 b = value; char* a = (char*)&b; - osSyncPrintf("\n@@@%d,%d,", a[0], a[1]); + PRINTF("\n@@@%d,%d,", a[0], a[1]); } void DebugCamera_PrintS16Bytes(s16 value) { @@ -441,7 +441,7 @@ void DebugCamera_PrintS16Bytes(s16 value) { s16 b = value; char* a = (char*)&b; - osSyncPrintf("\n@@@%d,%d,", a[0], a[1]); + PRINTF("\n@@@%d,%d,", a[0], a[1]); } void DebugCamera_PrintCutBytes(DebugCamCut* cut) { @@ -450,55 +450,55 @@ void DebugCamera_PrintCutBytes(DebugCamCut* cut) { s32 i; points = cut->lookAt; - osSyncPrintf("\n@@@ 0,0,0,2,\t/* Look Camera\t*/"); - osSyncPrintf("\n@@@ 0,1,\t/* dousa\t*/"); + PRINTF("\n@@@ 0,0,0,2,\t/* Look Camera\t*/"); + PRINTF("\n@@@ 0,1,\t/* dousa\t*/"); - osSyncPrintf("\n@@@ 0,0,\t/* Start Flame\t*/"); + PRINTF("\n@@@ 0,0,\t/* Start Flame\t*/"); DebugCamera_PrintU16Bytes(cut->nFrames); - osSyncPrintf("\t/* End Flame\t*/"); + PRINTF("\t/* End Flame\t*/"); - osSyncPrintf("\n@@@0,0,\t/* Dammy\t*/\n@@@ "); + PRINTF("\n@@@0,0,\t/* Dammy\t*/\n@@@ "); for (i = 0; i < cut->nPoints; i++) { point = points + i; - osSyncPrintf("\n@@@ %d, /* code */", point->continueFlag); - osSyncPrintf("\n@@@ %d, /* z */", point->cameraRoll); + PRINTF("\n@@@ %d, /* code */", point->continueFlag); + PRINTF("\n@@@ %d, /* z */", point->cameraRoll); DebugCamera_PrintU16Bytes(point->nextPointFrame); - osSyncPrintf("\t/* sokudo\t*/"); + PRINTF("\t/* sokudo\t*/"); DebugCamera_PrintF32Bytes(point->viewAngle); - osSyncPrintf("\t/* zoom\t*/"); + PRINTF("\t/* zoom\t*/"); DebugCamera_PrintS16Bytes(point->pos.x); - osSyncPrintf("\t/* x pos\t*/"); + PRINTF("\t/* x pos\t*/"); DebugCamera_PrintS16Bytes(point->pos.y); - osSyncPrintf("\t/* y pos\t*/"); + PRINTF("\t/* y pos\t*/"); DebugCamera_PrintS16Bytes(point->pos.z); - osSyncPrintf("\t/* z pos\t*/\n"); - osSyncPrintf("\n@@@0,0,\t/* Dammy\t*/\n@@@ "); + PRINTF("\t/* z pos\t*/\n"); + PRINTF("\n@@@0,0,\t/* Dammy\t*/\n@@@ "); } points = cut->position; - osSyncPrintf("\n@@@ 0,0,0,1,\t/* Position Camera */"); - osSyncPrintf("\n@@@ 0,1,\t/* dousa\t*/"); + PRINTF("\n@@@ 0,0,0,1,\t/* Position Camera */"); + PRINTF("\n@@@ 0,1,\t/* dousa\t*/"); - osSyncPrintf("\n@@@ 0,0,\t/* Start Flame\t*/"); + PRINTF("\n@@@ 0,0,\t/* Start Flame\t*/"); DebugCamera_PrintU16Bytes(cut->nFrames); - osSyncPrintf("\t/* End Flame\t*/"); + PRINTF("\t/* End Flame\t*/"); - osSyncPrintf("\n@@@0,0,\t/* Dammy\t*/\n@@@ "); + PRINTF("\n@@@0,0,\t/* Dammy\t*/\n@@@ "); for (i = 0; i < cut->nPoints; i++) { point = points + i; - osSyncPrintf("\n@@@ %d, /* code */", point->continueFlag); - osSyncPrintf("\n@@@ %d, /* z */", point->cameraRoll); + PRINTF("\n@@@ %d, /* code */", point->continueFlag); + PRINTF("\n@@@ %d, /* z */", point->cameraRoll); DebugCamera_PrintU16Bytes(point->nextPointFrame); - osSyncPrintf("\t/* sokudo\t*/"); + PRINTF("\t/* sokudo\t*/"); DebugCamera_PrintF32Bytes(point->viewAngle); - osSyncPrintf("\t/* zoom\t*/"); + PRINTF("\t/* zoom\t*/"); DebugCamera_PrintS16Bytes(point->pos.x); - osSyncPrintf("\t/* x pos\t*/"); + PRINTF("\t/* x pos\t*/"); DebugCamera_PrintS16Bytes(point->pos.y); - osSyncPrintf("\t/* y pos\t*/"); + PRINTF("\t/* y pos\t*/"); DebugCamera_PrintS16Bytes(point->pos.z); - osSyncPrintf("\t/* z pos\t*/"); - osSyncPrintf("\n@@@0,0,\t/* Dammy\t*/\n@@@ "); + PRINTF("\t/* z pos\t*/"); + PRINTF("\n@@@0,0,\t/* Dammy\t*/\n@@@ "); } } @@ -992,13 +992,13 @@ void DebugCamera_Update(DebugCam* debugCam, Camera* cam) { CHECK_BTN_ALL(sPlay->state.input[DEBUG_CAM_CONTROLLER_PORT].cur.button, BTN_L)) { Audio_PlaySfxGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - osSyncPrintf("@@@\n@@@\n@@@/* *** spline point data ** start here *** */\n@@@\n"); + PRINTF("@@@\n@@@\n@@@/* *** spline point data ** start here *** */\n@@@\n"); DebugCamera_PrintPoints("Lookat", debugCam->sub.nPoints, debugCam->sub.lookAt); DebugCamera_PrintPoints("Position", debugCam->sub.nPoints, debugCam->sub.position); - osSyncPrintf("@@@static short nPoints = %d;\n@@@\n", debugCam->sub.nPoints); - osSyncPrintf("@@@static short nFrames = %d;\n@@@\n", debugCam->sub.nFrames); - osSyncPrintf("@@@static short Mode = %d;\n@@@\n", debugCam->sub.mode); - osSyncPrintf("@@@\n@@@\n@@@/* *** spline point data ** finish! *** */\n@@@\n"); + PRINTF("@@@static short nPoints = %d;\n@@@\n", debugCam->sub.nPoints); + PRINTF("@@@static short nFrames = %d;\n@@@\n", debugCam->sub.nFrames); + PRINTF("@@@static short Mode = %d;\n@@@\n", debugCam->sub.mode); + PRINTF("@@@\n@@@\n@@@/* *** spline point data ** finish! *** */\n@@@\n"); } else if (CHECK_BTN_ALL(sPlay->state.input[DEBUG_CAM_CONTROLLER_PORT].press.button, BTN_CLEFT)) { Audio_PlaySfxGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -1541,14 +1541,14 @@ char DebugCamera_InitCut(s32 idx, DebugCamSub* sub) { sDebugCamCuts[idx].lookAt = DebugArena_MallocDebug(i, "../db_camera.c", 2748); if (sDebugCamCuts[idx].lookAt == NULL) { // "Debug camera memory allocation failure" - osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2751); + PRINTF("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2751); return '?'; } sDebugCamCuts[idx].position = DebugArena_MallocDebug(i, "../db_camera.c", 2754); if (sDebugCamCuts[idx].position == NULL) { // "Debug camera memory allocation failure" - osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2757); + PRINTF("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2757); DebugArena_FreeDebug(sDebugCamCuts[idx].lookAt, "../db_camera.c", 2758); sDebugCamCuts[idx].lookAt = NULL; return '?'; @@ -1626,7 +1626,7 @@ s32 DebugCamera_LoadCallback(char* c) { sDebugCamCuts[i].lookAt = DebugArena_MallocDebug(ALIGN32(size), "../db_camera.c", 2844); if (sDebugCamCuts[i].lookAt == NULL) { // "Debug camera memory allocation failure" - osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2847); + PRINTF("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2847); return false; } if (!Mempak_Read(DEBUG_CAM_CONTROLLER_PORT, *c, sDebugCamCuts[i].lookAt, off, ALIGN32(size))) { @@ -1637,7 +1637,7 @@ s32 DebugCamera_LoadCallback(char* c) { sDebugCamCuts[i].position = DebugArena_MallocDebug(ALIGN32(size), "../db_camera.c", 2855); if (sDebugCamCuts[i].position == NULL) { // "Debug camera memory allocation failure" - osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2858); + PRINTF("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2858); return false; } if (!Mempak_Read(DEBUG_CAM_CONTROLLER_PORT, *c, sDebugCamCuts[i].position, off, ALIGN32(size))) { @@ -1728,24 +1728,24 @@ void DebugCamera_PrintAllCuts(Camera* cam) { Audio_PlaySfxGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - osSyncPrintf("@@@\n@@@\n@@@/* ****** spline point data ** start here ***** */\n@@@\n"); + PRINTF("@@@\n@@@\n@@@/* ****** spline point data ** start here ***** */\n@@@\n"); for (i = 0; i < ARRAY_COUNT(sDebugCamCuts) - 1; i++) { DebugCamCut* cut = &sDebugCamCuts[i]; if (cut->nPoints != 0) { if (i != 0) { - osSyncPrintf("@@@\n@@@/* ** %d ** */\n@@@\n", i); + PRINTF("@@@\n@@@/* ** %d ** */\n@@@\n", i); } DebugCamera_PrintPoints("Lookat", cut->nPoints, cut->lookAt); DebugCamera_PrintPoints("Position", cut->nPoints, cut->position); - osSyncPrintf("@@@static short nPoints = %d;\n@@@\n", cut->nPoints); - osSyncPrintf("@@@static short nFrames = %d;\n@@@\n", cut->nFrames); - osSyncPrintf("@@@static short Mode = %d;\n@@@\n", cut->mode); + PRINTF("@@@static short nPoints = %d;\n@@@\n", cut->nPoints); + PRINTF("@@@static short nFrames = %d;\n@@@\n", cut->nFrames); + PRINTF("@@@static short Mode = %d;\n@@@\n", cut->mode); } } - osSyncPrintf("@@@\n@@@\n@@@/* ****** spline point data ** finish! ***** */\n@@@\n"); + PRINTF("@@@\n@@@\n@@@/* ****** spline point data ** finish! ***** */\n@@@\n"); } char D_8012D114[] = GFXP_KATAKANA "ﾌﾚ-ﾑ "; @@ -2310,9 +2310,9 @@ s32 DebugCamera_UpdateDemoControl(DebugCam* debugCam, Camera* cam) { if (CHECK_BTN_ALL(sPlay->state.input[DEBUG_CAM_CONTROLLER_PORT].cur.button, BTN_L) && CHECK_BTN_ALL(sPlay->state.input[DEBUG_CAM_CONTROLLER_PORT].press.button, BTN_CRIGHT)) { for (i = 0; i < ARRAY_COUNT(sDebugCamCuts) - 1; i++) { - osSyncPrintf("###%2d:(%c) (%d %d) %d %d %d\n", i, sDebugCamCuts[i].letter, - sDebugCamCuts[i].position, sDebugCamCuts[i].lookAt, sDebugCamCuts[i].nFrames, - sDebugCamCuts[i].nPoints, sDebugCamCuts[i].mode); + PRINTF("###%2d:(%c) (%d %d) %d %d %d\n", i, sDebugCamCuts[i].letter, sDebugCamCuts[i].position, + sDebugCamCuts[i].lookAt, sDebugCamCuts[i].nFrames, sDebugCamCuts[i].nPoints, + sDebugCamCuts[i].mode); } DebugCamera_PrintAllCuts(cam); } else if (CHECK_BTN_ALL(sPlay->state.input[DEBUG_CAM_CONTROLLER_PORT].cur.button, BTN_L) && @@ -2321,7 +2321,7 @@ s32 DebugCamera_UpdateDemoControl(DebugCam* debugCam, Camera* cam) { &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); for (i = 0; i < ARRAY_COUNT(sDebugCamCuts) - 1; i++) { if (sDebugCamCuts[i].nPoints != 0) { - osSyncPrintf("\n@@@ /* CUT [%d]\t*/", i); + PRINTF("\n@@@ /* CUT [%d]\t*/", i); DebugCamera_PrintCutBytes(&sDebugCamCuts[i]); } } diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index 670ce857ab..b833b6dfd7 100644 --- a/src/code/debug_malloc.c +++ b/src/code/debug_malloc.c @@ -11,13 +11,13 @@ void DebugArena_CheckPointer(void* ptr, u32 size, const char* name, const char* if (ptr == NULL) { if (gDebugArenaLogSeverity >= LOG_SEVERITY_ERROR) { // "%s: %u bytes %s failed\n" - osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); + PRINTF("%s: %u バイトの%sに失敗しました\n", name, size, action); __osDisplayArena(&sDebugArena); return; } } else if (gDebugArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { // "%s: %u bytes %s succeeded\n" - osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); + PRINTF("%s: %u バイトの%sに成功しました\n", name, size, action); } } @@ -84,7 +84,7 @@ void* DebugArena_Calloc(u32 num, u32 size) { void DebugArena_Display(void) { // "Zelda heap display" ("Zelda" should probably have been changed to "Debug") - osSyncPrintf("ゼルダヒープ表示\n"); + PRINTF("ゼルダヒープ表示\n"); __osDisplayArena(&sDebugArena); } diff --git a/src/code/game.c b/src/code/game.c index 183a18b46e..91f58733b7 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -13,7 +13,7 @@ void GameState_FaultPrint(void) { static char sBtnChars[] = "ABZSuldr*+LRudlr"; s32 i; - osSyncPrintf("last_button=%04x\n", sLastButtonPressed); + PRINTF("last_button=%04x\n", sLastButtonPressed); FaultDrawer_DrawText(120, 180, "%08x", sLastButtonPressed); for (i = 0; i < ARRAY_COUNT(sBtnChars); i++) { if (sLastButtonPressed & (1 << i)) { @@ -179,7 +179,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { DebugArena_Display(); SystemArena_Display(); // "%08x bytes left until the death of Hyrule (game_alloc)" - osSyncPrintf("ハイラル滅亡まであと %08x バイト(game_alloc)\n", THA_GetRemaining(&gameState->tha)); + PRINTF("ハイラル滅亡まであと %08x バイト(game_alloc)\n", THA_GetRemaining(&gameState->tha)); R_ENABLE_ARENA_DBG = 0; } @@ -333,14 +333,14 @@ void GameState_Update(GameState* gameState) { void GameState_InitArena(GameState* gameState, size_t size) { void* arena; - osSyncPrintf("ハイラル確保 サイズ＝%u バイト\n"); // "Hyrule reserved size = %u bytes" + PRINTF("ハイラル確保 サイズ＝%u バイト\n"); // "Hyrule reserved size = %u bytes" arena = GameAlloc_MallocDebug(&gameState->alloc, size, "../game.c", 992); if (arena != NULL) { THA_Init(&gameState->tha, arena, size); - osSyncPrintf("ハイラル確保成功\n"); // "Successful Hyral" + PRINTF("ハイラル確保成功\n"); // "Successful Hyral" } else { THA_Init(&gameState->tha, NULL, 0); - osSyncPrintf("ハイラル確保失敗\n"); // "Failure to secure Hyrule" + PRINTF("ハイラル確保失敗\n"); // "Failure to secure Hyrule" Fault_AddHungupAndCrash("../game.c", 999); } } @@ -355,27 +355,27 @@ void GameState_Realloc(GameState* gameState, size_t size) { THA_Destroy(&gameState->tha); GameAlloc_Free(alloc, thaStart); - osSyncPrintf("ハイラル一時解放!!\n"); // "Hyrule temporarily released!!" + PRINTF("ハイラル一時解放!!\n"); // "Hyrule temporarily released!!" SystemArena_GetSizes(&systemMaxFree, &systemFree, &systemAlloc); if ((systemMaxFree - 0x10) < size) { - osSyncPrintf("%c", BEL); - osSyncPrintf(VT_FGCOL(RED)); + PRINTF("%c", BEL); + PRINTF(VT_FGCOL(RED)); // "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); + PRINTF("メモリが足りません。ハイラルサイズを可能な最大値に変更します\n"); + PRINTF("(hyral=%08x max=%08x free=%08x alloc=%08x)\n", size, systemMaxFree, systemFree, systemAlloc); + PRINTF(VT_RST); size = systemMaxFree - 0x10; } - osSyncPrintf("ハイラル再確保 サイズ＝%u バイト\n", size); // "Hyral reallocate size = %u bytes" + PRINTF("ハイラル再確保 サイズ＝%u バイト\n", size); // "Hyral reallocate size = %u bytes" gameArena = GameAlloc_MallocDebug(alloc, size, "../game.c", 1033); if (gameArena != NULL) { THA_Init(&gameState->tha, gameArena, size); - osSyncPrintf("ハイラル再確保成功\n"); // "Successful reacquisition of Hyrule" + PRINTF("ハイラル再確保成功\n"); // "Successful reacquisition of Hyrule" } else { THA_Init(&gameState->tha, NULL, 0); - osSyncPrintf("ハイラル再確保失敗\n"); // "Failure to secure Hyral" + PRINTF("ハイラル再確保失敗\n"); // "Failure to secure Hyral" SystemArena_Display(); Fault_AddHungupAndCrash("../game.c", 1044); } @@ -385,7 +385,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g OSTime startTime; OSTime endTime; - osSyncPrintf("game コンストラクタ開始\n"); // "game constructor start" + PRINTF("game コンストラクタ開始\n"); // "game constructor start" gameState->gfxCtx = gfxCtx; gameState->frames = 0; gameState->main = NULL; @@ -397,13 +397,13 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g endTime = osGetTime(); // "game_set_next_game_null processing time %d us" - osSyncPrintf("game_set_next_game_null 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); + PRINTF("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" - osSyncPrintf("gamealloc_init 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); + PRINTF("gamealloc_init 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); startTime = endTime; GameState_InitArena(gameState, 0x100000); @@ -412,7 +412,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g endTime = osGetTime(); // "init processing time %d us" - osSyncPrintf("init 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); + PRINTF("init 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); startTime = endTime; LogUtils_CheckNullPointer("this->cleanup", gameState->destroy, "../game.c", 1088); @@ -428,15 +428,15 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g endTime = osGetTime(); // "Other initialization processing time %d us" - osSyncPrintf("その他初期化 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); + PRINTF("その他初期化 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); Fault_AddClient(&sGameFaultClient, GameState_FaultPrint, NULL, NULL); - osSyncPrintf("game コンストラクタ終了\n"); // "game constructor end" + PRINTF("game コンストラクタ終了\n"); // "game constructor end" } void GameState_Destroy(GameState* gameState) { - osSyncPrintf("game デストラクタ開始\n"); // "game destructor start" + PRINTF("game デストラクタ開始\n"); // "game destructor start" AudioMgr_StopAllSfx(); func_800F3054(); osRecvMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK); @@ -457,7 +457,7 @@ void GameState_Destroy(GameState* gameState) { SystemArena_Display(); Fault_RemoveClient(&sGameFaultClient); - osSyncPrintf("game デストラクタ終了\n"); // "game destructor end" + PRINTF("game デストラクタ終了\n"); // "game destructor end" } GameStateFunc GameState_GetInit(GameState* gameState) { @@ -476,24 +476,24 @@ void* GameState_Alloc(GameState* gameState, size_t size, char* file, s32 line) { void* ret; if (THA_IsCrash(&gameState->tha)) { - osSyncPrintf("ハイラルは滅亡している\n"); + PRINTF("ハイラルは滅亡している\n"); ret = NULL; } else if ((u32)THA_GetRemaining(&gameState->tha) < size) { // "Hyral on the verge of extinction does not have %d bytes left (%d bytes until extinction)" - osSyncPrintf("滅亡寸前のハイラルには %d バイトの余力もない（滅亡まであと %d バイト）\n", size, - THA_GetRemaining(&gameState->tha)); + PRINTF("滅亡寸前のハイラルには %d バイトの余力もない（滅亡まであと %d バイト）\n", size, + THA_GetRemaining(&gameState->tha)); ret = NULL; } else { ret = THA_AllocTailAlign16(&gameState->tha, size); if (THA_IsCrash(&gameState->tha)) { - osSyncPrintf("ハイラルは滅亡してしまった\n"); // "Hyrule has been destroyed" + PRINTF("ハイラルは滅亡してしまった\n"); // "Hyrule has been destroyed" ret = NULL; } } if (ret != NULL) { - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("game_alloc(%08x) %08x-%08x [%s:%d]\n", size, ret, (uintptr_t)ret + size, file, line); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("game_alloc(%08x) %08x-%08x [%s:%d]\n", size, ret, (uintptr_t)ret + size, file, line); + PRINTF(VT_RST); } return ret; } diff --git a/src/code/gamealloc.c b/src/code/gamealloc.c index 2b1cd04d43..59f280acac 100644 --- a/src/code/gamealloc.c +++ b/src/code/gamealloc.c @@ -3,11 +3,11 @@ void GameAlloc_Log(GameAlloc* this) { GameAllocEntry* iter; - osSyncPrintf("this = %08x\n", this); + PRINTF("this = %08x\n", this); iter = this->base.next; while (iter != &this->base) { - osSyncPrintf("ptr = %08x size = %d\n", iter, iter->size); + PRINTF("ptr = %08x size = %d\n", iter, iter->size); iter = iter->next; } } diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c index 93757234d3..d6171aaccb 100644 --- a/src/code/gfxprint.c +++ b/src/code/gfxprint.c @@ -341,7 +341,7 @@ void GfxPrint_Open(GfxPrint* this, Gfx* dList) { this->dList = dList; GfxPrint_Setup(this); } else { - osSyncPrintf("gfxprint_open:２重オープンです\n"); + PRINTF("gfxprint_open:２重オープンです\n"); } } diff --git a/src/code/graph.c b/src/code/graph.c index 5704c68f59..b25612ccc9 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -67,16 +67,16 @@ void Graph_DisassembleUCode(Gfx* workBuf) { R_UCODE_DISAS_LOAD_COUNT = disassembler.loaducodeCnt; if (R_UCODE_DISAS_LOG_MODE == 1 || R_UCODE_DISAS_LOG_MODE == 2) { - osSyncPrintf("vtx_cnt=%d\n", disassembler.vtxCnt); - osSyncPrintf("spvtx_cnt=%d\n", disassembler.spvtxCnt); - osSyncPrintf("tri1_cnt=%d\n", disassembler.tri1Cnt); - osSyncPrintf("tri2_cnt=%d\n", disassembler.tri2Cnt); - osSyncPrintf("quad_cnt=%d\n", disassembler.quadCnt); - osSyncPrintf("line_cnt=%d\n", disassembler.lineCnt); - osSyncPrintf("sync_err=%d\n", disassembler.syncErr); - osSyncPrintf("loaducode_cnt=%d\n", disassembler.loaducodeCnt); - osSyncPrintf("dl_depth=%d\n", disassembler.dlDepth); - osSyncPrintf("dl_cnt=%d\n", disassembler.dlCnt); + PRINTF("vtx_cnt=%d\n", disassembler.vtxCnt); + PRINTF("spvtx_cnt=%d\n", disassembler.spvtxCnt); + PRINTF("tri1_cnt=%d\n", disassembler.tri1Cnt); + PRINTF("tri2_cnt=%d\n", disassembler.tri2Cnt); + PRINTF("quad_cnt=%d\n", disassembler.quadCnt); + PRINTF("line_cnt=%d\n", disassembler.lineCnt); + PRINTF("sync_err=%d\n", disassembler.syncErr); + PRINTF("loaducode_cnt=%d\n", disassembler.loaducodeCnt); + PRINTF("dl_depth=%d\n", disassembler.dlDepth); + PRINTF("dl_cnt=%d\n", disassembler.dlCnt); } UCodeDisas_Destroy(&disassembler); @@ -168,9 +168,9 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { osStopTimer(&timer); if (msg == (OSMesg)666) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("RCPが帰ってきませんでした。"); // "RCP did not return." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("RCPが帰ってきませんでした。"); // "RCP did not return." + PRINTF(VT_RST); LogUtils_LogHexDump((void*)PHYS_TO_K1(SP_BASE_REG), 0x20); LogUtils_LogHexDump((void*)PHYS_TO_K1(DPC_BASE_REG), 0x20); @@ -334,37 +334,37 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { if (pool->headMagic != GFXPOOL_HEAD_MAGIC) { //! @bug (?) : "problem = true;" may be missing - osSyncPrintf("%c", BEL); + PRINTF("%c", BEL); // "Dynamic area head is destroyed" - osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST); Fault_AddHungupAndCrash("../graph.c", 1070); } if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) { problem = true; - osSyncPrintf("%c", BEL); + PRINTF("%c", BEL); // "Dynamic region tail is destroyed" - osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域末尾が破壊されています\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "ダイナミック領域末尾が破壊されています\n" VT_RST); Fault_AddHungupAndCrash("../graph.c", 1076); } } if (THGA_IsCrash(&gfxCtx->polyOpa)) { problem = true; - osSyncPrintf("%c", BEL); + PRINTF("%c", BEL); // "Zelda 0 is dead" - osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ0は死んでしまった(graph_alloc is empty)\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "ゼルダ0は死んでしまった(graph_alloc is empty)\n" VT_RST); } if (THGA_IsCrash(&gfxCtx->polyXlu)) { problem = true; - osSyncPrintf("%c", BEL); + PRINTF("%c", BEL); // "Zelda 1 is dead" - osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ1は死んでしまった(graph_alloc is empty)\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "ゼルダ1は死んでしまった(graph_alloc is empty)\n" VT_RST); } if (THGA_IsCrash(&gfxCtx->overlay)) { problem = true; - osSyncPrintf("%c", BEL); + PRINTF("%c", BEL); // "Zelda 4 is dead" - osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ4は死んでしまった(graph_alloc is empty)\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "ゼルダ4は死んでしまった(graph_alloc is empty)\n" VT_RST); } if (!problem) { @@ -401,7 +401,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { if (gIsCtrlr2Valid && PreNmiBuff_IsResetting(gAppNmiBufferPtr) && !gameState->inPreNMIState) { // "To reset mode" - osSyncPrintf(VT_COL(YELLOW, BLACK) "PRE-NMIによりリセットモードに移行します\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "PRE-NMIによりリセットモードに移行します\n" VT_RST); SET_NEXT_GAMESTATE(gameState, PreNMI_Init, PreNMIState); gameState->running = false; } @@ -415,7 +415,7 @@ void Graph_ThreadEntry(void* arg0) { GameStateOverlay* ovl; char faultMsg[0x50]; - osSyncPrintf("グラフィックスレッド実行開始\n"); // "Start graphic thread execution" + PRINTF("グラフィックスレッド実行開始\n"); // "Start graphic thread execution" Graph_Init(&gfxCtx); while (nextOvl != NULL) { @@ -423,12 +423,12 @@ void Graph_ThreadEntry(void* arg0) { Overlay_LoadGameState(ovl); size = ovl->instanceSize; - osSyncPrintf("クラスサイズ＝%dバイト\n", size); // "Class size = %d bytes" + PRINTF("クラスサイズ＝%dバイト\n", size); // "Class size = %d bytes" gameState = SYSTEM_ARENA_MALLOC(size, "../graph.c", 1196); if (gameState == NULL) { - osSyncPrintf("確保失敗\n"); // "Failure to secure" + PRINTF("確保失敗\n"); // "Failure to secure" sprintf(faultMsg, "CLASS SIZE= %d bytes", size); Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg); @@ -446,15 +446,15 @@ void Graph_ThreadEntry(void* arg0) { Overlay_FreeGameState(ovl); } Graph_Destroy(&gfxCtx); - osSyncPrintf("グラフィックスレッド実行終了\n"); // "End of graphic thread execution" + PRINTF("グラフィックスレッド実行終了\n"); // "End of graphic thread execution" } void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size) { TwoHeadGfxArena* thga = &gfxCtx->polyOpa; if (HREG(59) == 1) { - osSyncPrintf("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, thga->start, - thga->p, thga->d); + PRINTF("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, thga->start, + thga->p, thga->d); } return THGA_AllocTail(&gfxCtx->polyOpa, ALIGN16(size)); } @@ -463,8 +463,8 @@ void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size) { TwoHeadGfxArena* thga = &gfxCtx->polyOpa; if (HREG(59) == 1) { - osSyncPrintf("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, thga->start, - thga->p, thga->d); + PRINTF("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, thga->start, + thga->p, thga->d); } return THGA_AllocTail(&gfxCtx->polyOpa, ALIGN16(size)); } diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index df1faaf1bd..271cd9f006 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -118,7 +118,7 @@ void IrqMgr_SendMesgToClients(IrqMgr* irqMgr, OSMesg msg) { for (client = irqMgr->clients; client != NULL; client = client->prev) { if (MQ_IS_FULL(client->queue)) { // "irqmgr_SendMesgForClient: Message queue is overflowing mq=%08x cnt=%d" - osSyncPrintf( + PRINTF( VT_COL(RED, WHITE) "irqmgr_SendMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST, client->queue, MQ_GET_COUNT(client->queue)); } else { @@ -141,7 +141,7 @@ void IrqMgr_JamMesgToClients(IrqMgr* irqMgr, OSMesg msg) { for (client = irqMgr->clients; client != NULL; client = client->prev) { if (MQ_IS_FULL(client->queue)) { // "irqmgr_JamMesgForClient: Message queue is overflowing mq=%08x cnt=%d" - osSyncPrintf( + PRINTF( VT_COL(RED, WHITE) "irqmgr_JamMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST, client->queue, MQ_GET_COUNT(client->queue)); } else { @@ -171,19 +171,19 @@ void IrqMgr_HandlePreNMI(IrqMgr* irqMgr) { void IrqMgr_CheckStacks(void) { // "0.5 seconds after PRENMI" - osSyncPrintf("irqmgr.c: PRENMIから0.5秒経過\n"); + PRINTF("irqmgr.c: PRENMIから0.5秒経過\n"); if (StackCheck_Check(NULL) == STACK_STATUS_OK) { // "The stack looks ok" - osSyncPrintf("スタックは大丈夫みたいです\n"); + PRINTF("スタックは大丈夫みたいです\n"); } else { - osSyncPrintf("%c", BEL); - osSyncPrintf(VT_FGCOL(RED)); + PRINTF("%c", BEL); + PRINTF(VT_FGCOL(RED)); // "Stack overflow or dangerous" - osSyncPrintf("スタックがオーバーフローしたか危険な状態です\n"); + PRINTF("スタックがオーバーフローしたか危険な状態です\n"); // "Increase stack size early or don't consume stack" - osSyncPrintf("早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n"); - osSyncPrintf(VT_RST); + PRINTF("早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n"); + PRINTF(VT_RST); } } @@ -208,7 +208,7 @@ void IrqMgr_HandlePreNMI480(IrqMgr* irqMgr) { result = osAfterPreNMI(); if (result != 0) { // "osAfterPreNMI returned %d !?" - osSyncPrintf("osAfterPreNMIが %d を返しました！？\n", result); + PRINTF("osAfterPreNMIが %d を返しました！？\n", result); // osAfterPreNMI failed, try again in 1ms //! @bug setting the same timer for a second time without letting the first one complete breaks //! the timer linked list @@ -244,7 +244,7 @@ void IrqMgr_ThreadEntry(void* arg) { u8 exit; // "Start IRQ manager thread execution" - osSyncPrintf("ＩＲＱマネージャスレッド実行開始\n"); + PRINTF("ＩＲＱマネージャスレッド実行開始\n"); exit = false; while (!exit) { @@ -254,39 +254,39 @@ void IrqMgr_ThreadEntry(void* arg) { IrqMgr_HandleRetrace(irqMgr); break; case IRQ_PRENMI_MSG: - osSyncPrintf("PRE_NMI_MSG\n"); + PRINTF("PRE_NMI_MSG\n"); // "Scheduler: Receives PRE_NMI message" - osSyncPrintf("スケジューラ：PRE_NMIメッセージを受信\n"); + PRINTF("スケジューラ：PRE_NMIメッセージを受信\n"); IrqMgr_HandlePreNMI(irqMgr); break; case IRQ_PRENMI450_MSG: - osSyncPrintf("PRENMI450_MSG\n"); + PRINTF("PRENMI450_MSG\n"); // "Scheduler: Receives PRENMI450 message" - osSyncPrintf("スケジューラ：PRENMI450メッセージを受信\n"); + PRINTF("スケジューラ：PRENMI450メッセージを受信\n"); IrqMgr_HandlePreNMI450(irqMgr); break; case IRQ_PRENMI480_MSG: - osSyncPrintf("PRENMI480_MSG\n"); + PRINTF("PRENMI480_MSG\n"); // "Scheduler: Receives PRENMI480 message" - osSyncPrintf("スケジューラ：PRENMI480メッセージを受信\n"); + PRINTF("スケジューラ：PRENMI480メッセージを受信\n"); IrqMgr_HandlePreNMI480(irqMgr); break; case IRQ_PRENMI500_MSG: - osSyncPrintf("PRENMI500_MSG\n"); + PRINTF("PRENMI500_MSG\n"); // "Scheduler: Receives PRENMI500 message" - osSyncPrintf("スケジューラ：PRENMI500メッセージを受信\n"); + PRINTF("スケジューラ：PRENMI500メッセージを受信\n"); exit = true; IrqMgr_HandlePreNMI500(irqMgr); break; default: // "Unexpected message received" - osSyncPrintf("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n", msg); + PRINTF("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n", msg); break; } } // "End of IRQ manager thread execution" - osSyncPrintf("ＩＲＱマネージャスレッド実行終了\n"); + PRINTF("ＩＲＱマネージャスレッド実行終了\n"); } void IrqMgr_Init(IrqMgr* irqMgr, void* stack, OSPri pri, u8 retraceCount) { diff --git a/src/code/load.c b/src/code/load.c index ac9f76d5cf..183409505c 100644 --- a/src/code/load.c +++ b/src/code/load.c @@ -12,12 +12,12 @@ s32 Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* if (gOverlayLogSeverity >= 3) { // "Start loading dynamic link function" - osSyncPrintf("\nダイナミックリンクファンクションのロードを開始します\n"); + PRINTF("\nダイナミックリンクファンクションのロードを開始します\n"); } if (gOverlayLogSeverity >= 3) { // "DMA transfer of TEXT, DATA, RODATA + rel (%08x-%08x)" - osSyncPrintf("TEXT,DATA,RODATA+relをＤＭＡ転送します(%08x-%08x)\n", allocatedRamAddr, end); + PRINTF("TEXT,DATA,RODATA+relをＤＭＡ転送します(%08x-%08x)\n", allocatedRamAddr, end); } // DMA the overlay, wait until transfer completes @@ -29,12 +29,12 @@ s32 Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* ovlRelocs = (OverlayRelocationSection*)(end - relocSectionOffset); if (gOverlayLogSeverity >= 3) { - osSyncPrintf("TEXT(%08x), DATA(%08x), RODATA(%08x), BSS(%08x)\n", ovlRelocs->textSize, ovlRelocs->dataSize, - ovlRelocs->rodataSize, ovlRelocs->bssSize); + PRINTF("TEXT(%08x), DATA(%08x), RODATA(%08x), BSS(%08x)\n", ovlRelocs->textSize, ovlRelocs->dataSize, + ovlRelocs->rodataSize, ovlRelocs->bssSize); } if (gOverlayLogSeverity >= 3) { - osSyncPrintf("リロケーションします\n"); // "Relocate" + PRINTF("リロケーションします\n"); // "Relocate" } // Relocate pointers in overlay code and data @@ -44,7 +44,7 @@ s32 Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* if (ovlRelocs->bssSize != 0) { if (gOverlayLogSeverity >= 3) { // "Clear BSS area (% 08x-% 08x)" - osSyncPrintf("BSS領域をクリアします(%08x-%08x)\n", end, end + ovlRelocs->bssSize); + PRINTF("BSS領域をクリアします(%08x-%08x)\n", end, end + ovlRelocs->bssSize); } bzero((void*)end, (s32)ovlRelocs->bssSize); } @@ -53,7 +53,7 @@ s32 Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* if (gOverlayLogSeverity >= 3) { // "Clear REL area (%08x-%08x)" - osSyncPrintf("REL領域をクリアします(%08x-%08x)\n", ovlRelocs, (uintptr_t)ovlRelocs + size); + PRINTF("REL領域をクリアします(%08x-%08x)\n", ovlRelocs, (uintptr_t)ovlRelocs + size); } // Clear relocations, this space remains allocated and goes unused @@ -66,7 +66,7 @@ s32 Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* if (gOverlayLogSeverity >= 3) { // "Finish loading dynamic link function" - osSyncPrintf("ダイナミックリンクファンクションのロードを終了します\n\n"); + PRINTF("ダイナミックリンクファンクションのロードを終了します\n\n"); } return size; } diff --git a/src/code/loadfragment2.c b/src/code/loadfragment2.c index 693ef54250..6befb8c9b9 100644 --- a/src/code/loadfragment2.c +++ b/src/code/loadfragment2.c @@ -4,9 +4,9 @@ void* Overlay_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vram void* allocatedRamAddr = SYSTEM_ARENA_MALLOC_R((intptr_t)vramEnd - (intptr_t)vramStart, "../loadfragment2.c", 31); if (gOverlayLogSeverity >= 3) { - osSyncPrintf("OVL:SPEC(%08x-%08x) REAL(%08x-%08x) OFFSET(%08x)\n", vramStart, vramEnd, allocatedRamAddr, - ((uintptr_t)vramEnd - (uintptr_t)vramStart) + (uintptr_t)allocatedRamAddr, - (uintptr_t)vramStart - (uintptr_t)allocatedRamAddr); + PRINTF("OVL:SPEC(%08x-%08x) REAL(%08x-%08x) OFFSET(%08x)\n", vramStart, vramEnd, allocatedRamAddr, + ((uintptr_t)vramEnd - (uintptr_t)vramStart) + (uintptr_t)allocatedRamAddr, + (uintptr_t)vramStart - (uintptr_t)allocatedRamAddr); } if (allocatedRamAddr != NULL) { diff --git a/src/code/main.c b/src/code/main.c index c1fd17c48f..3ae05797b2 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -26,11 +26,10 @@ OSMesgQueue sSerialEventQueue; OSMesg sSerialMsgBuf[1]; void Main_LogSystemHeap(void) { - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); // "System heap size% 08x (% dKB) Start address% 08x" - osSyncPrintf("システムヒープサイズ %08x(%dKB) 開始アドレス %08x\n", gSystemHeapSize, gSystemHeapSize / 1024, - gSystemHeap); - osSyncPrintf(VT_RST); + PRINTF("システムヒープサイズ %08x(%dKB) 開始アドレス %08x\n", gSystemHeapSize, gSystemHeapSize / 1024, gSystemHeap); + PRINTF(VT_RST); } void Main(void* arg) { @@ -43,7 +42,7 @@ void Main(void* arg) { u32 debugHeapSize; s16* msg; - osSyncPrintf("mainproc 実行開始\n"); // "Start running" + PRINTF("mainproc 実行開始\n"); // "Start running" gScreenWidth = SCREEN_WIDTH; gScreenHeight = SCREEN_HEIGHT; gAppNmiBufferPtr = (PreNmiBuff*)osAppNMIBuffer; @@ -54,7 +53,7 @@ void Main(void* arg) { fb = (uintptr_t)SysCfb_GetFbPtr(0); gSystemHeapSize = fb - systemHeapStart; // "System heap initalization" - osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize); + PRINTF("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize); SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap if (osMemSize >= 0x800000) { debugHeapStart = SysCfb_GetFbEnd(); @@ -63,7 +62,7 @@ void Main(void* arg) { debugHeapSize = 0x400; debugHeapStart = SYSTEM_ARENA_MALLOC(debugHeapSize, "../main.c", 565); } - osSyncPrintf("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize); + PRINTF("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize); DebugArena_Init(debugHeapStart, debugHeapSize); Regs_Init(); @@ -78,7 +77,7 @@ void Main(void* arg) { StackCheck_Init(&sIrqMgrStackInfo, sIrqMgrStack, STACK_TOP(sIrqMgrStack), 0, 0x100, "irqmgr"); IrqMgr_Init(&gIrqMgr, STACK_TOP(sIrqMgrStack), THREAD_PRI_IRQMGR, 1); - osSyncPrintf("タスクスケジューラの初期化\n"); // "Initialize the task scheduler" + PRINTF("タスクスケジューラの初期化\n"); // "Initialize the task scheduler" StackCheck_Init(&sSchedStackInfo, sSchedStack, STACK_TOP(sSchedStack), 0, 0x100, "sched"); Sched_Init(&gScheduler, STACK_TOP(sSchedStack), THREAD_PRI_SCHED, gViConfigModeType, 1, &gIrqMgr); @@ -104,13 +103,13 @@ void Main(void* arg) { break; } if (*msg == OS_SC_PRE_NMI_MSG) { - osSyncPrintf("main.c: リセットされたみたいだよ\n"); // "Looks like it's been reset" + PRINTF("main.c: リセットされたみたいだよ\n"); // "Looks like it's been reset" PreNmiBuff_SetReset(gAppNmiBufferPtr); } } - osSyncPrintf("mainproc 後始末\n"); // "Cleanup" + PRINTF("mainproc 後始末\n"); // "Cleanup" osDestroyThread(&sGraphThread); RcpUtils_Reset(); - osSyncPrintf("mainproc 実行終了\n"); // "End of execution" + PRINTF("mainproc 実行終了\n"); // "End of execution" } diff --git a/src/code/mempak.c b/src/code/mempak.c index 4d00b311ab..8d68be5ca3 100644 --- a/src/code/mempak.c +++ b/src/code/mempak.c @@ -88,11 +88,11 @@ s32 Mempak_FindFiles(s32 controllerNum, char start, char end) { } bit <<= 1; - osSyncPrintf("mempak: find '%c' (%d)\n", letter, error); + PRINTF("mempak: find '%c' (%d)\n", letter, error); } PadMgr_ReleaseSerialEventQueue(&gPadMgr, serialEventQueue); - osSyncPrintf("mempak: find '%c' - '%c' %02x\n", start, end, bits); + PRINTF("mempak: find '%c' - '%c' %02x\n", start, end, bits); return bits; } @@ -120,8 +120,8 @@ s32 Mempak_Write(s32 controllerNum, char letter, void* buffer, s32 offset, s32 s if (error == 0) { ret = true; } - osSyncPrintf("mempak: write %d byte '%c' (%d)->%d\n", size, letter, - sMempakFiles[MEMPAK_LETTER_TO_INDEX(letter)], error); + PRINTF("mempak: write %d byte '%c' (%d)->%d\n", size, letter, sMempakFiles[MEMPAK_LETTER_TO_INDEX(letter)], + error); } PadMgr_ReleaseSerialEventQueue(&gPadMgr, serialEventQueue); return ret; @@ -151,8 +151,8 @@ s32 Mempak_Read(s32 controllerNum, char letter, void* buffer, s32 offset, s32 si if (error == 0) { ret = true; } - osSyncPrintf("mempak: read %d byte '%c' (%d)<-%d\n", size, letter, sMempakFiles[MEMPAK_LETTER_TO_INDEX(letter)], - error); + PRINTF("mempak: read %d byte '%c' (%d)<-%d\n", size, letter, sMempakFiles[MEMPAK_LETTER_TO_INDEX(letter)], + error); } PadMgr_ReleaseSerialEventQueue(&gPadMgr, serialEventQueue); return ret; @@ -190,7 +190,7 @@ s32 Mempak_CreateFile(s32 controllerNum, char* letter, s32 size) { if (error == 0) { ret = true; } - osSyncPrintf("mempak: alloc %d byte '%c' (%d)\n", size, *letter, error); + PRINTF("mempak: alloc %d byte '%c' (%d)\n", size, *letter, error); } else { // File already exists, delete then alloc @@ -204,7 +204,7 @@ s32 Mempak_CreateFile(s32 controllerNum, char* letter, s32 size) { if (error == 0) { ret |= true; } - osSyncPrintf("mempak: resize %d byte '%c' (%d)\n", size, *letter, error); + PRINTF("mempak: resize %d byte '%c' (%d)\n", size, *letter, error); } } else { // Find first free letter and create a file identified by it @@ -218,7 +218,7 @@ s32 Mempak_CreateFile(s32 controllerNum, char* letter, s32 size) { sMempakExtName[0] = NCH(*letter); error = osPfsAllocateFile(&sMempakPfsHandle, sMempakCompanyCode, sMempakGameCode, sMempakGameName, sMempakExtName, size, &sMempakFiles[i]); - osSyncPrintf("mempak: alloc %d byte '%c' (%d) with search\n", size, *letter, error); + PRINTF("mempak: alloc %d byte '%c' (%d) with search\n", size, *letter, error); if (error == 0) { ret = true; } @@ -246,7 +246,7 @@ s32 Mempak_DeleteFile(s32 controllerNum, char letter) { if (error == 0) { ret = true; } - osSyncPrintf("mempak: delete '%c' (%d)\n", letter, error); + PRINTF("mempak: delete '%c' (%d)\n", letter, error); PadMgr_ReleaseSerialEventQueue(&gPadMgr, serialEventQueue); return ret; diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 40b08150dc..eade378f00 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -31,13 +31,13 @@ #include "global.h" #include "terminal.h" -#define PADMGR_LOG(controllerNum, msg) \ - if (1) { \ - osSyncPrintf(VT_FGCOL(YELLOW)); \ - /* padmgr: Controller %d: %s */ \ - osSyncPrintf("padmgr: %dコン: %s\n", (controllerNum) + 1, (msg)); \ - osSyncPrintf(VT_RST); \ - } \ +#define PADMGR_LOG(controllerNum, msg) \ + if (1) { \ + PRINTF(VT_FGCOL(YELLOW)); \ + /* padmgr: Controller %d: %s */ \ + PRINTF("padmgr: %dコン: %s\n", (controllerNum) + 1, (msg)); \ + PRINTF(VT_RST); \ + } \ (void)0 #define LOG_SEVERITY_NOLOG 0 @@ -70,16 +70,16 @@ OSMesgQueue* PadMgr_AcquireSerialEventQueue(PadMgr* padMgr) { if (gPadMgrLogSeverity >= LOG_SEVERITY_VERBOSE) { // "serialMsgQ Waiting for lock" - osSyncPrintf("%2d %d serialMsgQロック待ち %08x %08x %08x\n", osGetThreadId(NULL), - MQ_GET_COUNT(&padMgr->serialLockQueue), padMgr, &padMgr->serialLockQueue, &serialEventQueue); + PRINTF("%2d %d serialMsgQロック待ち %08x %08x %08x\n", osGetThreadId(NULL), + MQ_GET_COUNT(&padMgr->serialLockQueue), padMgr, &padMgr->serialLockQueue, &serialEventQueue); } osRecvMesg(&padMgr->serialLockQueue, (OSMesg*)&serialEventQueue, OS_MESG_BLOCK); if (gPadMgrLogSeverity >= LOG_SEVERITY_VERBOSE) { // "serialMsgQ Locked" - osSyncPrintf("%2d %d serialMsgQをロックしました %08x\n", osGetThreadId(NULL), - MQ_GET_COUNT(&padMgr->serialLockQueue), serialEventQueue); + PRINTF("%2d %d serialMsgQをロックしました %08x\n", osGetThreadId(NULL), + MQ_GET_COUNT(&padMgr->serialLockQueue), serialEventQueue); } return serialEventQueue; @@ -95,16 +95,16 @@ OSMesgQueue* PadMgr_AcquireSerialEventQueue(PadMgr* padMgr) { void PadMgr_ReleaseSerialEventQueue(PadMgr* padMgr, OSMesgQueue* serialEventQueue) { if (gPadMgrLogSeverity >= LOG_SEVERITY_VERBOSE) { // "serialMsgQ Unlock" - osSyncPrintf("%2d %d serialMsgQロック解除します %08x %08x %08x\n", osGetThreadId(NULL), - MQ_GET_COUNT(&padMgr->serialLockQueue), padMgr, &padMgr->serialLockQueue, serialEventQueue); + PRINTF("%2d %d serialMsgQロック解除します %08x %08x %08x\n", osGetThreadId(NULL), + MQ_GET_COUNT(&padMgr->serialLockQueue), padMgr, &padMgr->serialLockQueue, serialEventQueue); } osSendMesg(&padMgr->serialLockQueue, (OSMesg)serialEventQueue, OS_MESG_BLOCK); if (gPadMgrLogSeverity >= LOG_SEVERITY_VERBOSE) { // "serialMsgQ Unlocked" - osSyncPrintf("%2d %d serialMsgQロック解除しました %08x %08x %08x\n", osGetThreadId(NULL), - MQ_GET_COUNT(&padMgr->serialLockQueue), padMgr, &padMgr->serialLockQueue, serialEventQueue); + PRINTF("%2d %d serialMsgQロック解除しました %08x %08x %08x\n", osGetThreadId(NULL), + MQ_GET_COUNT(&padMgr->serialLockQueue), padMgr, &padMgr->serialLockQueue, serialEventQueue); } } @@ -393,7 +393,7 @@ void PadMgr_HandleRetrace(PadMgr* padMgr) { } else { LOG_HEX("this->pad_status[i].type", padMgr->padStatus[i].type, "../padmgr.c", 458); // "An unknown type of controller is connected" - osSyncPrintf("知らない種類のコントローラが接続されています\n"); + PRINTF("知らない種類のコントローラが接続されています\n"); } } } @@ -417,7 +417,7 @@ void PadMgr_HandleRetrace(PadMgr* padMgr) { } void PadMgr_HandlePreNMI(PadMgr* padMgr) { - osSyncPrintf("padmgr_HandlePreNMI()\n"); + PRINTF("padmgr_HandlePreNMI()\n"); padMgr->isResetting = true; PadMgr_RumbleReset(padMgr); } @@ -467,13 +467,13 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) { s16* msg = NULL; s32 exit; - osSyncPrintf("コントローラスレッド実行開始\n"); // "Controller thread execution start" + PRINTF("コントローラスレッド実行開始\n"); // "Controller thread execution start" exit = false; while (!exit) { if (gPadMgrLogSeverity >= LOG_SEVERITY_VERBOSE && MQ_IS_EMPTY(&padMgr->interruptQueue)) { // "Waiting for controller thread event" - osSyncPrintf("コントローラスレッドイベント待ち %lld\n", OS_CYCLES_TO_USEC(osGetTime())); + PRINTF("コントローラスレッドイベント待ち %lld\n", OS_CYCLES_TO_USEC(osGetTime())); } osRecvMesg(&padMgr->interruptQueue, (OSMesg*)&msg, OS_MESG_BLOCK); @@ -482,13 +482,13 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) { switch (*msg) { case OS_SC_RETRACE_MSG: if (gPadMgrLogSeverity >= LOG_SEVERITY_VERBOSE) { - osSyncPrintf("padmgr_HandleRetraceMsg START %lld\n", OS_CYCLES_TO_USEC(osGetTime())); + PRINTF("padmgr_HandleRetraceMsg START %lld\n", OS_CYCLES_TO_USEC(osGetTime())); } PadMgr_HandleRetrace(padMgr); if (gPadMgrLogSeverity >= LOG_SEVERITY_VERBOSE) { - osSyncPrintf("padmgr_HandleRetraceMsg END %lld\n", OS_CYCLES_TO_USEC(osGetTime())); + PRINTF("padmgr_HandleRetraceMsg END %lld\n", OS_CYCLES_TO_USEC(osGetTime())); } break; case OS_SC_PRE_NMI_MSG: @@ -502,11 +502,11 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) { IrqMgr_RemoveClient(padMgr->irqMgr, &padMgr->irqClient); - osSyncPrintf("コントローラスレッド実行終了\n"); // "Controller thread execution end" + PRINTF("コントローラスレッド実行終了\n"); // "Controller thread execution end" } void PadMgr_Init(PadMgr* padMgr, OSMesgQueue* serialEventQueue, IrqMgr* irqMgr, OSId id, OSPri priority, void* stack) { - osSyncPrintf("パッドマネージャ作成 padmgr_Create()\n"); // "Pad Manager creation" + PRINTF("パッドマネージャ作成 padmgr_Create()\n"); // "Pad Manager creation" bzero(padMgr, sizeof(PadMgr)); padMgr->irqMgr = irqMgr; diff --git a/src/code/rcp_utils.c b/src/code/rcp_utils.c index e258ab02fa..f017b53e3f 100644 --- a/src/code/rcp_utils.c +++ b/src/code/rcp_utils.c @@ -2,17 +2,17 @@ #define printSpStatus(x, name) \ if (x & SP_STATUS_##name) \ - osSyncPrintf(#name " ") + PRINTF(#name " ") #define printDpStatus(x, name) \ if (x & DPC_STATUS_##name) \ - osSyncPrintf(#name " ") + PRINTF(#name " ") void RcpUtils_PrintRegisterStatus(void) { u32 spStatus = __osSpGetStatus(); u32 dpStatus = osDpGetStatus(); - osSyncPrintf("osSpGetStatus=%08x: ", spStatus); + PRINTF("osSpGetStatus=%08x: ", spStatus); printSpStatus(spStatus, HALT); printSpStatus(spStatus, BROKE); printSpStatus(spStatus, DMA_BUSY); @@ -28,9 +28,9 @@ void RcpUtils_PrintRegisterStatus(void) { printSpStatus(spStatus, SIG5); printSpStatus(spStatus, SIG6); printSpStatus(spStatus, SIG7); - osSyncPrintf("\n"); + PRINTF("\n"); - osSyncPrintf("osDpGetStatus=%08x:", dpStatus); + PRINTF("osDpGetStatus=%08x:", dpStatus); printDpStatus(dpStatus, XBUS_DMEM_DMA); printDpStatus(dpStatus, FREEZE); printDpStatus(dpStatus, FLUSH); @@ -42,7 +42,7 @@ void RcpUtils_PrintRegisterStatus(void) { printDpStatus(dpStatus, DMA_BUSY); printDpStatus(dpStatus, END_VALID); printDpStatus(dpStatus, START_VALID); - osSyncPrintf("\n"); + PRINTF("\n"); } void RcpUtils_Reset(void) { diff --git a/src/code/relocation.c b/src/code/relocation.c index e42a3fa818..4f9c64a0f0 100644 --- a/src/code/relocation.c +++ b/src/code/relocation.c @@ -68,9 +68,9 @@ void Overlay_Relocate(void* allocatedRamAddress, OverlayRelocationSection* ovlRe relocatedAddress = 0; if (gOverlayLogSeverity >= 3) { - osSyncPrintf("DoRelocation(%08x, %08x, %08x)\n", allocatedRamAddress, ovlRelocs, vramStart); - osSyncPrintf("text=%08x, data=%08x, rodata=%08x, bss=%08x\n", ovlRelocs->textSize, ovlRelocs->dataSize, - ovlRelocs->rodataSize, ovlRelocs->bssSize); + PRINTF("DoRelocation(%08x, %08x, %08x)\n", allocatedRamAddress, ovlRelocs, vramStart); + PRINTF("text=%08x, data=%08x, rodata=%08x, bss=%08x\n", ovlRelocs->textSize, ovlRelocs->dataSize, + ovlRelocs->rodataSize, ovlRelocs->bssSize); } sections[RELOC_SECTION_NULL] = 0; @@ -157,9 +157,9 @@ void Overlay_Relocate(void* allocatedRamAddress, OverlayRelocationSection* ovlRe FALLTHROUGH; case R_MIPS_LO16 << RELOC_TYPE_SHIFT: if (gOverlayLogSeverity >= 3) { - osSyncPrintf("%02d %08x %08x %08x ", dbg, relocDataP, relocatedValue, relocatedAddress); - osSyncPrintf(" %08x %08x %08x %08x\n", (uintptr_t)relocDataP + (uintptr_t)vramStart - allocu32, - relocData, unrelocatedAddress, relocOffset); + PRINTF("%02d %08x %08x %08x ", dbg, relocDataP, relocatedValue, relocatedAddress); + PRINTF(" %08x %08x %08x %08x\n", (uintptr_t)relocDataP + (uintptr_t)vramStart - allocu32, relocData, + unrelocatedAddress, relocOffset); } // Adding a break prevents matching } diff --git a/src/code/sched.c b/src/code/sched.c index d9a8c43f91..b5b30cc2e2 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -66,8 +66,8 @@ void Sched_SwapFrameBufferImpl(CfbInfo* cfbInfo) { cfbInfo->updateTimer = cfbInfo->updateRate; if (sLogScheduler) { - osSyncPrintf("osViSwapBuffer %08x %08x %08x\n", osViGetCurrentFramebuffer(), osViGetNextFramebuffer(), - (cfbInfo != NULL) ? cfbInfo->swapBuffer : NULL); + PRINTF("osViSwapBuffer %08x %08x %08x\n", osViGetCurrentFramebuffer(), osViGetNextFramebuffer(), + (cfbInfo != NULL) ? cfbInfo->swapBuffer : NULL); } width = (cfbInfo->viMode != NULL) ? cfbInfo->viMode->comRegs.width : (u32)gScreenWidth; @@ -163,7 +163,7 @@ void Sched_QueueTask(Scheduler* sc, OSScTask* task) { if (type == M_AUDTASK) { if (sLogScheduler) { // "You have entered an audio task" - osSyncPrintf("オーディオタスクをエントリしました\n"); + PRINTF("オーディオタスクをエントリしました\n"); } // Add to audio queue if (sc->audioListTail != NULL) { @@ -178,7 +178,7 @@ void Sched_QueueTask(Scheduler* sc, OSScTask* task) { } else { if (sLogScheduler) { // "Entered graph task" - osSyncPrintf("グラフタスクをエントリしました\n"); + PRINTF("グラフタスクをエントリしました\n"); } // Add to graphics queue if (sc->gfxListTail != NULL) { @@ -203,7 +203,7 @@ void Sched_Yield(Scheduler* sc) { osSpTaskYield(); if (sLogScheduler) { - osSyncPrintf("%08d:osSpTaskYield\n", (u32)(OS_CYCLES_TO_USEC(osGetTime()))); + PRINTF("%08d:osSpTaskYield\n", (u32)(OS_CYCLES_TO_USEC(osGetTime()))); } } } @@ -406,7 +406,7 @@ void Sched_RunTask(Scheduler* sc, OSScTask* spTask, OSScTask* dpTask) { osSpTaskStartGo(&spTask->list); if (sLogScheduler) { - osSyncPrintf( + PRINTF( "%08d:osSpTaskStartGo(%08x) %s\n", (u32)OS_CYCLES_TO_USEC(osGetTime()), &spTask->list, (spTask->list.t.type == M_AUDTASK ? "AUDIO" : (spTask->list.t.type == M_GFXTASK ? "GRAPH" : "OTHER"))); } @@ -443,7 +443,7 @@ void Sched_HandleNotification(Scheduler* sc) { // be ran as soon as possible. if (sc->doAudio && sc->curRSPTask != NULL) { if (sLogScheduler) { - osSyncPrintf("[YIELD B]"); + PRINTF("[YIELD B]"); } Sched_Yield(sc); return; @@ -455,13 +455,13 @@ void Sched_HandleNotification(Scheduler* sc) { Sched_RunTask(sc, nextRSP, nextRDP); } if (sLogScheduler) { - osSyncPrintf("EN sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); + PRINTF("EN sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); } } void Sched_HandleRetrace(Scheduler* sc) { if (sLogScheduler) { - osSyncPrintf("%08d:scHandleRetrace %08x\n", (u32)OS_CYCLES_TO_USEC(osGetTime()), osViGetCurrentFramebuffer()); + PRINTF("%08d:scHandleRetrace %08x\n", (u32)OS_CYCLES_TO_USEC(osGetTime()), osViGetCurrentFramebuffer()); } ViConfig_UpdateBlack(); sc->retraceCount++; @@ -491,9 +491,9 @@ void Sched_HandleRetrace(Scheduler* sc) { } if (sLogScheduler) { - osSyncPrintf("%08x %08x %08x %d\n", osViGetCurrentFramebuffer(), osViGetNextFramebuffer(), - (sc->pendingSwapBuf1 != NULL) ? sc->pendingSwapBuf1->swapBuffer : NULL, - (sc->curBuf != NULL) ? sc->curBuf->updateTimer : 0); + PRINTF("%08x %08x %08x %d\n", osViGetCurrentFramebuffer(), osViGetNextFramebuffer(), + (sc->pendingSwapBuf1 != NULL) ? sc->pendingSwapBuf1->swapBuffer : NULL, + (sc->curBuf != NULL) ? sc->curBuf->updateTimer : 0); } // Run the notification handler to enqueue any waiting tasks and possibly run one @@ -525,12 +525,12 @@ void Sched_HandleRSPDone(Scheduler* sc) { sc->curRSPTask = NULL; if (sLogScheduler) { - osSyncPrintf("RSP DONE %d %d", curRSPTask->state & OS_SC_YIELD, osSpTaskYielded(&curRSPTask->list)); + PRINTF("RSP DONE %d %d", curRSPTask->state & OS_SC_YIELD, osSpTaskYielded(&curRSPTask->list)); } if ((curRSPTask->state & OS_SC_YIELD) && osSpTaskYielded(&curRSPTask->list)) { if (sLogScheduler) { - osSyncPrintf("[YIELDED]\n"); + PRINTF("[YIELDED]\n"); } // Task yielded, set yielded state curRSPTask->state |= OS_SC_YIELDED; @@ -542,7 +542,7 @@ void Sched_HandleRSPDone(Scheduler* sc) { } } else { if (sLogScheduler) { - osSyncPrintf("[NOT YIELDED]\n"); + PRINTF("[NOT YIELDED]\n"); } // Task has completed on the RSP, unset RSP flag and check if the task is fully complete curRSPTask->state &= ~OS_SC_SP; @@ -555,7 +555,7 @@ void Sched_HandleRSPDone(Scheduler* sc) { Sched_RunTask(sc, nextRSP, nextRDP); } if (sLogScheduler) { - osSyncPrintf("SP sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); + PRINTF("SP sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); } } @@ -589,7 +589,7 @@ void Sched_HandleRDPDone(Scheduler* sc) { Sched_RunTask(sc, nextRSP, nextRDP); } if (sLogScheduler) { - osSyncPrintf("DP sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); + PRINTF("DP sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); } } @@ -602,7 +602,7 @@ void Sched_HandleRDPDone(Scheduler* sc) { */ void Sched_Notify(Scheduler* sc) { if (sLogScheduler) { - osSyncPrintf("osScKickEntryMsg\n"); + PRINTF("osScKickEntryMsg\n"); } osSendMesg(&sc->interruptQueue, (OSMesg)NOTIFY_MSG, OS_MESG_BLOCK); @@ -615,7 +615,7 @@ void Sched_ThreadEntry(void* arg) { while (true) { if (sLogScheduler) { // "%08d: standby" - osSyncPrintf("%08d:待機中\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); + PRINTF("%08d:待機中\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); } // Await interrupt messages, either from the OS, IrqMgr, or another thread @@ -624,19 +624,19 @@ void Sched_ThreadEntry(void* arg) { switch ((s32)msg) { case NOTIFY_MSG: if (sLogScheduler) { - osSyncPrintf("%08d:ENTRY_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); + PRINTF("%08d:ENTRY_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); } Sched_HandleNotification(sc); continue; case RSP_DONE_MSG: if (sLogScheduler) { - osSyncPrintf("%08d:RSP_DONE_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); + PRINTF("%08d:RSP_DONE_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); } Sched_HandleRSPDone(sc); continue; case RDP_DONE_MSG: if (sLogScheduler) { - osSyncPrintf("%08d:RDP_DONE_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); + PRINTF("%08d:RDP_DONE_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); } Sched_HandleRDPDone(sc); continue; diff --git a/src/code/shrink_window.c b/src/code/shrink_window.c index 2be49a018f..71e0e14ded 100644 --- a/src/code/shrink_window.c +++ b/src/code/shrink_window.c @@ -13,7 +13,7 @@ s32 sLetterboxSize = 0; void Letterbox_SetSizeTarget(s32 target) { if (R_HREG_MODE == HREG_MODE_LETTERBOX && R_LETTERBOX_ENABLE_LOGS == 1) { - osSyncPrintf("shrink_window_setval(%d)\n", target); + PRINTF("shrink_window_setval(%d)\n", target); } sLetterboxSizeTarget = target; @@ -25,7 +25,7 @@ u32 Letterbox_GetSizeTarget(void) { void Letterbox_SetSize(s32 size) { if (R_HREG_MODE == HREG_MODE_LETTERBOX && R_LETTERBOX_ENABLE_LOGS == 1) { - osSyncPrintf("shrink_window_setnowval(%d)\n", size); + PRINTF("shrink_window_setnowval(%d)\n", size); } sLetterboxSize = size; @@ -37,7 +37,7 @@ u32 Letterbox_GetSize(void) { void Letterbox_Init(void) { if (R_HREG_MODE == HREG_MODE_LETTERBOX && R_LETTERBOX_ENABLE_LOGS == 1) { - osSyncPrintf("shrink_window_init()\n"); + PRINTF("shrink_window_init()\n"); } sLetterboxState = LETTERBOX_STATE_IDLE; @@ -47,7 +47,7 @@ void Letterbox_Init(void) { void Letterbox_Destroy(void) { if (R_HREG_MODE == HREG_MODE_LETTERBOX && R_LETTERBOX_ENABLE_LOGS == 1) { - osSyncPrintf("shrink_window_cleanup()\n"); + PRINTF("shrink_window_cleanup()\n"); } sLetterboxSize = 0; diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 660a2ab647..d4da6770bb 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -182,9 +182,9 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC Gfx* gfx; if (this->maxval == 0) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); LOG_NUM("this->maxval", this->maxval, "../speed_meter.c", 313); - osSyncPrintf(VT_RST); + PRINTF(VT_RST); } else { OPEN_DISPS(gfxCtx, "../speed_meter.c", 318); diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index a37634be7b..2ec91e25c1 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -9,18 +9,18 @@ void SysCfb_Init(s32 n64dd) { if (osMemSize >= 0x800000) { // "8MB or more memory is installed" - osSyncPrintf("８Ｍバイト以上のメモリが搭載されています\n"); + PRINTF("８Ｍバイト以上のメモリが搭載されています\n"); tmpFbEnd = 0x8044BE80; if (n64dd == 1) { - osSyncPrintf("RAM 8M mode (N64DD対応)\n"); // "RAM 8M mode (N64DD compatible)" + PRINTF("RAM 8M mode (N64DD対応)\n"); // "RAM 8M mode (N64DD compatible)" sSysCfbEnd = 0x805FB000; } else { // "The margin for this version is %dK bytes" - osSyncPrintf("このバージョンのマージンは %dK バイトです\n", (0x4BC00 / 1024)); + PRINTF("このバージョンのマージンは %dK バイトです\n", (0x4BC00 / 1024)); sSysCfbEnd = tmpFbEnd; } } else if (osMemSize >= 0x400000) { - osSyncPrintf("RAM4M mode\n"); + PRINTF("RAM4M mode\n"); sSysCfbEnd = 0x80400000; } else { LogUtils_HungupThread("../sys_cfb.c", 354); @@ -29,11 +29,11 @@ void SysCfb_Init(s32 n64dd) { screenSize = SCREEN_WIDTH * SCREEN_HEIGHT; sSysCfbEnd &= ~0x3F; // "The final address used by the system is %08x" - osSyncPrintf("システムが使用する最終アドレスは %08x です\n", sSysCfbEnd); + PRINTF("システムが使用する最終アドレスは %08x です\n", sSysCfbEnd); sSysCfbFbPtr[0] = sSysCfbEnd - (screenSize * 4); sSysCfbFbPtr[1] = sSysCfbEnd - (screenSize * 2); // "Frame buffer addresses are %08x and %08x" - osSyncPrintf("フレームバッファのアドレスは %08x と %08x です\n", sSysCfbFbPtr[0], sSysCfbFbPtr[1]); + PRINTF("フレームバッファのアドレスは %08x と %08x です\n", sSysCfbFbPtr[0], sSysCfbFbPtr[1]); } void SysCfb_Reset(void) { diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 5c7975754a..0e31d1e4c5 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -120,11 +120,11 @@ void Math3D_LineClosestToPoint(InfiniteLine* line, Vec3f* pos, Vec3f* closestPoi dirVectorLengthSq = Math3D_Vec3fMagnitudeSq(&line->dir); if (IS_ZERO(dirVectorLengthSq)) { - osSyncPrintf(VT_COL(YELLOW, BLACK)); + PRINTF(VT_COL(YELLOW, BLACK)); // "Math3D_lineVsPosSuisenCross(): No straight line length" - osSyncPrintf("Math3D_lineVsPosSuisenCross():直線の長さがありません\n"); - osSyncPrintf("cross = pos を返します。\n"); // "Returns cross = pos." - osSyncPrintf(VT_RST); + PRINTF("Math3D_lineVsPosSuisenCross():直線の長さがありません\n"); + PRINTF("cross = pos を返します。\n"); // "Returns cross = pos." + PRINTF(VT_RST); Math_Vec3f_Copy(closestPoint, pos); //! @bug Missing early return } @@ -924,10 +924,10 @@ f32 Math3D_Plane(Plane* plane, Vec3f* pointOnPlane) { 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)); + PRINTF(VT_COL(YELLOW, BLACK)); // "Math3DLengthPlaneAndPos(): Normal size is near zero %f %f %f" - osSyncPrintf("Math3DLengthPlaneAndPos():法線size がゼロ近いです%f %f %f\n", nx, ny, nz); - osSyncPrintf(VT_RST); + PRINTF("Math3DLengthPlaneAndPos():法線size がゼロ近いです%f %f %f\n", nx, ny, nz); + PRINTF(VT_RST); return 0.0f; } return fabsf(Math3D_DistPlaneToPos(nx, ny, nz, originDist, p)); @@ -942,10 +942,10 @@ 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)); + PRINTF(VT_COL(YELLOW, BLACK)); // "Math3DSignedLengthPlaneAndPos(): Normal size is close to zero %f %f %f" - osSyncPrintf("Math3DSignedLengthPlaneAndPos():法線size がゼロ近いです%f %f %f\n", nx, ny, nz); - osSyncPrintf(VT_RST); + PRINTF("Math3DSignedLengthPlaneAndPos():法線size がゼロ近いです%f %f %f\n", nx, ny, nz); + PRINTF(VT_RST); return 0.0f; } return Math3D_Planef(nx, ny, nz, originDist, p) / normMagnitude; diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index fa038a76cb..5e15ec5e26 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -975,13 +975,13 @@ MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line) { for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { if (!(-32768.0f <= mf->mf[i][j]) || !(mf->mf[i][j] < 32768.0f)) { - osSyncPrintf("%s %d: [%s] =\n" - "/ %12.6f %12.6f %12.6f %12.6f \\\n" - "| %12.6f %12.6f %12.6f %12.6f |\n" - "| %12.6f %12.6f %12.6f %12.6f |\n" - "\\ %12.6f %12.6f %12.6f %12.6f /\n", - file, line, "mf", mf->xx, mf->xy, mf->xz, mf->xw, mf->yx, mf->yy, mf->yz, mf->yw, mf->zx, - mf->zy, mf->zz, mf->zw, mf->wx, mf->wy, mf->wz, mf->ww); + PRINTF("%s %d: [%s] =\n" + "/ %12.6f %12.6f %12.6f %12.6f \\\n" + "| %12.6f %12.6f %12.6f %12.6f |\n" + "| %12.6f %12.6f %12.6f %12.6f |\n" + "\\ %12.6f %12.6f %12.6f %12.6f /\n", + file, line, "mf", mf->xx, mf->xy, mf->xz, mf->xw, mf->yx, mf->yy, mf->yz, mf->yw, mf->zx, mf->zy, + mf->zz, mf->zw, mf->wx, mf->wy, mf->wz, mf->ww); Fault_AddHungupAndCrash(file, line); } } diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c index f62e5639ae..af1815eaf9 100644 --- a/src/code/system_malloc.c +++ b/src/code/system_malloc.c @@ -11,13 +11,13 @@ void SystemArena_CheckPointer(void* ptr, u32 size, const char* name, const char* if (ptr == NULL) { if (gSystemArenaLogSeverity >= LOG_SEVERITY_ERROR) { // "%s: %u bytes %s failed\n" - osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); + PRINTF("%s: %u バイトの%sに失敗しました\n", name, size, action); __osDisplayArena(&gSystemArena); return; } } else if (gSystemArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { // "%s: %u bytes %s succeeded\n" - osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); + PRINTF("%s: %u バイトの%sに成功しました\n", name, size, action); } } @@ -83,7 +83,7 @@ void* SystemArena_Calloc(u32 num, u32 size) { } void SystemArena_Display(void) { - osSyncPrintf("システムヒープ表示\n"); // "System heap display" + PRINTF("システムヒープ表示\n"); // "System heap display" __osDisplayArena(&gSystemArena); } diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 2dcee7ce9d..c344fcb4f9 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -1,7 +1,7 @@ #include "global.h" void Setup_InitImpl(SetupState* this) { - osSyncPrintf("ゼルダ共通データ初期化\n"); // "Zelda common data initalization" + PRINTF("ゼルダ共通データ初期化\n"); // "Zelda common data initalization" SaveContext_Init(); this->state.running = false; SET_NEXT_GAMESTATE(&this->state, ConsoleLogo_Init, ConsoleLogoState); diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 10bffd767e..cabc5a051d 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -46,7 +46,7 @@ typedef void (*UcodeDisasCallback)(UCodeDisas*, u32); #define DISAS_LOG \ if (this->enableLog) \ - osSyncPrintf + PRINTF void* UCodeDisas_TranslateAddr(UCodeDisas* this, uintptr_t addr) { uintptr_t physical = this->segments[SEGMENT_NUMBER(addr)] + SEGMENT_OFFSET(addr); @@ -283,14 +283,14 @@ void UCodeDisas_PrintRenderMode(UCodeDisas* this, u32 mode) { b = (mode >> 16) & 0x3333; // clang-format off - if (this->enableLog == 0) {} else { osSyncPrintf("\nGBL_c1(%s, %s, %s, %s)|", + if (this->enableLog == 0) {} else { PRINTF("\nGBL_c1(%s, %s, %s, %s)|", sBlenderInputNames[0][a >> 12 & 3], sBlenderInputNames[1][a >> 8 & 3], sBlenderInputNames[2][a >> 4 & 3], sBlenderInputNames[3][a >> 0 & 3]); } // clang-format on if (this->enableLog) { - osSyncPrintf("\nGBL_c2(%s, %s, %s, %s)", sBlenderInputNames[0][b >> 12 & 3], sBlenderInputNames[1][b >> 8 & 3], - sBlenderInputNames[2][b >> 4 & 3], sBlenderInputNames[3][b >> 0 & 3]); + PRINTF("\nGBL_c2(%s, %s, %s, %s)", sBlenderInputNames[0][b >> 12 & 3], sBlenderInputNames[1][b >> 8 & 3], + sBlenderInputNames[2][b >> 4 & 3], sBlenderInputNames[3][b >> 0 & 3]); } } diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c index 5da87b7af3..8c144a1cd4 100644 --- a/src/code/z_DLF.c +++ b/src/code/z_DLF.c @@ -3,7 +3,7 @@ void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { if (overlayEntry->loadedRamAddr != NULL) { - osSyncPrintf("既にリンクされています\n"); // "Already linked" + PRINTF("既にリンクされています\n"); // "Already linked" return; } @@ -14,16 +14,16 @@ void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { overlayEntry->vramStart, overlayEntry->vramEnd); if (overlayEntry->loadedRamAddr == NULL) { - osSyncPrintf("ロードに失敗しました\n"); // "Loading failed" + PRINTF("ロードに失敗しました\n"); // "Loading failed" return; } - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("OVL(d):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", overlayEntry->vramStart, overlayEntry->vramEnd, - overlayEntry->loadedRamAddr, - (u32)overlayEntry->loadedRamAddr + (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart, - (u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr, ""); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("OVL(d):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", overlayEntry->vramStart, overlayEntry->vramEnd, + overlayEntry->loadedRamAddr, + (u32)overlayEntry->loadedRamAddr + (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart, + (u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr, ""); + PRINTF(VT_RST); if (overlayEntry->unk_14 != NULL) { overlayEntry->unk_14 = (void*)((u32)overlayEntry->unk_14 - diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 0207725be6..fd6bb0e716 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -836,7 +836,7 @@ void Actor_Destroy(Actor* actor, PlayState* play) { name = overlayEntry->name != NULL ? overlayEntry->name : ""; // "No Actor class destruct [%s]" - osSyncPrintf("Ａｃｔｏｒクラス デストラクトがありません [%s]\n" VT_RST, name); + PRINTF("Ａｃｔｏｒクラス デストラクトがありません [%s]\n" VT_RST, name); } } @@ -1369,8 +1369,8 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* *hilite = GRAPH_ALLOC(gfxCtx, sizeof(Hilite)); if (R_HREG_MODE == HREG_MODE_PRINT_HILITE_INFO) { - osSyncPrintf("z_actor.c 3529 eye=[%f(%f) %f %f] object=[%f %f %f] light_direction=[%f %f %f]\n", correctedEyeX, - eye->x, eye->y, eye->z, object->x, object->y, object->z, lightDir->x, lightDir->y, lightDir->z); + PRINTF("z_actor.c 3529 eye=[%f(%f) %f %f] object=[%f %f %f] light_direction=[%f %f %f]\n", correctedEyeX, + eye->x, eye->y, eye->z, object->x, object->y, object->z, lightDir->x, lightDir->y, lightDir->z); } View_ErrorCheckEyePosition(correctedEyeX, eye->y, eye->z); @@ -1418,8 +1418,8 @@ void func_8002EBCC(Actor* actor, PlayState* play, s32 flag) { lightDir.z = play->envCtx.dirLight1.params.dir.z; if (R_HREG_MODE == HREG_MODE_PRINT_HILITE_INFO) { - osSyncPrintf("z_actor.c 3637 game_play->view.eye=[%f(%f) %f %f]\n", play->view.eye.x, play->view.eye.y, - play->view.eye.z); + PRINTF("z_actor.c 3637 game_play->view.eye=[%f(%f) %f %f]\n", play->view.eye.x, play->view.eye.y, + play->view.eye.z); } hilite = func_8002EABC(&actor->world.pos, &play->view.eye, &lightDir, play->state.gfxCtx); @@ -1957,7 +1957,7 @@ void Actor_DrawFaroresWindPointer(PlayState* play) { length *= 0.5f; dx = diff - length; yOffset += sqrtf(SQ(length) - SQ(dx)) * 0.2f; - osSyncPrintf("-------- DISPLAY Y=%f\n", yOffset); + PRINTF("-------- DISPLAY Y=%f\n", yOffset); } effectPos.x = curPos->x + Rand_CenteredFloat(6.0f); @@ -2282,10 +2282,10 @@ void Actor_FaultPrint(Actor* actor, char* command) { overlayEntry = actor->overlayEntry; name = overlayEntry->name != NULL ? overlayEntry->name : ""; - osSyncPrintf("アクターの名前(%08x:%s)\n", actor, name); // "Actor name (%08x:%s)" + PRINTF("アクターの名前(%08x:%s)\n", actor, name); // "Actor name (%08x:%s)" if (command != NULL) { - osSyncPrintf("コメント:%s\n", command); // "Command:%s" + PRINTF("コメント:%s\n", command); // "Command:%s" } FaultDrawer_SetCursor(48, 24); @@ -2684,7 +2684,7 @@ void func_80031C3C(ActorContext* actorCtx, PlayState* play) { } if (HREG(20) != 0) { - osSyncPrintf("絶対魔法領域解放\n"); // "Absolute magic field deallocation" + PRINTF("絶対魔法領域解放\n"); // "Absolute magic field deallocation" } if (actorCtx->absoluteSpace != NULL) { @@ -2752,27 +2752,27 @@ Actor* Actor_RemoveFromCategory(PlayState* play, ActorContext* actorCtx, Actor* } void Actor_FreeOverlay(ActorOverlay* actorOverlay) { - osSyncPrintf(VT_FGCOL(CYAN)); + PRINTF(VT_FGCOL(CYAN)); if (actorOverlay->numLoaded == 0) { if (HREG(20) != 0) { - osSyncPrintf("アクタークライアントが０になりました\n"); // "Actor client is now 0" + PRINTF("アクタークライアントが０になりました\n"); // "Actor client is now 0" } if (actorOverlay->loadedRamAddr != NULL) { if (actorOverlay->allocType & ACTOROVL_ALLOC_PERSISTENT) { if (HREG(20) != 0) { - osSyncPrintf("オーバーレイ解放しません\n"); // "Overlay will not be deallocated" + PRINTF("オーバーレイ解放しません\n"); // "Overlay will not be deallocated" } } else if (actorOverlay->allocType & ACTOROVL_ALLOC_ABSOLUTE) { if (HREG(20) != 0) { // "Absolute magic field reserved, so deallocation will not occur" - osSyncPrintf("絶対魔法領域確保なので解放しません\n"); + PRINTF("絶対魔法領域確保なので解放しません\n"); } actorOverlay->loadedRamAddr = NULL; } else { if (HREG(20) != 0) { - osSyncPrintf("オーバーレイ解放します\n"); // "Overlay deallocated" + PRINTF("オーバーレイ解放します\n"); // "Overlay deallocated" } ZELDA_ARENA_FREE(actorOverlay->loadedRamAddr, "../z_actor.c", 6834); actorOverlay->loadedRamAddr = NULL; @@ -2780,10 +2780,10 @@ void Actor_FreeOverlay(ActorOverlay* actorOverlay) { } } else if (HREG(20) != 0) { // "%d of actor client remains" - osSyncPrintf("アクタークライアントはあと %d 残っています\n", actorOverlay->numLoaded); + PRINTF("アクタークライアントはあと %d 残っています\n", actorOverlay->numLoaded); } - osSyncPrintf(VT_RST); + PRINTF(VT_RST); } Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 posX, f32 posY, f32 posZ, s16 rotX, @@ -2805,25 +2805,25 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos if (HREG(20) != 0) { // "Actor class addition [%d:%s]" - osSyncPrintf("アクタークラス追加 [%d:%s]\n", actorId, name); + PRINTF("アクタークラス追加 [%d:%s]\n", actorId, name); } if (actorCtx->total > ACTOR_NUMBER_MAX) { // "Ａｃｔｏｒ set number exceeded" - osSyncPrintf(VT_COL(YELLOW, BLACK) "Ａｃｔｏｒセット数オーバー\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "Ａｃｔｏｒセット数オーバー\n" VT_RST); return NULL; } if (overlayEntry->vramStart == NULL) { if (HREG(20) != 0) { - osSyncPrintf("オーバーレイではありません\n"); // "Not an overlay" + PRINTF("オーバーレイではありません\n"); // "Not an overlay" } actorInit = overlayEntry->initInfo; } else { if (overlayEntry->loadedRamAddr != NULL) { if (HREG(20) != 0) { - osSyncPrintf("既にロードされています\n"); // "Already loaded" + PRINTF("既にロードされています\n"); // "Already loaded" } } else { if (overlayEntry->allocType & ACTOROVL_ALLOC_ABSOLUTE) { @@ -2835,7 +2835,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos actorCtx->absoluteSpace = ZELDA_ARENA_MALLOC_R(ACTOROVL_ABSOLUTE_SPACE_SIZE, "AMF:絶対魔法領域", 0); if (HREG(20) != 0) { // "Absolute magic field reservation - %d bytes reserved" - osSyncPrintf("絶対魔法領域確保 %d バイト確保\n", ACTOROVL_ABSOLUTE_SPACE_SIZE); + PRINTF("絶対魔法領域確保 %d バイト確保\n", ACTOROVL_ABSOLUTE_SPACE_SIZE); } } @@ -2848,20 +2848,20 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos if (overlayEntry->loadedRamAddr == NULL) { // "Cannot reserve actor program memory" - osSyncPrintf(VT_COL(RED, WHITE) "Ａｃｔｏｒプログラムメモリが確保できません\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "Ａｃｔｏｒプログラムメモリが確保できません\n" VT_RST); return NULL; } Overlay_Load(overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr); - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("OVL(a):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", overlayEntry->vramStart, - overlayEntry->vramEnd, overlayEntry->loadedRamAddr, - (uintptr_t)overlayEntry->loadedRamAddr + (uintptr_t)overlayEntry->vramEnd - - (uintptr_t)overlayEntry->vramStart, - (uintptr_t)overlayEntry->vramStart - (uintptr_t)overlayEntry->loadedRamAddr, name); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("OVL(a):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", overlayEntry->vramStart, overlayEntry->vramEnd, + overlayEntry->loadedRamAddr, + (uintptr_t)overlayEntry->loadedRamAddr + (uintptr_t)overlayEntry->vramEnd - + (uintptr_t)overlayEntry->vramStart, + (uintptr_t)overlayEntry->vramStart - (uintptr_t)overlayEntry->loadedRamAddr, name); + PRINTF(VT_RST); overlayEntry->numLoaded = 0; } @@ -2878,8 +2878,8 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos if ((objectSlot < 0) || ((actorInit->category == ACTORCAT_ENEMY) && Flags_GetClear(play, play->roomCtx.curRoom.num))) { // "No data bank!! (profilep->bank=%d)" - osSyncPrintf(VT_COL(RED, WHITE) "データバンク無し！！<データバンク＝%d>(profilep->bank=%d)\n" VT_RST, - objectSlot, actorInit->objectId); + PRINTF(VT_COL(RED, WHITE) "データバンク無し！！<データバンク＝%d>(profilep->bank=%d)\n" VT_RST, objectSlot, + actorInit->objectId); Actor_FreeOverlay(overlayEntry); return NULL; } @@ -2888,8 +2888,8 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos if (actor == NULL) { // "Actor class cannot be reserved! %s " - osSyncPrintf(VT_COL(RED, WHITE) "Ａｃｔｏｒクラス確保できません！ %s <サイズ＝%dバイト>\n", VT_RST, name, - actorInit->instanceSize); + PRINTF(VT_COL(RED, WHITE) "Ａｃｔｏｒクラス確保できません！ %s <サイズ＝%dバイト>\n", VT_RST, name, + actorInit->instanceSize); Actor_FreeOverlay(overlayEntry); return NULL; } @@ -2900,7 +2900,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos if (HREG(20) != 0) { // "Actor client No. %d" - osSyncPrintf("アクタークライアントは %d 個目です\n", overlayEntry->numLoaded); + PRINTF("アクタークライアントは %d 個目です\n", overlayEntry->numLoaded); } Lib_MemSet((u8*)actor, actorInit->instanceSize, 0); @@ -3000,7 +3000,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) { name = overlayEntry->name != NULL ? overlayEntry->name : ""; if (HREG(20) != 0) { - osSyncPrintf("アクタークラス削除 [%s]\n", name); // "Actor class deleted [%s]" + PRINTF("アクタークラス削除 [%s]\n", name); // "Actor class deleted [%s]" } if ((player != NULL) && (actor == player->unk_664)) { @@ -3029,7 +3029,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) { if (overlayEntry->vramStart == NULL) { if (HREG(20) != 0) { - osSyncPrintf("オーバーレイではありません\n"); // "Not an overlay" + PRINTF("オーバーレイではありません\n"); // "Not an overlay" } } else { ASSERT(overlayEntry->loadedRamAddr != NULL, "actor_dlftbl->allocp != NULL", "../z_actor.c", 7251); diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index 69e84c436d..735a7f7b3e 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -55,13 +55,13 @@ void ActorOverlayTable_LogPrint(void) { ActorOverlay* overlayEntry; u32 i; - osSyncPrintf("actor_dlftbls %u\n", gMaxActorId); - osSyncPrintf("RomStart RomEnd SegStart SegEnd allocp profile segname\n"); + PRINTF("actor_dlftbls %u\n", gMaxActorId); + PRINTF("RomStart RomEnd SegStart SegEnd allocp profile segname\n"); for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < (u32)gMaxActorId; i++, overlayEntry++) { - osSyncPrintf("%08x %08x %08x %08x %08x %08x %s\n", overlayEntry->vromStart, overlayEntry->vromEnd, - overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr, - &overlayEntry->initInfo->id, overlayEntry->name != NULL ? overlayEntry->name : "?"); + PRINTF("%08x %08x %08x %08x %08x %08x %s\n", overlayEntry->vromStart, overlayEntry->vromEnd, + overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr, &overlayEntry->initInfo->id, + overlayEntry->name != NULL ? overlayEntry->name : "?"); } } diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 1fbca9e096..e2605d57f8 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -85,11 +85,11 @@ u16 sSurfaceMaterialToSfxOffset[SURFACE_MATERIAL_MAX] = { 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)); + PRINTF(VT_FGCOL(RED)); // "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); + PRINTF("T_BGCheck_PosErrorCheck():位置が妥当ではありません。pos (%f,%f,%f) file:%s line:%d\n", pos->x, pos->y, + pos->z, file, line); + PRINTF(VT_RST); return true; } return false; @@ -308,11 +308,11 @@ void CollisionPoly_GetVerticesByBgId(CollisionPoly* poly, s32 bgId, CollisionCon Vec3s* vtxList; if (poly == NULL || bgId > BG_ACTOR_MAX || dest == NULL) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "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); + PRINTF("T_Polygon_GetVertex_bg_ai(): Error %d %d %d 引数が適切ではありません。処理を終了します。\n", + poly == NULL, bgId > BG_ACTOR_MAX, dest == NULL); + PRINTF(VT_RST); if (dest != NULL) { //! @bug: dest[2] x and y are not set to 0 @@ -1552,18 +1552,18 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader customNodeListMax = -1; // "/*---------------- BGCheck Buffer Memory Size -------------*/\n" - osSyncPrintf("/*---------------- BGCheck バッファーメモリサイズ -------------*/\n"); + PRINTF("/*---------------- BGCheck バッファーメモリサイズ -------------*/\n"); if ((R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) || (R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_TOGGLE_VIEWPOINT) || (R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED) || (R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_MARKET)) { if (play->sceneId == SCENE_STABLE) { // "/* BGCheck LonLon Size %dbyte */\n" - osSyncPrintf("/* BGCheck LonLonサイズ %dbyte */\n", 0x3520); + PRINTF("/* BGCheck LonLonサイズ %dbyte */\n", 0x3520); colCtx->memSize = 0x3520; } else { // "/* BGCheck Mini Size %dbyte */\n" - osSyncPrintf("/* BGCheck ミニサイズ %dbyte */\n", 0x4E20); + PRINTF("/* BGCheck ミニサイズ %dbyte */\n", 0x4E20); colCtx->memSize = 0x4E20; } colCtx->dyna.polyNodesMax = 500; @@ -1575,7 +1575,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader } else if (BgCheck_IsSpotScene(play) == true) { colCtx->memSize = 0xF000; // "/* BGCheck Spot Size %dbyte */\n" - osSyncPrintf("/* BGCheck Spot用サイズ %dbyte */\n", 0xF000); + PRINTF("/* BGCheck Spot用サイズ %dbyte */\n", 0xF000); colCtx->dyna.polyNodesMax = 1000; colCtx->dyna.polyListMax = 512; colCtx->dyna.vtxListMax = 512; @@ -1589,7 +1589,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader colCtx->memSize = 0x1CC00; } // "/* BGCheck Normal Size %dbyte */\n" - osSyncPrintf("/* BGCheck ノーマルサイズ %dbyte */\n", colCtx->memSize); + PRINTF("/* BGCheck ノーマルサイズ %dbyte */\n", colCtx->memSize); colCtx->dyna.polyNodesMax = 1000; colCtx->dyna.polyListMax = 512; colCtx->dyna.vtxListMax = 512; @@ -1648,9 +1648,9 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader SSNodeList_Alloc(play, &colCtx->polyNodes, tblMax, colCtx->colHeader->numPolygons); lookupTblMemSize = BgCheck_InitializeStaticLookup(colCtx, play, colCtx->lookupTbl); - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("/*---結局 BG使用サイズ %dbyte---*/\n", memSize + lookupTblMemSize); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("/*---結局 BG使用サイズ %dbyte---*/\n", memSize + lookupTblMemSize); + PRINTF(VT_RST); DynaPoly_Init(play, &colCtx->dyna); DynaPoly_Alloc(play, &colCtx->dyna); @@ -1668,9 +1668,9 @@ CollisionHeader* BgCheck_GetCollisionHeader(CollisionContext* colCtx, s32 bgId) return NULL; } if (!(colCtx->dyna.bgActorFlags[bgId] & BGACTOR_IN_USE)) { - osSyncPrintf(VT_COL(YELLOW, BLACK)); - osSyncPrintf("T_BGCheck_getBGDataInfo():そのbg_actor_indexは使われておりません。index=%d\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(YELLOW, BLACK)); + PRINTF("T_BGCheck_getBGDataInfo():そのbg_actor_indexは使われておりません。index=%d\n"); + PRINTF(VT_RST); return NULL; } return colCtx->dyna.bgActors[bgId].colHeader; @@ -1719,7 +1719,7 @@ f32 BgCheck_RaycastDownImpl(PlayState* play, CollisionContext* colCtx, u16 xpFla } if (BgCheck_PosErrorCheck(&checkPos, "../z_bgcheck.c", 4410)) { if (actor != NULL) { - osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); + PRINTF("こいつ,pself_actor->name %d\n", actor->id); } } lookup = BgCheck_GetStaticLookup(colCtx, lookupTbl, &checkPos); @@ -1969,7 +1969,7 @@ s32 BgCheck_CheckWallImpl(CollisionContext* colCtx, u16 xpFlags, Vec3f* posResul if (BgCheck_PosErrorCheck(posNext, "../z_bgcheck.c", 4831) == true || BgCheck_PosErrorCheck(posPrev, "../z_bgcheck.c", 4832) == true) { if (actor != NULL) { - osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); + PRINTF("こいつ,pself_actor->name %d\n", actor->id); } } @@ -2157,7 +2157,7 @@ s32 BgCheck_CheckCeilingImpl(CollisionContext* colCtx, u16 xpFlags, f32* outY, V *outY = pos->y; if (BgCheck_PosErrorCheck(pos, "../z_bgcheck.c", 5206) == true) { if (actor != NULL) { - osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); + PRINTF("こいつ,pself_actor->name %d\n", actor->id); } } lookupTbl = colCtx->lookupTbl; @@ -2232,9 +2232,9 @@ s32 BgCheck_CheckLineImpl(CollisionContext* colCtx, u16 xpFlags1, u16 xpFlags2, if (BgCheck_PosErrorCheck(posA, "../z_bgcheck.c", 5334) == true || BgCheck_PosErrorCheck(posB, "../z_bgcheck.c", 5335) == true) { if (actor != NULL) { - osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); + PRINTF("こいつ,pself_actor->name %d\n", actor->id); } else { - osSyncPrintf("pself_actor == NULLで犯人不明\n"); + PRINTF("pself_actor == NULLで犯人不明\n"); } } @@ -2445,7 +2445,7 @@ s32 BgCheck_SphVsFirstPolyImpl(CollisionContext* colCtx, u16 xpFlags, CollisionP *outBgId = BGCHECK_SCENE; if (BgCheck_PosErrorCheck(center, "../z_bgcheck.c", 5852) == true) { if (actor != NULL) { - osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); + PRINTF("こいつ,pself_actor->name %d\n", actor->id); } } @@ -2717,9 +2717,9 @@ s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* acto } if (!foundSlot) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("DynaPolyInfo_setActor():ダイナミックポリゴン 空きインデックスはありません\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("DynaPolyInfo_setActor():ダイナミックポリゴン 空きインデックスはありません\n"); + PRINTF(VT_RST); return BG_ACTOR_MAX; } @@ -2727,9 +2727,9 @@ s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* acto dyna->bitFlag |= DYNAPOLY_INVALIDATE_LOOKUP; dyna->bgActorFlags[bgId] &= ~BGACTOR_1; - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("DynaPolyInfo_setActor():index %d\n", bgId); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("DynaPolyInfo_setActor():index %d\n", bgId); + PRINTF(VT_RST); return bgId; } @@ -2779,25 +2779,24 @@ void DynaPoly_EnableCeilingCollision(PlayState* play, DynaCollisionContext* dyna void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgId) { DynaPolyActor* actor; - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("DynaPolyInfo_delReserve():index %d\n", bgId); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("DynaPolyInfo_delReserve():index %d\n", bgId); + PRINTF(VT_RST); if (!DynaPoly_IsBgIdBgActor(bgId)) { if (bgId == -1) { - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); // "The index that should have been deleted(? ) was(== -1), processing aborted." - osSyncPrintf( - "DynaPolyInfo_delReserve():削除されているはずの(?)\nインデックス(== -1)のため,処理を中止します。\n"); - osSyncPrintf(VT_RST); + PRINTF("DynaPolyInfo_delReserve():削除されているはずの(?)\nインデックス(== -1)のため,処理を中止します。\n"); + PRINTF(VT_RST); return; } else { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "Unable to deallocate index / index unallocated, processing aborted." - osSyncPrintf("DynaPolyInfo_delReserve():" - "確保していない／出来なかったインデックスの解放のため、処理を中止します。index == %d\n", - bgId); - osSyncPrintf(VT_RST); + PRINTF("DynaPolyInfo_delReserve():" + "確保していない／出来なかったインデックスの解放のため、処理を中止します。index == %d\n", + bgId); + PRINTF(VT_RST); return; } } @@ -2853,17 +2852,17 @@ void DynaPoly_AddBgActorToLookup(PlayState* play, DynaCollisionContext* dyna, s3 } if (!(dyna->polyListMax >= *polyStartIndex + pbgdata->numPolygons)) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "do not use if %d exceeds %d" - osSyncPrintf("DynaPolyInfo_expandSRT():polygon over %dが%dを越えるとダメ\n", - *polyStartIndex + pbgdata->numPolygons, dyna->polyListMax); + PRINTF("DynaPolyInfo_expandSRT():polygon over %dが%dを越えるとダメ\n", *polyStartIndex + pbgdata->numPolygons, + dyna->polyListMax); } if (!(dyna->vtxListMax >= *vtxStartIndex + pbgdata->numVertices)) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "do not use if %d exceeds %d" - osSyncPrintf("DynaPolyInfo_expandSRT():vertex over %dが%dを越えるとダメ\n", - *vtxStartIndex + pbgdata->numVertices, dyna->vtxListMax); + PRINTF("DynaPolyInfo_expandSRT():vertex over %dが%dを越えるとダメ\n", *vtxStartIndex + pbgdata->numVertices, + dyna->vtxListMax); } ASSERT(dyna->polyListMax >= *polyStartIndex + pbgdata->numPolygons, @@ -3039,9 +3038,9 @@ void DynaPoly_UpdateContext(PlayState* play, DynaCollisionContext* dyna) { for (i = 0; i < BG_ACTOR_MAX; i++) { if (dyna->bgActorFlags[i] & BGACTOR_1) { // Initialize BgActor - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("DynaPolyInfo_setup():削除 index=%d\n", i); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("DynaPolyInfo_setup():削除 index=%d\n", i); + PRINTF(VT_RST); dyna->bgActorFlags[i] = 0; BgActor_Initialize(play, &dyna->bgActors[i]); @@ -3049,9 +3048,9 @@ void DynaPoly_UpdateContext(PlayState* play, DynaCollisionContext* dyna) { } if (dyna->bgActors[i].actor != NULL && dyna->bgActors[i].actor->update == NULL) { // Delete BgActor - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("DynaPolyInfo_setup():削除 index=%d\n", i); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("DynaPolyInfo_setup():削除 index=%d\n", i); + PRINTF(VT_RST); actor = DynaPoly_GetActor(&play->colCtx, i); if (actor == NULL) { return; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 8dd3e3e62d..7db82ed358 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -440,7 +440,7 @@ f32 Camera_GetFloorYLayer(Camera* camera, Vec3f* norm, Vec3f* pos, s32* bgId) { } } if (i == 0) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: foward check: too many layer!\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: foward check: too many layer!\n" VT_RST); } return floorY; } @@ -723,7 +723,7 @@ void Camera_CopyDataToRegs(Camera* camera, s16 mode) { s32 i; if (PREG(82)) { - osSyncPrintf("camera: res: stat (%d/%d/%d)\n", camera->camId, camera->setting, mode); + PRINTF("camera: res: stat (%d/%d/%d)\n", camera->camId, camera->setting, mode); } values = sCameraSettings[camera->setting].cameraModes[mode].values; @@ -732,7 +732,7 @@ void Camera_CopyDataToRegs(Camera* camera, s16 mode) { valueP = &values[i]; PREG(valueP->dataType) = valueP->val; if (PREG(82)) { - osSyncPrintf("camera: res: PREG(%02d) = %d\n", valueP->dataType, valueP->val); + PRINTF("camera: res: PREG(%02d) = %d\n", valueP->dataType, valueP->val); } } camera->animState = 0; @@ -747,7 +747,7 @@ s32 Camera_CopyPREGToModeValues(Camera* camera) { valueP = &values[i]; valueP->val = R_CAM_DATA(valueP->dataType); if (PREG(82)) { - osSyncPrintf("camera: res: %d = PREG(%02d)\n", valueP->val, valueP->dataType); + PRINTF("camera: res: %d = PREG(%02d)\n", valueP->val, valueP->dataType); } } return true; @@ -798,8 +798,7 @@ Vec3f Camera_BGCheckCorner(Vec3f* linePointA, Vec3f* linePointB, CamColChk* poin Vec3f closestPoint; if (!func_800427B4(pointAColChk->poly, pointBColChk->poly, linePointA, linePointB, &closestPoint)) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: corner check no cross point %x %x\n" VT_RST, pointAColChk, - pointBColChk); + PRINTF(VT_COL(YELLOW, BLACK) "camera: corner check no cross point %x %x\n" VT_RST, pointAColChk, pointBColChk); return pointAColChk->pos; } @@ -1131,8 +1130,8 @@ s32 Camera_CalcAtForLockOn(Camera* camera, VecGeo* eyeAtDir, Vec3f* targetPos, f lookFromOffset = OLib_VecGeoToVec3f(&playerToTargetDir); if (PREG(89)) { - osSyncPrintf("%f (%f %f %f) %f\n", playerToTargetDir.r / distance, lookFromOffset.x, lookFromOffset.y, - lookFromOffset.z, camera->atLERPStepScale); + PRINTF("%f (%f %f %f) %f\n", playerToTargetDir.r / distance, lookFromOffset.x, lookFromOffset.y, + lookFromOffset.z, camera->atLERPStepScale); } playerToAtOffsetTarget.x += lookFromOffset.x; @@ -2414,7 +2413,7 @@ s32 Camera_Jump2(Camera* camera) { rwData->yawTarget = atToEyeNextDir.yaw; rwData->initYawDiff = 0; if (rwData->floorY == BGCHECK_Y_MIN) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: climb: no floor \n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: climb: no floor \n" VT_RST); rwData->onFloor = -1; rwData->floorY = playerPosRot->pos.y - 1000.0f; } else if (playerPosRot->pos.y - rwData->floorY < playerHeight) { @@ -2853,8 +2852,7 @@ s32 Camera_Battle1(Camera* camera) { atToEyeNextDir = OLib_Vec3fDiffToVecGeo(at, eyeNext); if (camera->target == NULL || camera->target->update == NULL) { if (camera->target == NULL) { - osSyncPrintf( - VT_COL(YELLOW, BLACK) "camera: warning: battle: target is not valid, change parallel\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: battle: target is not valid, change parallel\n" VT_RST); } camera->target = NULL; Camera_RequestMode(camera, CAM_MODE_Z_PARALLEL); @@ -2869,9 +2867,9 @@ s32 Camera_Battle1(Camera* camera) { rwData->target = camera->target; camera->animState++; if (rwData->target->id > 0) { - osSyncPrintf("camera: battle: target actor name " VT_FGCOL(BLUE) "%d" VT_RST "\n", rwData->target->id); + PRINTF("camera: battle: target actor name " VT_FGCOL(BLUE) "%d" VT_RST "\n", rwData->target->id); } else { - osSyncPrintf("camera: battle: target actor name " VT_COL(RED, WHITE) "%d" VT_RST "\n", rwData->target->id); + PRINTF("camera: battle: target actor name " VT_COL(RED, WHITE) "%d" VT_RST "\n", rwData->target->id); camera->target = NULL; Camera_RequestMode(camera, CAM_MODE_Z_PARALLEL); return true; @@ -2904,8 +2902,8 @@ s32 Camera_Battle1(Camera* camera) { } camera->targetPosRot = Actor_GetFocus(camera->target); if (rwData->target != camera->target) { - osSyncPrintf("camera: battle: change target %d -> " VT_FGCOL(BLUE) "%d" VT_RST "\n", rwData->target->id, - camera->target->id); + PRINTF("camera: battle: change target %d -> " VT_FGCOL(BLUE) "%d" VT_RST "\n", rwData->target->id, + camera->target->id); camera->animState = 0; return true; } @@ -3139,8 +3137,7 @@ s32 Camera_KeepOn1(Camera* camera) { playerHeight = Player_GetHeight(camera->player); if ((camera->target == NULL) || (camera->target->update == NULL)) { if (camera->target == NULL) { - osSyncPrintf( - VT_COL(YELLOW, BLACK) "camera: warning: keepon: target is not valid, change parallel\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: keepon: target is not valid, change parallel\n" VT_RST); } camera->target = NULL; Camera_RequestMode(camera, CAM_MODE_Z_PARALLEL); @@ -3379,7 +3376,7 @@ s32 Camera_KeepOn3(Camera* camera) { playerHeight = Player_GetHeight(camera->player); if (camera->target == NULL || camera->target->update == NULL) { if (camera->target == NULL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: warning: talk: target is not valid, change parallel\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: talk: target is not valid, change parallel\n" VT_RST); } camera->target = NULL; Camera_RequestMode(camera, CAM_MODE_Z_PARALLEL); @@ -3488,7 +3485,7 @@ s32 Camera_KeepOn3(Camera* camera) { i++; } } - osSyncPrintf("camera: talk: BG&collision check %d time(s)\n", i); + PRINTF("camera: talk: BG&collision check %d time(s)\n", i); camera->stateFlags &= ~(CAM_STATE_CHECK_BG | CAM_STATE_EXTERNAL_FINISHED); pad = ((rwData->animTimer + 1) * rwData->animTimer) >> 1; rwData->eyeToAtTargetYaw = (f32)(s16)(atToEyeAdj.yaw - atToEyeNextDir.yaw) / pad; @@ -3577,8 +3574,7 @@ s32 Camera_KeepOn4(Camera* camera) { } if (rwData->unk_14 != *temp_s0) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: item: item type changed %d -> %d\n" VT_RST, rwData->unk_14, - *temp_s0); + PRINTF(VT_COL(YELLOW, BLACK) "camera: item: item type changed %d -> %d\n" VT_RST, rwData->unk_14, *temp_s0); camera->animState = 20; camera->stateFlags |= CAM_STATE_LOCK_MODE; camera->stateFlags &= ~(CAM_STATE_CHECK_WATER | CAM_STATE_CHECK_BG); @@ -3601,7 +3597,7 @@ s32 Camera_KeepOn4(Camera* camera) { roData->interfaceField = GET_NEXT_RO_DATA(values); roData->unk_14 = GET_NEXT_SCALED_RO_DATA(values); roData->unk_1E = GET_NEXT_RO_DATA(values); - osSyncPrintf("camera: item: type %d\n", *temp_s0); + PRINTF("camera: item: type %d\n", *temp_s0); switch (*temp_s0) { case 1: roData->unk_00 = playerHeight * -0.6f * yNormal; @@ -3789,7 +3785,7 @@ s32 Camera_KeepOn4(Camera* camera) { spB8.pitch = D_8011D3CC[i] + spA2; D_8015BD70 = Camera_AddVecGeoToVec3f(&D_8015BD50, &spB8); } - osSyncPrintf("camera: item: BG&collision check %d time(s)\n", i); + PRINTF("camera: item: BG&collision check %d time(s)\n", i); } rwData->unk_04 = (s16)(spB8.pitch - spA8.pitch) / (f32)rwData->unk_10; rwData->unk_00 = (s16)(spB8.yaw - spA8.yaw) / (f32)rwData->unk_10; @@ -3895,8 +3891,7 @@ s32 Camera_KeepOn0(Camera* camera) { if (camera->target == NULL || camera->target->update == NULL) { if (camera->target == NULL) { - osSyncPrintf( - VT_COL(YELLOW, BLACK) "camera: warning: talk: target is not valid, change normal camera\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: talk: target is not valid, change normal camera\n" VT_RST); } camera->target = NULL; Camera_RequestMode(camera, CAM_MODE_NORMAL); @@ -4130,7 +4125,7 @@ s32 Camera_Fixed3(Camera* camera) { } if (bgCamFuncData->roomImageOverrideBgCamIndex != rwData->roomImageOverrideBgCamIndex) { - osSyncPrintf("camera: position change %d \n", rwData->roomImageOverrideBgCamIndex); + PRINTF("camera: position change %d \n", rwData->roomImageOverrideBgCamIndex); rwData->roomImageOverrideBgCamIndex = bgCamFuncData->roomImageOverrideBgCamIndex; rwData->updDirTimer = 5; } @@ -4552,7 +4547,7 @@ s32 Camera_Data0(Camera* camera) { } s32 Camera_Data1(Camera* camera) { - osSyncPrintf("chau!chau!\n"); + PRINTF("chau!chau!\n"); return Camera_Normal1(camera); } @@ -5262,9 +5257,9 @@ s32 Camera_Unique9(Camera* camera) { if ((camera->player->stateFlags1 & PLAYER_STATE1_27) && (player->currentBoots != PLAYER_BOOTS_IRON)) { Player_SetCsAction(camera->play, camera->target, PLAYER_CSACTION_8); - osSyncPrintf("camera: demo: player demo set WAIT\n"); + PRINTF("camera: demo: player demo set WAIT\n"); } else { - osSyncPrintf("camera: demo: player demo set %d\n", rwData->curKeyFrame->initField); + PRINTF("camera: demo: player demo set %d\n", rwData->curKeyFrame->initField); Player_SetCsAction(camera->play, camera->target, rwData->curKeyFrame->initField); } } @@ -5314,7 +5309,7 @@ s32 Camera_Unique9(Camera* camera) { rwData->atTarget = Camera_AddVecGeoToVec3f(&targethead.pos, &scratchGeo); } else { if (camera->target == NULL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: warning: demo C: actor is not valid\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: demo C: actor is not valid\n" VT_RST); } camera->target = NULL; @@ -5353,7 +5348,7 @@ s32 Camera_Unique9(Camera* camera) { rwData->atTarget = Camera_AddVecGeoToVec3f(&atFocusPosRot.pos, &scratchGeo); } else { if (camera->target == NULL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: warning: demo C: actor is not valid\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: demo C: actor is not valid\n" VT_RST); } rwData->atTarget = *at; } @@ -5403,7 +5398,7 @@ s32 Camera_Unique9(Camera* camera) { rwData->eyeTarget = Camera_AddVecGeoToVec3f(&eyeLookAtPos, &scratchGeo); } else { if (camera->target == NULL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: warning: demo C: actor is not valid\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: demo C: actor is not valid\n" VT_RST); } camera->target = NULL; rwData->eyeTarget = *eyeNext; @@ -5444,7 +5439,7 @@ s32 Camera_Unique9(Camera* camera) { rwData->eyeTarget = Camera_AddVecGeoToVec3f(&eyeFocusPosRot.pos, &scratchGeo); } else { if (camera->target == NULL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: warning: demo C: actor is not valid\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: demo C: actor is not valid\n" VT_RST); } camera->target = NULL; rwData->eyeTarget = *eyeNext; @@ -5676,18 +5671,18 @@ s32 Camera_Unique9(Camera* camera) { void Camera_DebugPrintSplineArray(char* name, s16 length, CutsceneCameraPoint cameraPoints[]) { s32 i; - osSyncPrintf("static SplinedatZ %s[] = {\n", name); + PRINTF("static SplinedatZ %s[] = {\n", name); for (i = 0; i < length; i++) { - osSyncPrintf(" /* key frame %2d */ {\n", i); - osSyncPrintf(" /* code */ %d,\n", cameraPoints[i].continueFlag); - osSyncPrintf(" /* z */ %d,\n", cameraPoints[i].cameraRoll); - osSyncPrintf(" /* T */ %d,\n", cameraPoints[i].nextPointFrame); - osSyncPrintf(" /* zoom */ %f,\n", cameraPoints[i].viewAngle); - osSyncPrintf(" /* pos */ { %d, %d, %d }\n", cameraPoints[i].pos.x, cameraPoints[i].pos.y, - cameraPoints[i].pos.z); - osSyncPrintf(" },\n"); + PRINTF(" /* key frame %2d */ {\n", i); + PRINTF(" /* code */ %d,\n", cameraPoints[i].continueFlag); + PRINTF(" /* z */ %d,\n", cameraPoints[i].cameraRoll); + PRINTF(" /* T */ %d,\n", cameraPoints[i].nextPointFrame); + PRINTF(" /* zoom */ %f,\n", cameraPoints[i].viewAngle); + PRINTF(" /* pos */ { %d, %d, %d }\n", cameraPoints[i].pos.x, cameraPoints[i].pos.y, + cameraPoints[i].pos.z); + PRINTF(" },\n"); } - osSyncPrintf("};\n\n"); + PRINTF("};\n\n"); } /** @@ -5750,8 +5745,8 @@ s32 Camera_Demo1(Camera* camera) { rwData->curFrame = 0.0f; camera->animState++; // "absolute" : "relative" - osSyncPrintf(VT_SGR("1") "%06u:" VT_RST " camera: spline demo: start %s \n", camera->play->state.frames, - *relativeToPlayer == 0 ? "絶対" : "相対"); + PRINTF(VT_SGR("1") "%06u:" VT_RST " camera: spline demo: start %s \n", camera->play->state.frames, + *relativeToPlayer == 0 ? "絶対" : "相対"); if (PREG(93)) { Camera_DebugPrintSplineArray("CENTER", 5, csAtPoints); @@ -5772,7 +5767,7 @@ s32 Camera_Demo1(Camera* camera) { Camera_RotateAroundPoint(&curPlayerPosRot, &csEyeUpdate, eyeNext); Camera_RotateAroundPoint(&curPlayerPosRot, &csAtUpdate, at); } else { - osSyncPrintf(VT_COL(RED, WHITE) "camera: spline demo: owner dead\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "camera: spline demo: owner dead\n" VT_RST); } } else { // simply copy the interpolated values to the eye and at @@ -6041,7 +6036,7 @@ s32 Camera_Demo5(Camera* camera) { if ((camera->target == NULL) || (camera->target->update == NULL)) { if (camera->target == NULL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: warning: attention: target is not valid, stop!\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: attention: target is not valid, stop!\n" VT_RST); } camera->target = NULL; return true; @@ -6150,7 +6145,7 @@ s32 Camera_Demo5(Camera* camera) { D_8011D954[0].timerInit = camera->timer - 5; sp4A = 0; if (!func_800C0D34(camera->play, camera->target, &sp4A)) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: attention demo: this door is dummy door!\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: attention demo: this door is dummy door!\n" VT_RST); if (ABS(playerTargetGeo.yaw - camera->target->shape.rot.y) >= 0x4000) { sp4A = camera->target->shape.rot.y; } else { @@ -6518,7 +6513,7 @@ s32 Camera_Special0(Camera* camera) { if ((camera->target == NULL) || (camera->target->update == NULL)) { if (camera->target == NULL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: warning: circle: target is not valid, stop!\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: warning: circle: target is not valid, stop!\n" VT_RST); } camera->target = NULL; return true; @@ -7020,20 +7015,20 @@ Camera* Camera_Create(View* view, CollisionContext* colCtx, PlayState* play) { Camera* newCamera = ZELDA_ARENA_MALLOC(sizeof(*newCamera), "../z_camera.c", 9370); if (newCamera != NULL) { - osSyncPrintf(VT_FGCOL(BLUE) "camera: create --- allocate %d byte" VT_RST "\n", sizeof(*newCamera) * 4); + PRINTF(VT_FGCOL(BLUE) "camera: create --- allocate %d byte" VT_RST "\n", sizeof(*newCamera) * 4); Camera_Init(newCamera, view, colCtx, play); } else { - osSyncPrintf(VT_COL(RED, WHITE) "camera: create: not enough memory\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "camera: create: not enough memory\n" VT_RST); } return newCamera; } void Camera_Destroy(Camera* camera) { if (camera != NULL) { - osSyncPrintf(VT_FGCOL(BLUE) "camera: destroy ---" VT_RST "\n"); + PRINTF(VT_FGCOL(BLUE) "camera: destroy ---" VT_RST "\n"); ZELDA_ARENA_FREE(camera, "../z_camera.c", 9391); } else { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: destroy: already cleared\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "camera: destroy: already cleared\n" VT_RST); } } @@ -7112,7 +7107,7 @@ void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState sCameraInterfaceField = CAM_INTERFACE_FIELD(CAM_LETTERBOX_IGNORE, CAM_HUD_VISIBILITY_IGNORE, 0); sDbgModeIdx = -1; D_8011D3F0 = 3; - osSyncPrintf(VT_FGCOL(BLUE) "camera: initialize --- " VT_RST " UID %d\n", camera->uid); + PRINTF(VT_FGCOL(BLUE) "camera: initialize --- " VT_RST " UID %d\n", camera->uid); } void func_80057FC4(Camera* camera) { @@ -7126,19 +7121,19 @@ void func_80057FC4(Camera* camera) { camera->prevSetting = camera->setting = CAM_SET_DUNGEON0; break; case ROOM_BEHAVIOR_TYPE1_0: - osSyncPrintf("camera: room type: default set field\n"); + PRINTF("camera: room type: default set field\n"); Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10); camera->prevSetting = camera->setting = CAM_SET_NORMAL0; break; default: - osSyncPrintf("camera: room type: default set etc (%d)\n", camera->play->roomCtx.curRoom.behaviorType1); + PRINTF("camera: room type: default set etc (%d)\n", camera->play->roomCtx.curRoom.behaviorType1); Camera_ChangeDoorCam(camera, NULL, -99, 0, 0, 18, 10); camera->prevSetting = camera->setting = CAM_SET_NORMAL0; camera->stateFlags |= CAM_STATE_CHECK_BG; break; } } else { - osSyncPrintf("camera: room type: prerender\n"); + PRINTF("camera: room type: prerender\n"); camera->prevSetting = camera->setting = CAM_SET_FREE0; camera->stateFlags &= ~CAM_STATE_CHECK_BG; } @@ -7208,7 +7203,7 @@ void Camera_InitDataUsingPlayer(Camera* camera, Player* player) { camera->atLERPStepScale = 1.0f; Camera_CopyDataToRegs(camera, camera->mode); Camera_QRegInit(); - osSyncPrintf(VT_FGCOL(BLUE) "camera: personalize ---" VT_RST "\n"); + PRINTF(VT_FGCOL(BLUE) "camera: personalize ---" VT_RST "\n"); if (camera->camId == CAM_ID_MAIN) { Camera_UpdateWater(camera); @@ -7221,12 +7216,12 @@ s16 Camera_ChangeStatus(Camera* camera, s16 status) { s32 i; if (PREG(82)) { - osSyncPrintf("camera: change camera status: cond %c%c\n", status == CAM_STAT_ACTIVE ? 'o' : 'x', - camera->status != CAM_STAT_ACTIVE ? 'o' : 'x'); + PRINTF("camera: change camera status: cond %c%c\n", status == CAM_STAT_ACTIVE ? 'o' : 'x', + camera->status != CAM_STAT_ACTIVE ? 'o' : 'x'); } if (PREG(82)) { - osSyncPrintf("camera: res: stat (%d/%d/%d)\n", camera->camId, camera->setting, camera->mode); + PRINTF("camera: res: stat (%d/%d/%d)\n", camera->camId, camera->setting, camera->mode); } if (status == CAM_STAT_ACTIVE && camera->status != CAM_STAT_ACTIVE) { @@ -7235,7 +7230,7 @@ s16 Camera_ChangeStatus(Camera* camera, s16 status) { valueP = &values[i]; R_CAM_DATA(valueP->dataType) = valueP->val; if (PREG(82)) { - osSyncPrintf("camera: change camera status: PREG(%02d) = %d\n", valueP->dataType, valueP->val); + PRINTF("camera: change camera status: PREG(%02d) = %d\n", valueP->dataType, valueP->val); } } } @@ -7382,7 +7377,7 @@ s32 Camera_UpdateWater(Camera* camera) { } } else if (camera->stateFlags & CAM_STATE_PLAYER_IN_WATER) { // player is leaving a water box. - osSyncPrintf("camera: water: off\n"); + PRINTF("camera: water: off\n"); camera->stateFlags &= ~CAM_STATE_PLAYER_IN_WATER; prevBgId = camera->bgId; camera->bgId = BGCHECK_SCENE; @@ -7401,7 +7396,7 @@ s32 Camera_UpdateWater(Camera* camera) { camera->waterYPos = waterY; if (!(camera->stateFlags & CAM_STATE_CAMERA_IN_WATER)) { camera->stateFlags |= CAM_STATE_CAMERA_IN_WATER; - osSyncPrintf("kankyo changed water, sound on\n"); + PRINTF("kankyo changed water, sound on\n"); Environment_EnableUnderwaterLights(camera->play, waterLightsIndex); camera->waterDistortionTimer = 80; } @@ -7436,7 +7431,7 @@ s32 Camera_UpdateWater(Camera* camera) { } else { if (camera->stateFlags & CAM_STATE_CAMERA_IN_WATER) { camera->stateFlags &= ~CAM_STATE_CAMERA_IN_WATER; - osSyncPrintf("kankyo changed water off, sound off\n"); + PRINTF("kankyo changed water off, sound off\n"); Environment_DisableUnderwaterLights(camera->play); if (*waterQuakeIndex != 0) { Quake_RemoveRequest(*waterQuakeIndex); @@ -7463,11 +7458,11 @@ s32 Camera_DbgChangeMode(Camera* camera) { if (!gDebugCamEnabled && camera->play->activeCamId == CAM_ID_MAIN) { if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CUP)) { - osSyncPrintf("attention sound URGENCY\n"); + PRINTF("attention sound URGENCY\n"); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY); } if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CDOWN)) { - osSyncPrintf("attention sound NORMAL\n"); + PRINTF("attention sound NORMAL\n"); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON); } @@ -7480,7 +7475,7 @@ s32 Camera_DbgChangeMode(Camera* camera) { if (changeDir != 0) { sDbgModeIdx = (sDbgModeIdx + changeDir) % 6; if (Camera_RequestSetting(camera, D_8011DAFC[sDbgModeIdx]) > 0) { - osSyncPrintf("camera: force change SET to %s!\n", sCameraSettingNames[D_8011DAFC[sDbgModeIdx]]); + PRINTF("camera: force change SET to %s!\n", sCameraSettingNames[D_8011DAFC[sDbgModeIdx]]); } } } @@ -7592,12 +7587,12 @@ Vec3s Camera_Update(Camera* camera) { player = camera->play->cameraPtrs[CAM_ID_MAIN]->player; if (R_DEBUG_CAM_UPDATE) { - osSyncPrintf("camera: in %x\n", camera); + PRINTF("camera: in %x\n", camera); } if (camera->status == CAM_STAT_CUT) { if (R_DEBUG_CAM_UPDATE) { - osSyncPrintf("camera: cut out %x\n", camera); + PRINTF("camera: cut out %x\n", camera); } return camera->inputDir; } @@ -7672,7 +7667,7 @@ Vec3s Camera_Update(Camera* camera) { if (camera->status == CAM_STAT_WAIT) { if (R_DEBUG_CAM_UPDATE) { - osSyncPrintf("camera: wait out %x\n", camera); + PRINTF("camera: wait out %x\n", camera); } return camera->inputDir; } @@ -7682,8 +7677,8 @@ Vec3s Camera_Update(Camera* camera) { camera->stateFlags |= CAM_STATE_CAM_FUNC_FINISH; if (R_DEBUG_CAM_UPDATE) { - osSyncPrintf("camera: engine (%d %d %d) %04x \n", camera->setting, camera->mode, - sCameraSettings[camera->setting].cameraModes[camera->mode].funcIdx, camera->stateFlags); + PRINTF("camera: engine (%d %d %d) %04x \n", camera->setting, camera->mode, + sCameraSettings[camera->setting].cameraModes[camera->mode].funcIdx, camera->stateFlags); } if (sOOBTimer < 200) { @@ -7713,14 +7708,14 @@ Vec3s Camera_Update(Camera* camera) { } if (R_DEBUG_CAM_UPDATE) { - osSyncPrintf("camera: shrink_and_bitem %x(%d)\n", sCameraInterfaceField, camera->play->transitionMode); + PRINTF("camera: shrink_and_bitem %x(%d)\n", sCameraInterfaceField, camera->play->transitionMode); } if (R_DEBUG_CAM_UPDATE) { - osSyncPrintf("camera: engine (%s(%d) %s(%d) %s(%d)) ok!\n", &sCameraSettingNames[camera->setting], - camera->setting, &sCameraModeNames[camera->mode], camera->mode, - &sCameraFunctionNames[sCameraSettings[camera->setting].cameraModes[camera->mode].funcIdx], - sCameraSettings[camera->setting].cameraModes[camera->mode].funcIdx); + PRINTF("camera: engine (%s(%d) %s(%d) %s(%d)) ok!\n", &sCameraSettingNames[camera->setting], camera->setting, + &sCameraModeNames[camera->mode], camera->mode, + &sCameraFunctionNames[sCameraSettings[camera->setting].cameraModes[camera->mode].funcIdx], + sCameraSettings[camera->setting].cameraModes[camera->mode].funcIdx); } // enable/disable debug cam @@ -7739,7 +7734,7 @@ Vec3s Camera_Update(Camera* camera) { DebugCamera_Update(&D_8015BD80, camera); View_LookAt(&camera->play->view, &D_8015BD80.eye, &D_8015BD80.at, &D_8015BD80.unk_1C); if (R_DEBUG_CAM_UPDATE) { - osSyncPrintf("camera: debug out\n"); + PRINTF("camera: debug out\n"); } return D_8015BD80.sub.unk_104A; } @@ -7804,10 +7799,10 @@ Vec3s Camera_Update(Camera* camera) { } if (PREG(81)) { - osSyncPrintf("dir (%d) %d(%f) %d(%f) 0(0) \n", sUpdateCameraDirection, camera->inputDir.x, - CAM_BINANG_TO_DEG(camera->inputDir.x), camera->inputDir.y, CAM_BINANG_TO_DEG(camera->inputDir.y)); - osSyncPrintf("real (%d) %d(%f) %d(%f) 0(0) \n", sUpdateCameraDirection, camera->camDir.x, - CAM_BINANG_TO_DEG(camera->camDir.x), camera->camDir.y, CAM_BINANG_TO_DEG(camera->camDir.y)); + PRINTF("dir (%d) %d(%f) %d(%f) 0(0) \n", sUpdateCameraDirection, camera->inputDir.x, + CAM_BINANG_TO_DEG(camera->inputDir.x), camera->inputDir.y, CAM_BINANG_TO_DEG(camera->inputDir.y)); + PRINTF("real (%d) %d(%f) %d(%f) 0(0) \n", sUpdateCameraDirection, camera->camDir.x, + CAM_BINANG_TO_DEG(camera->camDir.x), camera->camDir.y, CAM_BINANG_TO_DEG(camera->camDir.y)); } if (camera->timer != -1 && CHECK_BTN_ALL(D_8015BD7C->state.input[0].press.button, BTN_DRIGHT)) { @@ -7815,14 +7810,13 @@ Vec3s Camera_Update(Camera* camera) { } if (R_DEBUG_CAM_UPDATE) { - osSyncPrintf("camera: out (%f %f %f) (%f %f %f)\n", camera->at.x, camera->at.y, camera->at.z, camera->eye.x, - camera->eye.y, camera->eye.z); - osSyncPrintf("camera: dir (%f %d(%f) %d(%f)) (%f)\n", eyeAtAngle.r, eyeAtAngle.pitch, - CAM_BINANG_TO_DEG(eyeAtAngle.pitch), eyeAtAngle.yaw, CAM_BINANG_TO_DEG(eyeAtAngle.yaw), - camera->fov); + PRINTF("camera: out (%f %f %f) (%f %f %f)\n", camera->at.x, camera->at.y, camera->at.z, camera->eye.x, + camera->eye.y, camera->eye.z); + PRINTF("camera: dir (%f %d(%f) %d(%f)) (%f)\n", eyeAtAngle.r, eyeAtAngle.pitch, + CAM_BINANG_TO_DEG(eyeAtAngle.pitch), eyeAtAngle.yaw, CAM_BINANG_TO_DEG(eyeAtAngle.yaw), camera->fov); if (camera->player != NULL) { - osSyncPrintf("camera: foot(%f %f %f) dist (%f)\n", curPlayerPosRot.pos.x, curPlayerPosRot.pos.y, - curPlayerPosRot.pos.z, camera->dist); + PRINTF("camera: foot(%f %f %f) dist (%f)\n", curPlayerPosRot.pos.x, curPlayerPosRot.pos.y, + curPlayerPosRot.pos.z, camera->dist); } } @@ -7845,7 +7839,7 @@ void Camera_Finish(Camera* camera) { if (player->csAction != PLAYER_CSACTION_NONE) { Player_SetCsActionWithHaltedActors(camera->play, &player->actor, PLAYER_CSACTION_7); - osSyncPrintf("camera: player demo end!!\n"); + PRINTF("camera: player demo end!!\n"); } mainCam->stateFlags |= CAM_STATE_EXTERNAL_FINISHED; @@ -7888,7 +7882,7 @@ s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange static s32 sModeRequestFlags = 0; if (QREG(89)) { - osSyncPrintf("+=+(%d)+=+ recive request -> %s\n", camera->play->state.frames, sCameraModeNames[requestedMode]); + PRINTF("+=+(%d)+=+ recive request -> %s\n", camera->play->state.frames, sCameraModeNames[requestedMode]); } if ((camera->stateFlags & CAM_STATE_LOCK_MODE) && !forceModeChange) { @@ -7898,13 +7892,13 @@ s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange if (!((sCameraSettings[camera->setting].unk_00 & 0x3FFFFFFF) & (1 << requestedMode))) { if (requestedMode == CAM_MODE_FIRST_PERSON) { - osSyncPrintf("camera: error sound\n"); + PRINTF("camera: error sound\n"); Sfx_PlaySfxCentered(NA_SE_SY_ERROR); } if (camera->mode != CAM_MODE_NORMAL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: change camera mode: force NORMAL: %s %s refused\n" VT_RST, - sCameraSettingNames[camera->setting], sCameraModeNames[requestedMode]); + PRINTF(VT_COL(YELLOW, BLACK) "camera: change camera mode: force NORMAL: %s %s refused\n" VT_RST, + sCameraSettingNames[camera->setting], sCameraModeNames[requestedMode]); camera->mode = CAM_MODE_NORMAL; Camera_CopyDataToRegs(camera, camera->mode); Camera_SetNewModeStateFlags(camera); @@ -8050,8 +8044,7 @@ s32 Camera_RequestMode(Camera* camera, s16 mode) { s32 Camera_CheckValidMode(Camera* camera, s16 mode) { if (QREG(89) != 0) { - osSyncPrintf("+=+=+=+ recive asking -> %s (%s)\n", sCameraModeNames[mode], - sCameraSettingNames[camera->setting]); + PRINTF("+=+=+=+ recive asking -> %s (%s)\n", sCameraModeNames[mode], sCameraSettingNames[camera->setting]); } if (!(sCameraSettings[camera->setting].validModes & (1 << mode))) { return 0; @@ -8080,7 +8073,7 @@ s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags) { } if ((requestedSetting == CAM_SET_NONE) || (requestedSetting >= CAM_SET_MAX)) { - osSyncPrintf(VT_COL(RED, WHITE) "camera: error: illegal camera set (%d) !!!!\n" VT_RST, requestedSetting); + PRINTF(VT_COL(RED, WHITE) "camera: error: illegal camera set (%d) !!!!\n" VT_RST, requestedSetting); return -99; } @@ -8122,8 +8115,8 @@ s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags) { Camera_CopyDataToRegs(camera, camera->mode); } - osSyncPrintf(VT_SGR("1") "%06u:" VT_RST " camera: change camera[%d] set %s\n", camera->play->state.frames, - camera->camId, sCameraSettingNames[camera->setting]); + PRINTF(VT_SGR("1") "%06u:" VT_RST " camera: change camera[%d] set %s\n", camera->play->state.frames, camera->camId, + sCameraSettingNames[camera->setting]); return requestedSetting; } @@ -8154,8 +8147,8 @@ s32 Camera_RequestBgCam(Camera* camera, s32 requestedBgCamIndex) { } else if (settingChangeSuccessful < -1) { //! @bug: `settingChangeSuccessful` is a bool and is likely checking the wrong value. This can never pass. // The actual return of Camera_RequestSettingImpl or bgCamIndex would make more sense. - osSyncPrintf(VT_COL(RED, WHITE) "camera: error: illegal camera ID (%d) !! (%d|%d|%d)\n" VT_RST, - requestedBgCamIndex, camera->camId, BGCHECK_SCENE, requestedCamSetting); + PRINTF(VT_COL(RED, WHITE) "camera: error: illegal camera ID (%d) !! (%d|%d|%d)\n" VT_RST, + requestedBgCamIndex, camera->camId, BGCHECK_SCENE, requestedCamSetting); } return 0x80000000 | requestedBgCamIndex; } @@ -8336,7 +8329,7 @@ s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, f32 a if (bgCamIndex == -1) { Camera_RequestSetting(camera, CAM_SET_DOORC); - osSyncPrintf(".... change default door camera (set %d)\n", CAM_SET_DOORC); + PRINTF(".... change default door camera (set %d)\n", CAM_SET_DOORC); } else { s32 setting = Camera_GetBgCamSetting(camera, bgCamIndex); @@ -8347,7 +8340,7 @@ s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, f32 a camera->behaviorFlags |= CAM_BEHAVIOR_BG_SUCCESS; } - osSyncPrintf("....change door camera ID %d (set %d)\n", camera->bgCamIndex, camera->setting); + PRINTF("....change door camera ID %d (set %d)\n", camera->bgCamIndex, camera->setting); } Camera_CopyDataToRegs(camera, camera->mode); @@ -8409,7 +8402,7 @@ void Camera_SetCameraData(Camera* camera, s16 setDataFlags, void* data0, void* d } if (setDataFlags & 0x10) { - osSyncPrintf(VT_COL(RED, WHITE) "camera: setCameraData: last argument not alive!\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "camera: setCameraData: last argument not alive!\n" VT_RST); } } diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index 2d8a32ce3d..3873cce0d5 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -811,7 +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))) { - osSyncPrintf("CollisionBtlTbl_get():インデックスオーバー\n"); // "Index over" + PRINTF("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 bf0bafeadf..efb64705f1 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -340,9 +340,9 @@ s32 Collider_SetJntSphToActor(PlayState* play, ColliderJntSph* dest, ColliderJnt if (dest->elements == NULL) { dest->count = 0; - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("ClObjJntSph_set():zelda_malloc()出来ません。\n"); // "Can not." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("ClObjJntSph_set():zelda_malloc()出来ません。\n"); // "Can not." + PRINTF(VT_RST); return false; } @@ -368,9 +368,9 @@ s32 Collider_SetJntSphAllocType1(PlayState* play, ColliderJntSph* dest, Actor* a if (dest->elements == NULL) { dest->count = 0; - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("ClObjJntSph_set3():zelda_malloc_出来ません。\n"); // "Can not." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("ClObjJntSph_set3():zelda_malloc_出来ません。\n"); // "Can not." + PRINTF(VT_RST); return false; } @@ -396,9 +396,9 @@ s32 Collider_SetJntSphAlloc(PlayState* play, ColliderJntSph* dest, Actor* actor, if (dest->elements == NULL) { dest->count = 0; - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("ClObjJntSph_set5():zelda_malloc出来ません\n"); // "Can not." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("ClObjJntSph_set5():zelda_malloc出来ません\n"); // "Can not." + PRINTF(VT_RST); return false; } for (destElem = dest->elements, srcElem = src->elements; destElem < dest->elements + dest->count; @@ -702,9 +702,9 @@ s32 Collider_SetTrisAllocType1(PlayState* play, ColliderTris* dest, Actor* actor dest->elements = ZELDA_ARENA_MALLOC(dest->count * sizeof(ColliderTrisElement), "../z_collision_check.c", 2156); if (dest->elements == NULL) { dest->count = 0; - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("ClObjTris_set3():zelda_malloc()出来ません\n"); // "Can not." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("ClObjTris_set3():zelda_malloc()出来ません\n"); // "Can not." + PRINTF(VT_RST); return false; } for (destElem = dest->elements, srcElem = src->elements; destElem < dest->elements + dest->count; @@ -728,9 +728,9 @@ s32 Collider_SetTrisAlloc(PlayState* play, ColliderTris* dest, Actor* actor, Col dest->elements = ZELDA_ARENA_MALLOC(dest->count * sizeof(ColliderTrisElement), "../z_collision_check.c", 2207); if (dest->elements == NULL) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("ClObjTris_set5():zelda_malloc出来ません\n"); // "Can not." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("ClObjTris_set5():zelda_malloc出来ません\n"); // "Can not." + PRINTF(VT_RST); dest->count = 0; return false; } @@ -1155,7 +1155,7 @@ s32 CollisionCheck_SetAT(PlayState* play, CollisionCheckContext* colChkCtx, Coll } if (colChkCtx->colATCount >= COLLISION_CHECK_AT_MAX) { // "Index exceeded and cannot add more" - osSyncPrintf("CollisionCheck_setAT():インデックスがオーバーして追加不能\n"); + PRINTF("CollisionCheck_setAT():インデックスがオーバーして追加不能\n"); return -1; } if (colChkCtx->sacFlags & SAC_ENABLE) { @@ -1183,14 +1183,14 @@ s32 CollisionCheck_SetAT_SAC(PlayState* play, CollisionCheckContext* colChkCtx, if (colChkCtx->sacFlags & SAC_ENABLE) { if (!(index < colChkCtx->colATCount)) { // "You are trying to register a location that is larger than the total number of data." - osSyncPrintf("CollisionCheck_setAT_SAC():全データ数より大きいところに登録しようとしている。\n"); + PRINTF("CollisionCheck_setAT_SAC():全データ数より大きいところに登録しようとしている。\n"); return -1; } colChkCtx->colAT[index] = collider; } else { if (!(colChkCtx->colATCount < COLLISION_CHECK_AT_MAX)) { // "Index exceeded and cannot add more" - osSyncPrintf("CollisionCheck_setAT():インデックスがオーバーして追加不能\n"); + PRINTF("CollisionCheck_setAT():インデックスがオーバーして追加不能\n"); return -1; } index = colChkCtx->colATCount; @@ -1223,7 +1223,7 @@ s32 CollisionCheck_SetAC(PlayState* play, CollisionCheckContext* colChkCtx, Coll } if (colChkCtx->colACCount >= COLLISION_CHECK_AC_MAX) { // "Index exceeded and cannot add more" - osSyncPrintf("CollisionCheck_setAC():インデックスがオーバして追加不能\n"); + PRINTF("CollisionCheck_setAC():インデックスがオーバして追加不能\n"); return -1; } if (colChkCtx->sacFlags & SAC_ENABLE) { @@ -1251,14 +1251,14 @@ s32 CollisionCheck_SetAC_SAC(PlayState* play, CollisionCheckContext* colChkCtx, if (colChkCtx->sacFlags & SAC_ENABLE) { if (!(index < colChkCtx->colACCount)) { // "You are trying to register a location that is larger than the total number of data." - osSyncPrintf("CollisionCheck_setAC_SAC():全データ数より大きいところに登録しようとしている。\n"); + PRINTF("CollisionCheck_setAC_SAC():全データ数より大きいところに登録しようとしている。\n"); return -1; } colChkCtx->colAC[index] = collider; } else { if (!(colChkCtx->colACCount < COLLISION_CHECK_AC_MAX)) { // "Index exceeded and cannot add more" - osSyncPrintf("CollisionCheck_setAC():インデックスがオーバして追加不能\n"); + PRINTF("CollisionCheck_setAC():インデックスがオーバして追加不能\n"); return -1; } index = colChkCtx->colACCount; @@ -1293,7 +1293,7 @@ s32 CollisionCheck_SetOC(PlayState* play, CollisionCheckContext* colChkCtx, Coll } if (colChkCtx->colOCCount >= COLLISION_CHECK_OC_MAX) { // "Index exceeded and cannot add more" - osSyncPrintf("CollisionCheck_setOC():インデックスがオーバして追加不能\n"); + PRINTF("CollisionCheck_setOC():インデックスがオーバして追加不能\n"); return -1; } if (colChkCtx->sacFlags & SAC_ENABLE) { @@ -1321,7 +1321,7 @@ s32 CollisionCheck_SetOC_SAC(PlayState* play, CollisionCheckContext* colChkCtx, if (colChkCtx->sacFlags & SAC_ENABLE) { if (!(index < colChkCtx->colOCCount)) { // "You are trying to register a location that is larger than the total number of data." - osSyncPrintf("CollisionCheck_setOC_SAC():全データ数より大きいところに登録しようとしている。\n"); + PRINTF("CollisionCheck_setOC_SAC():全データ数より大きいところに登録しようとしている。\n"); return -1; } //! @bug Should be colOC @@ -1329,7 +1329,7 @@ s32 CollisionCheck_SetOC_SAC(PlayState* play, CollisionCheckContext* colChkCtx, } else { if (!(colChkCtx->colOCCount < COLLISION_CHECK_OC_MAX)) { // "Index exceeded and cannot add more" - osSyncPrintf("CollisionCheck_setOC():インデックスがオーバして追加不能\n"); + PRINTF("CollisionCheck_setOC():インデックスがオーバして追加不能\n"); return -1; } index = colChkCtx->colOCCount; @@ -1351,7 +1351,7 @@ s32 CollisionCheck_SetOCLine(PlayState* play, CollisionCheckContext* colChkCtx, Collider_ResetLineOC(play, collider); if (!(colChkCtx->colLineCount < COLLISION_CHECK_OC_LINE_MAX)) { // "Index exceeded and cannot add more" - osSyncPrintf("CollisionCheck_setOCLine():インデックスがオーバして追加不能\n"); + PRINTF("CollisionCheck_setOCLine():インデックスがオーバして追加不能\n"); return -1; } index = colChkCtx->colLineCount; @@ -2959,7 +2959,7 @@ void CollisionCheck_OC(PlayState* play, CollisionCheckContext* colChkCtx) { vsFunc = sOCVsFuncs[(*leftColP)->shape][(*rightColP)->shape]; if (vsFunc == NULL) { // "Not compatible" - osSyncPrintf("CollisionCheck_OC():未対応 %d, %d\n", (*leftColP)->shape, (*rightColP)->shape); + PRINTF("CollisionCheck_OC():未対応 %d, %d\n", (*leftColP)->shape, (*rightColP)->shape); continue; } vsFunc(play, colChkCtx, *leftColP, *rightColP); @@ -3220,7 +3220,7 @@ s32 CollisionCheck_LineOC(PlayState* play, CollisionCheckContext* colChkCtx, Vec lineCheck = sOCLineCheckFuncs[(*col)->shape]; if (lineCheck == NULL) { // "type %d not supported" - osSyncPrintf("CollisionCheck_generalLineOcCheck():未対応 %dタイプ\n", (*col)->shape); + PRINTF("CollisionCheck_generalLineOcCheck():未対応 %dタイプ\n", (*col)->shape); } else { result = lineCheck(play, colChkCtx, (*col), a, b); if (result) { diff --git a/src/code/z_construct.c b/src/code/z_construct.c index a0ae14504c..e2810934a4 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -32,11 +32,11 @@ void Interface_Init(PlayState* play) { parameterSize = (uintptr_t)_parameter_staticSegmentRomEnd - (uintptr_t)_parameter_staticSegmentRomStart; // "Permanent PARAMETER Segment = %x" - osSyncPrintf("常駐ＰＡＲＡＭＥＴＥＲセグメント=%x\n", parameterSize); + PRINTF("常駐ＰＡＲＡＭＥＴＥＲセグメント=%x\n", parameterSize); interfaceCtx->parameterSegment = GAME_STATE_ALLOC(&play->state, parameterSize, "../z_construct.c", 159); - osSyncPrintf("parameter->parameterSegment=%x\n", interfaceCtx->parameterSegment); + PRINTF("parameter->parameterSegment=%x\n", interfaceCtx->parameterSegment); ASSERT(interfaceCtx->parameterSegment != NULL, "parameter->parameterSegment != NULL", "../z_construct.c", 161); DMA_REQUEST_SYNC(interfaceCtx->parameterSegment, (uintptr_t)_parameter_staticSegmentRomStart, parameterSize, @@ -44,8 +44,8 @@ void Interface_Init(PlayState* play) { interfaceCtx->doActionSegment = GAME_STATE_ALLOC(&play->state, 3 * DO_ACTION_TEX_SIZE, "../z_construct.c", 166); - osSyncPrintf("ＤＯアクション テクスチャ初期=%x\n", 3 * DO_ACTION_TEX_SIZE); // "DO Action Texture Initialization" - osSyncPrintf("parameter->do_actionSegment=%x\n", interfaceCtx->doActionSegment); + PRINTF("ＤＯアクション テクスチャ初期=%x\n", 3 * DO_ACTION_TEX_SIZE); // "DO Action Texture Initialization" + PRINTF("parameter->do_actionSegment=%x\n", interfaceCtx->doActionSegment); ASSERT(interfaceCtx->doActionSegment != NULL, "parameter->do_actionSegment != NULL", "../z_construct.c", 169); @@ -75,14 +75,14 @@ void Interface_Init(PlayState* play) { interfaceCtx->iconItemSegment = GAME_STATE_ALLOC(&play->state, ICON_ITEM_SEGMENT_SIZE, "../z_construct.c", 190); // "Icon Item Texture Initialization = %x" - osSyncPrintf("アイコンアイテム テクスチャ初期=%x\n", ICON_ITEM_SEGMENT_SIZE); - osSyncPrintf("parameter->icon_itemSegment=%x\n", interfaceCtx->iconItemSegment); + PRINTF("アイコンアイテム テクスチャ初期=%x\n", ICON_ITEM_SEGMENT_SIZE); + PRINTF("parameter->icon_itemSegment=%x\n", interfaceCtx->iconItemSegment); ASSERT(interfaceCtx->iconItemSegment != NULL, "parameter->icon_itemSegment != NULL", "../z_construct.c", 193); - osSyncPrintf("Register_Item[%x, %x, %x, %x]\n", gSaveContext.save.info.equips.buttonItems[0], - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); + PRINTF("Register_Item[%x, %x, %x, %x]\n", gSaveContext.save.info.equips.buttonItems[0], + gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], + gSaveContext.save.info.equips.buttonItems[3]); if (gSaveContext.save.info.equips.buttonItems[0] < 0xF0) { DMA_REQUEST_SYNC(interfaceCtx->iconItemSegment + (0 * ITEM_ICON_SIZE), @@ -114,13 +114,13 @@ void Interface_Init(PlayState* play) { "../z_construct.c", 219); } - osSyncPrintf("ＥＶＥＮＴ＝%d\n", ((void)0, gSaveContext.timerState)); + PRINTF("ＥＶＥＮＴ＝%d\n", ((void)0, gSaveContext.timerState)); if ((gSaveContext.timerState == TIMER_STATE_ENV_HAZARD_TICK) || (gSaveContext.timerState == TIMER_STATE_DOWN_TICK) || (gSaveContext.subTimerState == SUBTIMER_STATE_DOWN_TICK) || (gSaveContext.subTimerState == SUBTIMER_STATE_UP_TICK)) { - osSyncPrintf("restart_flag=%d\n", ((void)0, gSaveContext.respawnFlag)); + PRINTF("restart_flag=%d\n", ((void)0, gSaveContext.respawnFlag)); if ((gSaveContext.respawnFlag == -1) || (gSaveContext.respawnFlag == 1)) { if (gSaveContext.timerState == TIMER_STATE_ENV_HAZARD_TICK) { @@ -149,10 +149,10 @@ void Interface_Init(PlayState* play) { if ((gSaveContext.timerState >= TIMER_STATE_UP_INIT) && (gSaveContext.timerState <= TIMER_STATE_UP_FREEZE)) { gSaveContext.timerState = TIMER_STATE_OFF; // "Timer Stop!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf("タイマー停止！！！！！！！！！！！！！！！！！！！！！ = %d\n", gSaveContext.timerState); + PRINTF("タイマー停止！！！！！！！！！！！！！！！！！！！！！ = %d\n", gSaveContext.timerState); } - osSyncPrintf("ＰＡＲＡＭＥＴＥＲ領域＝%x\n", parameterSize + 0x5300); // "Parameter Area = %x" + PRINTF("ＰＡＲＡＭＥＴＥＲ領域＝%x\n", parameterSize + 0x5300); // "Parameter Area = %x" Health_InitMeter(play); Map_Init(play); @@ -192,9 +192,9 @@ void Message_Init(PlayState* play) { msgCtx->textboxSegment = GAME_STATE_ALLOC(&play->state, TEXTBOX_SEGMENT_SIZE, "../z_construct.c", 349); - osSyncPrintf("message->fukidashiSegment=%x\n", msgCtx->textboxSegment); + PRINTF("message->fukidashiSegment=%x\n", msgCtx->textboxSegment); - osSyncPrintf("吹き出しgame_alloc=%x\n", TEXTBOX_SEGMENT_SIZE); // "Textbox game_alloc=%x" + PRINTF("吹き出しgame_alloc=%x\n", TEXTBOX_SEGMENT_SIZE); // "Textbox game_alloc=%x" ASSERT(msgCtx->textboxSegment != NULL, "message->fukidashiSegment != NULL", "../z_construct.c", 352); Font_LoadOrderedFont(&play->msgCtx.font); diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 67a45676c0..95c15ea705 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -193,7 +193,7 @@ void Cutscene_UpdateScripted(PlayState* play, CutsceneContext* csCtx) { } if ((gSaveContext.cutsceneTrigger != 0) && (csCtx->state == CS_STATE_IDLE)) { - osSyncPrintf("\nデモ開始要求 発令！"); // "Cutscene start request announcement!" + PRINTF("\nデモ開始要求 発令！"); // "Cutscene start request announcement!" gSaveContext.save.cutsceneIndex = 0xFFFD; gSaveContext.cutsceneTrigger = 1; } @@ -568,7 +568,7 @@ void CutsceneCmd_Destination(PlayState* play, CutsceneContext* csCtx, CsCmdDesti Audio_SetCutsceneFlag(0); gSaveContext.cutsceneTransitionControl = 1; - osSyncPrintf("\n分岐先指定！！=[%d]番", cmd->destination); // "Future fork designation=No. [%d]" + PRINTF("\n分岐先指定！！=[%d]番", cmd->destination); // "Future fork designation=No. [%d]" // `forceRisingButtonAlphas` has a secondary purpose, which is to signal to the title screen actor // that it should display immediately. This occurs when a title screen cutscene that is not the main @@ -2238,7 +2238,7 @@ void CutsceneHandler_StopScript(PlayState* play, CutsceneContext* csCtx) { csCtx->actorCues[i] = NULL; } - osSyncPrintf("\n\n\n\n\nやっぱりここかいな"); // "Right here, huh" + PRINTF("\n\n\n\n\nやっぱりここかいな"); // "Right here, huh" gSaveContext.save.cutsceneIndex = 0; gSaveContext.gameMode = GAMEMODE_NORMAL; @@ -2363,7 +2363,7 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) { } void Cutscene_HandleConditionalTriggers(PlayState* play) { - osSyncPrintf("\ngame_info.mode=[%d] restart_flag", ((void)0, gSaveContext.respawnFlag)); + PRINTF("\ngame_info.mode=[%d] restart_flag", ((void)0, gSaveContext.respawnFlag)); if ((gSaveContext.gameMode == GAMEMODE_NORMAL) && (gSaveContext.respawnFlag <= 0) && (gSaveContext.save.cutsceneIndex < 0xFFF0)) { diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 31edaa0424..ca7d816bea 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -19,7 +19,7 @@ void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) { numElements = this->numElements; if (numElements >= 16) { // "Blure vertex addition processing: Table over %d" - osSyncPrintf("ブラ─頂点追加処理:テーブルオーバー %d\n", numElements); + PRINTF("ブラ─頂点追加処理:テーブルオーバー %d\n", numElements); return; } @@ -77,7 +77,7 @@ void EffectBlure_AddSpace(EffectBlure* this) { numElements = this->numElements; if (numElements >= 16) { // "Blure space addition processing: Table over %d" - osSyncPrintf("ブラ─空白追加処理:テーブルオーバー %d\n", numElements); + PRINTF("ブラ─空白追加処理:テーブルオーバー %d\n", numElements); return; } @@ -396,7 +396,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* vtx = GRAPH_ALLOC(gfxCtx, sizeof(Vtx[4])); if (vtx == NULL) { // "Vertices cannot be secured." - osSyncPrintf("z_eff_blure.c::SQ_NoInterpolate_disp() 頂点確保できず。\n"); + PRINTF("z_eff_blure.c::SQ_NoInterpolate_disp() 頂点確保できず。\n"); } else { vtx[0].v = baseVtx; vtx[1].v = baseVtx; @@ -557,7 +557,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem vtx = GRAPH_ALLOC(gfxCtx, sizeof(Vtx[16])); if (vtx == NULL) { // "Vertices cannot be secured." - osSyncPrintf("z_eff_blure.c::SQ_HermiteInterpolate_disp() 頂点確保できず。\n"); + PRINTF("z_eff_blure.c::SQ_HermiteInterpolate_disp() 頂点確保できず。\n"); } else { Math_Vec3f_Diff(&sp1CC, &sp138, &sp158); Math_Vec3f_Scale(&sp158, 10.0f); @@ -800,7 +800,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &sp94); if (mtx == NULL) { // "Forced termination because a matrix cannot be taken" - osSyncPrintf("EffectBlureInfo2_disp_makeDisplayList()マトリックス取れないので,強制終了\n"); + PRINTF("EffectBlureInfo2_disp_makeDisplayList()マトリックス取れないので,強制終了\n"); break; } @@ -852,7 +852,7 @@ void EffectBlure_DrawSimple(EffectBlure* this2, GraphicsContext* gfxCtx) { vtx = GRAPH_ALLOC(gfxCtx, vtxCount * sizeof(Vtx)); if (vtx == NULL) { // "Vertices cannot be secured. Forced termination" - osSyncPrintf("ブラ─表示:頂点確保できず。強制終了\n"); + PRINTF("ブラ─表示:頂点確保できず。強制終了\n"); return; } @@ -946,7 +946,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { vtx = GRAPH_ALLOC(gfxCtx, sizeof(Vtx[32])); if (vtx == NULL) { // "Blure display: Vertex table could not be secured" - osSyncPrintf("ブラ─表示:頂点テーブル確保できず\n"); + PRINTF("ブラ─表示:頂点テーブル確保できず\n"); } else { j = 0; for (i = 0; i < this->numElements; i++) { diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 90a813cae4..d6df5282e5 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -18,9 +18,9 @@ void EffectShieldParticle_Init(void* thisx, void* initParamsx) { if ((this != NULL) && (initParams != NULL)) { this->numElements = initParams->numElements; if (this->numElements > ARRAY_COUNT(this->elements)) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("EffectShieldParticle_ct():パーティクル数がオーバしてます。\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("EffectShieldParticle_ct():パーティクル数がオーバしてます。\n"); + PRINTF(VT_RST); return; } diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index e20954bfa5..fdf91418a7 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -11,7 +11,7 @@ void EffectSpark_Init(void* thisx, void* initParamsx) { if ((this != NULL) && (initParams != NULL)) { if ((initParams->uDiv == 0) || (initParams->vDiv == 0)) { - osSyncPrintf("spark():u_div,v_div 0では困る。\n"); // "u_div,v_div 0 is not good." + PRINTF("spark():u_div,v_div 0では困る。\n"); // "u_div,v_div 0 is not good." return; } @@ -56,7 +56,7 @@ void EffectSpark_Init(void* thisx, void* initParamsx) { this->numElements = (this->uDiv * this->vDiv) + 2; if (this->numElements > ARRAY_COUNT(this->elements)) { - osSyncPrintf("table_sizeオーバー\n"); // "over table_size" + PRINTF("table_sizeオーバー\n"); // "over table_size" return; } @@ -103,7 +103,7 @@ s32 EffectSpark_Update(void* thisx) { s32 i; if (this == NULL) { - osSyncPrintf("EffectSparkInfo_proc():Spark Pointer is NULL\n"); + PRINTF("EffectSparkInfo_proc():Spark Pointer is NULL\n"); } for (i = 0; i < this->numElements; i++) { @@ -174,7 +174,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { vertices = GRAPH_ALLOC(gfxCtx, this->numElements * sizeof(Vtx[4])); if (vertices == NULL) { // "Memory Allocation Failure graph_malloc" - osSyncPrintf("EffectSparkInfo_disp():メモリー確保失敗 graph_malloc\n"); + PRINTF("EffectSparkInfo_disp():メモリー確保失敗 graph_malloc\n"); goto end; } diff --git a/src/code/z_effect.c b/src/code/z_effect.c index 0ff1392a40..b4226e9de4 100644 --- a/src/code/z_effect.c +++ b/src/code/z_effect.c @@ -145,8 +145,8 @@ void Effect_Add(PlayState* play, s32* pIndex, s32 type, u8 arg3, u8 arg4, void* if (!slotFound) { // "EffectAdd(): I cannot secure it. Be careful. Type %d" - osSyncPrintf("EffectAdd():確保できません。注意してください。Type%d\n", type); - osSyncPrintf("エフェクト追加せずに終了します。\n"); // "Exit without adding the effect." + PRINTF("EffectAdd():確保できません。注意してください。Type%d\n", type); + PRINTF("エフェクト追加せずに終了します。\n"); // "Exit without adding the effect." } else { sEffectInfoTable[type].init(effect, initParams); status->unk_02 = arg3; @@ -238,7 +238,7 @@ void Effect_Delete(PlayState* play, s32 index) { void Effect_DeleteAll(PlayState* play) { s32 i; - osSyncPrintf("エフェクト総て解放\n"); // "All effect release" + PRINTF("エフェクト総て解放\n"); // "All effect release" for (i = 0; i < SPARK_COUNT; i++) { sEffectContext.sparks[i].status.active = false; @@ -255,5 +255,5 @@ void Effect_DeleteAll(PlayState* play) { sEffectInfoTable[EFFECT_SHIELD_PARTICLE].destroy(&sEffectContext.shieldParticles[i].effect); } - osSyncPrintf("エフェクト総て解放 終了\n"); // "All effects release End" + PRINTF("エフェクト総て解放 終了\n"); // "All effects release End" } diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 3147e3c0b8..6f4edc1596 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -10,9 +10,8 @@ void EffectSs_InitInfo(PlayState* play, s32 tableSize) { for (i = 0; i < ARRAY_COUNT(gEffectSsOverlayTable); i++) { overlay = &gEffectSsOverlayTable[i]; - osSyncPrintf("effect index %3d:size=%6dbyte romsize=%6dbyte\n", i, - (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart, - overlay->vromEnd - overlay->vromStart); + PRINTF("effect index %3d:size=%6dbyte romsize=%6dbyte\n", i, + (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart, overlay->vromEnd - overlay->vromStart); } sEffectSsInfo.table = @@ -186,32 +185,32 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) { if (overlayEntry->vramStart == NULL) { // "Not an overlay" - osSyncPrintf("EffectSoftSprite2_makeEffect():オーバーレイではありません。\n"); + PRINTF("EffectSoftSprite2_makeEffect():オーバーレイではありません。\n"); initInfo = overlayEntry->initInfo; } else { if (overlayEntry->loadedRamAddr == NULL) { overlayEntry->loadedRamAddr = ZELDA_ARENA_MALLOC_R(overlaySize, "../z_effect_soft_sprite.c", 585); if (overlayEntry->loadedRamAddr == NULL) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "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出来ません。ただいま危険" - "な状態です！\nもちろん,エフェクトも出ません。\n", - overlaySize); - osSyncPrintf(VT_RST); + PRINTF("EffectSoftSprite2_makeEffect():zelda_malloc_r()により,%" + "dbyteのメモリ確保ができま\nせん。そのため、プログラムのロードも\n出来ません。ただいま危険" + "な状態です！\nもちろん,エフェクトも出ません。\n", + overlaySize); + PRINTF(VT_RST); return; } Overlay_Load(overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr); - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("EFFECT SS OVL:SegRom %08x %08x, Seg %08x %08x, RamStart %08x, type: %d\n", - overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, - overlayEntry->loadedRamAddr, type); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("EFFECT SS OVL:SegRom %08x %08x, Seg %08x %08x, RamStart %08x, type: %d\n", overlayEntry->vromStart, + overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr, + type); + PRINTF(VT_RST); } initInfo = (void*)(uintptr_t)((overlayEntry->initInfo != NULL) @@ -224,9 +223,9 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) { if (initInfo->init == NULL) { // "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", - initInfo, type); + PRINTF("EffectSoftSprite2_makeEffect():すでにエフェクトはロード済みで\nすが," + "コンストラクターがNULLなので追加をやめます。\n直してください。（メモリーの無駄) %08x %d\n", + initInfo, type); return; } @@ -237,13 +236,13 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) { sEffectSsInfo.table[index].priority = priority; if (initInfo->init(play, index, &sEffectSsInfo.table[index], initParams) == 0) { - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); // "Construction failed for some reason. The constructor returned an error. // Ceasing effect addition." - osSyncPrintf("EffectSoftSprite2_makeEffect():" - "何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。エフェクトの追加を中" - "止します。\n"); - osSyncPrintf(VT_RST); + PRINTF("EffectSoftSprite2_makeEffect():" + "何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。エフェクトの追加を中" + "止します。\n"); + PRINTF(VT_RST); EffectSs_Reset(&sEffectSsInfo.table[index]); } } @@ -303,19 +302,19 @@ void EffectSs_DrawAll(PlayState* play) { if ((sEffectSsInfo.table[i].pos.x > 32000.0f) || (sEffectSsInfo.table[i].pos.x < -32000.0f) || (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)); + PRINTF(VT_FGCOL(RED)); // "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():位置が領域外のため " - "削除します。エフェクトラベルNo.%d:プログラムの方で対応をお願いします。ここです ==> " - "pos(%f, %f, %f)で、ラベルはz_effect_soft_sprite_dlftbls.declにあります。\n", - sEffectSsInfo.table[i].type, sEffectSsInfo.table[i].pos.x, sEffectSsInfo.table[i].pos.y, - sEffectSsInfo.table[i].pos.z); - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF("EffectSoftSprite2_disp():位置が領域外のため " + "削除します。エフェクトラベルNo.%d:プログラムの方で対応をお願いします。ここです ==> " + "pos(%f, %f, %f)で、ラベルはz_effect_soft_sprite_dlftbls.declにあります。\n", + sEffectSsInfo.table[i].type, sEffectSsInfo.table[i].pos.x, sEffectSsInfo.table[i].pos.y, + sEffectSsInfo.table[i].pos.z); + PRINTF(VT_FGCOL(GREEN)); // "If you are using pos for something else, consult me." - osSyncPrintf("もし、posを別のことに使っている場合相談に応じます。\n"); - osSyncPrintf(VT_RST); + PRINTF("もし、posを別のことに使っている場合相談に応じます。\n"); + PRINTF(VT_RST); EffectSs_Delete(&sEffectSsInfo.table[i]); } else { diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 0e3eb674b3..b1ad5a2089 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -128,8 +128,8 @@ void TransitionTile_InitVtxData(TransitionTile* this) { } void TransitionTile_Destroy(TransitionTile* this) { - osSyncPrintf("fbdemo_cleanup(%08x)\n", this); - osSyncPrintf("msleep(100);\n"); + PRINTF("fbdemo_cleanup(%08x)\n", this); + PRINTF("msleep(100);\n"); Sleep_Msec(100); if (this->vtxData != NULL) { @@ -151,7 +151,7 @@ void TransitionTile_Destroy(TransitionTile* this) { } TransitionTile* TransitionTile_Init(TransitionTile* this, s32 cols, s32 rows) { - osSyncPrintf("fbdemo_init(%08x, %d, %d)\n", this, cols, rows); + PRINTF("fbdemo_init(%08x, %d, %d)\n", this, cols, rows); bzero(this, sizeof(TransitionTile)); this->frame = 0; this->cols = cols; @@ -162,7 +162,7 @@ TransitionTile* TransitionTile_Init(TransitionTile* this, s32 cols, s32 rows) { this->gfx = SYSTEM_ARENA_MALLOC((this->rows * (1 + this->cols * 9) + 2) * sizeof(Gfx), "../z_fbdemo.c", 198); if ((this->vtxData == NULL) || (this->vtxFrame1 == NULL) || (this->vtxFrame2 == NULL) || (this->gfx == NULL)) { - osSyncPrintf("fbdemo_init allocation error\n"); + PRINTF("fbdemo_init allocation error\n"); if (this->vtxData != NULL) { SYSTEM_ARENA_FREE(this->vtxData, "../z_fbdemo.c", 202); this->vtxData = NULL; diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index 8769a5909a..1d76e8ec71 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -69,7 +69,7 @@ void TransitionFade_Update(void* thisx, s32 updateRate) { } if ((u32)gSaveContext.transFadeDuration == 0) { // "Divide by 0! Zero is included in ZCommonGet fade_speed" - osSyncPrintf(VT_COL(RED, WHITE) "０除算! ZCommonGet fade_speed に０がはいってる" VT_RST); + PRINTF(VT_COL(RED, WHITE) "０除算! ZCommonGet fade_speed に０がはいってる" VT_RST); } alpha = (255.0f * this->timer) / ((void)0, gSaveContext.transFadeDuration); diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index 19ce810f8f..b131d209d9 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -80,7 +80,7 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP) { modelView = this->modelView[this->frame]; scale = this->transPos * 0.625f; this->frame ^= 1; - osSyncPrintf("rate=%f tx=%f ty=%f rotate=%f\n", this->transPos, 0.0f, 0.0f, rotation); + PRINTF("rate=%f tx=%f ty=%f rotate=%f\n", this->transPos, 0.0f, 0.0f, rotation); guScale(&modelView[0], scale, scale, 1.0f); guRotate(&modelView[1], rotation, 0.0f, 0.0f, 1.0f); guTranslate(&modelView[2], 0.0f, 0.0f, 0.0f); diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index 27c947c074..2348fa13a4 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -213,7 +213,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov } } else { // "FcSkeletonInfo_draw_child (): Not supported" - osSyncPrintf("FcSkeletonInfo_draw_child():未対応\n"); + PRINTF("FcSkeletonInfo_draw_child():未対応\n"); } } diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 832c75a3bc..058cb439b8 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -76,8 +76,8 @@ void func_8006D0EC(PlayState* play, Player* player) { } else if ((play->sceneId == gSaveContext.save.info.horseData.sceneId) && (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || DREG(1) != 0)) { // "Set by existence of horse %d %d %d" - osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.save.info.horseData.sceneId, - Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED), DREG(1)); + PRINTF("馬存在によるセット %d %d %d\n", gSaveContext.save.info.horseData.sceneId, + Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED), DREG(1)); if (func_8006CFC0(gSaveContext.save.info.horseData.sceneId)) { Actor* horseActor = @@ -89,10 +89,10 @@ void func_8006D0EC(PlayState* play, Player* player) { horseActor->room = -1; } } else { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "Horse_SetNormal():%d set spot is no good." - osSyncPrintf("Horse_SetNormal():%d セットスポットまずいです。\n", gSaveContext.save.info.horseData.sceneId); - osSyncPrintf(VT_RST); + PRINTF("Horse_SetNormal():%d セットスポットまずいです。\n", gSaveContext.save.info.horseData.sceneId); + PRINTF(VT_RST); func_8006D074(play); } } else if ((play->sceneId == SCENE_LON_LON_RANCH) && !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && @@ -246,10 +246,10 @@ void func_8006D684(PlayState* play, Player* player) { void func_8006DC68(PlayState* play, Player* player) { if (LINK_IS_ADULT) { if (!func_8006CFC0(gSaveContext.save.info.horseData.sceneId)) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "Horse_Set_Check():%d set spot is no good." - osSyncPrintf("Horse_Set_Check():%d セットスポットまずいです。\n", gSaveContext.save.info.horseData.sceneId); - osSyncPrintf(VT_RST); + PRINTF("Horse_Set_Check():%d セットスポットまずいです。\n", gSaveContext.save.info.horseData.sceneId); + PRINTF(VT_RST); func_8006D074(play); } diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 2285eac8c9..54edbf19bb 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -135,65 +135,65 @@ void Jpeg_ParseMarkers(u8* ptr, JpegContext* ctx) { } case MARKER_SOI: { // Start of Image - osSyncPrintf("MARKER_SOI\n"); + PRINTF("MARKER_SOI\n"); break; } case MARKER_APP0: { // Application marker for JFIF - osSyncPrintf("MARKER_APP0 %d\n", Jpeg_GetUnalignedU16(ptr)); + PRINTF("MARKER_APP0 %d\n", Jpeg_GetUnalignedU16(ptr)); ptr += Jpeg_GetUnalignedU16(ptr); break; } case MARKER_APP1: { // Application marker for EXIF - osSyncPrintf("MARKER_APP1 %d\n", Jpeg_GetUnalignedU16(ptr)); + PRINTF("MARKER_APP1 %d\n", Jpeg_GetUnalignedU16(ptr)); ptr += Jpeg_GetUnalignedU16(ptr); break; } case MARKER_APP2: { - osSyncPrintf("MARKER_APP2 %d\n", Jpeg_GetUnalignedU16(ptr)); + PRINTF("MARKER_APP2 %d\n", Jpeg_GetUnalignedU16(ptr)); ptr += Jpeg_GetUnalignedU16(ptr); break; } case MARKER_DQT: { // Define Quantization Table, stored for later processing - osSyncPrintf("MARKER_DQT %d %d %02x\n", ctx->dqtCount, Jpeg_GetUnalignedU16(ptr), ptr[2]); + PRINTF("MARKER_DQT %d %d %02x\n", ctx->dqtCount, Jpeg_GetUnalignedU16(ptr), ptr[2]); ctx->dqtPtr[ctx->dqtCount++] = ptr + 2; ptr += Jpeg_GetUnalignedU16(ptr); break; } case MARKER_DHT: { // Define Huffman Table, stored for later processing - osSyncPrintf("MARKER_DHT %d %d %02x\n", ctx->dhtCount, Jpeg_GetUnalignedU16(ptr), ptr[2]); + PRINTF("MARKER_DHT %d %d %02x\n", ctx->dhtCount, Jpeg_GetUnalignedU16(ptr), ptr[2]); ctx->dhtPtr[ctx->dhtCount++] = ptr + 2; ptr += Jpeg_GetUnalignedU16(ptr); break; } case MARKER_DRI: { // Define Restart Interval - osSyncPrintf("MARKER_DRI %d\n", Jpeg_GetUnalignedU16(ptr)); + PRINTF("MARKER_DRI %d\n", Jpeg_GetUnalignedU16(ptr)); ptr += Jpeg_GetUnalignedU16(ptr); break; } case MARKER_SOF: { // Start of Frame, stores important metadata of the image. // Only used for extracting the sampling factors (ctx->mode). - osSyncPrintf("MARKER_SOF %d " - "精度%02x " // "accuracy" - "垂直%d " // "vertical" - "水平%d " // "horizontal" - "compo%02x " - "(1:Y)%d (H0=2,V0=1(422) or 2(420))%02x (量子化テーブル)%02x " - "(2:Cb)%d (H1=1,V1=1)%02x (量子化テーブル)%02x " - "(3:Cr)%d (H2=1,V2=1)%02x (量子化テーブル)%02x\n", - Jpeg_GetUnalignedU16(ptr), - ptr[2], // precision - Jpeg_GetUnalignedU16(ptr + 3), // height - Jpeg_GetUnalignedU16(ptr + 5), // width - ptr[7], // component count (assumed to be 3) - ptr[8], ptr[9], ptr[10], // Y component - ptr[11], ptr[12], ptr[13], // Cb component - ptr[14], ptr[15], ptr[16] // Cr component + PRINTF("MARKER_SOF %d " + "精度%02x " // "accuracy" + "垂直%d " // "vertical" + "水平%d " // "horizontal" + "compo%02x " + "(1:Y)%d (H0=2,V0=1(422) or 2(420))%02x (量子化テーブル)%02x " + "(2:Cb)%d (H1=1,V1=1)%02x (量子化テーブル)%02x " + "(3:Cr)%d (H2=1,V2=1)%02x (量子化テーブル)%02x\n", + Jpeg_GetUnalignedU16(ptr), + ptr[2], // precision + Jpeg_GetUnalignedU16(ptr + 3), // height + Jpeg_GetUnalignedU16(ptr + 5), // width + ptr[7], // component count (assumed to be 3) + ptr[8], ptr[9], ptr[10], // Y component + ptr[11], ptr[12], ptr[13], // Cb component + ptr[14], ptr[15], ptr[16] // Cr component ); if (ptr[9] == 0x21) { @@ -208,19 +208,19 @@ void Jpeg_ParseMarkers(u8* ptr, JpegContext* ctx) { } case MARKER_SOS: { // Start of Scan marker, indicates the start of the image data. - osSyncPrintf("MARKER_SOS %d\n", Jpeg_GetUnalignedU16(ptr)); + PRINTF("MARKER_SOS %d\n", Jpeg_GetUnalignedU16(ptr)); ptr += Jpeg_GetUnalignedU16(ptr); ctx->imageData = ptr; break; } case MARKER_EOI: { // End of Image - osSyncPrintf("MARKER_EOI\n"); + PRINTF("MARKER_EOI\n"); exit = true; break; } default: { - osSyncPrintf("マーカー不明 %02x\n", ptr[-1]); // "Unknown marker" + PRINTF("マーカー不明 %02x\n", ptr[-1]); // "Unknown marker" ptr += Jpeg_GetUnalignedU16(ptr); break; } @@ -257,7 +257,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { diff = curTime - time; time = curTime; // "Wait for synchronization of fifo buffer" - osSyncPrintf("*** fifoバッファの同期待ち time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); + PRINTF("*** fifoバッファの同期待ち time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); ctx.workBuf = workBuff; Jpeg_ParseMarkers(data, &ctx); @@ -266,7 +266,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { diff = curTime - time; time = curTime; // "Check markers for each segment" - osSyncPrintf("*** 各セグメントのマーカーのチェック time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); + PRINTF("*** 各セグメントのマーカーのチェック time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); switch (ctx.dqtCount) { case 1: @@ -290,26 +290,26 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { diff = curTime - time; time = curTime; // "Create quantization table" - osSyncPrintf("*** 量子化テーブル作成 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); + PRINTF("*** 量子化テーブル作成 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); switch (ctx.dhtCount) { case 1: if (JpegUtils_ProcessHuffmanTable(ctx.dhtPtr[0], &hTables[0], workBuff->codesLengths, workBuff->codes, 4)) { - osSyncPrintf("Error : Cant' make huffman table.\n"); + PRINTF("Error : Cant' make huffman table.\n"); } break; case 4: if (JpegUtils_ProcessHuffmanTable(ctx.dhtPtr[0], &hTables[0], workBuff->codesLengths, workBuff->codes, 1)) { - osSyncPrintf("Error : Cant' make huffman table.\n"); + PRINTF("Error : Cant' make huffman table.\n"); } if (JpegUtils_ProcessHuffmanTable(ctx.dhtPtr[1], &hTables[1], workBuff->codesLengths, workBuff->codes, 1)) { - osSyncPrintf("Error : Cant' make huffman table.\n"); + PRINTF("Error : Cant' make huffman table.\n"); } if (JpegUtils_ProcessHuffmanTable(ctx.dhtPtr[2], &hTables[2], workBuff->codesLengths, workBuff->codes, 1)) { - osSyncPrintf("Error : Cant' make huffman table.\n"); + PRINTF("Error : Cant' make huffman table.\n"); } if (JpegUtils_ProcessHuffmanTable(ctx.dhtPtr[3], &hTables[3], workBuff->codesLengths, workBuff->codes, 1)) { - osSyncPrintf("Error : Cant' make huffman table.\n"); + PRINTF("Error : Cant' make huffman table.\n"); } break; default: @@ -320,7 +320,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { diff = curTime - time; time = curTime; // "Huffman table creation" - osSyncPrintf("*** ハフマンテーブル作成 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); + PRINTF("*** ハフマンテーブル作成 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); decoder.imageData = ctx.imageData; decoder.mode = ctx.mode; @@ -334,9 +334,9 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { x = y = 0; for (i = 0; i < 300; i += 4) { if (JpegDecoder_Decode(&decoder, (u16*)workBuff->data, 4, i != 0, &state)) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Error : Can't decode jpeg\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("Error : Can't decode jpeg\n"); + PRINTF(VT_RST); } else { Jpeg_ScheduleDecoderTask(&ctx); osInvalDCache(&workBuff->data, sizeof(workBuff->data[0])); @@ -357,7 +357,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { diff = curTime - time; time = curTime; // "Unfold & draw" - osSyncPrintf("*** 展開 & 描画 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f); + PRINTF("*** 展開 & 描画 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 04efe06ff3..ab75c4be86 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -22,11 +22,11 @@ void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl) { ovl->loadedRamAddr = sKaleidoAreaPtr; Overlay_Load(ovl->vromStart, ovl->vromEnd, ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr); - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("OVL(k):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr, - (uintptr_t)ovl->loadedRamAddr + (uintptr_t)ovl->vramEnd - (uintptr_t)ovl->vramStart, - (uintptr_t)ovl->vramStart - (uintptr_t)ovl->loadedRamAddr, ovl->name); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("OVL(k):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr, + (uintptr_t)ovl->loadedRamAddr + (uintptr_t)ovl->vramEnd - (uintptr_t)ovl->vramStart, + (uintptr_t)ovl->vramStart - (uintptr_t)ovl->loadedRamAddr, ovl->name); + PRINTF(VT_RST); ovl->offset = (uintptr_t)ovl->loadedRamAddr - (uintptr_t)ovl->vramStart; gKaleidoMgrCurOvl = ovl; @@ -53,16 +53,16 @@ void KaleidoManager_Init(PlayState* play) { } } - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("KaleidoArea の最大サイズは %d バイトを確保します\n", largestSize); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("KaleidoArea の最大サイズは %d バイトを確保します\n", largestSize); + PRINTF(VT_RST); sKaleidoAreaPtr = GAME_STATE_ALLOC(&play->state, largestSize, "../z_kaleido_manager.c", 150); LogUtils_CheckNullPointer("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 151); - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("KaleidoArea %08x - %08x\n", sKaleidoAreaPtr, (uintptr_t)sKaleidoAreaPtr + largestSize); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("KaleidoArea %08x - %08x\n", sKaleidoAreaPtr, (uintptr_t)sKaleidoAreaPtr + largestSize); + PRINTF(VT_RST); gKaleidoMgrCurOvl = NULL; } @@ -93,7 +93,7 @@ void* KaleidoManager_GetRamAddr(void* vram) { //! @bug Probably missing iter++ here } - osSyncPrintf("異常\n"); // "Abnormal" + PRINTF("異常\n"); // "Abnormal" return NULL; } diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index c61eb33546..79d9242f4c 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -15,16 +15,16 @@ void KaleidoScopeCall_LoadPlayer(void) { if (gKaleidoMgrCurOvl != playerActorOvl) { if (gKaleidoMgrCurOvl != NULL) { - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("カレイド領域 強制排除\n"); // "Kaleido area forced exclusion" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("カレイド領域 強制排除\n"); // "Kaleido area forced exclusion" + PRINTF(VT_RST); KaleidoManager_ClearOvl(gKaleidoMgrCurOvl); } - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("プレイヤーアクター搬入\n"); // "Player actor import" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("プレイヤーアクター搬入\n"); // "Player actor import" + PRINTF(VT_RST); KaleidoManager_LoadOvl(playerActorOvl); } @@ -32,7 +32,7 @@ void KaleidoScopeCall_LoadPlayer(void) { void KaleidoScopeCall_Init(PlayState* play) { // "Kaleidoscope replacement construction" - osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n"); + PRINTF("カレイド・スコープ入れ替え コンストラクト \n"); sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(KaleidoScope_Update); sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(KaleidoScope_Draw); @@ -47,7 +47,7 @@ void KaleidoScopeCall_Init(PlayState* play) { void KaleidoScopeCall_Destroy(PlayState* play) { // "Kaleidoscope replacement destruction" - osSyncPrintf("カレイド・スコープ入れ替え デストラクト \n"); + PRINTF("カレイド・スコープ入れ替え デストラクト \n"); KaleidoSetup_Destroy(play); } @@ -74,7 +74,7 @@ void KaleidoScopeCall_Update(PlayState* play) { pauseCtx->unk_1EC = 0; pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSE_STATE_9 } else if ((pauseCtx->state == PAUSE_STATE_WAIT_BG_PRERENDER) || (pauseCtx->state == PAUSE_STATE_9)) { - osSyncPrintf("PR_KAREIDOSCOPE_MODE=%d\n", R_PAUSE_BG_PRERENDER_STATE); + PRINTF("PR_KAREIDOSCOPE_MODE=%d\n", R_PAUSE_BG_PRERENDER_STATE); if (R_PAUSE_BG_PRERENDER_STATE >= PAUSE_BG_PRERENDER_READY) { pauseCtx->state++; // PAUSE_STATE_INIT or PAUSE_STATE_10 @@ -82,18 +82,18 @@ void KaleidoScopeCall_Update(PlayState* play) { } else if (pauseCtx->state != PAUSE_STATE_OFF) { if (gKaleidoMgrCurOvl != kaleidoScopeOvl) { if (gKaleidoMgrCurOvl != NULL) { - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); // "Kaleido area Player Forced Elimination" - osSyncPrintf("カレイド領域 プレイヤー 強制排除\n"); - osSyncPrintf(VT_RST); + PRINTF("カレイド領域 プレイヤー 強制排除\n"); + PRINTF(VT_RST); KaleidoManager_ClearOvl(gKaleidoMgrCurOvl); } - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); // "Kaleido area Kaleidoscope loading" - osSyncPrintf("カレイド領域 カレイドスコープ搬入\n"); - osSyncPrintf(VT_RST); + PRINTF("カレイド領域 カレイドスコープ搬入\n"); + PRINTF(VT_RST); KaleidoManager_LoadOvl(kaleidoScopeOvl); } @@ -102,10 +102,10 @@ void KaleidoScopeCall_Update(PlayState* play) { sKaleidoScopeUpdateFunc(play); if (!IS_PAUSED(&play->pauseCtx)) { - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); // "Kaleido area Kaleidoscope Emission" - osSyncPrintf("カレイド領域 カレイドスコープ排出\n"); - osSyncPrintf(VT_RST); + PRINTF("カレイド領域 カレイドスコープ排出\n"); + PRINTF(VT_RST); KaleidoManager_ClearOvl(kaleidoScopeOvl); KaleidoScopeCall_LoadPlayer(); diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 9f264378b8..6585ea54f1 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -46,8 +46,8 @@ void KaleidoSetup_Update(PlayState* play) { pauseCtx->mode = (u16)(pauseCtx->pageIndex * 2) + 1; pauseCtx->state = PAUSE_STATE_WAIT_LETTERBOX; - osSyncPrintf("Ｍｏｄｅ=%d eye.x=%f, eye.z=%f kscp_pos=%d\n", pauseCtx->mode, pauseCtx->eye.x, - pauseCtx->eye.z, pauseCtx->pageIndex); + PRINTF("Ｍｏｄｅ=%d eye.x=%f, eye.z=%f kscp_pos=%d\n", pauseCtx->mode, pauseCtx->eye.x, pauseCtx->eye.z, + pauseCtx->pageIndex); } if (pauseCtx->state == PAUSE_STATE_WAIT_LETTERBOX) { diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 4caad7713a..e1ab29cef9 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -44,12 +44,12 @@ void Font_LoadOrderedFont(Font* font) { DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, len, "../z_kanfont.c", 122); - osSyncPrintf("msg_data=%x, msg_data0=%x jj=%x\n", font->msgOffset, font->msgLength, jj = len); + PRINTF("msg_data=%x, msg_data0=%x jj=%x\n", font->msgOffset, font->msgLength, jj = len); len = jj; for (fontBufIndex = 0, codePointIndex = 0; font->msgBuf[codePointIndex] != MESSAGE_END; codePointIndex++) { if (codePointIndex > len) { - osSyncPrintf("ＥＲＲＯＲ！！ エラー！！！ error───！！！！\n"); + PRINTF("ＥＲＲＯＲ！！ エラー！！！ error───！！！！\n"); return; } @@ -57,7 +57,7 @@ void Font_LoadOrderedFont(Font* font) { fontBuf = font->fontBuf + fontBufIndex * 8; fontStatic = (uintptr_t)_nes_font_staticSegmentRomStart; - osSyncPrintf("nes_mes_buf[%d]=%d\n", codePointIndex, font->msgBuf[codePointIndex]); + PRINTF("nes_mes_buf[%d]=%d\n", codePointIndex, font->msgBuf[codePointIndex]); offset = (font->msgBuf[codePointIndex] - ' ') * FONT_CHAR_TEX_SIZE; DMA_REQUEST_SYNC(fontBuf, fontStatic + offset, FONT_CHAR_TEX_SIZE, "../z_kanfont.c", 134); diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 7c12ea7c9f..37556fd913 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -435,7 +435,7 @@ void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 unused) if (Object_GetSlot(&play->objectCtx, OBJECT_GAMEPLAY_FIELD_KEEP) < 0 && !play->envCtx.sunMoonDisabled) { play->envCtx.sunMoonDisabled = true; // "Sun setting other than field keep! So forced release!" - osSyncPrintf(VT_COL(YELLOW, BLACK) "\n\nフィールド常駐以外、太陽設定！よって強制解除！\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "\n\nフィールド常駐以外、太陽設定！よって強制解除！\n" VT_RST); } gCustomLensFlareOn = false; @@ -554,8 +554,8 @@ f32 Environment_LerpWeightAccelDecel(u16 endFrame, u16 startFrame, u16 curFrame, if ((startFrameF >= endFrameF) || (accelDurationF + decelDurationF > totalFrames)) { // "The frame relation between end_frame and start_frame is wrong!!!" - osSyncPrintf(VT_COL(RED, WHITE) "\nend_frameとstart_frameのフレーム関係がおかしい!!!" VT_RST); - osSyncPrintf(VT_COL(RED, WHITE) "\nby get_parcent_forAccelBrake!!!!!!!!!" VT_RST); + PRINTF(VT_COL(RED, WHITE) "\nend_frameとstart_frameのフレーム関係がおかしい!!!" VT_RST); + PRINTF(VT_COL(RED, WHITE) "\nby get_parcent_forAccelBrake!!!!!!!!!" VT_RST); return 0.0f; } @@ -702,7 +702,7 @@ void Environment_UpdateSkybox(u8 skyboxId, EnvironmentContext* envCtx, SkyboxCon if (newSkybox1Index == 0xFF) { // "Environment VR data acquisition failed! Report to Sasaki!" - osSyncPrintf(VT_COL(RED, WHITE) "\n環境ＶＲデータ取得失敗！ ささきまでご報告を！" VT_RST); + PRINTF(VT_COL(RED, WHITE) "\n環境ＶＲデータ取得失敗！ ささきまでご報告を！" VT_RST); } if ((envCtx->skybox1Index != newSkybox1Index) && (envCtx->skyboxDmaState == SKYBOX_DMA_INACTIVE)) { @@ -788,7 +788,7 @@ void Environment_EnableUnderwaterLights(PlayState* play, s32 waterLightsIndex) { if (waterLightsIndex == WATERBOX_LIGHT_INDEX_NONE) { waterLightsIndex = 0; // "Underwater color is not set in the water poly data!" - osSyncPrintf(VT_COL(YELLOW, BLACK) "\n水ポリゴンデータに水中カラーが設定されておりません!" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "\n水ポリゴンデータに水中カラーが設定されておりません!" VT_RST); } if (play->envCtx.lightMode == LIGHT_MODE_TIME) { @@ -902,7 +902,7 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex if (((void)0, gSaveContext.nextDayTime) >= 0xFF00 && ((void)0, gSaveContext.nextDayTime) != NEXT_TIME_NONE) { gSaveContext.nextDayTime -= 0x10; - osSyncPrintf("\nnext_zelda_time=[%x]", ((void)0, gSaveContext.nextDayTime)); + PRINTF("\nnext_zelda_time=[%x]", ((void)0, gSaveContext.nextDayTime)); // nextDayTime is used as both a time of day value and a timer to delay sfx when changing days. // When Sun's Song is played, nextDayTime is set to 0x8001 or 0 for day and night respectively. @@ -1127,12 +1127,12 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex if (sTimeBasedLightConfigs[envCtx->changeLightNextConfig][i].nextLightSetting >= envCtx->numLightSettings) { // "The color palette setting seems to be wrong!" - osSyncPrintf(VT_COL(RED, WHITE) "\nカラーパレットの設定がおかしいようです！" VT_RST); + PRINTF(VT_COL(RED, WHITE) "\nカラーパレットの設定がおかしいようです！" VT_RST); // "Palette setting = [] Last palette number = []" - osSyncPrintf(VT_COL(RED, WHITE) "\n設定パレット＝[%d] 最後パレット番号＝[%d]\n" VT_RST, - sTimeBasedLightConfigs[envCtx->changeLightNextConfig][i].nextLightSetting, - envCtx->numLightSettings - 1); + PRINTF(VT_COL(RED, WHITE) "\n設定パレット＝[%d] 最後パレット番号＝[%d]\n" VT_RST, + sTimeBasedLightConfigs[envCtx->changeLightNextConfig][i].nextLightSetting, + envCtx->numLightSettings - 1); } break; } @@ -1203,11 +1203,11 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex if (envCtx->lightSetting >= envCtx->numLightSettings) { // "The color palette seems to be wrong!" - osSyncPrintf("\n" VT_FGCOL(RED) "カラーパレットがおかしいようです！"); + PRINTF("\n" VT_FGCOL(RED) "カラーパレットがおかしいようです！"); // "Palette setting = [] Last palette number = []" - osSyncPrintf("\n" VT_FGCOL(YELLOW) "設定パレット＝[%d] パレット数＝[%d]\n" VT_RST, - envCtx->lightSetting, envCtx->numLightSettings); + PRINTF("\n" VT_FGCOL(YELLOW) "設定パレット＝[%d] パレット数＝[%d]\n" VT_RST, envCtx->lightSetting, + envCtx->numLightSettings); } } } @@ -2058,8 +2058,8 @@ void Environment_PlaySceneSequence(PlayState* play) { } } else if (play->sequenceCtx.natureAmbienceId == NATURE_ID_NONE) { // "BGM Configuration" - osSyncPrintf("\n\n\nBGM設定game_play->sound_info.BGM=[%d] old_bgm=[%d]\n\n", play->sequenceCtx.seqId, - ((void)0, gSaveContext.seqId)); + PRINTF("\n\n\nBGM設定game_play->sound_info.BGM=[%d] old_bgm=[%d]\n\n", play->sequenceCtx.seqId, + ((void)0, gSaveContext.seqId)); if (((void)0, gSaveContext.seqId) != play->sequenceCtx.seqId) { Audio_PlaySceneSequence(play->sequenceCtx.seqId); } @@ -2086,11 +2086,11 @@ void Environment_PlaySceneSequence(PlayState* play) { } } - osSyncPrintf("\n-----------------\n", ((void)0, gSaveContext.forcedSeqId)); - osSyncPrintf("\n 強制ＢＧＭ=[%d]", ((void)0, gSaveContext.forcedSeqId)); // "Forced BGM" - osSyncPrintf("\n ＢＧＭ=[%d]", play->sequenceCtx.seqId); - osSyncPrintf("\n エンブ=[%d]", play->sequenceCtx.natureAmbienceId); - osSyncPrintf("\n status=[%d]", play->envCtx.timeSeqState); + PRINTF("\n-----------------\n", ((void)0, gSaveContext.forcedSeqId)); + PRINTF("\n 強制ＢＧＭ=[%d]", ((void)0, gSaveContext.forcedSeqId)); // "Forced BGM" + PRINTF("\n ＢＧＭ=[%d]", play->sequenceCtx.seqId); + PRINTF("\n エンブ=[%d]", play->sequenceCtx.natureAmbienceId); + PRINTF("\n status=[%d]", play->envCtx.timeSeqState); Audio_SetEnvReverb(play->roomCtx.curRoom.echo); } @@ -2102,7 +2102,7 @@ void Environment_PlayTimeBasedSequence(PlayState* play) { CHANNEL_IO_PORT_1, 0); if (play->envCtx.precipitation[PRECIP_RAIN_MAX] == 0 && play->envCtx.precipitation[PRECIP_SOS_MAX] == 0) { - osSyncPrintf("\n\n\nNa_StartMorinigBgm\n\n"); + PRINTF("\n\n\nNa_StartMorinigBgm\n\n"); Audio_PlayMorningSceneSequence(play->sequenceCtx.seqId); } diff --git a/src/code/z_lib.c b/src/code/z_lib.c index 9857097a5e..fbea9dce45 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -380,7 +380,7 @@ void IChain_Apply_Vec3fdiv1000(u8* ptr, InitChainEntry* ichain) { Vec3f* vec = (Vec3f*)(ptr + ichain->offset); f32 val; - osSyncPrintf("pp=%x data=%f\n", vec, ichain->value / 1000.0f); + PRINTF("pp=%x data=%f\n", vec, ichain->value / 1000.0f); val = ichain->value / 1000.0f; vec->z = val; diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index 35942de28f..4dcf7831e5 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -11,12 +11,12 @@ void ZeldaArena_CheckPointer(void* ptr, u32 size, const char* name, const char* if (ptr == NULL) { if (gZeldaArenaLogSeverity >= LOG_SEVERITY_ERROR) { // "%s: %u bytes %s failed\n" - osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); + PRINTF("%s: %u バイトの%sに失敗しました\n", name, size, action); __osDisplayArena(&sZeldaArena); } } else if (gZeldaArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { // "%s: %u bytes %s succeeded\n" - osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); + PRINTF("%s: %u バイトの%sに成功しました\n", name, size, action); } } @@ -82,7 +82,7 @@ void* ZeldaArena_Calloc(u32 num, u32 size) { } void ZeldaArena_Display(void) { - osSyncPrintf("ゼルダヒープ表示\n"); // "Zelda heap display" + PRINTF("ゼルダヒープ表示\n"); // "Zelda heap display" __osDisplayArena(&sZeldaArena); } diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index b12ffe4198..a4eb9d5207 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -27,11 +27,11 @@ void Map_SetPaletteData(PlayState* play, s16 room) { interfaceCtx->mapPaletteIndex = paletteIndex; } - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "PALETE Set" - osSyncPrintf("ＰＡＬＥＴＥセット 【 i=%x : room=%x 】Room_Inf[%d][4]=%x ( map_palete_no = %d )\n", paletteIndex, - room, mapIndex, gSaveContext.save.info.sceneFlags[mapIndex].rooms, interfaceCtx->mapPaletteIndex); - osSyncPrintf(VT_RST); + PRINTF("ＰＡＬＥＴＥセット 【 i=%x : room=%x 】Room_Inf[%d][4]=%x ( map_palete_no = %d )\n", paletteIndex, room, + mapIndex, gSaveContext.save.info.sceneFlags[mapIndex].rooms, interfaceCtx->mapPaletteIndex); + PRINTF(VT_RST); interfaceCtx->mapPalette[paletteIndex * 2] = 2; interfaceCtx->mapPalette[paletteIndex * 2 + 1] = 0xBF; @@ -126,9 +126,9 @@ void Map_InitData(PlayState* play, s16 room) { extendedMapIndex = 0x17; } } - osSyncPrintf(VT_FGCOL(BLUE)); - osSyncPrintf("ＫＫＫ＝%d\n", extendedMapIndex); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(BLUE)); + PRINTF("ＫＫＫ＝%d\n", extendedMapIndex); + PRINTF(VT_RST); sEntranceIconMapIndex = extendedMapIndex; DMA_REQUEST_SYNC(interfaceCtx->mapSegment, (uintptr_t)_map_grand_staticSegmentRomStart + @@ -154,11 +154,11 @@ void Map_InitData(PlayState* play, s16 room) { case SCENE_WATER_TEMPLE_BOSS: case SCENE_SPIRIT_TEMPLE_BOSS: case SCENE_SHADOW_TEMPLE_BOSS: - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "Deku Tree Dungeon MAP Texture DMA" - osSyncPrintf("デクの樹ダンジョンＭＡＰ テクスチャＤＭＡ(%x) scene_id_offset=%d VREG(30)=%d\n", room, - mapIndex, VREG(30)); - osSyncPrintf(VT_RST); + PRINTF("デクの樹ダンジョンＭＡＰ テクスチャＤＭＡ(%x) scene_id_offset=%d VREG(30)=%d\n", room, mapIndex, + VREG(30)); + PRINTF(VT_RST); DMA_REQUEST_SYNC(play->interfaceCtx.mapSegment, (uintptr_t)_map_i_staticSegmentRomStart + ((gMapData->dgnMinimapTexIndexOffset[mapIndex] + room) * MAP_I_TEX_SIZE), @@ -166,7 +166,7 @@ void Map_InitData(PlayState* play, s16 room) { R_COMPASS_OFFSET_X = gMapData->roomCompassOffsetX[mapIndex][room]; R_COMPASS_OFFSET_Y = gMapData->roomCompassOffsetY[mapIndex][room]; Map_SetFloorPalettesData(play, VREG(30)); - osSyncPrintf("ＭＡＰ 各階ＯＮチェック\n"); // "MAP Individual Floor ON Check" + PRINTF("ＭＡＰ 各階ＯＮチェック\n"); // "MAP Individual Floor ON Check" break; } } @@ -175,8 +175,8 @@ void Map_InitRoomData(PlayState* play, s16 room) { s32 mapIndex = gSaveContext.mapIndex; InterfaceContext* interfaceCtx = &play->interfaceCtx; - osSyncPrintf("＊＊＊＊＊＊＊\n＊＊＊＊＊＊＊\nroom_no=%d (%d)(%d)\n＊＊＊＊＊＊＊\n＊＊＊＊＊＊＊\n", room, - mapIndex, play->sceneId); + PRINTF("＊＊＊＊＊＊＊\n＊＊＊＊＊＊＊\nroom_no=%d (%d)(%d)\n＊＊＊＊＊＊＊\n＊＊＊＊＊＊＊\n", room, mapIndex, + play->sceneId); if (room >= 0) { switch (play->sceneId) { @@ -199,13 +199,13 @@ void Map_InitRoomData(PlayState* play, s16 room) { case SCENE_SPIRIT_TEMPLE_BOSS: case SCENE_SHADOW_TEMPLE_BOSS: gSaveContext.save.info.sceneFlags[mapIndex].rooms |= gBitFlags[room]; - osSyncPrintf("ＲＯＯＭ＿ＩＮＦ＝%d\n", gSaveContext.save.info.sceneFlags[mapIndex].rooms); + PRINTF("ＲＯＯＭ＿ＩＮＦ＝%d\n", gSaveContext.save.info.sceneFlags[mapIndex].rooms); interfaceCtx->mapRoomNum = room; interfaceCtx->unk_25A = mapIndex; Map_SetPaletteData(play, room); - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("部屋部屋＝%d\n", room); // "Room Room = %d" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("部屋部屋＝%d\n", room); // "Room Room = %d" + PRINTF(VT_RST); Map_InitData(play, room); break; } @@ -234,8 +234,8 @@ void Map_Init(PlayState* play) { interfaceCtx->mapSegment = GAME_STATE_ALLOC(&play->state, 0x1000, "../z_map_exp.c", 457); // "ＭＡＰ texture initialization scene_data_ID=%d mapSegment=%x" - osSyncPrintf("\n\n\nＭＡＰ テクスチャ初期化 scene_data_ID=%d\nmapSegment=%x\n\n", play->sceneId, - interfaceCtx->mapSegment, play); + PRINTF("\n\n\nＭＡＰ テクスチャ初期化 scene_data_ID=%d\nmapSegment=%x\n\n", play->sceneId, + interfaceCtx->mapSegment, play); ASSERT(interfaceCtx->mapSegment != NULL, "parameter->mapSegment != NULL", "../z_map_exp.c", 459); switch (play->sceneId) { @@ -404,7 +404,7 @@ void Minimap_Draw(PlayState* play) { } if (CHECK_BTN_ALL(play->state.input[0].press.button, BTN_L) && !Play_InCsMode(play)) { - osSyncPrintf("Game_play_demo_mode_check=%d\n", Play_InCsMode(play)); + PRINTF("Game_play_demo_mode_check=%d\n", Play_InCsMode(play)); // clang-format off if (!R_MINIMAP_DISABLED) { Audio_PlaySfxGeneral(NA_SE_SY_CAMERA_ZOOM_UP, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, @@ -556,8 +556,8 @@ void Map_Update(PlayState* play) { if (interfaceCtx->mapRoomNum != sLastRoomNum) { // "Current floor = %d Current room = %x Number of rooms = %d" - osSyncPrintf("現在階＝%d 現在部屋＝%x 部屋数＝%d\n", floor, interfaceCtx->mapRoomNum, - gMapData->switchEntryCount[mapIndex]); + PRINTF("現在階＝%d 現在部屋＝%x 部屋数＝%d\n", floor, interfaceCtx->mapRoomNum, + gMapData->switchEntryCount[mapIndex]); sLastRoomNum = interfaceCtx->mapRoomNum; } @@ -565,10 +565,10 @@ void Map_Update(PlayState* play) { if ((interfaceCtx->mapRoomNum == gMapData->switchFromRoom[mapIndex][i]) && (floor == gMapData->switchFromFloor[mapIndex][i])) { interfaceCtx->mapRoomNum = gMapData->switchToRoom[mapIndex][i]; - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "Layer switching = %x" - osSyncPrintf("階層切替＝%x\n", interfaceCtx->mapRoomNum); - osSyncPrintf(VT_RST); + PRINTF("階層切替＝%x\n", interfaceCtx->mapRoomNum); + PRINTF(VT_RST); Map_InitData(play, interfaceCtx->mapRoomNum); gSaveContext.sunsSongState = SUNSSONG_INACTIVE; Map_SavePlayerInitialInfo(play); diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 60e092daf6..3e805ea0c3 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -89,8 +89,8 @@ void MapMark_DrawForDungeon(PlayState* play) { if ((gMapData != NULL) && (play->interfaceCtx.mapRoomNum >= gMapData->dgnMinimapCount[dungeon])) { // "Room number exceeded, yikes %d/%d MapMarkDraw processing interrupted" - osSyncPrintf(VT_COL(RED, WHITE) "部屋番号がオーバーしてるで,ヤバイで %d/%d \nMapMarkDraw の処理を中断します\n", - VT_RST, play->interfaceCtx.mapRoomNum, gMapData->dgnMinimapCount[dungeon]); + PRINTF(VT_COL(RED, WHITE) "部屋番号がオーバーしてるで,ヤバイで %d/%d \nMapMarkDraw の処理を中断します\n", + VT_RST, play->interfaceCtx.mapRoomNum, gMapData->dgnMinimapCount[dungeon]); return; } diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index d43148efd4..eaeebf0037 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -310,9 +310,9 @@ void Message_FindMessage(PlayState* play, u16 textId) { font->msgOffset = foundSeg - seg; font->msgLength = nextSeg - foundSeg; // "Message found!!!" - osSyncPrintf(" メッセージが,見つかった！！！ = %x " - "(data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n", - textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); + PRINTF(" メッセージが,見つかった！！！ = %x " + "(data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n", + textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); return; } messageTableEntry++; @@ -333,9 +333,9 @@ void Message_FindMessage(PlayState* play, u16 textId) { font->msgOffset = foundSeg - seg; font->msgLength = nextSeg - foundSeg; // "Message found!!!" - osSyncPrintf(" メッセージが,見つかった！！！ = %x " - "(data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n", - textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); + PRINTF(" メッセージが,見つかった！！！ = %x " + "(data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n", + textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); return; } messageTableEntry++; @@ -343,7 +343,7 @@ void Message_FindMessage(PlayState* play, u16 textId) { } } // "Message not found!!!" - osSyncPrintf(" メッセージが,見つからなかった！！！ = %x\n", textId); + PRINTF(" メッセージが,見つからなかった！！！ = %x\n", textId); font = &play->msgCtx.font; messageTableEntry = sNesMessageEntryTablePtr; @@ -383,8 +383,8 @@ void Message_FindCreditsMessage(PlayState* play, u16 textId) { font->msgOffset = foundSeg - seg; font->msgLength = nextSeg - foundSeg; // "Message found!!!" - osSyncPrintf(" メッセージが,見つかった！！！ = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n", - textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); + PRINTF(" メッセージが,見つかった！！！ = %x (data=%x) (data0=%x) (data1=%x) (data2=%x) (data3=%x)\n", + textId, font->msgOffset, font->msgLength, foundSeg, seg, nextSeg); return; } messageTableEntry++; @@ -785,10 +785,10 @@ void Message_HandleOcarina(PlayState* play) { if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_LONG_RECORDING) { msgCtx->msgMode = MSGMODE_SCARECROW_LONG_RECORDING_START; // "Recording Start / Recording Start / Recording Start / Recording Start -> " - osSyncPrintf("録音開始 録音開始 録音開始 録音開始 -> "); + PRINTF("録音開始 録音開始 録音開始 録音開始 -> "); } else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_LONG_PLAYBACK) { // "Recording Playback / Recording Playback / Recording Playback / Recording Playback -> " - osSyncPrintf("録音再生 録音再生 録音再生 録音再生 -> "); + PRINTF("録音再生 録音再生 録音再生 録音再生 -> "); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); @@ -801,10 +801,10 @@ void Message_HandleOcarina(PlayState* play) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_SPAWN_RECORDING) { msgCtx->msgMode = MSGMODE_SCARECROW_SPAWN_RECORDING_START; // "8 Note Recording Start / 8 Note Recording Start / 8 Note Recording Start -> " - osSyncPrintf("８音録音開始 ８音録音開始 ８音録音開始 -> "); + PRINTF("８音録音開始 ８音録音開始 ８音録音開始 -> "); } else if (msgCtx->ocarinaAction == OCARINA_ACTION_SCARECROW_SPAWN_PLAYBACK) { // "8 Note Playback / 8 Note Playback / 8 Note Playback -> " - osSyncPrintf("８音再生 ８音再生 ８音再生 -> "); + PRINTF("８音再生 ８音再生 ８音再生 -> "); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); @@ -817,28 +817,28 @@ void Message_HandleOcarina(PlayState* play) { } else if (msgCtx->ocarinaAction == OCARINA_ACTION_MEMORY_GAME) { msgCtx->msgMode = MSGMODE_MEMORY_GAME_START; // "Musical Round Start / Musical Round Start / Musical Round Start / Musical Round Start -> " - osSyncPrintf("輪唱開始 輪唱開始 輪唱開始 輪唱開始 -> "); + PRINTF("輪唱開始 輪唱開始 輪唱開始 輪唱開始 -> "); } else if (msgCtx->ocarinaAction == OCARINA_ACTION_FROGS) { msgCtx->msgMode = MSGMODE_FROGS_START; // "Frog Chorus / Frog Chorus -> " - osSyncPrintf("カエルの合唱 カエルの合唱 -> "); + PRINTF("カエルの合唱 カエルの合唱 -> "); } else { // "Ocarina（%d）" - osSyncPrintf("オカリナ（%d） ", msgCtx->ocarinaAction); + PRINTF("オカリナ（%d） ", msgCtx->ocarinaAction); if (msgCtx->ocarinaAction == OCARINA_ACTION_UNK_0 || msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY || msgCtx->ocarinaAction >= OCARINA_ACTION_CHECK_SARIA) { msgCtx->msgMode = MSGMODE_OCARINA_STARTING; - osSyncPrintf("000000000000 -> "); + PRINTF("000000000000 -> "); } else if (msgCtx->ocarinaAction >= OCARINA_ACTION_TEACH_MINUET && msgCtx->ocarinaAction <= OCARINA_ACTION_TEACH_STORMS) { msgCtx->msgMode = MSGMODE_SONG_DEMONSTRATION_STARTING; - osSyncPrintf("111111111111 -> "); + PRINTF("111111111111 -> "); } else { msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_STARTING; - osSyncPrintf("222222222222 -> "); + PRINTF("222222222222 -> "); } } - osSyncPrintf("msg_mode=%d\n", msgCtx->msgMode); + PRINTF("msg_mode=%d\n", msgCtx->msgMode); } } @@ -968,11 +968,11 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) { msgCtx->msgMode = MSGMODE_TEXT_DONE; msgCtx->textboxEndType = TEXTBOX_ENDTYPE_FADING; // "Timer" - osSyncPrintf("タイマー (%x) (%x)", msgCtx->msgBufDecoded[i + 1], msgCtx->msgBufDecoded[i + 2]); + PRINTF("タイマー (%x) (%x)", msgCtx->msgBufDecoded[i + 1], msgCtx->msgBufDecoded[i + 2]); msgCtx->stateTimer = msgCtx->msgBufDecoded[++i] << 8; msgCtx->stateTimer |= msgCtx->msgBufDecoded[++i]; // "Total wct" - osSyncPrintf("合計wct=%x(%d)\n", msgCtx->stateTimer, msgCtx->stateTimer); + PRINTF("合計wct=%x(%d)\n", msgCtx->stateTimer, msgCtx->stateTimer); } *gfxP = gfx; return; @@ -980,7 +980,7 @@ void Message_DrawText(PlayState* play, Gfx** gfxP) { if (msgCtx->msgMode == MSGMODE_TEXT_DISPLAYING && !sMessageHasSetSfx) { sMessageHasSetSfx = true; // "Sound (SE)" - osSyncPrintf("サウンド（ＳＥ）\n"); + PRINTF("サウンド（ＳＥ）\n"); sfxHi = msgCtx->msgBufDecoded[i + 1] << 8; Audio_PlaySfxGeneral(sfxHi | msgCtx->msgBufDecoded[i + 2], &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -1164,7 +1164,7 @@ void Message_LoadItemIcon(PlayState* play, u16 itemId, s16 y) { DMA_REQUEST_SYNC(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, GET_ITEM_ICON_VROM(itemId), ITEM_ICON_SIZE, "../z_message_PAL.c", 1473); // "Item 32-0" - osSyncPrintf("アイテム32-0\n"); + PRINTF("アイテム32-0\n"); } else { R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem24XOffsets[gSaveContext.language]; R_TEXTBOX_ICON_YPOS = y + ((44 - QUEST_ICON_HEIGHT) / 2); @@ -1172,7 +1172,7 @@ void Message_LoadItemIcon(PlayState* play, u16 itemId, s16 y) { DMA_REQUEST_SYNC(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, GET_QUEST_ICON_VROM(itemId), QUEST_ICON_SIZE, "../z_message_PAL.c", 1482); // "Item 24" - osSyncPrintf("アイテム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->choiceNum = 1; @@ -1206,7 +1206,7 @@ void Message_Decode(PlayState* play) { msgCtx->msgMode = MSGMODE_TEXT_DISPLAYING; msgCtx->textDrawPos = 1; R_TEXT_INIT_YPOS = R_TEXTBOX_Y + 8; - osSyncPrintf("ＪＪ＝%d\n", numLines); + PRINTF("ＪＪ＝%d\n", numLines); if (msgCtx->textBoxType != TEXTBOX_TYPE_NONE_BOTTOM) { if (numLines == 0) { R_TEXT_INIT_YPOS = (u16)(R_TEXTBOX_Y + 26); @@ -1217,8 +1217,8 @@ void Message_Decode(PlayState* play) { } } if (curChar2 == MESSAGE_TEXTID) { - osSyncPrintf("NZ_NEXTMSG=%x, %x, %x\n", font->msgBuf[msgCtx->msgBufPos], - font->msgBuf[msgCtx->msgBufPos + 1], font->msgBuf[msgCtx->msgBufPos + 2]); + PRINTF("NZ_NEXTMSG=%x, %x, %x\n", font->msgBuf[msgCtx->msgBufPos], font->msgBuf[msgCtx->msgBufPos + 1], + font->msgBuf[msgCtx->msgBufPos + 2]); curChar = msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[msgCtx->msgBufPos + 1]; msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[msgCtx->msgBufPos + 2]; value = curChar << 8; @@ -1242,7 +1242,7 @@ void Message_Decode(PlayState* play) { } } // "Name" - osSyncPrintf("\n名前 ＝ "); + PRINTF("\n名前 ＝ "); for (i = 0; i < playerNameLen; i++) { curChar2 = gSaveContext.save.info.playerData.playerName[i]; if (curChar2 == 0x3E) { @@ -1265,7 +1265,7 @@ void Message_Decode(PlayState* play) { Font_LoadChar(font, curChar2 - ' ', charTexIdx); charTexIdx += FONT_CHAR_TEX_SIZE; } - osSyncPrintf("%x ", curChar2); + PRINTF("%x ", curChar2); msgCtx->msgBufDecoded[decodedBufPos] = curChar2; decodedBufPos++; } @@ -1274,7 +1274,7 @@ void Message_Decode(PlayState* play) { // Convert the values of the appropriate timer to digits and add the // digits to the decoded buffer in place of the control character. // "EVENT timer" - osSyncPrintf("\nＥＶＥＮＴタイマー ＝ "); + PRINTF("\nＥＶＥＮＴタイマー ＝ "); digits[0] = digits[1] = digits[2] = 0; if (curChar == MESSAGE_RACE_TIME) { digits[3] = gSaveContext.timerSeconds; @@ -1315,7 +1315,7 @@ void Message_Decode(PlayState* play) { // Convert the values of the current minigame score to digits and // add the digits to the decoded buffer in place of the control character. // "Yabusame score" - osSyncPrintf("\n流鏑馬スコア ＝ %d\n", gSaveContext.minigameScore); + PRINTF("\n流鏑馬スコア ＝ %d\n", gSaveContext.minigameScore); digits[0] = digits[1] = digits[2] = 0; digits[3] = gSaveContext.minigameScore; @@ -1349,7 +1349,7 @@ void Message_Decode(PlayState* play) { // 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. // "Total number of gold stars" - osSyncPrintf("\n金スタ合計数 ＝ %d", gSaveContext.save.info.inventory.gsTokens); + PRINTF("\n金スタ合計数 ＝ %d", gSaveContext.save.info.inventory.gsTokens); digits[0] = digits[1] = 0; digits[2] = gSaveContext.save.info.inventory.gsTokens; @@ -1371,14 +1371,14 @@ void Message_Decode(PlayState* play) { Font_LoadChar(font, digits[i] + '0' - ' ', charTexIdx); msgCtx->msgBufDecoded[decodedBufPos] = digits[i] + '0'; charTexIdx += FONT_CHAR_TEX_SIZE; - osSyncPrintf("%x(%x) ", digits[i] + '0' - ' ', digits[i]); + PRINTF("%x(%x) ", digits[i] + '0' - ' ', digits[i]); decodedBufPos++; } } decodedBufPos--; } else if (curChar == MESSAGE_FISH_INFO) { // "Fishing hole fish size" - osSyncPrintf("\n釣り堀魚サイズ ＝ "); + PRINTF("\n釣り堀魚サイズ ＝ "); digits[0] = 0; digits[1] = gSaveContext.minigameScore; @@ -1392,7 +1392,7 @@ void Message_Decode(PlayState* play) { Font_LoadChar(font, digits[i] + '0' - ' ', charTexIdx); msgCtx->msgBufDecoded[decodedBufPos] = digits[i] + '0'; charTexIdx += FONT_CHAR_TEX_SIZE; - osSyncPrintf("%x(%x) ", digits[i] + '0' - ' ', digits[i]); + PRINTF("%x(%x) ", digits[i] + '0' - ' ', digits[i]); decodedBufPos++; } } @@ -1400,17 +1400,17 @@ void Message_Decode(PlayState* play) { } else if (curChar == MESSAGE_HIGHSCORE) { value = HIGH_SCORE((u8)font->msgBuf[++msgCtx->msgBufPos]); // "Highscore" - osSyncPrintf("ランキング＝%d\n", font->msgBuf[msgCtx->msgBufPos]); + PRINTF("ランキング＝%d\n", font->msgBuf[msgCtx->msgBufPos]); if ((font->msgBuf[msgCtx->msgBufPos] & 0xFF) == 2) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) { value &= 0x7F; } else { - osSyncPrintf("HI_SCORE( kanfont->mbuff.nes_mes_buf[message->rdp] & 0xff000000 ) = %x\n", - HIGH_SCORE(font->msgBufWide[msgCtx->msgBufPos] & 0xFF000000)); + PRINTF("HI_SCORE( kanfont->mbuff.nes_mes_buf[message->rdp] & 0xff000000 ) = %x\n", + HIGH_SCORE(font->msgBufWide[msgCtx->msgBufPos] & 0xFF000000)); value = ((HIGH_SCORE((u8)font->msgBuf[msgCtx->msgBufPos]) & 0xFF000000) >> 0x18) & 0x7F; } value = SQ((f32)value) * 0.0036f + 0.5f; - osSyncPrintf("score=%d\n", value); + PRINTF("score=%d\n", value); } switch (font->msgBuf[msgCtx->msgBufPos] & 0xFF) { case HS_HBA: @@ -1487,7 +1487,7 @@ void Message_Decode(PlayState* play) { } } else if (curChar == MESSAGE_TIME) { // "Zelda time" - osSyncPrintf("\nゼルダ時間 ＝ "); + PRINTF("\nゼルダ時間 ＝ "); digits[0] = 0; timeInSeconds = gSaveContext.save.dayTime * (24.0f * 60.0f / 0x10000); @@ -1518,8 +1518,7 @@ void Message_Decode(PlayState* play) { decodedBufPos--; } else if (curChar == MESSAGE_ITEM_ICON) { msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[msgCtx->msgBufPos + 1]; - osSyncPrintf("ITEM_NO=(%d) (%d)\n", msgCtx->msgBufDecoded[decodedBufPos], - font->msgBuf[msgCtx->msgBufPos + 1]); + PRINTF("ITEM_NO=(%d) (%d)\n", msgCtx->msgBufDecoded[decodedBufPos], font->msgBuf[msgCtx->msgBufPos + 1]); Message_LoadItemIcon(play, font->msgBuf[msgCtx->msgBufPos + 1], R_TEXTBOX_Y + 10); } else if (curChar == MESSAGE_BACKGROUND) { msgCtx->textboxBackgroundIdx = font->msgBuf[msgCtx->msgBufPos + 1] * 2; @@ -1548,11 +1547,11 @@ void Message_Decode(PlayState* play) { curChar != MESSAGE_PERSISTENT && curChar != MESSAGE_UNSKIPPABLE) { if (curChar == MESSAGE_FADE) { sTextFade = true; - osSyncPrintf("NZ_TIMER_END (key_off_flag=%d)\n", sTextFade); + PRINTF("NZ_TIMER_END (key_off_flag=%d)\n", sTextFade); msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[++msgCtx->msgBufPos]; } else if (curChar == MESSAGE_FADE2) { sTextFade = true; - osSyncPrintf("NZ_BGM (key_off_flag=%d)\n", sTextFade); + PRINTF("NZ_BGM (key_off_flag=%d)\n", sTextFade); msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[++msgCtx->msgBufPos]; msgCtx->msgBufDecoded[++decodedBufPos] = font->msgBuf[++msgCtx->msgBufPos]; } else if (curChar == MESSAGE_SHIFT || curChar == MESSAGE_TEXT_SPEED) { @@ -1620,9 +1619,9 @@ void Message_OpenText(PlayState* play, u16 textId) { msgCtx->textId = textId; if (textId == 0x2030) { // Talking to Ingo as adult in Lon Lon Ranch for the first time before freeing Epona - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("？？？？？？？？？？？？？？？？ z_message.c ？？？？？？？？？？？？？？？？？？\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("？？？？？？？？？？？？？？？？ z_message.c ？？？？？？？？？？？？？？？？？？\n"); + PRINTF(VT_RST); gSaveContext.eventInf[0] = gSaveContext.eventInf[1] = gSaveContext.eventInf[2] = gSaveContext.eventInf[3] = 0; } @@ -1654,7 +1653,7 @@ void Message_OpenText(PlayState* play, u16 textId) { msgCtx->textBoxPos = msgCtx->textBoxProperties & 0xF; textBoxType = msgCtx->textBoxType; // "Text Box Type" - osSyncPrintf("吹き出し種類＝%d\n", msgCtx->textBoxType); + PRINTF("吹き出し種類＝%d\n", msgCtx->textBoxType); if (textBoxType < TEXTBOX_TYPE_NONE_BOTTOM) { DMA_REQUEST_SYNC(msgCtx->textboxSegment, (uintptr_t)_message_staticSegmentRomStart + @@ -1693,10 +1692,10 @@ void Message_OpenText(PlayState* play, u16 textId) { void Message_StartTextbox(PlayState* play, u16 textId, Actor* actor) { MessageContext* msgCtx = &play->msgCtx; - osSyncPrintf(VT_FGCOL(BLUE)); + PRINTF(VT_FGCOL(BLUE)); // "Message" - osSyncPrintf("めっせーじ＝%x(%d)\n", textId, actor); - osSyncPrintf(VT_RST); + PRINTF("めっせーじ＝%x(%d)\n", textId, actor); + PRINTF(VT_RST); msgCtx->ocarinaAction = 0xFFFF; Message_OpenText(play, textId); @@ -1710,10 +1709,10 @@ void Message_StartTextbox(PlayState* play, u16 textId, Actor* actor) { void Message_ContinueTextbox(PlayState* play, u16 textId) { MessageContext* msgCtx = &play->msgCtx; - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); // "Message" - osSyncPrintf("めっせーじ＝%x message->msg_data\n", textId, msgCtx->msgLength); - osSyncPrintf(VT_RST); + PRINTF("めっせーじ＝%x message->msg_data\n", textId, msgCtx->msgLength); + PRINTF(VT_RST); msgCtx->msgLength = 0; Message_OpenText(play, textId); @@ -1753,19 +1752,19 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) { s16 noStopDoAction; s32 k; - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); for (i = sOcarinaSongBitFlags = 0; i <= (QUEST_SONG_STORMS - QUEST_SONG_MINUET); i++) { if (CHECK_QUEST_ITEM(QUEST_SONG_MINUET + i)) { - osSyncPrintf("ocarina_check_bit[%d]=%x\n", i, sOcarinaSongFlagsMap[i]); + PRINTF("ocarina_check_bit[%d]=%x\n", i, sOcarinaSongFlagsMap[i]); sOcarinaSongBitFlags |= sOcarinaSongFlagsMap[i]; } } if (gSaveContext.save.info.scarecrowSpawnSongSet) { sOcarinaSongBitFlags |= (1 << OCARINA_SONG_SCARECROW_SPAWN); } - osSyncPrintf("ocarina_bit = %x\n", sOcarinaSongBitFlags); - osSyncPrintf(VT_RST); + PRINTF("ocarina_bit = %x\n", sOcarinaSongBitFlags); + PRINTF(VT_RST); sHasSunsSong = CHECK_QUEST_ITEM(QUEST_SONG_SUN); msgCtx->ocarinaStaff = AudioOcarina_GetRecordingStaff(); @@ -1775,7 +1774,7 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) { sLastPlayedSong = msgCtx->unk_E3F2 = msgCtx->lastOcarinaButtonIndex = 0xFF; // "Ocarina Number" - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ オカリナ番号＝%d(%d) ☆☆☆☆☆\n" VT_RST, ocarinaActionId, 2); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ オカリナ番号＝%d(%d) ☆☆☆☆☆\n" VT_RST, ocarinaActionId, 2); noStopDoAction = false; if (ocarinaActionId >= 0x893) { Message_OpenText(play, ocarinaActionId); // You played the [song name] @@ -1785,7 +1784,7 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) { Message_OpenText(play, 0x86D); // Play using [A] and [C]. textId = ocarinaActionId + 0x86E; } else if (ocarinaActionId == OCARINA_ACTION_FREE_PLAY || ocarinaActionId >= OCARINA_ACTION_CHECK_SARIA) { - osSyncPrintf("ocarina_set 000000000000000000 = %d\n", ocarinaActionId); + PRINTF("ocarina_set 000000000000000000 = %d\n", ocarinaActionId); msgCtx->ocarinaAction = ocarinaActionId; if (ocarinaActionId >= OCARINA_ACTION_CHECK_SARIA && ocarinaActionId <= OCARINA_ACTION_CHECK_STORMS) { Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -1802,18 +1801,18 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) { msgCtx->ocarinaAction = ocarinaActionId; noStopDoAction = true; if (ocarinaActionId >= OCARINA_ACTION_PLAYBACK_MINUET) { - osSyncPrintf("222222222\n"); + PRINTF("222222222\n"); Message_OpenText(play, 0x86D); // Play using [A] and [C]. textId = ocarinaActionId + 0x86E; } else { - osSyncPrintf("333333333\n"); + PRINTF("333333333\n"); textId = ocarinaActionId + 0x86E; Message_OpenText(play, textId); // Play using [A] and [C]; [B] to Stop. } } msgCtx->talkActor = NULL; // "Ocarina Mode" - osSyncPrintf("オカリナモード = %d (%x)\n", msgCtx->ocarinaAction, textId); + PRINTF("オカリナモード = %d (%x)\n", msgCtx->ocarinaAction, textId); msgCtx->textDelayTimer = 0; play->msgCtx.ocarinaMode = OCARINA_MODE_00; R_TEXTBOX_X = 34; @@ -1837,7 +1836,7 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) { gSaveContext.hudVisibilityMode = noStopDoAction; } // "Music Performance Start" - osSyncPrintf("演奏開始\n"); + PRINTF("演奏開始\n"); if (ocarinaActionId == OCARINA_ACTION_FREE_PLAY || ocarinaActionId == OCARINA_ACTION_CHECK_NOWARP) { msgCtx->msgMode = MSGMODE_OCARINA_STARTING; msgCtx->textBoxType = 0x63; @@ -1850,7 +1849,7 @@ void Message_StartOcarinaImpl(PlayState* play, u16 ocarinaActionId) { msgCtx->msgMode = MSGMODE_MEMORY_GAME_START; } else if (ocarinaActionId == OCARINA_ACTION_SCARECROW_LONG_PLAYBACK) { // "?????Recording Playback / Recording Playback / Recording Playback / Recording Playback -> " - osSyncPrintf("?????録音再生 録音再生 録音再生 録音再生 -> "); + PRINTF("?????録音再生 録音再生 録音再生 録音再生 -> "); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); msgCtx->ocarinaStaff = AudioOcarina_GetPlaybackStaff(); @@ -2074,11 +2073,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) { AudioOcarina_Start(sOcarinaSongBitFlags + 0xC000); } else { // "On Stage Performance" - osSyncPrintf("台上演奏\n"); + PRINTF("台上演奏\n"); AudioOcarina_Start(sOcarinaSongBitFlags); } } else { - osSyncPrintf("Na_StartOcarinaSinglePlayCheck2( message->ocarina_no );\n"); + PRINTF("Na_StartOcarinaSinglePlayCheck2( message->ocarina_no );\n"); AudioOcarina_Start((1 << msgCtx->ocarinaAction) + 0x8000); } msgCtx->msgMode = MSGMODE_OCARINA_PLAYING; @@ -2088,7 +2087,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { } else { AudioOcarina_Start((1 << (msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET)) + 0x8000); // "Performance Check" - osSyncPrintf("演奏チェック=%d\n", msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET); + PRINTF("演奏チェック=%d\n", msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET); msgCtx->msgMode = MSGMODE_SONG_PLAYBACK; } if (msgCtx->ocarinaAction != OCARINA_ACTION_FREE_PLAY && @@ -2099,7 +2098,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { case MSGMODE_OCARINA_PLAYING: msgCtx->ocarinaStaff = AudioOcarina_GetPlayingStaff(); if (msgCtx->ocarinaStaff->pos) { - osSyncPrintf("locate=%d onpu_pt=%d\n", msgCtx->ocarinaStaff->pos, sOcarinaButtonIndexBufPos); + PRINTF("locate=%d onpu_pt=%d\n", msgCtx->ocarinaStaff->pos, sOcarinaButtonIndexBufPos); if (msgCtx->ocarinaStaff->pos == 1 && sOcarinaButtonIndexBufPos == 8) { sOcarinaButtonIndexBufPos = 0; } @@ -2127,7 +2126,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { msgCtx->msgMode = MSGMODE_OCARINA_STARTING; } else { // "Ocarina_Flog Correct Example Performance" - osSyncPrintf("Ocarina_Flog 正解模範演奏=%x\n", msgCtx->lastPlayedSong); + PRINTF("Ocarina_Flog 正解模範演奏=%x\n", msgCtx->lastPlayedSong); Message_ContinueTextbox(play, 0x86F); // Ocarina msgCtx->msgMode = MSGMODE_SONG_PLAYED; msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA; @@ -2147,7 +2146,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { msgCtx->msgMode = MSGMODE_OCARINA_FAIL; } else { // "Ocarina_Flog Correct Example Performance" - osSyncPrintf("Ocarina_Flog 正解模範演奏=%x\n", msgCtx->lastPlayedSong); + PRINTF("Ocarina_Flog 正解模範演奏=%x\n", msgCtx->lastPlayedSong); Message_ContinueTextbox(play, 0x86F); // Ocarina msgCtx->msgMode = MSGMODE_SONG_PLAYED; msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA; @@ -2159,7 +2158,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { } } else if (msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY) { // "Ocarina_Free Correct Example Performance" - osSyncPrintf("Ocarina_Free 正解模範演奏=%x\n", msgCtx->lastPlayedSong); + PRINTF("Ocarina_Free 正解模範演奏=%x\n", msgCtx->lastPlayedSong); Message_ContinueTextbox(play, 0x86F); // Ocarina msgCtx->msgMode = MSGMODE_SONG_PLAYED; msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA; @@ -2313,7 +2312,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); if (msgCtx->msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) { // "Correct Example Performance" - osSyncPrintf("正解模範演奏=%x\n", msgCtx->lastPlayedSong); + PRINTF("正解模範演奏=%x\n", msgCtx->lastPlayedSong); Message_ContinueTextbox(play, 0x86F); // Ocarina msgCtx->msgMode = MSGMODE_SONG_PLAYED; msgCtx->textBoxType = TEXTBOX_TYPE_OCARINA; @@ -2345,7 +2344,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { R_OCARINA_BUTTONS_YPOS_OFFSET = 1; if (msgCtx->msgMode == MSGMODE_SONG_PLAYBACK_FAIL) { // "kokokokokoko" - osSyncPrintf("ここここここ\n"); + PRINTF("ここここここ\n"); Message_ContinueTextbox(play, 0x88B); // red X background Message_Decode(play); msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_NOTES_DROP; @@ -2353,7 +2352,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { msgCtx->msgMode = MSGMODE_OCARINA_NOTES_DROP; } // "Cancel" - osSyncPrintf("キャンセル\n"); + PRINTF("キャンセル\n"); } break; case MSGMODE_OCARINA_NOTES_DROP: @@ -2379,11 +2378,11 @@ void Message_DrawMain(PlayState* play, Gfx** p) { msgCtx->stateTimer--; if (msgCtx->stateTimer == 0) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("Na_StopOcarinaMode();\n"); - osSyncPrintf("Na_StopOcarinaMode();\n"); - osSyncPrintf("Na_StopOcarinaMode();\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("Na_StopOcarinaMode();\n"); + PRINTF("Na_StopOcarinaMode();\n"); + PRINTF("Na_StopOcarinaMode();\n"); + PRINTF(VT_RST); Message_Decode(play); msgCtx->msgMode = MSGMODE_SETUP_DISPLAY_SONG_PLAYED; msgCtx->ocarinaStaff = AudioOcarina_GetPlayingStaff(); @@ -2421,7 +2420,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { msgCtx->stateTimer--; if (msgCtx->stateTimer == 0) { // "ocarina_no=%d Song Chosen=%d" - osSyncPrintf("ocarina_no=%d 選曲=%d\n", msgCtx->ocarinaAction, 0x16); + PRINTF("ocarina_no=%d 選曲=%d\n", msgCtx->ocarinaAction, 0x16); if (msgCtx->ocarinaAction < OCARINA_ACTION_TEACH_SARIA) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_HARP); } else if (msgCtx->ocarinaAction == OCARINA_ACTION_TEACH_EPONA) { @@ -2434,7 +2433,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); } // "Example Performance" - osSyncPrintf("模範演奏=%x\n", msgCtx->ocarinaAction - OCARINA_ACTION_TEACH_MINUET); + PRINTF("模範演奏=%x\n", msgCtx->ocarinaAction - OCARINA_ACTION_TEACH_MINUET); AudioOcarina_SetPlaybackSong(msgCtx->ocarinaAction - OCARINA_ACTION_TEACH_MINUET + 1, 2); sOcarinaButtonIndexBufPos = 0; msgCtx->msgMode = MSGMODE_SONG_DEMONSTRATION; @@ -2483,35 +2482,35 @@ void Message_DrawMain(PlayState* play, Gfx** p) { if (msgCtx->lastPlayedSong == OCARINA_SONG_EPONAS) { R_EPONAS_SONG_PLAYED = true; } - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("☆☆☆ocarina=%d message->ocarina_no=%d ", msgCtx->lastPlayedSong, - msgCtx->ocarinaAction); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("☆☆☆ocarina=%d message->ocarina_no=%d ", msgCtx->lastPlayedSong, + msgCtx->ocarinaAction); if (msgCtx->ocarinaAction == OCARINA_ACTION_FREE_PLAY_DONE) { play->msgCtx.ocarinaMode = OCARINA_MODE_01; if (msgCtx->lastPlayedSong == OCARINA_SONG_SCARECROW_SPAWN) { play->msgCtx.ocarinaMode = OCARINA_MODE_0B; } } else if (msgCtx->ocarinaAction >= OCARINA_ACTION_CHECK_MINUET) { - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("Ocarina_PC_Wind=%d(%d) ☆☆☆ ", OCARINA_ACTION_CHECK_MINUET, - msgCtx->ocarinaAction - OCARINA_ACTION_CHECK_MINUET); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("Ocarina_PC_Wind=%d(%d) ☆☆☆ ", OCARINA_ACTION_CHECK_MINUET, + msgCtx->ocarinaAction - OCARINA_ACTION_CHECK_MINUET); if (msgCtx->lastPlayedSong == (msgCtx->ocarinaAction - OCARINA_ACTION_CHECK_MINUET)) { play->msgCtx.ocarinaMode = OCARINA_MODE_03; } else { play->msgCtx.ocarinaMode = msgCtx->lastPlayedSong - 1; } } else { - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("Ocarina_C_Wind=%d(%d) ☆☆☆ ", OCARINA_ACTION_PLAYBACK_MINUET, - msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("Ocarina_C_Wind=%d(%d) ☆☆☆ ", OCARINA_ACTION_PLAYBACK_MINUET, + msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET); if (msgCtx->lastPlayedSong == (msgCtx->ocarinaAction - OCARINA_ACTION_PLAYBACK_MINUET)) { play->msgCtx.ocarinaMode = OCARINA_MODE_03; } else { play->msgCtx.ocarinaMode = OCARINA_MODE_04; } } - osSyncPrintf(VT_RST); - osSyncPrintf("→ OCARINA_MODE=%d\n", play->msgCtx.ocarinaMode); + PRINTF(VT_RST); + PRINTF("→ OCARINA_MODE=%d\n", play->msgCtx.ocarinaMode); } } break; @@ -2524,8 +2523,8 @@ void Message_DrawMain(PlayState* play, Gfx** p) { } else { msgCtx->msgMode = MSGMODE_SONG_DEMONSTRATION_DONE; } - osSyncPrintf("onpu_buff[%d]=%x\n", msgCtx->ocarinaStaff->pos, - sOcarinaButtonIndexBuf[msgCtx->ocarinaStaff->pos]); + PRINTF("onpu_buff[%d]=%x\n", msgCtx->ocarinaStaff->pos, + sOcarinaButtonIndexBuf[msgCtx->ocarinaStaff->pos]); } else { if (sOcarinaButtonIndexBufPos != 0 && msgCtx->ocarinaStaff->pos == 1) { sOcarinaButtonIndexBufPos = 0; @@ -2551,15 +2550,15 @@ void Message_DrawMain(PlayState* play, Gfx** p) { sOcarinaButtonIndexBufPos++; } if (msgCtx->ocarinaStaff->state < OCARINA_SONG_MEMORY_GAME) { - osSyncPrintf("M_OCARINA20 : ocarina_no=%x status=%x\n", msgCtx->ocarinaAction, - msgCtx->ocarinaStaff->state); + PRINTF("M_OCARINA20 : ocarina_no=%x status=%x\n", msgCtx->ocarinaAction, + msgCtx->ocarinaStaff->state); msgCtx->lastPlayedSong = msgCtx->ocarinaStaff->state; msgCtx->msgMode = MSGMODE_SONG_PLAYBACK_SUCCESS; Item_Give(play, ITEM_SONG_MINUET + gOcarinaSongItemMap[msgCtx->ocarinaStaff->state]); - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "z_message.c Song Acquired" - osSyncPrintf("z_message.c 取得メロディ＝%d\n", ITEM_SONG_MINUET + msgCtx->ocarinaStaff->state); - osSyncPrintf(VT_RST); + PRINTF("z_message.c 取得メロディ＝%d\n", ITEM_SONG_MINUET + msgCtx->ocarinaStaff->state); + PRINTF(VT_RST); msgCtx->stateTimer = 20; Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -2579,7 +2578,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { break; case MSGMODE_SCARECROW_LONG_RECORDING_START: // "Scarecrow Recording Initialization" - osSyncPrintf("案山子録音 初期化\n"); + PRINTF("案山子録音 初期化\n"); AudioOcarina_SetRecordingState(OCARINA_RECORD_SCARECROW_LONG); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT); msgCtx->ocarinaStaff = AudioOcarina_GetRecordingStaff(); @@ -2591,7 +2590,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { break; case MSGMODE_SCARECROW_LONG_RECORDING_ONGOING: msgCtx->ocarinaStaff = AudioOcarina_GetRecordingStaff(); - osSyncPrintf("\nonpu_pt=%d, locate=%d", sOcarinaButtonIndexBufPos, msgCtx->ocarinaStaff->pos); + PRINTF("\nonpu_pt=%d, locate=%d", sOcarinaButtonIndexBufPos, msgCtx->ocarinaStaff->pos); if (((u32)msgCtx->ocarinaStaff->pos != 0) && (sOcarinaButtonIndexBufPos == msgCtx->ocarinaStaff->pos - 1)) { if (sOcarinaButtonIndexBufLen >= 8) { @@ -2601,8 +2600,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { sOcarinaButtonIndexBufLen--; } // "Button Entered" - osSyncPrintf(" 入力ボタン【%d】=%d", sOcarinaButtonIndexBufLen, - msgCtx->ocarinaStaff->buttonIndex); + PRINTF(" 入力ボタン【%d】=%d", sOcarinaButtonIndexBufLen, msgCtx->ocarinaStaff->buttonIndex); msgCtx->lastOcarinaButtonIndex = sOcarinaButtonIndexBuf[sOcarinaButtonIndexBufLen] = msgCtx->ocarinaStaff->buttonIndex; sOcarinaButtonIndexBufLen++; @@ -2616,28 +2614,27 @@ void Message_DrawMain(PlayState* play, Gfx** p) { CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) { if (sOcarinaButtonIndexBufLen != 0) { // "Recording complete！！！！！！！！！" - osSyncPrintf("録音終了！！！！！！！！！ message->info->status=%d \n", - msgCtx->ocarinaStaff->state); + PRINTF("録音終了！！！！！！！！！ message->info->status=%d \n", msgCtx->ocarinaStaff->state); gSaveContext.save.info.scarecrowLongSongSet = true; } Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - osSyncPrintf("aaaaaaaaaaaaaa\n"); + PRINTF("aaaaaaaaaaaaaa\n"); AudioOcarina_SetRecordingState(OCARINA_RECORD_OFF); msgCtx->stateTimer = 10; play->msgCtx.ocarinaMode = OCARINA_MODE_04; Message_CloseTextbox(play); // "Recording complete！！！！！！！！！Recording Complete" - osSyncPrintf("録音終了！！！！！！！！！録音終了\n"); - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("\n====================================================================\n"); + PRINTF("録音終了！！！！！！！！！録音終了\n"); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("\n====================================================================\n"); MemCpy(gSaveContext.save.info.scarecrowLongSong, gScarecrowLongSongPtr, sizeof(gSaveContext.save.info.scarecrowLongSong)); for (i = 0; i < ARRAY_COUNT(gSaveContext.save.info.scarecrowLongSong); i++) { - osSyncPrintf("%d, ", gSaveContext.save.info.scarecrowLongSong[i]); + PRINTF("%d, ", gSaveContext.save.info.scarecrowLongSong[i]); } - osSyncPrintf(VT_RST); - osSyncPrintf("\n====================================================================\n"); + PRINTF(VT_RST); + PRINTF("\n====================================================================\n"); } Message_DrawText(play, &gfx); break; @@ -2660,10 +2657,10 @@ void Message_DrawMain(PlayState* play, Gfx** p) { sOcarinaButtonIndexBufLen = sOcarinaButtonIndexBufPos = 0; } } - osSyncPrintf("status=%d (%d)\n", msgCtx->ocarinaStaff->state, 0); + PRINTF("status=%d (%d)\n", msgCtx->ocarinaStaff->state, 0); if (msgCtx->stateTimer == 0) { if (msgCtx->ocarinaStaff->state == 0) { - osSyncPrintf("bbbbbbbbbbb\n"); + PRINTF("bbbbbbbbbbb\n"); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); play->msgCtx.ocarinaMode = OCARINA_MODE_0F; Message_CloseTextbox(play); @@ -2689,25 +2686,25 @@ void Message_DrawMain(PlayState* play, Gfx** p) { } if (msgCtx->ocarinaStaff->state == OCARINA_RECORD_OFF) { // "8 Note Recording ＯＫ！" - osSyncPrintf("８音録音ＯＫ！\n"); + PRINTF("８音録音ＯＫ！\n"); msgCtx->stateTimer = 20; gSaveContext.save.info.scarecrowSpawnSongSet = true; msgCtx->msgMode = MSGMODE_SCARECROW_SPAWN_RECORDING_DONE; Audio_PlaySfxGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("\n====================================================================\n"); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("\n====================================================================\n"); MemCpy(gSaveContext.save.info.scarecrowSpawnSong, gScarecrowSpawnSongPtr, sizeof(gSaveContext.save.info.scarecrowSpawnSong)); for (i = 0; i < ARRAY_COUNT(gSaveContext.save.info.scarecrowSpawnSong); i++) { - osSyncPrintf("%d, ", gSaveContext.save.info.scarecrowSpawnSong[i]); + PRINTF("%d, ", gSaveContext.save.info.scarecrowSpawnSong[i]); } - osSyncPrintf(VT_RST); - osSyncPrintf("\n====================================================================\n"); + PRINTF(VT_RST); + PRINTF("\n====================================================================\n"); } else if (msgCtx->ocarinaStaff->state == OCARINA_RECORD_REJECTED || CHECK_BTN_ALL(play->state.input[0].press.button, BTN_B)) { // "Played an existing song！！！" - osSyncPrintf("すでに存在する曲吹いた！！！ \n"); + PRINTF("すでに存在する曲吹いた！！！ \n"); AudioOcarina_SetRecordingState(OCARINA_RECORD_OFF); Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -2717,7 +2714,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { Message_DrawText(play, &gfx); break; case MSGMODE_SCARECROW_SPAWN_RECORDING_FAILED: - osSyncPrintf("cccccccccccc\n"); + PRINTF("cccccccccccc\n"); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); Message_StartTextbox(play, 0x40AD, NULL); // Bonooru doesn't remember your song play->msgCtx.ocarinaMode = OCARINA_MODE_04; @@ -2781,7 +2778,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { } if (msgCtx->ocarinaStaff->state == 0xFF) { // "Musical round failed！！！！！！！！！" - osSyncPrintf("輪唱失敗！！！！！！！！！\n"); + PRINTF("輪唱失敗！！！！！！！！！\n"); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); Audio_PlaySfxGeneral(NA_SE_SY_OCARINA_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -2789,7 +2786,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { play->msgCtx.ocarinaMode = OCARINA_MODE_03; } else if (msgCtx->ocarinaStaff->state == OCARINA_SONG_MEMORY_GAME) { // "Musical round succeeded！！！！！！！！！" - osSyncPrintf("輪唱成功！！！！！！！！！\n"); + PRINTF("輪唱成功！！！！！！！！！\n"); Audio_PlaySfxGeneral(NA_SE_SY_GET_ITEM, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); msgCtx->msgMode = MSGMODE_MEMORY_GAME_ROUND_SUCCESS; @@ -3068,7 +3065,7 @@ void Message_Update(PlayState* play) { if (BREG(0) != 0) { if (CHECK_BTN_ALL(input->press.button, BTN_DDOWN) && CHECK_BTN_ALL(input->cur.button, BTN_L)) { - osSyncPrintf("msgno=%d\n", D_80153D78); + PRINTF("msgno=%d\n", D_80153D78); Message_StartTextbox(play, R_MESSAGE_DEBUGGER_TEXTID, NULL); D_80153D78 = (D_80153D78 + 1) % 10; } @@ -3079,7 +3076,7 @@ void Message_Update(PlayState* play) { while (entry->textId != 0xFFFD) { if (entry->textId == R_MESSAGE_DEBUGGER_TEXTID) { // "The message was found! !! !!" - osSyncPrintf(" メッセージが,見つかった！！！ = %x\n", R_MESSAGE_DEBUGGER_TEXTID); + PRINTF(" メッセージが,見つかった！！！ = %x\n", R_MESSAGE_DEBUGGER_TEXTID); Message_StartTextbox(play, R_MESSAGE_DEBUGGER_TEXTID, NULL); R_MESSAGE_DEBUGGER_TEXTID++; R_MESSAGE_DEBUGGER_SELECT = 0; @@ -3122,8 +3119,8 @@ void Message_Update(PlayState* play) { } else { averageY = ((actorFocusScreenPosY - playerFocusScreenPosY) / 2) + playerFocusScreenPosY; } - osSyncPrintf("dxpos=%d dypos=%d dypos1 dypos2=%d\n", focusScreenPosX, averageY, - playerFocusScreenPosY, actorFocusScreenPosY); + PRINTF("dxpos=%d dypos=%d dypos1 dypos2=%d\n", focusScreenPosX, averageY, playerFocusScreenPosY, + actorFocusScreenPosY); } else { R_TEXTBOX_X = R_TEXTBOX_X_TARGET; R_TEXTBOX_Y = R_TEXTBOX_Y_TARGET; @@ -3166,7 +3163,7 @@ void Message_Update(PlayState* play) { R_TEXT_CHOICE_YPOS(0) = R_TEXTBOX_Y_TARGET + 20; R_TEXT_CHOICE_YPOS(1) = R_TEXTBOX_Y_TARGET + 32; R_TEXT_CHOICE_YPOS(2) = R_TEXTBOX_Y_TARGET + 44; - osSyncPrintf("message->msg_disp_type=%x\n", msgCtx->textBoxProperties & 0xF0); + PRINTF("message->msg_disp_type=%x\n", msgCtx->textBoxProperties & 0xF0); if (msgCtx->textBoxType == TEXTBOX_TYPE_NONE_BOTTOM || msgCtx->textBoxType == TEXTBOX_TYPE_NONE_NO_SHADOW) { msgCtx->msgMode = MSGMODE_TEXT_STARTING; @@ -3245,15 +3242,15 @@ void Message_Update(PlayState* play) { msgCtx->textboxEndType != TEXTBOX_ENDTYPE_EVENT && YREG(31) == 0) { if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_2_CHOICE && play->msgCtx.ocarinaMode == OCARINA_MODE_01) { if (Message_ShouldAdvance(play)) { - osSyncPrintf("OCARINA_MODE=%d -> ", play->msgCtx.ocarinaMode); + PRINTF("OCARINA_MODE=%d -> ", play->msgCtx.ocarinaMode); play->msgCtx.ocarinaMode = (msgCtx->choiceIndex == 0) ? OCARINA_MODE_02 : OCARINA_MODE_04; - osSyncPrintf("InRaceSeq=%d(%d) OCARINA_MODE=%d --> ", GET_EVENTINF_HORSES_STATE(), 1, - play->msgCtx.ocarinaMode); + PRINTF("InRaceSeq=%d(%d) OCARINA_MODE=%d --> ", GET_EVENTINF_HORSES_STATE(), 1, + play->msgCtx.ocarinaMode); Message_CloseTextbox(play); - osSyncPrintf("OCARINA_MODE=%d\n", play->msgCtx.ocarinaMode); + PRINTF("OCARINA_MODE=%d\n", play->msgCtx.ocarinaMode); } } else if (Message_ShouldAdvanceSilent(play)) { - osSyncPrintf("select=%d\n", msgCtx->textboxEndType); + PRINTF("select=%d\n", msgCtx->textboxEndType); if (msgCtx->textboxEndType == TEXTBOX_ENDTYPE_HAS_NEXT) { Audio_PlaySfxGeneral(NA_SE_SY_MESSAGE_PASS, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -3281,13 +3278,13 @@ void Message_Update(PlayState* play) { gSaveContext.prevHudVisibilityMode = HUD_VISIBILITY_ALL; } if (play->csCtx.state == 0) { - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("day_time=%x active_camera=%d ", gSaveContext.save.cutsceneIndex, play->activeCamId); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("day_time=%x active_camera=%d ", gSaveContext.save.cutsceneIndex, play->activeCamId); if (msgCtx->textId != 0x2061 && msgCtx->textId != 0x2025 && msgCtx->textId != 0x208C && ((msgCtx->textId < 0x88D || msgCtx->textId >= 0x893) || msgCtx->choiceIndex != 0) && (msgCtx->textId != 0x3055 && gSaveContext.save.cutsceneIndex < 0xFFF0)) { - osSyncPrintf("=== day_time=%x ", ((void)0, gSaveContext.save.cutsceneIndex)); + PRINTF("=== day_time=%x ", ((void)0, gSaveContext.save.cutsceneIndex)); if (play->activeCamId == CAM_ID_MAIN) { if (gSaveContext.prevHudVisibilityMode == HUD_VISIBILITY_NO_CHANGE || gSaveContext.prevHudVisibilityMode == HUD_VISIBILITY_NOTHING || @@ -3299,7 +3296,7 @@ void Message_Update(PlayState* play) { } } } - osSyncPrintf(VT_RST); + PRINTF(VT_RST); msgCtx->msgLength = 0; msgCtx->msgMode = MSGMODE_NONE; interfaceCtx->unk_1FA = interfaceCtx->unk_1FC = 0; @@ -3334,7 +3331,7 @@ void Message_Update(PlayState* play) { } } sLastPlayedSong = 0xFF; - osSyncPrintf("OCARINA_MODE=%d chk_ocarina_no=%d\n", play->msgCtx.ocarinaMode, msgCtx->unk_E3F2); + PRINTF("OCARINA_MODE=%d chk_ocarina_no=%d\n", play->msgCtx.ocarinaMode, msgCtx->unk_E3F2); break; case MSGMODE_PAUSED: break; diff --git a/src/code/z_moji.c b/src/code/z_moji.c index a015492f5c..c9cbbdda88 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -65,7 +65,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { OPEN_DISPS(gfxCtx, "../z_moji.c", 86); if ((uintptr_t)gMojiFontTLUTs & 0xF) { - osSyncPrintf("moji_tlut --> %X\n", gMojiFontTLUTs); + PRINTF("moji_tlut --> %X\n", gMojiFontTLUTs); } if (sCurTLUTIndex != GET_CHAR_TLUT_INDEX(c)) { @@ -91,7 +91,7 @@ void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) { OPEN_DISPS(gfxCtx, "../z_moji.c", 137); if ((uintptr_t)gMojiFontTex & 0xF) { - osSyncPrintf("font_ff --> %X\n", gMojiFontTex); + PRINTF("font_ff --> %X\n", gMojiFontTex); } gDPPipeSync(POLY_OPA_DISP++); diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 1ba0c01ff5..b8e3c2cba8 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -258,8 +258,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act D_801211D4[0].atTargetInit.y = actor->focus.pos.y - 5.0f; D_801211D4[0].atTargetInit.z = actor->focus.pos.z; spC0 = ((EnSw*)actor)->unk_364; - osSyncPrintf("%s(%d): xyz_t: %s (%f %f %f)\n", "../z_onepointdemo.c", 1671, "&cp", spC0.x, spC0.y, - spC0.z); + PRINTF("%s(%d): xyz_t: %s (%f %f %f)\n", "../z_onepointdemo.c", 1671, "&cp", spC0.x, spC0.y, spC0.z); D_801211D4[0].eyeTargetInit.x = (actor->focus.pos.x + (120.0f * spC0.x)) - (Rand_ZeroOne() * 20.0f); D_801211D4[0].eyeTargetInit.y = actor->focus.pos.y + (120.0f * spC0.y) + 20.0f; D_801211D4[0].eyeTargetInit.z = (actor->focus.pos.z + (120.0f * spC0.z)) - (Rand_ZeroOne() * 20.0f); @@ -1192,7 +1191,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act break; default: - osSyncPrintf(VT_COL(RED, WHITE) "onepointdemo camera: demo number not found !! (%d)\n" VT_RST, csId); + PRINTF(VT_COL(RED, WHITE) "onepointdemo camera: demo number not found !! (%d)\n" VT_RST, csId); break; } return 0; @@ -1250,7 +1249,7 @@ s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s1 } subCamId = Play_CreateSubCamera(play); if (subCamId == CAM_ID_NONE) { - osSyncPrintf(VT_COL(RED, WHITE) "onepoint demo: error: too many cameras ... give up! type=%d\n" VT_RST, csId); + PRINTF(VT_COL(RED, WHITE) "onepoint demo: error: too many cameras ... give up! type=%d\n" VT_RST, csId); return CAM_ID_NONE; } @@ -1294,8 +1293,8 @@ s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s1 s16 thisCsId = play->cameraPtrs[subCamId]->csId; if ((nextCsId / 100) < (thisCsId / 100)) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "onepointdemo camera[%d]: killed 'coz low priority (%d < %d)\n" VT_RST, - vNextCamId, nextCsId, thisCsId); + PRINTF(VT_COL(YELLOW, BLACK) "onepointdemo camera[%d]: killed 'coz low priority (%d < %d)\n" VT_RST, + vNextCamId, nextCsId, thisCsId); if (play->cameraPtrs[vNextCamId]->csId != 5010) { if ((vNextCamId = OnePointCutscene_RemoveCamera(play, vNextCamId)) != CAM_ID_NONE) { Play_ChangeCameraStatus(play, vNextCamId, CAM_STAT_ACTIVE); @@ -1320,8 +1319,8 @@ s16 OnePointCutscene_EndCutscene(PlayState* play, s16 subCamId) { subCamId = play->activeCamId; } if (play->cameraPtrs[subCamId] != NULL) { - osSyncPrintf("onepointdemo camera[%d]: delete timer=%d next=%d\n", subCamId, play->cameraPtrs[subCamId]->timer, - play->cameraPtrs[subCamId]->parentCamId); + PRINTF("onepointdemo camera[%d]: delete timer=%d next=%d\n", subCamId, play->cameraPtrs[subCamId]->timer, + play->cameraPtrs[subCamId]->parentCamId); if (play->cameraPtrs[subCamId]->csId == 5010) { play->cameraPtrs[subCamId]->timer = 5; } else { @@ -1346,14 +1345,14 @@ s32 OnePointCutscene_Attention(PlayState* play, Actor* actor) { s32 timer; if (sDisableAttention) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "actor attention demo camera: canceled by other camera\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "actor attention demo camera: canceled by other camera\n" VT_RST); return CAM_ID_NONE; } sUnused = -1; parentCam = play->cameraPtrs[CAM_ID_MAIN]; if (parentCam->mode == CAM_MODE_FOLLOW_BOOMERANG) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "actor attention demo camera: change mode BOOKEEPON -> NORMAL\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "actor attention demo camera: change mode BOOKEEPON -> NORMAL\n" VT_RST); Camera_RequestMode(parentCam, CAM_MODE_NORMAL); } @@ -1401,23 +1400,23 @@ s32 OnePointCutscene_Attention(PlayState* play, Actor* actor) { case ACTORCAT_MISC: case ACTORCAT_BOSS: default: - osSyncPrintf(VT_COL(YELLOW, BLACK) "actor attention demo camera: %d: unkown part of actor %d\n" VT_RST, - play->state.frames, actor->category); + PRINTF(VT_COL(YELLOW, BLACK) "actor attention demo camera: %d: unkown part of actor %d\n" VT_RST, + play->state.frames, actor->category); timer = 30; break; } - osSyncPrintf(VT_FGCOL(CYAN) "%06u:" VT_RST " actor attention demo camera: request %d ", play->state.frames, - actor->category); + PRINTF(VT_FGCOL(CYAN) "%06u:" VT_RST " actor attention demo camera: request %d ", play->state.frames, + actor->category); // If the previous attention cutscene has an actor in the same category, skip this actor. if (actor->category == vLastHigherCat) { - osSyncPrintf("→ " VT_FGCOL(MAGENTA) "×" VT_RST " (%d)\n", actor->id); + PRINTF("→ " VT_FGCOL(MAGENTA) "×" VT_RST " (%d)\n", actor->id); return CAM_ID_NONE; } - osSyncPrintf("→ " VT_FGCOL(BLUE) "○" VT_RST " (%d)\n", actor->id); + PRINTF("→ " VT_FGCOL(BLUE) "○" VT_RST " (%d)\n", actor->id); vSubCamId = OnePointCutscene_Init(play, 5010, timer, actor, vParentCamId); if (vSubCamId == CAM_ID_NONE) { - osSyncPrintf(VT_COL(RED, WHITE) "actor attention demo: give up! \n" VT_RST, actor->id); + PRINTF(VT_COL(RED, WHITE) "actor attention demo: give up! \n" VT_RST, actor->id); return CAM_ID_NONE; } else { s32* data = (s32*)&play->cameraPtrs[vSubCamId]->data1; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 9db54bc973..023ff064fd 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -166,8 +166,7 @@ static Gfx sSetupDL_80125A60[] = { // original name: "alpha_change" void Interface_ChangeHudVisibilityMode(u16 hudVisibilityMode) { if (hudVisibilityMode != gSaveContext.hudVisibilityMode) { - osSyncPrintf("ＡＬＰＨＡーＴＹＰＥ＝%d LAST_TIME_TYPE=%d\n", hudVisibilityMode, - gSaveContext.prevHudVisibilityMode); + PRINTF("ＡＬＰＨＡーＴＹＰＥ＝%d LAST_TIME_TYPE=%d\n", hudVisibilityMode, gSaveContext.prevHudVisibilityMode); gSaveContext.hudVisibilityMode = gSaveContext.nextHudVisibilityMode = hudVisibilityMode; gSaveContext.hudVisibilityModeTimer = 1; } @@ -272,7 +271,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { case HUD_VISIBILITY_NOTHING: case HUD_VISIBILITY_NOTHING_ALT: case HUD_VISIBILITY_B: - osSyncPrintf("a_alpha=%d, c_alpha=%d → ", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); + PRINTF("a_alpha=%d, c_alpha=%d → ", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); if (gSaveContext.nextHudVisibilityMode == HUD_VISIBILITY_B) { if (interfaceCtx->bAlpha != 255) { @@ -312,7 +311,7 @@ void Interface_UpdateHudAlphas(PlayState* play, s16 dimmingAlpha) { interfaceCtx->minimapAlpha = dimmingAlpha; } - osSyncPrintf("a_alpha=%d, c_alpha=%d\n", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); + PRINTF("a_alpha=%d, c_alpha=%d\n", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); break; @@ -996,7 +995,7 @@ void func_80083108(PlayState* play) { } gSaveContext.buttonStatus[i] = BTN_DISABLED; - osSyncPrintf("***(i=%d)*** ", i); + PRINTF("***(i=%d)*** ", i); } } } else if (interfaceCtx->restrictions.farores == 0) { @@ -1088,9 +1087,9 @@ void func_80083108(PlayState* play) { gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE; if ((play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF)) { Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_ALL); - osSyncPrintf("???????? alpha_change( 50 ); ?????\n"); + PRINTF("???????? alpha_change( 50 ); ?????\n"); } else { - osSyncPrintf("game_play->fade_direction || game_play->fbdemo_wipe_modem"); + PRINTF("game_play->fade_direction || game_play->fbdemo_wipe_modem"); } } } @@ -1110,7 +1109,7 @@ void Interface_SetSceneRestrictions(PlayState* play) { i = 0; // "Data settings related to button display scene_data_ID=%d\n" - osSyncPrintf("ボタン表示関係データ設定 scene_data_ID=%d\n", play->sceneId); + PRINTF("ボタン表示関係データ設定 scene_data_ID=%d\n", play->sceneId); do { sceneId = (u8)play->sceneId; @@ -1128,19 +1127,19 @@ void Interface_SetSceneRestrictions(PlayState* play) { interfaceCtx->restrictions.dinsNayrus = (sRestrictionFlags[i].flags3 & 0x0C) >> 2; interfaceCtx->restrictions.all = (sRestrictionFlags[i].flags3 & 0x03) >> 0; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("parameter->button_status = %x,%x,%x\n", sRestrictionFlags[i].flags1, - sRestrictionFlags[i].flags2, sRestrictionFlags[i].flags3); - osSyncPrintf("h_gage=%d, b_button=%d, a_button=%d, c_bottle=%d\n", interfaceCtx->restrictions.hGauge, - interfaceCtx->restrictions.bButton, interfaceCtx->restrictions.aButton, - interfaceCtx->restrictions.bottles); - osSyncPrintf("c_warasibe=%d, c_hook=%d, c_ocarina=%d, c_warp=%d\n", interfaceCtx->restrictions.tradeItems, - interfaceCtx->restrictions.hookshot, interfaceCtx->restrictions.ocarina, - interfaceCtx->restrictions.warpSongs); - osSyncPrintf("c_sunmoon=%d, m_wind=%d, m_magic=%d, another=%d\n", interfaceCtx->restrictions.sunsSong, - interfaceCtx->restrictions.farores, interfaceCtx->restrictions.dinsNayrus, - interfaceCtx->restrictions.all); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("parameter->button_status = %x,%x,%x\n", sRestrictionFlags[i].flags1, sRestrictionFlags[i].flags2, + sRestrictionFlags[i].flags3); + PRINTF("h_gage=%d, b_button=%d, a_button=%d, c_bottle=%d\n", interfaceCtx->restrictions.hGauge, + interfaceCtx->restrictions.bButton, interfaceCtx->restrictions.aButton, + interfaceCtx->restrictions.bottles); + PRINTF("c_warasibe=%d, c_hook=%d, c_ocarina=%d, c_warp=%d\n", interfaceCtx->restrictions.tradeItems, + interfaceCtx->restrictions.hookshot, interfaceCtx->restrictions.ocarina, + interfaceCtx->restrictions.warpSongs); + PRINTF("c_sunmoon=%d, m_wind=%d, m_magic=%d, another=%d\n", interfaceCtx->restrictions.sunsSong, + interfaceCtx->restrictions.farores, interfaceCtx->restrictions.dinsNayrus, + interfaceCtx->restrictions.all); + PRINTF(VT_RST); return; } i++; @@ -1225,7 +1224,7 @@ void Inventory_SwapAgeEquipment(void) { (gSaveContext.save.info.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) || ((gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && (gSaveContext.save.info.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { - osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.save.info.equips.cButtonSlots[i - 1]); + PRINTF("Register_Item_Pt(%d)=%d\n", i, gSaveContext.save.info.equips.cButtonSlots[i - 1]); gSaveContext.save.info.equips.buttonItems[i] = gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[i - 1]]; } @@ -1259,7 +1258,7 @@ void Inventory_SwapAgeEquipment(void) { (gSaveContext.save.info.equips.buttonItems[i] <= ITEM_BOTTLE_POE)) || ((gSaveContext.save.info.equips.buttonItems[i] >= ITEM_WEIRD_EGG) && (gSaveContext.save.info.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) { - osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.save.info.equips.cButtonSlots[i - 1]); + PRINTF("Register_Item_Pt(%d)=%d\n", i, gSaveContext.save.info.equips.cButtonSlots[i - 1]); gSaveContext.save.info.equips.buttonItems[i] = gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[i - 1]]; } @@ -1369,16 +1368,16 @@ u8 Item_Give(PlayState* play, u8 item) { slot = SLOT(sExtraItemBases[item - ITEM_DEKU_STICKS_5]); } - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("item_get_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.save.info.inventory.items[slot]); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("item_get_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.save.info.inventory.items[slot]); + PRINTF(VT_RST); if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST]; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("封印 = %x\n", gSaveContext.save.info.inventory.questItems); // "Seals = %x" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("封印 = %x\n", gSaveContext.save.info.inventory.questItems); // "Seals = %x" + PRINTF(VT_RST); if (item == ITEM_MEDALLION_WATER) { func_8006D0AC(play); @@ -1388,39 +1387,39 @@ u8 Item_Give(PlayState* play, u8 item) { } else if ((item >= ITEM_SONG_MINUET) && (item <= ITEM_SONG_STORMS)) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET]; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("楽譜 = %x\n", gSaveContext.save.info.inventory.questItems); // "Musical scores = %x" + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("楽譜 = %x\n", gSaveContext.save.info.inventory.questItems); // "Musical scores = %x" // "Musical scores = %x (%x) (%x)" - osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.save.info.inventory.questItems, - gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]); - osSyncPrintf(VT_RST); + PRINTF("楽譜 = %x (%x) (%x)\n", gSaveContext.save.info.inventory.questItems, + gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]); + PRINTF(VT_RST); return ITEM_NONE; } else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_ZORA_SAPPHIRE)) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_KOKIRI_EMERALD + QUEST_KOKIRI_EMERALD]; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("精霊石 = %x\n", gSaveContext.save.info.inventory.questItems); // "Spiritual Stones = %x" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("精霊石 = %x\n", gSaveContext.save.info.inventory.questItems); // "Spiritual Stones = %x" + PRINTF(VT_RST); return ITEM_NONE; } else if ((item == ITEM_STONE_OF_AGONY) || (item == ITEM_GERUDOS_CARD)) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_STONE_OF_AGONY + QUEST_STONE_OF_AGONY]; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("アイテム = %x\n", gSaveContext.save.info.inventory.questItems); // "Items = %x" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("アイテム = %x\n", gSaveContext.save.info.inventory.questItems); // "Items = %x" + PRINTF(VT_RST); return ITEM_NONE; } else if (item == ITEM_SKULL_TOKEN) { gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_SKULL_TOKEN + QUEST_SKULL_TOKEN]; gSaveContext.save.info.inventory.gsTokens++; - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "N Coins = %x(%d)" - osSyncPrintf("Ｎコイン = %x(%d)\n", gSaveContext.save.info.inventory.questItems, - gSaveContext.save.info.inventory.gsTokens); - osSyncPrintf(VT_RST); + PRINTF("Ｎコイン = %x(%d)\n", gSaveContext.save.info.inventory.questItems, + gSaveContext.save.info.inventory.gsTokens); + PRINTF(VT_RST); return ITEM_NONE; } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BIGGORON)) { @@ -1610,8 +1609,8 @@ u8 Item_Give(PlayState* play, u8 item) { Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1); AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]; // "Deku Nuts %d(%d)=%d BS_count=%d" - osSyncPrintf("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_DEKU_NUTS_5, item - ITEM_DEKU_NUTS_5, - sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]); + PRINTF("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_DEKU_NUTS_5, item - ITEM_DEKU_NUTS_5, + sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]); } else { AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]; if (AMMO(ITEM_DEKU_NUT) > CUR_CAPACITY(UPG_DEKU_NUTS)) { @@ -1621,7 +1620,7 @@ u8 Item_Give(PlayState* play, u8 item) { item = ITEM_DEKU_NUT; } else if (item == ITEM_BOMB) { // "Bomb Bomb Bomb Bomb Bomb Bomb Bomb" - osSyncPrintf(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n"); + PRINTF(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n"); if ((AMMO(ITEM_BOMB) += 1) > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); } @@ -1662,7 +1661,7 @@ u8 Item_Give(PlayState* play, u8 item) { AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER); } - osSyncPrintf("%d本 Item_MaxGet=%d\n", AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER)); + PRINTF("%d本 Item_MaxGet=%d\n", AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER)); return ITEM_BOW; } else if (item == ITEM_SLINGSHOT) { @@ -1726,7 +1725,7 @@ u8 Item_Give(PlayState* play, u8 item) { gSaveContext.save.info.playerData.health += 0x10; return ITEM_NONE; } else if (item == ITEM_RECOVERY_HEART) { - osSyncPrintf("回復ハート回復ハート回復ハート\n"); // "Recovery Heart" + PRINTF("回復ハート回復ハート回復ハート\n"); // "Recovery Heart" Health_ChangeBy(play, 0x10); return item; } else if (item == ITEM_MAGIC_JAR_SMALL) { @@ -1785,10 +1784,9 @@ u8 Item_Give(PlayState* play, u8 item) { for (i = 0; i < 4; i++) { if (gSaveContext.save.info.inventory.items[temp + i] == ITEM_BOTTLE_EMPTY) { // "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.save.info.equips.cButtonSlots[0], - gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2], temp + i, item); + PRINTF("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n", + gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], + gSaveContext.save.info.equips.cButtonSlots[2], temp + i, item); if ((temp + i) == gSaveContext.save.info.equips.cButtonSlots[0]) { gSaveContext.save.info.equips.buttonItems[1] = item; @@ -1842,7 +1840,7 @@ u8 Item_Give(PlayState* play, u8 item) { } temp = gSaveContext.save.info.inventory.items[slot]; - osSyncPrintf("Item_Register(%d)=%d %d\n", slot, item, temp); + PRINTF("Item_Register(%d)=%d %d\n", slot, item, temp); INV_CONTENT(item) = item; return temp; @@ -1857,9 +1855,9 @@ u8 Item_CheckObtainability(u8 item) { slot = SLOT(sExtraItemBases[item - ITEM_DEKU_STICKS_5]); } - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("item_get_non_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.save.info.inventory.items[slot]); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("item_get_non_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.save.info.inventory.items[slot]); + PRINTF(VT_RST); if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) { return ITEM_NONE; @@ -1937,7 +1935,7 @@ u8 Item_CheckObtainability(u8 item) { return ITEM_RECOVERY_HEART; } else if ((item == ITEM_MAGIC_JAR_SMALL) || (item == ITEM_MAGIC_JAR_BIG)) { // "Magic Pot Get_Inf_Table( 25, 0x0100)=%d" - osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", GET_INFTABLE(INFTABLE_198)); + PRINTF("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", GET_INFTABLE(INFTABLE_198)); if (!GET_INFTABLE(INFTABLE_198)) { return ITEM_NONE; } else { @@ -1984,7 +1982,7 @@ void Inventory_DeleteItem(u16 item, u16 invSlot) { gSaveContext.save.info.inventory.items[invSlot] = ITEM_NONE; - osSyncPrintf("\nItem_Register(%d)\n", invSlot, gSaveContext.save.info.inventory.items[invSlot]); + PRINTF("\nItem_Register(%d)\n", invSlot, gSaveContext.save.info.inventory.items[invSlot]); for (i = 1; i < 4; i++) { if (gSaveContext.save.info.equips.buttonItems[i] == item) { @@ -2000,7 +1998,7 @@ s32 Inventory_ReplaceItem(PlayState* play, u16 oldItem, u16 newItem) { for (i = 0; i < ARRAY_COUNT(gSaveContext.save.info.inventory.items); i++) { if (gSaveContext.save.info.inventory.items[i] == oldItem) { gSaveContext.save.info.inventory.items[i] = newItem; - osSyncPrintf("アイテム消去(%d)\n", i); // "Item Purge (%d)" + PRINTF("アイテム消去(%d)\n", i); // "Item Purge (%d)" for (i = 1; i < 4; i++) { if (gSaveContext.save.info.equips.buttonItems[i] == oldItem) { gSaveContext.save.info.equips.buttonItems[i] = newItem; @@ -2048,9 +2046,9 @@ s32 Inventory_HasSpecificBottle(u8 bottleItem) { } void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 button) { - osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, button, - gSaveContext.save.info.equips.cButtonSlots[button - 1], - gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[button - 1]]); + PRINTF("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, button, + gSaveContext.save.info.equips.cButtonSlots[button - 1], + gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[button - 1]]); // Special case to only empty half of a Lon Lon Milk Bottle if ((gSaveContext.save.info.inventory.items[gSaveContext.save.info.equips.cButtonSlots[button - 1]] == @@ -2084,7 +2082,7 @@ s32 Inventory_ConsumeFairy(PlayState* play) { break; } } - osSyncPrintf("妖精使用＝%d\n", bottleSlot); // "Fairy Usage＝%d" + PRINTF("妖精使用＝%d\n", bottleSlot); // "Fairy Usage＝%d" gSaveContext.save.info.inventory.items[bottleSlot + i] = ITEM_BOTTLE_EMPTY; return true; } @@ -2199,15 +2197,15 @@ s32 Health_ChangeBy(PlayState* play, s16 amount) { u16 healthLevel; // "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊" - osSyncPrintf("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", amount, gSaveContext.save.info.playerData.health, - gSaveContext.save.info.playerData.healthCapacity); + PRINTF("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", amount, gSaveContext.save.info.playerData.health, + gSaveContext.save.info.playerData.healthCapacity); // clang-format off if (amount > 0) { Audio_PlaySfxGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } else if (gSaveContext.save.info.playerData.isDoubleDefenseAcquired && (amount < 0)) { amount >>= 1; - osSyncPrintf("ハート減少半分！！＝%d\n", amount); // "Heart decrease halved!!＝%d" + PRINTF("ハート減少半分！！＝%d\n", amount); // "Heart decrease halved!!＝%d" } // clang-format on @@ -2231,7 +2229,7 @@ s32 Health_ChangeBy(PlayState* play, s16 amount) { } // "Life=%d ＊＊＊ %d ＊＊＊＊＊＊" - osSyncPrintf(" ライフ=%d ＊＊＊ %d ＊＊＊＊＊＊\n", gSaveContext.save.info.playerData.health, healthLevel); + PRINTF(" ライフ=%d ＊＊＊ %d ＊＊＊＊＊＊\n", gSaveContext.save.info.playerData.health, healthLevel); if (gSaveContext.save.info.playerData.health <= 0) { gSaveContext.save.info.playerData.health = 0; @@ -2251,7 +2249,7 @@ void Rupees_ChangeBy(s16 rupeeChange) { void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { // "Item = (%d) Amount = (%d + %d)" - osSyncPrintf("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange); + PRINTF("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange); if (item == ITEM_DEKU_STICK) { AMMO(ITEM_DEKU_STICK) += ammoChange; @@ -2305,7 +2303,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { AMMO(ITEM_MAGIC_BEAN) += ammoChange; } - osSyncPrintf("合計 = (%d)\n", AMMO(item)); // "Total = (%d)" + PRINTF("合計 = (%d)\n", AMMO(item)); // "Total = (%d)" } void Magic_Fill(PlayState* play) { @@ -2482,8 +2480,7 @@ void Magic_Update(PlayState* play) { } // "Storage MAGIC_NOW=%d (%d)" - osSyncPrintf("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.save.info.playerData.magic, - gSaveContext.magicFillTarget); + PRINTF("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.save.info.playerData.magic, gSaveContext.magicFillTarget); if (gSaveContext.save.info.playerData.magic >= gSaveContext.magicFillTarget) { gSaveContext.save.info.playerData.magic = gSaveContext.magicFillTarget; @@ -3504,7 +3501,7 @@ void Interface_Draw(PlayState* play) { gSaveContext.eventInf[EVENTINF_HORSES_INDEX] &= (u16) ~(EVENTINF_HORSES_STATE_MASK | EVENTINF_HORSES_HORSETYPE_MASK | EVENTINF_HORSES_05_MASK | EVENTINF_HORSES_06_MASK | EVENTINF_HORSES_0F_MASK); - osSyncPrintf("EVENT_INF=%x\n", gSaveContext.eventInf[EVENTINF_HORSES_INDEX]); + PRINTF("EVENT_INF=%x\n", gSaveContext.eventInf[EVENTINF_HORSES_INDEX]); play->nextEntranceIndex = spoilingItemEntrances[svar1]; INV_CONTENT(gSpoilingItemReverts[svar1]) = gSpoilingItemReverts[svar1]; @@ -3753,9 +3750,9 @@ void Interface_Draw(PlayState* play) { case SUBTIMER_STATE_DOWN_MOVE: case SUBTIMER_STATE_UP_MOVE: - osSyncPrintf("event_xp[1]=%d, event_yp[1]=%d TOTAL_EVENT_TM=%d\n", - ((void)0, gSaveContext.timerX[TIMER_ID_SUB]), - ((void)0, gSaveContext.timerY[TIMER_ID_SUB]), gSaveContext.subTimerSeconds); + PRINTF("event_xp[1]=%d, event_yp[1]=%d TOTAL_EVENT_TM=%d\n", + ((void)0, gSaveContext.timerX[TIMER_ID_SUB]), + ((void)0, gSaveContext.timerY[TIMER_ID_SUB]), gSaveContext.subTimerSeconds); svar1 = (gSaveContext.timerX[TIMER_ID_SUB] - 26) / sSubTimerStateTimer; gSaveContext.timerX[TIMER_ID_SUB] -= svar1; if (gSaveContext.save.info.playerData.healthCapacity > 0xA0) { @@ -3802,7 +3799,7 @@ void Interface_Draw(PlayState* play) { sSubTimerNextSecondTimer = 20; if (gSaveContext.subTimerState == SUBTIMER_STATE_DOWN_TICK) { gSaveContext.subTimerSeconds--; - osSyncPrintf("TOTAL_EVENT_TM=%d\n", gSaveContext.subTimerSeconds); + PRINTF("TOTAL_EVENT_TM=%d\n", gSaveContext.subTimerSeconds); if (gSaveContext.subTimerSeconds <= 0) { // Out of time @@ -3965,13 +3962,13 @@ void Interface_Update(PlayState* play) { if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) { gSaveContext.language = LANGUAGE_ENG; - osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); + PRINTF("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DUP)) { gSaveContext.language = LANGUAGE_GER; - osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); + PRINTF("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DRIGHT)) { gSaveContext.language = LANGUAGE_FRA; - osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); + PRINTF("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } if (!IS_PAUSED(&play->pauseCtx)) { @@ -4025,7 +4022,7 @@ void Interface_Update(PlayState* play) { risingAlpha = 255; } - osSyncPrintf("case 50 : alpha=%d alpha1=%d\n", dimmingAlpha, risingAlpha); + PRINTF("case 50 : alpha=%d alpha1=%d\n", dimmingAlpha, risingAlpha); Interface_RaiseButtonAlphas(play, risingAlpha); @@ -4100,13 +4097,13 @@ void Interface_Update(PlayState* play) { &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - osSyncPrintf("now_life=%d max_life=%d\n", gSaveContext.save.info.playerData.health, - gSaveContext.save.info.playerData.healthCapacity); + PRINTF("now_life=%d max_life=%d\n", gSaveContext.save.info.playerData.health, + gSaveContext.save.info.playerData.healthCapacity); if (gSaveContext.save.info.playerData.health >= gSaveContext.save.info.playerData.healthCapacity) { gSaveContext.save.info.playerData.health = gSaveContext.save.info.playerData.healthCapacity; - osSyncPrintf("S_Private.now_life=%d S_Private.max_life=%d\n", gSaveContext.save.info.playerData.health, - gSaveContext.save.info.playerData.healthCapacity); + PRINTF("S_Private.now_life=%d S_Private.max_life=%d\n", gSaveContext.save.info.playerData.health, + gSaveContext.save.info.playerData.healthCapacity); gSaveContext.healthAccumulator = 0; } } @@ -4141,7 +4138,7 @@ void Interface_Update(PlayState* play) { &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } else { // "Rupee Amount MAX = %d" - osSyncPrintf("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET)); + PRINTF("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET)); gSaveContext.save.info.playerData.rupees = CUR_CAPACITY(UPG_WALLET); gSaveContext.rupeeAccumulator = 0; } @@ -4220,13 +4217,13 @@ void Interface_Update(PlayState* play) { if (gSaveContext.save.info.playerData.isMagicAcquired && (gSaveContext.save.info.playerData.magicLevel == 0)) { gSaveContext.save.info.playerData.magicLevel = gSaveContext.save.info.playerData.isDoubleMagicAcquired + 1; gSaveContext.magicState = MAGIC_STATE_STEP_CAPACITY; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("魔法スター─────ト！！！！！！！！！\n"); // "Magic Start!!!!!!!!!" - osSyncPrintf("MAGIC_MAX=%d\n", gSaveContext.save.info.playerData.magicLevel); - osSyncPrintf("MAGIC_NOW=%d\n", gSaveContext.save.info.playerData.magic); - osSyncPrintf("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget); - osSyncPrintf("Z_MAGIC_NOW_MAX=%d\n", gSaveContext.magicCapacity); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("魔法スター─────ト！！！！！！！！！\n"); // "Magic Start!!!!!!!!!" + PRINTF("MAGIC_MAX=%d\n", gSaveContext.save.info.playerData.magicLevel); + PRINTF("MAGIC_NOW=%d\n", gSaveContext.save.info.playerData.magic); + PRINTF("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget); + PRINTF("Z_MAGIC_NOW_MAX=%d\n", gSaveContext.magicCapacity); + PRINTF(VT_RST); } Magic_Update(play); diff --git a/src/code/z_play.c b/src/code/z_play.c index 753ce80f12..5ad02db22e 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -57,7 +57,7 @@ s32 Play_CheckViewpoint(PlayState* this, s16 viewpoint) { * to toggle the camera into a "browsing item selection" setting. */ void Play_SetShopBrowsingViewpoint(PlayState* this) { - osSyncPrintf("Game_play_shop_pr_vr_switch_set()\n"); + PRINTF("Game_play_shop_pr_vr_switch_set()\n"); if (R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) { this->viewpoint = VIEWPOINT_PIVOT; @@ -325,15 +325,15 @@ void Play_Init(GameState* thisx) { this, gEntranceTable[((void)0, gSaveContext.save.entranceIndex) + ((void)0, gSaveContext.sceneLayer)].sceneId, gEntranceTable[((void)0, gSaveContext.save.entranceIndex) + ((void)0, gSaveContext.sceneLayer)].spawn); - osSyncPrintf("\nSCENE_NO=%d COUNTER=%d\n", ((void)0, gSaveContext.save.entranceIndex), gSaveContext.sceneLayer); + PRINTF("\nSCENE_NO=%d COUNTER=%d\n", ((void)0, gSaveContext.save.entranceIndex), gSaveContext.sceneLayer); // When entering Gerudo Valley in the credits, trigger the GC emulator to play the ending movie. // The emulator constantly checks whether PC is 0x81000000, so this works even though it's not a valid address. if ((gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_GERUDO_VALLEY) && gSaveContext.sceneLayer == 6) { - osSyncPrintf("エンディングはじまるよー\n"); // "The ending starts" + PRINTF("エンディングはじまるよー\n"); // "The ending starts" ((void (*)(void))0x81000000)(); - osSyncPrintf("出戻り？\n"); // "Return?" + PRINTF("出戻り？\n"); // "Return?" } Cutscene_HandleEntranceTriggers(this); @@ -395,14 +395,13 @@ void Play_Init(GameState* thisx) { gVisMonoColor.a = 0; CutsceneFlags_UnsetAll(this); - osSyncPrintf("ZELDA ALLOC SIZE=%x\n", THA_GetRemaining(&this->state.tha)); + PRINTF("ZELDA ALLOC SIZE=%x\n", THA_GetRemaining(&this->state.tha)); zAllocSize = THA_GetRemaining(&this->state.tha); zAlloc = (uintptr_t)GAME_STATE_ALLOC(&this->state, zAllocSize, "../z_play.c", 2918); zAllocAligned = (zAlloc + 8) & ~0xF; ZeldaArena_Init((void*)zAllocAligned, zAllocSize - (zAllocAligned - zAlloc)); // "Zelda Heap" - osSyncPrintf("ゼルダヒープ %08x-%08x\n", zAllocAligned, - (u8*)zAllocAligned + zAllocSize - (s32)(zAllocAligned - zAlloc)); + PRINTF("ゼルダヒープ %08x-%08x\n", zAllocAligned, (u8*)zAllocAligned + zAllocSize - (s32)(zAllocAligned - zAlloc)); Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL); Actor_InitContext(this, &this->actorCtx, this->playerEntry); @@ -417,7 +416,7 @@ void Play_Init(GameState* thisx) { playerStartBgCamIndex = player->actor.params & 0xFF; if (playerStartBgCamIndex != 0xFF) { - osSyncPrintf("player has start camera ID (" VT_FGCOL(BLUE) "%d" VT_RST ")\n", playerStartBgCamIndex); + PRINTF("player has start camera ID (" VT_FGCOL(BLUE) "%d" VT_RST ")\n", playerStartBgCamIndex); Camera_RequestBgCam(&this->mainCamera, playerStartBgCamIndex); } @@ -439,7 +438,7 @@ void Play_Init(GameState* thisx) { if (R_USE_DEBUG_CUTSCENE) { gDebugCutsceneScript = sDebugCutsceneScriptBuf; - osSyncPrintf("\nkawauso_data=[%x]", gDebugCutsceneScript); + PRINTF("\nkawauso_data=[%x]", gDebugCutsceneScript); // This hardcoded ROM address extends past the end of the ROM file. // Presumably the ROM was larger at a previous point in development when this debug feature was used. @@ -463,17 +462,17 @@ void Play_Update(PlayState* this) { if ((R_HREG_MODE == HREG_MODE_PRINT_OBJECT_TABLE) && (R_PRINT_OBJECT_TABLE_TRIGGER < 0)) { R_PRINT_OBJECT_TABLE_TRIGGER = 0; - osSyncPrintf("object_exchange_rom_address %u\n", gObjectTableSize); - osSyncPrintf("RomStart RomEnd Size\n"); + PRINTF("object_exchange_rom_address %u\n", gObjectTableSize); + PRINTF("RomStart RomEnd Size\n"); for (i = 0; i < gObjectTableSize; i++) { s32 size = gObjectTable[i].vromEnd - gObjectTable[i].vromStart; - osSyncPrintf("%08x-%08x %08x(%8.3fKB)\n", gObjectTable[i].vromStart, gObjectTable[i].vromEnd, size, - size / 1024.0f); + PRINTF("%08x-%08x %08x(%8.3fKB)\n", gObjectTable[i].vromStart, gObjectTable[i].vromEnd, size, + size / 1024.0f); } - osSyncPrintf("\n"); + PRINTF("\n"); } // HREG(81) was very likely intended to be HREG(80), which would make more sense given how the @@ -497,7 +496,7 @@ void Play_Update(PlayState* this) { switch (gTransitionTileState) { case TRANS_TILE_PROCESS: if (TransitionTile_Init(&sTransitionTile, 10, 7) == NULL) { - osSyncPrintf("fbdemo_init呼出し失敗！\n"); // "fbdemo_init call failed!" + PRINTF("fbdemo_init呼出し失敗！\n"); // "fbdemo_init call failed!" gTransitionTileState = TRANS_TILE_OFF; } else { sTransitionTile.zBuffer = (u16*)gZBuffer; @@ -531,10 +530,10 @@ void Play_Update(PlayState* this) { if (!(gEntranceTable[this->nextEntranceIndex + sceneLayer].field & ENTRANCE_INFO_CONTINUE_BGM_FLAG)) { // "Sound initialized. 111" - osSyncPrintf("\n\n\nサウンドイニシャル来ました。111"); + PRINTF("\n\n\nサウンドイニシャル来ました。111"); if ((this->transitionType < TRANS_TYPE_MAX) && !Environment_IsForcedSequenceDisabled()) { // "Sound initialized. 222" - osSyncPrintf("\n\n\nサウンドイニシャル来ました。222"); + PRINTF("\n\n\nサウンドイニシャル来ました。222"); func_800F6964(0x14); gSaveContext.seqId = (u8)NA_BGM_DISABLED; gSaveContext.natureAmbienceId = NATURE_ID_DISABLED; @@ -868,7 +867,7 @@ void Play_Update(PlayState* this) { Rumble_SetUpdateEnabled(true); if (this->actorCtx.freezeFlashTimer && (this->actorCtx.freezeFlashTimer-- < 5)) { - osSyncPrintf("FINISH=%d\n", this->actorCtx.freezeFlashTimer); + PRINTF("FINISH=%d\n", this->actorCtx.freezeFlashTimer); if ((this->actorCtx.freezeFlashTimer > 0) && ((this->actorCtx.freezeFlashTimer % 2) != 0)) { this->envCtx.fillScreen = true; @@ -930,10 +929,10 @@ void Play_Update(PlayState* this) { if (CHECK_BTN_ALL(input[0].press.button, BTN_CUP)) { if (IS_PAUSED(&this->pauseCtx)) { // "Changing viewpoint is prohibited due to the kaleidoscope" - osSyncPrintf(VT_FGCOL(CYAN) "カレイドスコープ中につき視点変更を禁止しております\n" VT_RST); + PRINTF(VT_FGCOL(CYAN) "カレイドスコープ中につき視点変更を禁止しております\n" VT_RST); } else if (Player_InCsMode(this)) { // "Changing viewpoint is prohibited during the cutscene" - osSyncPrintf(VT_FGCOL(CYAN) "デモ中につき視点変更を禁止しております\n" VT_RST); + PRINTF(VT_FGCOL(CYAN) "デモ中につき視点変更を禁止しております\n" VT_RST); } else if (R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) { Audio_PlaySfxGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -1455,7 +1454,7 @@ void Play_SpawnScene(PlayState* this, s32 sceneId, s32 spawn) { this->sceneId = sceneId; this->sceneDrawConfig = scene->drawConfig; - osSyncPrintf("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) / 1024.0f); + PRINTF("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) / 1024.0f); this->sceneSegment = Play_LoadFile(this, &scene->sceneFile); scene->unk_13 = 0; @@ -1467,7 +1466,7 @@ void Play_SpawnScene(PlayState* this, s32 sceneId, s32 spawn) { size = func_80096FE8(this, &this->roomCtx); - osSyncPrintf("ROOM SIZE=%fK\n", size / 1024.0f); + PRINTF("ROOM SIZE=%fK\n", size / 1024.0f); } void Play_GetScreenPos(PlayState* this, Vec3f* src, Vec3f* dest) { @@ -1493,13 +1492,13 @@ s16 Play_CreateSubCamera(PlayState* this) { } if (camId == NUM_CAMS) { - osSyncPrintf(VT_COL(RED, WHITE) "camera control: error: fulled sub camera system area\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "camera control: error: fulled sub camera system area\n" VT_RST); return CAM_ID_NONE; } - osSyncPrintf("camera control: " VT_BGCOL(CYAN) " " VT_COL(WHITE, BLUE) " create new sub camera [%d] " VT_BGCOL( - CYAN) " " VT_RST "\n", - camId); + PRINTF("camera control: " VT_BGCOL(CYAN) " " VT_COL(WHITE, BLUE) " create new sub camera [%d] " VT_BGCOL( + CYAN) " " VT_RST "\n", + camId); this->cameraPtrs[camId] = &this->subCameras[camId - CAM_ID_SUB_FIRST]; Camera_Init(this->cameraPtrs[camId], &this->view, &this->colCtx, this); @@ -1526,17 +1525,17 @@ void Play_ClearCamera(PlayState* this, s16 camId) { s16 camIdx = (camId == CAM_ID_NONE) ? this->activeCamId : camId; if (camIdx == CAM_ID_MAIN) { - osSyncPrintf(VT_COL(RED, WHITE) "camera control: error: never clear camera !!\n" VT_RST); + PRINTF(VT_COL(RED, WHITE) "camera control: error: never clear camera !!\n" VT_RST); } if (this->cameraPtrs[camIdx] != NULL) { Camera_ChangeStatus(this->cameraPtrs[camIdx], CAM_STAT_UNK100); this->cameraPtrs[camIdx] = NULL; - osSyncPrintf("camera control: " VT_BGCOL(CYAN) " " VT_COL(WHITE, BLUE) " clear sub camera [%d] " VT_BGCOL( - CYAN) " " VT_RST "\n", - camIdx); + PRINTF("camera control: " VT_BGCOL(CYAN) " " VT_COL(WHITE, BLUE) " clear sub camera [%d] " VT_BGCOL( + CYAN) " " VT_RST "\n", + camIdx); } else { - osSyncPrintf(VT_COL(RED, WHITE) "camera control: error: camera No.%d already cleared\n" VT_RST, camIdx); + PRINTF(VT_COL(RED, WHITE) "camera control: error: camera No.%d already cleared\n" VT_RST, camIdx); } } @@ -1665,9 +1664,8 @@ void Play_ReturnToMainCam(PlayState* this, s16 camId, s16 duration) { for (subCamId = CAM_ID_SUB_FIRST; subCamId < NUM_CAMS; subCamId++) { if (this->cameraPtrs[subCamId] != NULL) { - osSyncPrintf( - VT_COL(RED, WHITE) "camera control: error: return to main, other camera left. %d cleared!!\n" VT_RST, - subCamId); + PRINTF(VT_COL(RED, WHITE) "camera control: error: return to main, other camera left. %d cleared!!\n" VT_RST, + subCamId); Play_ClearCamera(this, subCamId); } } diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index f792d2133b..29ea097d68 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -8,12 +8,12 @@ void func_80092320(PreNMIState* this) { } void PreNMI_Update(PreNMIState* this) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_move\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "prenmi_move\n" VT_RST); // Strings existing only in rodata if (0) { - osSyncPrintf("../z_prenmi.c"); - osSyncPrintf("(int)volume = %d\n"); + PRINTF("../z_prenmi.c"); + PRINTF("(int)volume = %d\n"); } if (this->timer == 0) { @@ -28,7 +28,7 @@ void PreNMI_Update(PreNMIState* this) { void PreNMI_Draw(PreNMIState* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; - osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST); + PRINTF(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST); OPEN_DISPS(gfxCtx, "../z_prenmi.c", 96); diff --git a/src/code/z_quake.c b/src/code/z_quake.c index 38b97c4d71..51d7844499 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -160,7 +160,7 @@ s16 Quake_GetFreeIndex(void) { } if (timerMin != 0x20000) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "quake: too many request %d is changed new one !!\n" VT_RST, index); + PRINTF(VT_COL(YELLOW, BLACK) "quake: too many request %d is changed new one !!\n" VT_RST, index); } return index; @@ -437,7 +437,7 @@ s16 Quake_Update(Camera* camera, ShakeInfo* camShake) { } if (play->cameraPtrs[req->camId] == NULL) { - osSyncPrintf(VT_COL(YELLOW, BLACK) "quake: stopped! 'coz camera [%d] killed!!\n" VT_RST, req->camId); + PRINTF(VT_COL(YELLOW, BLACK) "quake: stopped! 'coz camera [%d] killed!!\n" VT_RST, req->camId); Quake_Remove(req); continue; } diff --git a/src/code/z_room.c b/src/code/z_room.c index 1e9e29e8f0..68047dcd43 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -262,25 +262,25 @@ s32 Room_DecodeJpeg(void* data) { OSTime time; if (*(u32*)data == JPEG_MARKER) { - osSyncPrintf("JPEGデータを展開します\n"); // "Expanding jpeg data" - osSyncPrintf("JPEGデータアドレス %08x\n", data); // "Jpeg data address %08x" + PRINTF("JPEGデータを展開します\n"); // "Expanding jpeg data" + PRINTF("JPEGデータアドレス %08x\n", data); // "Jpeg data address %08x" // "Work buffer address (Z buffer) %08x" - osSyncPrintf("ワークバッファアドレス（Ｚバッファ）%08x\n", gZBuffer); + PRINTF("ワークバッファアドレス（Ｚバッファ）%08x\n", gZBuffer); time = osGetTime(); if (!Jpeg_Decode(data, gZBuffer, gGfxSPTaskOutputBuffer, sizeof(gGfxSPTaskOutputBuffer))) { time = osGetTime() - time; // "Success... I think. time = %6.3f ms" - osSyncPrintf("成功…だと思う。 time = %6.3f ms \n", OS_CYCLES_TO_USEC(time) / 1000.0f); + PRINTF("成功…だと思う。 time = %6.3f ms \n", OS_CYCLES_TO_USEC(time) / 1000.0f); // "Writing back to original address from work buffer." - osSyncPrintf("ワークバッファから元のアドレスに書き戻します。\n"); + PRINTF("ワークバッファから元のアドレスに書き戻します。\n"); // "If the original buffer size isn't at least 150kB, it will be out of control." - osSyncPrintf("元のバッファのサイズが150キロバイト無いと暴走するでしょう。\n"); + PRINTF("元のバッファのサイズが150キロバイト無いと暴走するでしょう。\n"); bcopy(gZBuffer, data, sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH])); } else { - osSyncPrintf("失敗！なんで〜\n"); // "Failure! Why is it 〜" + PRINTF("失敗！なんで〜\n"); // "Failure! Why is it 〜" } } @@ -438,7 +438,7 @@ RoomShapeImageMultiBgEntry* Room_GetImageMultiBgEntry(RoomShapeImageMulti* roomS } // "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, bgCamIndex); + PRINTF(VT_COL(RED, WHITE) "z_room.c:カメラＩＤに一致するデータが存在しません camid=%d\n" VT_RST, bgCamIndex); LogUtils_HungupThread("../z_room.c", 726); return NULL; @@ -540,7 +540,7 @@ u32 func_80096FE8(PlayState* play, RoomContext* roomCtx) { for (i = 0; i < play->numRooms; i++) { roomSize = roomList[i].vromEnd - roomList[i].vromStart; - osSyncPrintf("ROOM%d size=%d\n", i, roomSize); + PRINTF("ROOM%d size=%d\n", i, roomSize); if (maxRoomSize < roomSize) { maxRoomSize = roomSize; } @@ -559,8 +559,8 @@ u32 func_80096FE8(PlayState* play, RoomContext* roomCtx) { backRoomSize = (backRoom < 0) ? 0 : roomList[backRoom].vromEnd - roomList[backRoom].vromStart; cumulRoomSize = (frontRoom != backRoom) ? frontRoomSize + backRoomSize : frontRoomSize; - osSyncPrintf("DOOR%d=<%d> ROOM1=<%d, %d> ROOM2=<%d, %d>\n", j, cumulRoomSize, frontRoom, frontRoomSize, - backRoom, backRoomSize); + PRINTF("DOOR%d=<%d> ROOM1=<%d, %d> ROOM2=<%d, %d>\n", j, cumulRoomSize, frontRoom, frontRoomSize, backRoom, + backRoomSize); if (maxRoomSize < cumulRoomSize) { maxRoomSize = cumulRoomSize; } @@ -568,16 +568,16 @@ u32 func_80096FE8(PlayState* play, RoomContext* roomCtx) { } } - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "Room buffer size=%08x(%5.1fK)" - osSyncPrintf("部屋バッファサイズ=%08x(%5.1fK)\n", maxRoomSize, maxRoomSize / 1024.0f); + PRINTF("部屋バッファサイズ=%08x(%5.1fK)\n", maxRoomSize, maxRoomSize / 1024.0f); roomCtx->bufPtrs[0] = GAME_STATE_ALLOC(&play->state, maxRoomSize, "../z_room.c", 946); // "Room buffer initial pointer=%08x" - osSyncPrintf("部屋バッファ開始ポインタ=%08x\n", roomCtx->bufPtrs[0]); + PRINTF("部屋バッファ開始ポインタ=%08x\n", roomCtx->bufPtrs[0]); roomCtx->bufPtrs[1] = (void*)((uintptr_t)roomCtx->bufPtrs[0] + maxRoomSize); // "Room buffer end pointer=%08x" - osSyncPrintf("部屋バッファ終了ポインタ=%08x\n", roomCtx->bufPtrs[1]); - osSyncPrintf(VT_RST); + PRINTF("部屋バッファ終了ポインタ=%08x\n", roomCtx->bufPtrs[1]); + PRINTF(VT_RST); roomCtx->unk_30 = 0; roomCtx->status = 0; diff --git a/src/code/z_scene.c b/src/code/z_scene.c index e8f6ef7951..ad1eb49bc0 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -21,11 +21,10 @@ s32 Object_SpawnPersistent(ObjectContext* objectCtx, s16 objectId) { objectCtx->slots[objectCtx->numEntries].id = objectId; size = gObjectTable[objectId].vromEnd - gObjectTable[objectId].vromStart; - osSyncPrintf("OBJECT[%d] SIZE %fK SEG=%x\n", objectId, size / 1024.0f, - objectCtx->slots[objectCtx->numEntries].segment); + PRINTF("OBJECT[%d] SIZE %fK SEG=%x\n", objectId, size / 1024.0f, objectCtx->slots[objectCtx->numEntries].segment); - osSyncPrintf("num=%d adrs=%x end=%x\n", objectCtx->numEntries, - (uintptr_t)objectCtx->slots[objectCtx->numEntries].segment + size, objectCtx->spaceEnd); + PRINTF("num=%d adrs=%x end=%x\n", objectCtx->numEntries, + (uintptr_t)objectCtx->slots[objectCtx->numEntries].segment + size, objectCtx->spaceEnd); ASSERT(((objectCtx->numEntries < ARRAY_COUNT(objectCtx->slots)) && (((uintptr_t)objectCtx->slots[objectCtx->numEntries].segment + size) < (uintptr_t)objectCtx->spaceEnd)), @@ -76,10 +75,10 @@ void Object_InitContext(PlayState* play, ObjectContext* objectCtx) { objectCtx->slots[i].id = OBJECT_INVALID; } - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); // "Object exchange bank data %8.3fKB" - osSyncPrintf("オブジェクト入れ替えバンク情報 %8.3fKB\n", spaceSize / 1024.0f); - osSyncPrintf(VT_RST); + PRINTF("オブジェクト入れ替えバンク情報 %8.3fKB\n", spaceSize / 1024.0f); + PRINTF(VT_RST); objectCtx->spaceStart = objectCtx->slots[0].segment = GAME_STATE_ALLOC(&play->state, spaceSize, "../z_scene.c", 219); @@ -102,7 +101,7 @@ void Object_UpdateEntries(ObjectContext* objectCtx) { objectFile = &gObjectTable[-entry->id]; size = objectFile->vromEnd - objectFile->vromStart; - osSyncPrintf("OBJECT EXCHANGE BANK-%2d SIZE %8.3fK SEG=%08x\n", i, size / 1024.0f, entry->segment); + PRINTF("OBJECT EXCHANGE BANK-%2d SIZE %8.3fK SEG=%08x\n", i, size / 1024.0f, entry->segment); DMA_REQUEST_ASYNC(&entry->dmaRequest, entry->segment, objectFile->vromStart, size, 0, &entry->loadQueue, NULL, "../z_scene.c", 266); @@ -142,10 +141,9 @@ void func_800981B8(ObjectContext* objectCtx) { for (i = 0; i < objectCtx->numEntries; i++) { id = objectCtx->slots[i].id; size = gObjectTable[id].vromEnd - gObjectTable[id].vromStart; - osSyncPrintf("OBJECT[%d] SIZE %fK SEG=%x\n", objectCtx->slots[i].id, size / 1024.0f, - objectCtx->slots[i].segment); - osSyncPrintf("num=%d adrs=%x end=%x\n", objectCtx->numEntries, (uintptr_t)objectCtx->slots[i].segment + size, - objectCtx->spaceEnd); + PRINTF("OBJECT[%d] SIZE %fK SEG=%x\n", objectCtx->slots[i].id, size / 1024.0f, objectCtx->slots[i].segment); + PRINTF("num=%d adrs=%x end=%x\n", objectCtx->numEntries, (uintptr_t)objectCtx->slots[i].segment + size, + objectCtx->spaceEnd); DMA_REQUEST_SYNC(objectCtx->slots[i].segment, gObjectTable[id].vromStart, size, "../z_scene.c", 342); } } @@ -160,14 +158,14 @@ void* func_800982FC(ObjectContext* objectCtx, s32 slot, s16 objectId) { entry->dmaRequest.vromAddr = 0; size = objectFile->vromEnd - objectFile->vromStart; - osSyncPrintf("OBJECT EXCHANGE NO=%2d BANK=%3d SIZE=%8.3fK\n", slot, objectId, size / 1024.0f); + PRINTF("OBJECT EXCHANGE NO=%2d BANK=%3d SIZE=%8.3fK\n", slot, objectId, size / 1024.0f); nextPtr = (void*)ALIGN16((uintptr_t)entry->segment + size); ASSERT(nextPtr < objectCtx->spaceEnd, "nextptr < this->endSegment", "../z_scene.c", 381); // "Object exchange free size=%08x" - osSyncPrintf("オブジェクト入れ替え空きサイズ=%08x\n", (uintptr_t)objectCtx->spaceEnd - (uintptr_t)nextPtr); + PRINTF("オブジェクト入れ替え空きサイズ=%08x\n", (uintptr_t)objectCtx->spaceEnd - (uintptr_t)nextPtr); return nextPtr; } @@ -177,8 +175,8 @@ s32 Scene_ExecuteCommands(PlayState* play, SceneCmd* sceneCmd) { while (true) { cmdCode = sceneCmd->base.code; - osSyncPrintf("*** Scene_Word = { code=%d, data1=%02x, data2=%04x } ***\n", cmdCode, sceneCmd->base.data1, - sceneCmd->base.data2); + PRINTF("*** Scene_Word = { code=%d, data1=%02x, data2=%04x } ***\n", cmdCode, sceneCmd->base.data1, + sceneCmd->base.data2); if (cmdCode == SCENE_CMD_ID_END) { break; @@ -187,9 +185,9 @@ s32 Scene_ExecuteCommands(PlayState* play, SceneCmd* sceneCmd) { if (cmdCode < ARRAY_COUNT(gSceneCmdHandlers)) { gSceneCmdHandlers[cmdCode](play, sceneCmd); } else { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("code の値が異常です\n"); // "code variable is abnormal" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("code の値が異常です\n"); // "code variable is abnormal" + PRINTF(VT_RST); } sceneCmd++; } @@ -425,9 +423,9 @@ void Scene_CommandAlternateHeaderList(PlayState* play, SceneCmd* cmd) { s32 pad; SceneCmd* altHeader; - osSyncPrintf("\n[ZU]sceneset age =[%X]", ((void)0, gSaveContext.save.linkAge)); - osSyncPrintf("\n[ZU]sceneset time =[%X]", ((void)0, gSaveContext.save.cutsceneIndex)); - osSyncPrintf("\n[ZU]sceneset counter=[%X]", ((void)0, gSaveContext.sceneLayer)); + PRINTF("\n[ZU]sceneset age =[%X]", ((void)0, gSaveContext.save.linkAge)); + PRINTF("\n[ZU]sceneset time =[%X]", ((void)0, gSaveContext.save.cutsceneIndex)); + PRINTF("\n[ZU]sceneset counter=[%X]", ((void)0, gSaveContext.sceneLayer)); if (gSaveContext.sceneLayer != 0) { altHeader = ((SceneCmd**)SEGMENTED_TO_VIRTUAL(cmd->altHeaders.data))[gSaveContext.sceneLayer - 1]; @@ -439,7 +437,7 @@ void Scene_CommandAlternateHeaderList(PlayState* play, SceneCmd* cmd) { (cmd + 1)->base.code = SCENE_CMD_ID_END; } else { // "Coughh! There is no specified dataaaaa!" - osSyncPrintf("\nげぼはっ！ 指定されたデータがないでええっす！"); + PRINTF("\nげぼはっ！ 指定されたデータがないでええっす！"); if (gSaveContext.sceneLayer == SCENE_LAYER_ADULT_NIGHT) { // Due to the condition above, this is equivalent to accessing altHeaders[SCENE_LAYER_ADULT_DAY - 1] @@ -448,7 +446,7 @@ void Scene_CommandAlternateHeaderList(PlayState* play, SceneCmd* cmd) { .data))[(gSaveContext.sceneLayer - SCENE_LAYER_ADULT_NIGHT) + SCENE_LAYER_ADULT_DAY - 1]; // "Using adult day data there!" - osSyncPrintf("\nそこで、大人の昼データを使用するでええっす！！"); + PRINTF("\nそこで、大人の昼データを使用するでええっす！！"); if (altHeader != NULL) { Scene_ExecuteCommands(play, SEGMENTED_TO_VIRTUAL(altHeader)); @@ -460,7 +458,7 @@ void Scene_CommandAlternateHeaderList(PlayState* play, SceneCmd* cmd) { } void Scene_CommandCutsceneData(PlayState* play, SceneCmd* cmd) { - osSyncPrintf("\ngame_play->demo_play.data=[%x]", play->csCtx.script); + PRINTF("\ngame_play->demo_play.data=[%x]", play->csCtx.script); play->csCtx.script = SEGMENTED_TO_VIRTUAL(cmd->cutsceneData.data); } @@ -479,8 +477,8 @@ void Scene_CommandMiscSettings(PlayState* play, SceneCmd* cmd) { ((play->sceneId >= SCENE_MARKET_ENTRANCE_DAY) && (play->sceneId <= SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS))) { if (gSaveContext.save.cutsceneIndex < 0xFFF0) { gSaveContext.save.info.worldMapAreaData |= gBitFlags[gSaveContext.worldMapArea]; - osSyncPrintf("０００ ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.save.info.worldMapAreaData, - gSaveContext.worldMapArea); + PRINTF("０００ ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.save.info.worldMapAreaData, + gSaveContext.worldMapArea); } } } diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index f6324b361e..5d421cd587 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -76,9 +76,9 @@ void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable, Over Vec3s rot; if (skeleton == NULL) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Si2_Lod_draw():skelがNULLです。\n"); // "skel is NULL." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("Si2_Lod_draw():skelがNULLです。\n"); // "skel is NULL." + PRINTF(VT_RST); return; } @@ -188,9 +188,9 @@ void SkelAnime_DrawFlexLod(PlayState* play, void** skeleton, Vec3s* jointTable, Mtx* mtx = GRAPH_ALLOC(play->state.gfxCtx, dListCount * sizeof(Mtx)); if (skeleton == NULL) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Si2_Lod_draw_SV():skelがNULLです。\n"); // "skel is NULL." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("Si2_Lod_draw_SV():skelがNULLです。\n"); // "skel is NULL." + PRINTF(VT_RST); return; } @@ -293,9 +293,9 @@ void SkelAnime_DrawOpa(PlayState* play, void** skeleton, Vec3s* jointTable, Over Vec3s rot; if (skeleton == NULL) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Si2_draw():skelがNULLです。\n"); // "skel is NULL." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("Si2_draw():skelがNULLです。\n"); // "skel is NULL." + PRINTF(VT_RST); return; } @@ -405,9 +405,9 @@ void SkelAnime_DrawFlexOpa(PlayState* play, void** skeleton, Vec3s* jointTable, Mtx* mtx = GRAPH_ALLOC(play->state.gfxCtx, dListCount * sizeof(Mtx)); if (skeleton == NULL) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Si2_draw_SV():skelがNULLです。\n"); // "skel is NULL." - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("Si2_draw_SV():skelがNULLです。\n"); // "skel is NULL." + PRINTF(VT_RST); return; } @@ -556,10 +556,10 @@ Gfx* SkelAnime_Draw(PlayState* play, void** skeleton, Vec3s* jointTable, Overrid Vec3s rot; if (skeleton == NULL) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "skel is NULL. Returns NULL." - osSyncPrintf("Si2_draw2():skelがNULLです。NULLを返します。\n"); - osSyncPrintf(VT_RST); + PRINTF("Si2_draw2():skelがNULLです。NULLを返します。\n"); + PRINTF(VT_RST); return NULL; } @@ -665,10 +665,10 @@ Gfx* SkelAnime_DrawFlex(PlayState* play, void** skeleton, Vec3s* jointTable, s32 Mtx* mtx = GRAPH_ALLOC(play->state.gfxCtx, dListCount * sizeof(*mtx)); if (skeleton == NULL) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "skel is NULL. Returns NULL." - osSyncPrintf("Si2_draw2_SV():skelがNULLです。NULLを返します。\n"); - osSyncPrintf(VT_RST); + PRINTF("Si2_draw2_SV():skelがNULLです。NULLを返します。\n"); + PRINTF(VT_RST); return NULL; } @@ -1077,10 +1077,10 @@ void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeade } if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "Memory allocation error" - osSyncPrintf("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n"); - osSyncPrintf(VT_RST); + PRINTF("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n"); + PRINTF(VT_RST); } LinkAnimation_Change(play, skelAnime, animation, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f); @@ -1392,9 +1392,9 @@ SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHe skelAnime->morphTable = morphTable; } if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Skeleton_Info2_ct メモリアロケーションエラー\n"); // "Memory allocation error" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("Skeleton_Info2_ct メモリアロケーションエラー\n"); // "Memory allocation error" + PRINTF(VT_RST); } if (animation != NULL) { @@ -1426,10 +1426,10 @@ SkelAnime_InitFlex(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* sk skelAnime->morphTable = morphTable; } if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "Memory allocation error" - osSyncPrintf("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n"); - osSyncPrintf(VT_RST); + PRINTF("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n"); + PRINTF(VT_RST); } if (animation != NULL) { @@ -1452,10 +1452,10 @@ SkelAnime_InitSkin(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skelet skelAnime->morphTable = ZELDA_ARENA_MALLOC(skelAnime->limbCount * sizeof(*skelAnime->morphTable), "../z_skelanime.c", 3121); if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "Memory allocation error" - osSyncPrintf("Skeleton_Info2_skin2_ct メモリアロケーションエラー\n"); - osSyncPrintf(VT_RST); + PRINTF("Skeleton_Info2_skin2_ct メモリアロケーションエラー\n"); + PRINTF(VT_RST); } if (animation != NULL) { @@ -1840,13 +1840,13 @@ void SkelAnime_Free(SkelAnime* skelAnime, PlayState* play) { if (skelAnime->jointTable != NULL) { ZELDA_ARENA_FREE(skelAnime->jointTable, "../z_skelanime.c", 3729); } else { - osSyncPrintf("now_joint あきまへん！！\n"); // "now_joint is freed! !" + PRINTF("now_joint あきまへん！！\n"); // "now_joint is freed! !" } if (skelAnime->morphTable != NULL) { ZELDA_ARENA_FREE(skelAnime->morphTable, "../z_skelanime.c", 3731); } else { - osSyncPrintf("morf_joint あきまへん！！\n"); // "morf_joint is freed !!" + PRINTF("morf_joint あきまへん！！\n"); // "morf_joint is freed !!" } } diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index 3879af52fa..d590616134 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -254,9 +254,9 @@ s32 SkinMatrix_Invert(MtxF* src, MtxF* dest) { // Reaching row = 4 means the column is either all 0 or a duplicate column. // Therefore src is a singular matrix (0 determinant). - osSyncPrintf(VT_COL(YELLOW, BLACK)); - osSyncPrintf("Skin_Matrix_InverseMatrix():逆行列つくれません\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(YELLOW, BLACK)); + PRINTF("Skin_Matrix_InverseMatrix():逆行列つくれません\n"); + PRINTF(VT_RST); return 2; } @@ -596,7 +596,7 @@ Mtx* SkinMatrix_MtxFToNewMtx(GraphicsContext* gfxCtx, MtxF* src) { Mtx* mtx = GRAPH_ALLOC(gfxCtx, sizeof(Mtx)); if (mtx == NULL) { - osSyncPrintf("Skin_Matrix_to_Mtx_new() 確保失敗:NULLを返して終了\n", mtx); + PRINTF("Skin_Matrix_to_Mtx_new() 確保失敗:NULLを返して終了\n", mtx); return NULL; } SkinMatrix_MtxFToMtx(src, mtx); diff --git a/src/code/z_sram.c b/src/code/z_sram.c index ff54527236..d5d72a664e 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -345,15 +345,15 @@ void Sram_OpenSave(SramContext* sramCtx) { u16 j; u8* ptr; - osSyncPrintf("個人Ｆｉｌｅ作成\n"); // "Create personal file" + PRINTF("個人Ｆｉｌｅ作成\n"); // "Create personal file" i = gSramSlotOffsets[gSaveContext.fileNum]; - osSyncPrintf("ぽいんと＝%x(%d)\n", i, gSaveContext.fileNum); // "Point=" + PRINTF("ぽいんと＝%x(%d)\n", i, gSaveContext.fileNum); // "Point=" MemCpy(&gSaveContext, sramCtx->readBuff + i, sizeof(Save)); - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("SCENE_DATA_ID = %d SceneNo = %d\n", gSaveContext.save.info.playerData.savedSceneId, - ((void)0, gSaveContext.save.entranceIndex)); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("SCENE_DATA_ID = %d SceneNo = %d\n", gSaveContext.save.info.playerData.savedSceneId, + ((void)0, gSaveContext.save.entranceIndex)); switch (gSaveContext.save.info.playerData.savedSceneId) { case SCENE_DEKU_TREE: @@ -423,43 +423,43 @@ void Sram_OpenSave(SramContext* sramCtx) { break; } - osSyncPrintf("scene_no = %d\n", gSaveContext.save.entranceIndex); - osSyncPrintf(VT_RST); + PRINTF("scene_no = %d\n", gSaveContext.save.entranceIndex); + PRINTF(VT_RST); if (gSaveContext.save.info.playerData.health < 0x30) { gSaveContext.save.info.playerData.health = 0x30; } if (gSaveContext.save.info.scarecrowLongSongSet) { - osSyncPrintf(VT_FGCOL(BLUE)); - osSyncPrintf("\n====================================================================\n"); + PRINTF(VT_FGCOL(BLUE)); + PRINTF("\n====================================================================\n"); MemCpy(gScarecrowLongSongPtr, gSaveContext.save.info.scarecrowLongSong, sizeof(gSaveContext.save.info.scarecrowLongSong)); ptr = (u8*)gScarecrowLongSongPtr; for (i = 0; i < ARRAY_COUNT(gSaveContext.save.info.scarecrowLongSong); i++, ptr++) { - osSyncPrintf("%d, ", *ptr); + PRINTF("%d, ", *ptr); } - osSyncPrintf("\n====================================================================\n"); - osSyncPrintf(VT_RST); + PRINTF("\n====================================================================\n"); + PRINTF(VT_RST); } if (gSaveContext.save.info.scarecrowSpawnSongSet) { - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("\n====================================================================\n"); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("\n====================================================================\n"); MemCpy(gScarecrowSpawnSongPtr, gSaveContext.save.info.scarecrowSpawnSong, sizeof(gSaveContext.save.info.scarecrowSpawnSong)); ptr = gScarecrowSpawnSongPtr; for (i = 0; i < ARRAY_COUNT(gSaveContext.save.info.scarecrowSpawnSong); i++, ptr++) { - osSyncPrintf("%d, ", *ptr); + PRINTF("%d, ", *ptr); } - osSyncPrintf("\n====================================================================\n"); - osSyncPrintf(VT_RST); + PRINTF("\n====================================================================\n"); + PRINTF(VT_RST); } // if zelda cutscene has been watched but lullaby was not obtained, restore cutscene and take away letter @@ -566,7 +566,7 @@ void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCt u16* ptr; u16 dayTime; - osSyncPrintf("ＳＲＡＭ ＳＴＡＲＴ─ＬＯＡＤ\n"); + PRINTF("ＳＲＡＭ ＳＴＡＲＴ─ＬＯＡＤ\n"); bzero(sramCtx->readBuff, SRAM_SIZE); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_READ); @@ -574,41 +574,41 @@ void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCt for (slotNum = 0; slotNum < 3; slotNum++) { offset = gSramSlotOffsets[slotNum]; - osSyncPrintf("ぽいんと＝%x(%d) SAVE_MAX=%d\n", offset, gSaveContext.fileNum, sizeof(Save)); + PRINTF("ぽいんと＝%x(%d) SAVE_MAX=%d\n", offset, gSaveContext.fileNum, sizeof(Save)); MemCpy(&gSaveContext, sramCtx->readBuff + offset, sizeof(Save)); oldChecksum = gSaveContext.save.info.checksum; gSaveContext.save.info.checksum = 0; ptr = (u16*)&gSaveContext; - osSyncPrintf("\n＝＝＝＝＝＝＝＝＝＝＝＝＝ Ｓ（%d） ＝＝＝＝＝＝＝＝＝＝＝＝＝\n", slotNum); + PRINTF("\n＝＝＝＝＝＝＝＝＝＝＝＝＝ Ｓ（%d） ＝＝＝＝＝＝＝＝＝＝＝＝＝\n", slotNum); for (i = newChecksum = j = 0; i < CHECKSUM_SIZE; i++, offset += 2) { newChecksum += *ptr++; } // "SAVE checksum calculation" - osSyncPrintf("\nＳＡＶＥチェックサム計算 j=%x mmm=%x ", newChecksum, oldChecksum); + PRINTF("\nＳＡＶＥチェックサム計算 j=%x mmm=%x ", newChecksum, oldChecksum); if (newChecksum != oldChecksum) { // checksum didnt match, try backup save - osSyncPrintf("ＥＲＲＯＲ！！！ ＝ %x(%d)\n", gSramSlotOffsets[slotNum], slotNum); + PRINTF("ＥＲＲＯＲ！！！ ＝ %x(%d)\n", gSramSlotOffsets[slotNum], slotNum); offset = gSramSlotOffsets[slotNum + 3]; MemCpy(&gSaveContext, sramCtx->readBuff + offset, sizeof(Save)); oldChecksum = gSaveContext.save.info.checksum; gSaveContext.save.info.checksum = 0; ptr = (u16*)&gSaveContext; - osSyncPrintf("================= ＢＡＣＫ─ＵＰ ========================\n"); + PRINTF("================= ＢＡＣＫ─ＵＰ ========================\n"); for (i = newChecksum = j = 0; i < CHECKSUM_SIZE; i++, offset += 2) { newChecksum += *ptr++; } // "(B) SAVE checksum calculation" - osSyncPrintf("\n（Ｂ）ＳＡＶＥチェックサム計算 j=%x mmm=%x ", newChecksum, oldChecksum); + PRINTF("\n（Ｂ）ＳＡＶＥチェックサム計算 j=%x mmm=%x ", newChecksum, oldChecksum); if (newChecksum != oldChecksum) { // backup save didnt work, make new save - osSyncPrintf("ＥＲＲＯＲ！！！ ＝ %x(%d+3)\n", gSramSlotOffsets[slotNum + 3], slotNum); + PRINTF("ＥＲＲＯＲ！！！ ＝ %x(%d+3)\n", gSramSlotOffsets[slotNum + 3], slotNum); bzero(&gSaveContext.save.entranceIndex, sizeof(s32)); bzero(&gSaveContext.save.linkAge, sizeof(s32)); bzero(&gSaveContext.save.cutsceneIndex, sizeof(s32)); @@ -626,47 +626,46 @@ void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCt gSaveContext.save.info.playerData.newf[3] = 'D'; gSaveContext.save.info.playerData.newf[4] = 'A'; gSaveContext.save.info.playerData.newf[5] = 'Z'; - osSyncPrintf("newf=%x,%x,%x,%x,%x,%x\n", gSaveContext.save.info.playerData.newf[0], - gSaveContext.save.info.playerData.newf[1], gSaveContext.save.info.playerData.newf[2], - gSaveContext.save.info.playerData.newf[3], gSaveContext.save.info.playerData.newf[4], - gSaveContext.save.info.playerData.newf[5]); + PRINTF("newf=%x,%x,%x,%x,%x,%x\n", gSaveContext.save.info.playerData.newf[0], + gSaveContext.save.info.playerData.newf[1], gSaveContext.save.info.playerData.newf[2], + gSaveContext.save.info.playerData.newf[3], gSaveContext.save.info.playerData.newf[4], + gSaveContext.save.info.playerData.newf[5]); } else { Sram_InitNewSave(); } ptr = (u16*)&gSaveContext; - osSyncPrintf("\n--------------------------------------------------------------\n"); + PRINTF("\n--------------------------------------------------------------\n"); for (i = newChecksum = j = 0; i < CHECKSUM_SIZE; i++) { - osSyncPrintf("%x ", *ptr); + PRINTF("%x ", *ptr); if (++j == 0x20) { - osSyncPrintf("\n"); + PRINTF("\n"); j = 0; } newChecksum += *ptr++; } gSaveContext.save.info.checksum = newChecksum; - osSyncPrintf("\nCheck_Sum=%x(%x)\n", gSaveContext.save.info.checksum, newChecksum); + PRINTF("\nCheck_Sum=%x(%x)\n", gSaveContext.save.info.checksum, newChecksum); i = gSramSlotOffsets[slotNum + 3]; SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000) + i, &gSaveContext, SLOT_SIZE, OS_WRITE); - osSyncPrintf("????#%x,%x,%x,%x,%x,%x\n", gSaveContext.save.info.playerData.newf[0], - gSaveContext.save.info.playerData.newf[1], gSaveContext.save.info.playerData.newf[2], - gSaveContext.save.info.playerData.newf[3], gSaveContext.save.info.playerData.newf[4], - gSaveContext.save.info.playerData.newf[5]); - osSyncPrintf("\nぽいんと＝%x(%d+3) check_sum=%x(%x)\n", i, slotNum, gSaveContext.save.info.checksum, - newChecksum); + PRINTF("????#%x,%x,%x,%x,%x,%x\n", gSaveContext.save.info.playerData.newf[0], + gSaveContext.save.info.playerData.newf[1], gSaveContext.save.info.playerData.newf[2], + gSaveContext.save.info.playerData.newf[3], gSaveContext.save.info.playerData.newf[4], + gSaveContext.save.info.playerData.newf[5]); + PRINTF("\nぽいんと＝%x(%d+3) check_sum=%x(%x)\n", i, slotNum, gSaveContext.save.info.checksum, + newChecksum); } i = gSramSlotOffsets[slotNum]; SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000) + i, &gSaveContext, SLOT_SIZE, OS_WRITE); - osSyncPrintf("ぽいんと＝%x(%d) check_sum=%x(%x)\n", i, slotNum, gSaveContext.save.info.checksum, - newChecksum); + PRINTF("ぽいんと＝%x(%d) check_sum=%x(%x)\n", i, slotNum, gSaveContext.save.info.checksum, newChecksum); } else { - osSyncPrintf("\nＳＡＶＥデータ ＯＫ！！！！\n"); // "SAVE data OK! ! ! !" + PRINTF("\nＳＡＶＥデータ ＯＫ！！！！\n"); // "SAVE data OK! ! ! !" } } @@ -674,8 +673,8 @@ void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCt SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_READ); gSaveContext.save.dayTime = dayTime; - osSyncPrintf("SAVECT=%x, NAME=%x, LIFE=%x, ITEM=%x, 64DD=%x, HEART=%x\n", DEATHS, NAME, HEALTH_CAP, QUEST, N64DD, - DEFENSE); + PRINTF("SAVECT=%x, NAME=%x, LIFE=%x, ITEM=%x, 64DD=%x, HEART=%x\n", DEATHS, NAME, HEALTH_CAP, QUEST, N64DD, + DEFENSE); MemCpy(&fileSelect->deaths[0], sramCtx->readBuff + SLOT_OFFSET(0) + DEATHS, sizeof(fileSelect->deaths[0])); MemCpy(&fileSelect->deaths[1], sramCtx->readBuff + SLOT_OFFSET(1) + DEATHS, sizeof(fileSelect->deaths[0])); @@ -708,10 +707,9 @@ void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCt MemCpy(&fileSelect->health[1], sramCtx->readBuff + SLOT_OFFSET(1) + HEALTH, sizeof(fileSelect->health[0])); MemCpy(&fileSelect->health[2], sramCtx->readBuff + SLOT_OFFSET(2) + HEALTH, sizeof(fileSelect->health[0])); - osSyncPrintf("f_64dd=%d, %d, %d\n", fileSelect->n64ddFlags[0], fileSelect->n64ddFlags[1], - fileSelect->n64ddFlags[2]); - osSyncPrintf("heart_status=%d, %d, %d\n", fileSelect->defense[0], fileSelect->defense[1], fileSelect->defense[2]); - osSyncPrintf("now_life=%d, %d, %d\n", fileSelect->health[0], fileSelect->health[1], fileSelect->health[2]); + PRINTF("f_64dd=%d, %d, %d\n", fileSelect->n64ddFlags[0], fileSelect->n64ddFlags[1], fileSelect->n64ddFlags[2]); + PRINTF("heart_status=%d, %d, %d\n", fileSelect->defense[0], fileSelect->defense[1], fileSelect->defense[2]); + PRINTF("now_life=%d, %d, %d\n", fileSelect->health[0], fileSelect->health[1], fileSelect->health[2]); } void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx) { @@ -747,42 +745,42 @@ void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx) { gSaveContext.save.info.playerData.newf[5] = 'Z'; gSaveContext.save.info.playerData.n64ddFlag = fileSelect->n64ddFlag; - osSyncPrintf("６４ＤＤフラグ=%d\n", fileSelect->n64ddFlag); - osSyncPrintf("newf=%x,%x,%x,%x,%x,%x\n", gSaveContext.save.info.playerData.newf[0], - gSaveContext.save.info.playerData.newf[1], gSaveContext.save.info.playerData.newf[2], - gSaveContext.save.info.playerData.newf[3], gSaveContext.save.info.playerData.newf[4], - gSaveContext.save.info.playerData.newf[5]); - osSyncPrintf("\n$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n"); + PRINTF("６４ＤＤフラグ=%d\n", fileSelect->n64ddFlag); + PRINTF("newf=%x,%x,%x,%x,%x,%x\n", gSaveContext.save.info.playerData.newf[0], + gSaveContext.save.info.playerData.newf[1], gSaveContext.save.info.playerData.newf[2], + gSaveContext.save.info.playerData.newf[3], gSaveContext.save.info.playerData.newf[4], + gSaveContext.save.info.playerData.newf[5]); + PRINTF("\n$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\n"); ptr = (u16*)&gSaveContext; j = 0; checksum = 0; for (offset = 0; offset < CHECKSUM_SIZE; offset++) { - osSyncPrintf("%x ", *ptr); + PRINTF("%x ", *ptr); checksum += *ptr++; if (++j == 0x20) { - osSyncPrintf("\n"); + PRINTF("\n"); j = 0; } } gSaveContext.save.info.checksum = checksum; - osSyncPrintf("\nチェックサム＝%x\n", gSaveContext.save.info.checksum); // "Checksum = %x" + PRINTF("\nチェックサム＝%x\n", gSaveContext.save.info.checksum); // "Checksum = %x" offset = gSramSlotOffsets[gSaveContext.fileNum]; - osSyncPrintf("I=%x no=%d\n", offset, gSaveContext.fileNum); + PRINTF("I=%x no=%d\n", offset, gSaveContext.fileNum); MemCpy(sramCtx->readBuff + offset, &gSaveContext, sizeof(Save)); offset = gSramSlotOffsets[gSaveContext.fileNum + 3]; - osSyncPrintf("I=%x no=%d\n", offset, gSaveContext.fileNum + 3); + PRINTF("I=%x no=%d\n", offset, gSaveContext.fileNum + 3); MemCpy(sramCtx->readBuff + offset, &gSaveContext, sizeof(Save)); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_WRITE); - 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); + PRINTF("ＳＡＶＥ終了\n"); // "SAVE end" + PRINTF("z_common_data.file_no = %d\n", gSaveContext.fileNum); + PRINTF("SAVECT=%x, NAME=%x, LIFE=%x, ITEM=%x, SAVE_64DD=%x\n", DEATHS, NAME, HEALTH_CAP, QUEST, N64DD); j = gSramSlotOffsets[gSaveContext.fileNum]; @@ -798,9 +796,9 @@ void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx) { MemCpy(&fileSelect->defense[gSaveContext.fileNum], sramCtx->readBuff + j + DEFENSE, sizeof(fileSelect->defense[0])); MemCpy(&fileSelect->health[gSaveContext.fileNum], sramCtx->readBuff + j + HEALTH, sizeof(fileSelect->health[0])); - osSyncPrintf("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileSelect->n64ddFlags[gSaveContext.fileNum]); - osSyncPrintf("heart_status[%d]=%d\n", gSaveContext.fileNum, fileSelect->defense[gSaveContext.fileNum]); - osSyncPrintf("now_life[%d]=%d\n", gSaveContext.fileNum, fileSelect->health[gSaveContext.fileNum]); + PRINTF("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileSelect->n64ddFlags[gSaveContext.fileNum]); + PRINTF("heart_status[%d]=%d\n", gSaveContext.fileNum, fileSelect->defense[gSaveContext.fileNum]); + PRINTF("now_life[%d]=%d\n", gSaveContext.fileNum, fileSelect->health[gSaveContext.fileNum]); } void Sram_EraseSave(FileSelectState* fileSelect, SramContext* sramCtx) { @@ -819,15 +817,15 @@ void Sram_EraseSave(FileSelectState* fileSelect, SramContext* sramCtx) { MemCpy(sramCtx->readBuff + offset, &gSaveContext, sizeof(Save)); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000) + offset, &gSaveContext, SLOT_SIZE, OS_WRITE); - osSyncPrintf("ＣＬＥＡＲ終了\n"); + PRINTF("ＣＬＥＡＲ終了\n"); } void Sram_CopySave(FileSelectState* fileSelect, SramContext* sramCtx) { s32 offset; - osSyncPrintf("ＲＥＡＤ=%d(%x) ＣＯＰＹ=%d(%x)\n", fileSelect->selectedFileIndex, - gSramSlotOffsets[fileSelect->selectedFileIndex], fileSelect->copyDestFileIndex, - gSramSlotOffsets[fileSelect->copyDestFileIndex]); + PRINTF("ＲＥＡＤ=%d(%x) ＣＯＰＹ=%d(%x)\n", fileSelect->selectedFileIndex, + gSramSlotOffsets[fileSelect->selectedFileIndex], fileSelect->copyDestFileIndex, + gSramSlotOffsets[fileSelect->copyDestFileIndex]); offset = gSramSlotOffsets[fileSelect->selectedFileIndex]; MemCpy(&gSaveContext, sramCtx->readBuff + offset, sizeof(Save)); @@ -857,9 +855,9 @@ void Sram_CopySave(FileSelectState* fileSelect, SramContext* sramCtx) { MemCpy(&fileSelect->health[fileSelect->copyDestFileIndex], (sramCtx->readBuff + offset) + HEALTH, sizeof(fileSelect->health[0])); - osSyncPrintf("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileSelect->n64ddFlags[gSaveContext.fileNum]); - osSyncPrintf("heart_status[%d]=%d\n", gSaveContext.fileNum, fileSelect->defense[gSaveContext.fileNum]); - osSyncPrintf("ＣＯＰＹ終了\n"); // "Copy end" + PRINTF("f_64dd[%d]=%d\n", gSaveContext.fileNum, fileSelect->n64ddFlags[gSaveContext.fileNum]); + PRINTF("heart_status[%d]=%d\n", gSaveContext.fileNum, fileSelect->defense[gSaveContext.fileNum]); + PRINTF("ＣＯＰＹ終了\n"); // "Copy end" } /** @@ -872,12 +870,12 @@ void Sram_WriteSramHeader(SramContext* sramCtx) { void Sram_InitSram(GameState* gameState, SramContext* sramCtx) { u16 i; - osSyncPrintf("sram_initialize( Game *game, Sram *sram )\n"); + PRINTF("sram_initialize( Game *game, Sram *sram )\n"); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_READ); for (i = 0; i < ARRAY_COUNTU(sZeldaMagic) - 3; i++) { if (sZeldaMagic[i + SRAM_HEADER_MAGIC] != sramCtx->readBuff[i + SRAM_HEADER_MAGIC]) { - osSyncPrintf("ＳＲＡＭ破壊！！！！！！\n"); // "SRAM destruction! ! ! ! ! !" + PRINTF("ＳＲＡＭ破壊！！！！！！\n"); // "SRAM destruction! ! ! ! ! !" gSaveContext.language = sramCtx->readBuff[SRAM_HEADER_LANGUAGE]; MemCpy(sramCtx->readBuff, sZeldaMagic, sizeof(sZeldaMagic)); sramCtx->readBuff[SRAM_HEADER_LANGUAGE] = gSaveContext.language; @@ -901,16 +899,16 @@ void Sram_InitSram(GameState* gameState, SramContext* sramCtx) { sramCtx->readBuff[i] = i; } SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_WRITE); - osSyncPrintf("ＳＲＡＭ破壊！！！！！！\n"); // "SRAM destruction! ! ! ! ! !" + PRINTF("ＳＲＡＭ破壊！！！！！！\n"); // "SRAM destruction! ! ! ! ! !" } // "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); - osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); - osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); - osSyncPrintf(VT_RST); + PRINTF("ＧＯＯＤ！ＧＯＯＤ！ サイズ＝%d + %d ＝ %d\n", sizeof(SaveInfo), 4, sizeof(SaveInfo) + 4); + PRINTF(VT_FGCOL(BLUE)); + PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); + PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); + PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); + PRINTF(VT_RST); func_800F6700(gSaveContext.audioSetting); } diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c index df11657a51..8feef8ad1d 100644 --- a/src/code/z_ss_sram.c +++ b/src/code/z_ss_sram.c @@ -50,7 +50,7 @@ void SsSram_Dma(void* dramAddr, size_t size, s32 direction) { } void SsSram_ReadWrite(u32 addr, void* dramAddr, size_t size, s32 direction) { - osSyncPrintf("ssSRAMReadWrite:%08x %08x %08x %d\n", addr, dramAddr, size, direction); + PRINTF("ssSRAMReadWrite:%08x %08x %08x %d\n", addr, dramAddr, size, direction); SsSram_Init(addr, DEVICE_TYPE_SRAM, PI_DOMAIN2, 5, 0xD, 2, 0xC, 0); SsSram_Dma(dramAddr, size, direction); } diff --git a/src/code/z_view.c b/src/code/z_view.c index d1df496ba9..47b787bed8 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -56,7 +56,7 @@ void View_Init(View* view, GraphicsContext* gfxCtx) { if (sLogOnNextViewInit) { if (sLogOnNextViewInit == false) {} - osSyncPrintf("\nview: initialize ---\n"); + PRINTF("\nview: initialize ---\n"); sLogOnNextViewInit = false; } @@ -329,15 +329,15 @@ s32 View_ApplyPerspective(View* view) { s32 i; MtxF mf; - osSyncPrintf("fovy %f near %f far %f scale %f aspect %f normal %08x\n", view->fovy, view->zNear, view->zFar, - view->scale, aspect, view->normal); + PRINTF("fovy %f near %f far %f scale %f aspect %f normal %08x\n", view->fovy, view->zNear, view->zFar, + view->scale, aspect, view->normal); Matrix_MtxToMtxF(projection, &mf); - osSyncPrintf("projection\n"); + PRINTF("projection\n"); for (i = 0; i < 4; i++) { - osSyncPrintf("\t%f\t%f\t%f\t%f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); + PRINTF("\t%f\t%f\t%f\t%f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); } - osSyncPrintf("\n"); + PRINTF("\n"); } view->projection = *projection; @@ -372,11 +372,11 @@ s32 View_ApplyPerspective(View* view) { MtxF mf; Matrix_MtxToMtxF(view->viewingPtr, &mf); - osSyncPrintf("viewing\n"); + PRINTF("viewing\n"); for (i = 0; i < 4; i++) { - osSyncPrintf("\t%f\t%f\t%f\t%f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); + PRINTF("\t%f\t%f\t%f\t%f\n", mf.mf[i][0], mf.mf[i][1], mf.mf[i][2], mf.mf[i][3]); } - osSyncPrintf("\n"); + PRINTF("\n"); } gSPMatrix(POLY_OPA_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); @@ -632,10 +632,10 @@ s32 View_ErrorCheckEyePosition(f32 eyeX, f32 eyeY, f32 eyeZ) { } if (error != 0) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "Is too large" - osSyncPrintf("eye が大きすぎます eye=[%8.3f %8.3f %8.3f] error=%d\n", eyeX, eyeY, eyeZ, error); - osSyncPrintf(VT_RST); + PRINTF("eye が大きすぎます eye=[%8.3f %8.3f %8.3f] error=%d\n", eyeX, eyeY, eyeZ, error); + PRINTF(VT_RST); } return error; diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index d3f5e0a2c6..d9478867fb 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -187,15 +187,15 @@ void ViMode_Save(ViMode* viMode) { switch (SREG(59)) { case 1: - osSyncPrintf("osViModePalLan1\n"); + PRINTF("osViModePalLan1\n"); ViMode_LogPrint(&osViModePalLan1); break; case 2: - osSyncPrintf("osViModeFpalLan1\n"); + PRINTF("osViModeFpalLan1\n"); ViMode_LogPrint(&osViModeFpalLan1); break; default: - osSyncPrintf("Custom\n"); + PRINTF("Custom\n"); ViMode_LogPrint(&viMode->customViMode); break; } diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index ed3547d4fd..3472573eeb 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -582,7 +582,7 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) { start = (uintptr_t)_vr_RUVR_pal_staticSegmentRomStart; size = (uintptr_t)_vr_RUVR_pal_staticSegmentRomEnd - start; - osSyncPrintf("ＳＩＺＥ = %d\n", size); + PRINTF("ＳＩＺＥ = %d\n", size); skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1188); ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1189); @@ -664,7 +664,7 @@ void Skybox_Setup(PlayState* play, SkyboxContext* skyboxCtx, s16 skyboxId) { start = (uintptr_t)_vr_MNVR_pal_staticSegmentRomStart; size = (uintptr_t)_vr_MNVR_pal_staticSegmentRomEnd - start; - osSyncPrintf("ＳＩＺＥ = %d\n", size); + PRINTF("ＳＩＺＥ = %d\n", size); skyboxCtx->palettes = GAME_STATE_ALLOC(&play->state, size, "../z_vr_box.c", 1277); ASSERT(skyboxCtx->palettes != NULL, "vr_box->vr_box_staticSegment[2] != NULL", "../z_vr_box.c", 1278); @@ -997,14 +997,14 @@ void Skybox_Init(GameState* state, SkyboxContext* skyboxCtx, s16 skyboxId) { // DMA required assets based on skybox id Skybox_Setup(play, skyboxCtx, skyboxId); - osSyncPrintf("\n\n\n＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊\n\n\n" - "ＴＹＰＥ＝%d" - "\n\n\n＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊\n\n\n", - skyboxId); + PRINTF("\n\n\n＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊\n\n\n" + "ＴＹＰＥ＝%d" + "\n\n\n＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊＊\n\n\n", + skyboxId); // Precompute vertices and display lists for drawing the skybox if (skyboxId != SKYBOX_NONE) { - osSyncPrintf(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(GREEN)); if (skyboxCtx->drawType != SKYBOX_DRAW_128) { skyboxCtx->dListBuf = GAME_STATE_ALLOC(state, 8 * 150 * sizeof(Gfx), "../z_vr_box.c", 1636); @@ -1030,6 +1030,6 @@ void Skybox_Init(GameState* state, SkyboxContext* skyboxCtx, s16 skyboxId) { Skybox_Calculate128(skyboxCtx, 5); // compute 5 faces, excludes the bottom face } } - osSyncPrintf(VT_RST); + PRINTF(VT_RST); } } diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index aa2653fe34..d263d8bce4 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -95,7 +95,7 @@ s32 BgBdanObjects_GetProperty(BgBdanObjects* this, s32 arg1) { case JABU_OBJECTS_GET_PROP_CAM_SETTING_DUNGEON1: return this->cameraSetting == CAM_SET_DUNGEON1; default: - osSyncPrintf("Bg_Bdan_Objects_Get_Contact_Ru1\nそんな受信モードは無い%d!!!!!!!!\n"); + PRINTF("Bg_Bdan_Objects_Get_Contact_Ru1\nそんな受信モードは無い%d!!!!!!!!\n"); return -1; } } @@ -112,7 +112,7 @@ void BgBdanObjects_SetProperty(BgBdanObjects* this, s32 arg1) { SET_INFTABLE(INFTABLE_146); break; default: - osSyncPrintf("Bg_Bdan_Objects_Set_Contact_Ru1\nそんな送信モードは無い%d!!!!!!!!\n"); + PRINTF("Bg_Bdan_Objects_Set_Contact_Ru1\nそんな送信モードは無い%d!!!!!!!!\n"); } } diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 3e1df35363..2220e8f546 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -98,8 +98,8 @@ void BgBdanSwitch_InitDynaPoly(BgBdanSwitch* this, PlayState* play, CollisionHea CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_bdan_switch.c", 325, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_bdan_switch.c", 325, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -192,12 +192,11 @@ void BgBdanSwitch_Init(Actor* thisx, PlayState* play) { } break; default: - osSyncPrintf("不正な ARG_DATA(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, "../z_bg_bdan_switch.c", - 454); + PRINTF("不正な ARG_DATA(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, "../z_bg_bdan_switch.c", 454); Actor_Kill(&this->dyna.actor); return; } - osSyncPrintf("(巨大魚ダンジョン 専用スイッチ)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(巨大魚ダンジョン 専用スイッチ)(arg_data 0x%04x)\n", this->dyna.actor.params); } void BgBdanSwitch_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index 02c08a6583..44950a46cd 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -42,8 +42,8 @@ void BgBomGuard_Init(Actor* thisx, PlayState* play) { CollisionHeader_GetVirtual(&gBowlingDefaultCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader); - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 透明ガード出現 ☆☆☆☆☆ \n" VT_RST); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 透明ガード出現 ☆☆☆☆☆ \n" VT_RST); thisx->scale.x = 1.0f; thisx->scale.y = 1.0f; diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 977d4ed242..19d53090ea 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -92,8 +92,8 @@ void BgBombwall_InitDynapoly(BgBombwall* this, PlayState* play) { if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG login failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_bombwall.c", 243, - this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_bombwall.c", 243, + this->dyna.actor.params); } } @@ -149,8 +149,8 @@ void BgBombwall_Init(Actor* thisx, PlayState* play) { func_8086ED50(this, play); } - osSyncPrintf("(field keep 汎用爆弾壁)(arg_data 0x%04x)(angY %d)\n", this->dyna.actor.params, - this->dyna.actor.shape.rot.y); + PRINTF("(field keep 汎用爆弾壁)(arg_data 0x%04x)(angY %d)\n", this->dyna.actor.params, + this->dyna.actor.shape.rot.y); } void BgBombwall_DestroyCollision(BgBombwall* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index bea9bd146b..3fdafb1444 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -61,8 +61,8 @@ void BgBowlWall_Init(Actor* thisx, PlayState* play) { this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); this->initPos = this->dyna.actor.world.pos; - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ ボーリングおじゃま壁発生 ☆☆☆☆☆ %d\n" VT_RST, this->dyna.actor.params); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ ボーリングおじゃま壁発生 ☆☆☆☆☆ %d\n" VT_RST, this->dyna.actor.params); this->actionFunc = BgBowlWall_SpawnBullseyes; this->dyna.actor.scale.x = this->dyna.actor.scale.y = this->dyna.actor.scale.z = 1.0f; } @@ -83,7 +83,7 @@ void BgBowlWall_SpawnBullseyes(BgBowlWall* this, PlayState* play) { if (type != 0) { type += (s16)Rand_ZeroFloat(2.99f); this->dyna.actor.shape.rot.z = this->dyna.actor.world.rot.z = sTargetRot[type]; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); } this->bullseyeCenter.x = sBullseyeOffset[type].x + this->dyna.actor.world.pos.x; this->bullseyeCenter.y = sBullseyeOffset[type].y + this->dyna.actor.world.pos.y; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 1475685947..f5cc8bd9c5 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -96,7 +96,7 @@ void BgDdanKd_CheckForExplosions(BgDdanKd* this, PlayState* play) { explosive = Actor_GetCollidedExplosive(play, &this->collider.base); if (explosive != NULL) { - osSyncPrintf("dam %d\n", this->dyna.actor.colChkInfo.damage); + PRINTF("dam %d\n", this->dyna.actor.colChkInfo.damage); explosive->params = 2; } diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 245c063e0c..f2779f3c61 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -82,12 +82,12 @@ void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) { if (play->sceneId == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) { // "Great Fairy Fountain" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, play->spawn); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 大妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, play->spawn); SkelAnime_InitFlex(play, &this->skelAnime, &gGreatFairySkel, &gGreatFairySittingTransitionAnim, this->jointTable, this->morphTable, 28); } else { // "Stone/Jewel Fairy Fountain" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, play->spawn); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 石妖精の泉 ☆☆☆☆☆ %d\n" VT_RST, play->spawn); SkelAnime_InitFlex(play, &this->skelAnime, &gGreatFairySkel, &gGreatFairyLayingDownTransitionAnim, this->jointTable, this->morphTable, 28); } @@ -201,7 +201,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) { Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); // "Mode" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); givingReward = false; if (play->sceneId != SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) { @@ -227,7 +227,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) { case FAIRY_UPGRADE_MAGIC: if (!gSaveContext.save.info.playerData.isMagicAcquired || BREG(2)) { // "Spin Attack speed UP" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 回転切り速度ＵＰ ☆☆☆☆☆ \n" VT_RST); this->givingSpell = true; givingReward = true; } @@ -235,7 +235,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) { case FAIRY_UPGRADE_DOUBLE_MAGIC: if (!gSaveContext.save.info.playerData.isDoubleMagicAcquired) { // "Magic Meter doubled" - osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 魔法ゲージメーター倍増 ☆☆☆☆☆ \n" VT_RST); this->givingSpell = true; givingReward = true; } @@ -243,7 +243,7 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) { case FAIRY_UPGRADE_DOUBLE_DEFENSE: if (!gSaveContext.save.info.playerData.isDoubleDefenseAcquired) { // "Damage halved" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n" VT_RST); this->givingSpell = true; givingReward = true; } diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index c7cf1564b8..95f18f4b7c 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -89,9 +89,9 @@ void BgGanonOtyuka_Destroy(Actor* thisx, PlayState* play2) { DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("WHY !!!!!!!!!!!!!!!!\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("WHY !!!!!!!!!!!!!!!!\n"); + PRINTF(VT_RST); } void BgGanonOtyuka_WaitToFall(BgGanonOtyuka* this, PlayState* play) { @@ -105,7 +105,7 @@ void BgGanonOtyuka_WaitToFall(BgGanonOtyuka* this, PlayState* play) { s16 i; if (this->isFalling || ((play->actorCtx.unk_02 != 0) && (this->dyna.actor.xyzDistToPlayerSq < SQ(70.0f)))) { - osSyncPrintf("OTC O 1\n"); + PRINTF("OTC O 1\n"); for (i = 0; i < ARRAY_COUNT(D_80876A68); i++) { prop = play->actorCtx.actorLists[ACTORCAT_PROP].head; @@ -130,7 +130,7 @@ void BgGanonOtyuka_WaitToFall(BgGanonOtyuka* this, PlayState* play) { } } - osSyncPrintf("OTC O 2\n"); + PRINTF("OTC O 2\n"); for (i = 0; i < ARRAY_COUNT(D_80876A68); i++) { center.x = this->dyna.actor.world.pos.x + D_80876A68[i].x; @@ -141,7 +141,7 @@ void BgGanonOtyuka_WaitToFall(BgGanonOtyuka* this, PlayState* play) { } } - osSyncPrintf("OTC O 3\n"); + PRINTF("OTC O 3\n"); this->actionFunc = BgGanonOtyuka_Fall; this->isFalling = true; @@ -164,7 +164,7 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, PlayState* play) { Vec3f velocity; Vec3f accel; - osSyncPrintf("MODE DOWN\n"); + PRINTF("MODE DOWN\n"); if (this->flashState == FLASH_GROW) { Math_ApproachF(&this->flashPrimColorB, 170.0f, 1.0f, 8.5f); Math_ApproachF(&this->flashEnvColorR, 120.0f, 1.0f, 13.5f); @@ -227,7 +227,7 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, PlayState* play) { Math_ApproachF(&this->dyna.actor.world.pos.y, -1000.0f, 1.0f, this->dyna.actor.speed); Math_ApproachF(&this->dyna.actor.speed, 100.0f, 1.0f, 0.1f); } - osSyncPrintf("MODE DOWN END\n"); + PRINTF("MODE DOWN END\n"); } void BgGanonOtyuka_DoNothing(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index 86a0ba8495..af27042725 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -50,8 +50,8 @@ void BgGateShutter_Init(Actor* thisx, PlayState* play) { thisx->scale.x = 1.0f; thisx->scale.y = 1.0f; thisx->scale.z = 1.0f; - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 柵でたなぁ ☆☆☆☆☆ \n" VT_RST); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 柵でたなぁ ☆☆☆☆☆ \n" VT_RST); this->actionFunc = func_8087828C; } diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index b63018b3fe..4bd23fcaac 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -93,7 +93,7 @@ void BgHakaShip_WaitForSong(BgHakaShip* this, PlayState* play) { if (this->counter == 0) { this->counter = 130; this->actionFunc = BgHakaShip_CutsceneStationary; - osSyncPrintf("シーン 外輪船 ... アァクション！！\n"); + PRINTF("シーン 外輪船 ... アァクション！！\n"); OnePointCutscene_Init(play, 3390, 999, &this->dyna.actor, CAM_ID_MAIN); } } diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index f4edfaded1..c868ca72a1 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -146,7 +146,7 @@ void BgHeavyBlock_Init(Actor* thisx, PlayState* play) { break; } // "Largest Block Save Bit %x" - osSyncPrintf(VT_FGCOL(CYAN) " 最大 ブロック セーブビット %x\n" VT_RST, thisx->params); + PRINTF(VT_FGCOL(CYAN) " 最大 ブロック セーブビット %x\n" VT_RST, thisx->params); } void BgHeavyBlock_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index ee9b8a9323..e7ec041a3e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -70,13 +70,13 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) { BgHidanCurtain* this = (BgHidanCurtain*)thisx; BgHidanCurtainParams* hcParams; - osSyncPrintf("Curtain (arg_data 0x%04x)\n", this->actor.params); + PRINTF("Curtain (arg_data 0x%04x)\n", this->actor.params); Actor_SetFocus(&this->actor, 20.0f); this->type = (thisx->params >> 0xC) & 0xF; if (this->type > 6) { // "Type is not set" - osSyncPrintf("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_hidan_curtain.c", - 352, this->actor.params); + PRINTF("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_hidan_curtain.c", 352, + this->actor.params); Actor_Kill(&this->actor); return; } @@ -88,8 +88,8 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) { if ((this->actor.params < 0) || (this->actor.params > 0x3F)) { // "Save bit is not set" - osSyncPrintf("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n", - "../z_bg_hidan_curtain.c", 373, this->actor.params); + PRINTF("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_hidan_curtain.c", + 373, this->actor.params); } Actor_SetScale(&this->actor, hcParams->scale); Collider_InitCylinder(play, &this->collider); 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 7f09ac3dc6..b20e9f1c12 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,13 +180,13 @@ void BgHidanHamstep_Init(Actor* thisx, PlayState* play) { if ((this->dyna.actor.params & 0xFF) == 0) { // "Fire Temple Object [Hammer Step] appears" - osSyncPrintf("◯◯◯炎の神殿オブジェクト【ハンマーステップ】出現\n"); + PRINTF("◯◯◯炎の神殿オブジェクト【ハンマーステップ】出現\n"); if (BgHidanHamstep_SpawnChildren(this, play) == 0) { step = this; // "[Hammer Step] I can't create a step!" - osSyncPrintf("【ハンマーステップ】 足場産れない！！\n"); - osSyncPrintf("%s %d\n", "../z_bg_hidan_hamstep.c", 425); + PRINTF("【ハンマーステップ】 足場産れない！！\n"); + PRINTF("%s %d\n", "../z_bg_hidan_hamstep.c", 425); while (step != NULL) { Actor_Kill(&step->dyna.actor); @@ -316,7 +316,7 @@ void func_80888860(BgHidanHamstep* this, PlayState* play) { Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 255, 20, 150); func_80888638(this, play); - osSyncPrintf("A(%d)\n", this->dyna.actor.params); + PRINTF("A(%d)\n", this->dyna.actor.params); } } } @@ -349,8 +349,8 @@ void func_80888A58(BgHidanHamstep* this, PlayState* play) { if (((this->dyna.actor.params & 0xFF) <= 0) || ((this->dyna.actor.params & 0xFF) >= 6)) { // "[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); + PRINTF("【ハンマーステップ】 arg_data おかしい (arg_data = %d)", this->dyna.actor.params); + PRINTF("%s %d\n", "../z_bg_hidan_hamstep.c", 696); } if (((this->dyna.actor.world.pos.y - this->dyna.actor.home.pos.y) <= @@ -381,7 +381,7 @@ void func_80888A58(BgHidanHamstep* this, PlayState* play) { Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); } - osSyncPrintf("B(%d)\n", this->dyna.actor.params); + PRINTF("B(%d)\n", this->dyna.actor.params); } } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 3b91b2e603..4bcee5a11a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -69,12 +69,12 @@ void BgHidanKousi_Init(Actor* thisx, PlayState* play) { DynaPolyActor_Init(&this->dyna, 0); Actor_SetFocus(thisx, 50.0f); - osSyncPrintf("◯◯◯炎の神殿オブジェクト【格子(arg_data : %0x)】出現 (%d %d)\n", thisx->params, thisx->params & 0xFF, - ((s32)thisx->params >> 8) & 0xFF); + PRINTF("◯◯◯炎の神殿オブジェクト【格子(arg_data : %0x)】出現 (%d %d)\n", thisx->params, thisx->params & 0xFF, + ((s32)thisx->params >> 8) & 0xFF); Actor_ProcessInitChain(thisx, sInitChain); if (((thisx->params & 0xFF) < 0) || ((thisx->params & 0xFF) >= 3)) { - osSyncPrintf("arg_data おかしい 【格子】\n"); + PRINTF("arg_data おかしい 【格子】\n"); } CollisionHeader_GetVirtual(sMetalFencesCollisions[thisx->params & 0xFF], &colHeader); 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 d157bc2cbc..5c5730585e 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 @@ -118,8 +118,8 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) { if (((this->dyna.actor.params & 0xFF) < CRACKED_STONE_FLOOR) || ((this->dyna.actor.params & 0xFF) > LARGE_BOMBABLE_WALL)) { // "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); + PRINTF("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); return; } @@ -134,7 +134,7 @@ void BgHidanKowarerukabe_Init(Actor* thisx, PlayState* play) { BgHidanKowarerukabe_InitColliderSphere(this, play); BgHidanKowarerukabe_OffsetActorYPos(this); // "(fire walls, floors, destroyed by bombs)(arg_data 0x%04x)" - osSyncPrintf("(hidan 爆弾で壊れる 壁 床)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(hidan 爆弾で壊れる 壁 床)(arg_data 0x%04x)\n", this->dyna.actor.params); } void BgHidanKowarerukabe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 3628615f37..2a862c4631 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -123,8 +123,8 @@ void BgIceShelter_InitDynaPoly(BgIceShelter* this, PlayState* play, CollisionHea if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG registration failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_ice_shelter.c", 362, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_ice_shelter.c", 362, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -186,7 +186,7 @@ void BgIceShelter_Init(Actor* thisx, PlayState* play) { BgIceShelter_SetupIdle(this); - osSyncPrintf("(ice shelter)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(ice shelter)(arg_data 0x%04x)\n", this->dyna.actor.params); } void BgIceShelter_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index b56effd8c9..e9632360db 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -77,8 +77,8 @@ void BgJya1flift_InitDynapoly(BgJya1flift* this, PlayState* play, CollisionHeade if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG login failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_1flift.c", 179, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_1flift.c", 179, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -93,7 +93,7 @@ void BgJya1flift_InitCollision(Actor* thisx, PlayState* play) { void BgJya1flift_Init(Actor* thisx, PlayState* play) { BgJya1flift* this = (BgJya1flift*)thisx; // "1 F lift" - osSyncPrintf("(１Ｆリフト)(flag %d)(room %d)\n", sIsSpawned, play->roomCtx.curRoom.num); + PRINTF("(１Ｆリフト)(flag %d)(room %d)\n", sIsSpawned, play->roomCtx.curRoom.num); this->hasInitialized = false; if (sIsSpawned) { Actor_Kill(thisx); diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index c5f73e4107..4df5b39ed3 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -51,8 +51,8 @@ void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, Collis CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_amishutter.c", 129, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_amishutter.c", 129, + this->dyna.actor.id, this->dyna.actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index 73c4324f2f..a66909bd6c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -76,7 +76,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, PlayState* play) { if (curCobraInfo->cobra->dyna.actor.update == NULL) { // "Cobra deleted" - osSyncPrintf("Error : コブラ削除された (%s %d)\n", "../z_bg_jya_bigmirror.c", 203); + PRINTF("Error : コブラ削除された (%s %d)\n", "../z_bg_jya_bigmirror.c", 203); } } else { curCobraInfo->cobra = (BgJyaCobra*)Actor_SpawnAsChild( @@ -86,7 +86,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, PlayState* play) { if (curCobraInfo->cobra == NULL) { // "Cobra generation failed" - osSyncPrintf("Error : コブラ発生失敗 (%s %d)\n", "../z_bg_jya_bigmirror.c", 221); + PRINTF("Error : コブラ発生失敗 (%s %d)\n", "../z_bg_jya_bigmirror.c", 221); } } } @@ -160,7 +160,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, PlayState* play) { if (this->lightBeams[i] == NULL) { // "Mir Ray generation failed" - osSyncPrintf("Error : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_bigmirror.c", 310); + PRINTF("Error : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_bigmirror.c", 310); } } } else { @@ -191,7 +191,7 @@ void BgJyaBigmirror_Init(Actor* thisx, PlayState* play) { this->mirRayObjectSlot = -1; // "jya Bigmirror" - osSyncPrintf("(jya 大鏡)(arg_data 0x%04x)\n", this->actor.params); + PRINTF("(jya 大鏡)(arg_data 0x%04x)\n", this->actor.params); } void BgJyaBigmirror_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 3567f9d6d8..54cb236fe2 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -182,8 +182,8 @@ void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, PlayState* play) { if (Actor_Spawn(&play->actorCtx, play, ACTOR_MIR_RAY, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0) == NULL) { // "Occurrence failure" - osSyncPrintf("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombchuiwa.c", 410, - this->actor.params); + PRINTF("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombchuiwa.c", 410, + this->actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index c0d8a30658..b03f841e3c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -73,8 +73,8 @@ void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHe if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning: move BG registration failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombiwa.c", 174, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombiwa.c", 174, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -89,12 +89,12 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) { BgJyaBombiwa* this = (BgJyaBombiwa*)thisx; if ((this->dyna.actor.params & 0x3F) != 0x29) { - osSyncPrintf(VT_COL(YELLOW, BLACK)); + PRINTF(VT_COL(YELLOW, BLACK)); // "Warning: Switch Number changed (%s %d)(SW %d)" - osSyncPrintf("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n", "../z_bg_jya_bombiwa.c", 218, - this->dyna.actor.params & 0x3F); - osSyncPrintf(VT_RST); + PRINTF("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n", "../z_bg_jya_bombiwa.c", 218, + this->dyna.actor.params & 0x3F); + PRINTF(VT_RST); } BgJyaBombiwa_SetupDynaPoly(this, play, &gBombiwaCol, 0); BgJyaBombiwa_InitCollider(this, play); @@ -104,7 +104,7 @@ void BgJyaBombiwa_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); // "Rock destroyed by jya bomb" - osSyncPrintf("(jya 爆弾で破壊岩)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(jya 爆弾で破壊岩)(arg_data 0x%04x)\n", this->dyna.actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 0febcf05d0..02b42c4ce8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -125,8 +125,8 @@ void BgJyaCobra_InitDynapoly(BgJyaCobra* this, PlayState* play, CollisionHeader* this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG Registration Failure" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_cobra.c", 247, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_cobra.c", 247, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -134,10 +134,10 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, PlayState* play) { Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_MIR_RAY, this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + 57.0f, this->dyna.actor.world.pos.z, 0, 0, 0, 6); if (this->dyna.actor.child == NULL) { - osSyncPrintf(VT_FGCOL(RED)); + PRINTF(VT_FGCOL(RED)); // "Ｅｒｒｏｒ : Mir Ray occurrence failure" - osSyncPrintf("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_cobra.c", 270); - osSyncPrintf(VT_RST); + PRINTF("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_cobra.c", 270); + PRINTF(VT_RST); } } @@ -420,8 +420,8 @@ void BgJyaCobra_Init(Actor* thisx, PlayState* play) { } // "(jya cobra)" - osSyncPrintf("(jya コブラ)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n", this->dyna.actor.params, this, - &this->shadowTextureBuffer, COBRA_SHADOW_TEX_PTR(this)); + PRINTF("(jya コブラ)(arg_data 0x%04x)(act %x)(txt %x)(txt16 %x)\n", this->dyna.actor.params, this, + &this->shadowTextureBuffer, COBRA_SHADOW_TEX_PTR(this)); } void BgJyaCobra_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index 516959e9df..af9ced88f4 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -107,10 +107,10 @@ void BgJyaIronobj_SpawnPillarParticles(BgJyaIronobj* this, PlayState* play, EnIk s32 pad[2]; if (enIk->unk_2FF <= 0 || enIk->unk_2FF >= 4) { - osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 233, enIk->unk_2FF); + PRINTF("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 233, enIk->unk_2FF); return; } - osSyncPrintf("¢ attack_type(%d)\n", enIk->unk_2FF); + PRINTF("¢ attack_type(%d)\n", enIk->unk_2FF); rotY = Actor_WorldYawTowardActor(&this->dyna.actor, &enIk->actor) + D_808994D8[enIk->unk_2FF - 1]; for (i = 0; i < 8; i++) { @@ -170,10 +170,10 @@ void BgJyaIronobj_SpawnThroneParticles(BgJyaIronobj* this, PlayState* play, EnIk s32 pad[2]; if (enIk->unk_2FF <= 0 || enIk->unk_2FF >= 4) { - osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 362, enIk->unk_2FF); + PRINTF("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 362, enIk->unk_2FF); return; } - osSyncPrintf("¢ attack_type(%d)\n", enIk->unk_2FF); + PRINTF("¢ attack_type(%d)\n", enIk->unk_2FF); rotY = Actor_WorldYawTowardActor(&this->dyna.actor, &enIk->actor) + D_808994D8[enIk->unk_2FF - 1]; for (i = 0; i < 8; i++) { Actor* actor = diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index cc6a1fa9e0..f8ef9d42de 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -49,8 +49,8 @@ void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, PlayState* play, CollisionHea CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_kanaami.c", 145, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_kanaami.c", 145, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -64,7 +64,7 @@ void BgJyaKanaami_Init(Actor* thisx, PlayState* play) { } else { func_80899880(this); } - osSyncPrintf("(jya 金網)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(jya 金網)(arg_data 0x%04x)\n", this->dyna.actor.params); } void BgJyaKanaami_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index a6aa9612fa..5462ee6dc1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -60,7 +60,7 @@ void BgJyaLift_Init(Actor* thisx, PlayState* play) { } // "Goddess lift CT" - osSyncPrintf("女神リフト CT\n"); + PRINTF("女神リフト CT\n"); BgJyaLift_InitDynapoly(this, play, &gLiftCol, 0); Actor_ProcessInitChain(thisx, sInitChain); if (Flags_GetSwitch(play, (thisx->params & 0x3F))) { @@ -79,7 +79,7 @@ void BgJyaLift_Destroy(Actor* thisx, PlayState* play) { if (this->isSpawned) { // "Goddess Lift DT" - osSyncPrintf("女神リフト DT\n"); + PRINTF("女神リフト DT\n"); sIsSpawned = false; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 0fe33cddcc..2a4181eefd 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -68,8 +68,8 @@ void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, Collis CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 194, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 194, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -121,15 +121,15 @@ void BgJyaZurerukabe_Init(Actor* thisx, PlayState* play) { } if (i == ARRAY_COUNT(D_8089B9F0)) { - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 299, - this->dyna.actor.params); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 299, + this->dyna.actor.params); + PRINTF(VT_RST); } this->unk_16E = D_8089B9F8[this->unk_168]; func_8089B7B4(this); - osSyncPrintf("(jya ずれる壁)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(jya ずれる壁)(arg_data 0x%04x)\n", this->dyna.actor.params); } void BgJyaZurerukabe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 63b9da19e0..0ab3facdac 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -190,8 +190,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { } else { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitFloor, this->elements)) { - osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", - 484, this->dyna.actor.params); + PRINTF("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", 484, + this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { f32 sin = Math_SinS(this->dyna.actor.shape.rot.y); @@ -225,8 +225,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { } else { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitRutoWall, this->elements)) { - osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", - 558, this->dyna.actor.params); + PRINTF("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", 558, + this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { f32 sin = Math_SinS(this->dyna.actor.shape.rot.y); @@ -260,8 +260,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { } else { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitUnusedWall, this->elements)) { - osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", - 638, this->dyna.actor.params); + PRINTF("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", 638, + this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { f32 sin = Math_SinS(this->dyna.actor.shape.rot.y); @@ -298,8 +298,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall, this->elements)) { - osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", - 724, this->dyna.actor.params); + PRINTF("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", 724, + this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { f32 sin = Math_SinS(this->dyna.actor.shape.rot.y); @@ -336,8 +336,8 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { Collider_InitTris(play, &this->collider); if (!Collider_SetTris(play, &this->collider, &this->dyna.actor, &sTrisInitStingerWall, this->elements)) { - osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", - 798, this->dyna.actor.params); + PRINTF("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c", 798, + this->dyna.actor.params); Actor_Kill(&this->dyna.actor); } else { f32 sin = Math_SinS(this->dyna.actor.shape.rot.y); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 038acf6390..050f850aaa 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -105,9 +105,9 @@ void BgMizuWater_Init(Actor* thisx, PlayState* play) { switch (this->type) { case 0: if (bREG(15) == 0) { - osSyncPrintf("<コンストラクト>%x %x %x\n", Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG), - Flags_GetSwitch(play, WATER_TEMPLE_WATER_F2_FLAG), - Flags_GetSwitch(play, WATER_TEMPLE_WATER_F3_FLAG)); + PRINTF("<コンストラクト>%x %x %x\n", Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG), + Flags_GetSwitch(play, WATER_TEMPLE_WATER_F2_FLAG), + Flags_GetSwitch(play, WATER_TEMPLE_WATER_F3_FLAG)); } waterLevelActionIndex = BgMizuWater_GetWaterLevelActionIndex(-1, play); this->actor.world.pos.y = sWaterLevels[waterLevelActionIndex].yDiff + this->baseY; @@ -298,9 +298,8 @@ void BgMizuWater_Update(Actor* thisx, PlayState* play) { s32 pad; if (bREG(15) == 0) { - osSyncPrintf("%x %x %x\n", Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG), - Flags_GetSwitch(play, WATER_TEMPLE_WATER_F2_FLAG), - Flags_GetSwitch(play, WATER_TEMPLE_WATER_F3_FLAG)); + PRINTF("%x %x %x\n", Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG), + Flags_GetSwitch(play, WATER_TEMPLE_WATER_F2_FLAG), Flags_GetSwitch(play, WATER_TEMPLE_WATER_F3_FLAG)); } if (this->type == 0) { posY = this->actor.world.pos.y; diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 7d103330fb..18e1eaaafd 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -61,8 +61,8 @@ void BgMoriBigst_InitDynapoly(BgMoriBigst* this, PlayState* play, CollisionHeade if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG login failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_bigst.c", 190, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_bigst.c", 190, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -71,17 +71,17 @@ void BgMoriBigst_Init(Actor* thisx, PlayState* play) { BgMoriBigst* this = (BgMoriBigst*)thisx; // "mori (bigST.keyceiling)" - osSyncPrintf("mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n", this->dyna.actor.params, - Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F), - Flags_GetTempClear(play, this->dyna.actor.room), Flags_GetClear(play, this->dyna.actor.room), - GET_PLAYER(play)->actor.world.pos.y); + PRINTF("mori (bigST.鍵型天井)(arg : %04x)(sw %d)(noE %d)(roomC %d)(playerPosY %f)\n", this->dyna.actor.params, + Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F), + Flags_GetTempClear(play, this->dyna.actor.room), Flags_GetClear(play, this->dyna.actor.room), + GET_PLAYER(play)->actor.world.pos.y); BgMoriBigst_InitDynapoly(this, play, &gMoriBigstCol, 0); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX); if (this->moriTexObjectSlot < 0) { // "【Big Stalfos key ceiling】 bank danger!" - osSyncPrintf("【ビッグスタルフォス鍵型天井】 バンク危険！\n"); - osSyncPrintf("%s %d\n", "../z_bg_mori_bigst.c", 234); + PRINTF("【ビッグスタルフォス鍵型天井】 バンク危険！\n"); + PRINTF("%s %d\n", "../z_bg_mori_bigst.c", 234); Actor_Kill(&this->dyna.actor); return; } @@ -138,7 +138,7 @@ void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, PlayState* play) { this->dyna.actor.home.rot.z++; } else { // "Second Stalfos failure" - osSyncPrintf("Warning : 第２スタルフォス発生失敗\n"); + PRINTF("Warning : 第２スタルフォス発生失敗\n"); } Flags_SetClear(play, this->dyna.actor.room); } @@ -200,7 +200,7 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) { this->dyna.actor.home.rot.z++; } else { // "Warning: 3-1 Stalfos failure" - osSyncPrintf("Warning : 第３-1スタルフォス発生失敗\n"); + PRINTF("Warning : 第３-1スタルフォス発生失敗\n"); } stalfos2 = Actor_SpawnAsChild(&play->actorCtx, &this->dyna.actor, play, ACTOR_EN_TEST, 170.0f, 827.0f, -3260.0f, 0, 0, 0, 5); @@ -209,7 +209,7 @@ void BgMoriBigst_SetupStalfosPairFight(BgMoriBigst* this, PlayState* play) { this->dyna.actor.home.rot.z++; } else { // "Warning: 3-2 Stalfos failure" - osSyncPrintf("Warning : 第３-2スタルフォス発生失敗\n"); + PRINTF("Warning : 第３-2スタルフォス発生失敗\n"); } Flags_SetClear(play, this->dyna.actor.room); } diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index d673d61b2b..12072ce5ff 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -91,12 +91,12 @@ void BgMoriElevator_Init(Actor* thisx, PlayState* play) { if (this->moriTexObjectSlot < 0) { Actor_Kill(thisx); // "Forest Temple obj elevator Bank Danger!" - osSyncPrintf("Error : 森の神殿 obj elevator バンク危険！(%s %d)\n", "../z_bg_mori_elevator.c", 277); + PRINTF("Error : 森の神殿 obj elevator バンク危険！(%s %d)\n", "../z_bg_mori_elevator.c", 277); } else { switch (sIsSpawned) { case false: // "Forest Temple elevator CT" - osSyncPrintf("森の神殿 elevator CT\n"); + PRINTF("森の神殿 elevator CT\n"); sIsSpawned = true; this->dyna.actor.room = -1; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -117,7 +117,7 @@ void BgMoriElevator_Destroy(Actor* thisx, PlayState* play) { if (this->unk_172 == 0) { // "Forest Temple elevator DT" - osSyncPrintf("森の神殿 elevator DT\n"); + PRINTF("森の神殿 elevator DT\n"); DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); sIsSpawned = false; } @@ -141,7 +141,7 @@ void BgMoriElevator_WaitAfterInit(BgMoriElevator* this, PlayState* play) { BgMoriElevator_SetupSetPosition(this); } else { // "Error: Forest Temple obj elevator Room setting is dangerous" - osSyncPrintf("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "../z_bg_mori_elevator.c", 371); + PRINTF("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "../z_bg_mori_elevator.c", 371); } } else { BgMoriElevator_SetupSetPosition(this); @@ -202,7 +202,7 @@ void BgMoriElevator_SetPosition(BgMoriElevator* this, PlayState* play) { BgMoriElevator_StopMovement(this); } else { // "Error:Forest Temple obj elevator Room setting is dangerous(%s %d)" - osSyncPrintf("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "../z_bg_mori_elevator.c", 479); + PRINTF("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "../z_bg_mori_elevator.c", 479); } } else if ((play->roomCtx.curRoom.num == 2) && (this->dyna.actor.world.pos.y < -275.0f)) { this->targetY = 233.0f; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 7510f4245c..e4be790154 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -88,8 +88,8 @@ void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionH if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG login failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 164, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 164, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -125,8 +125,8 @@ s32 BgMoriHashigo_SpawnLadder(BgMoriHashigo* this, PlayState* play) { return true; } else { // "Ladder failure" - osSyncPrintf("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 220, - this->dyna.actor.params); + PRINTF("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 220, + this->dyna.actor.params); return false; } } @@ -167,13 +167,13 @@ void BgMoriHashigo_Init(Actor* thisx, PlayState* play) { this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX); if (this->moriTexObjectSlot < 0) { // "Bank danger!" - osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, - "../z_bg_mori_hashigo.c", 312); + PRINTF("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, "../z_bg_mori_hashigo.c", + 312); Actor_Kill(&this->dyna.actor); } else { BgMoriHashigo_SetupWaitForMoriTex(this); // "(Forest Temple Ladder and its clasp)" - osSyncPrintf("(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(森の神殿 梯子とその留め金)(arg_data 0x%04x)\n", this->dyna.actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index 122046aaec..e4b2a1217f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -60,8 +60,8 @@ void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, Collisio if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG login failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashira4.c", 155, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashira4.c", 155, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -82,8 +82,8 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) { if (this->moriTexObjectSlot < 0) { Actor_Kill(&this->dyna.actor); // "Bank danger!" - osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, - "../z_bg_mori_hashira4.c", 196); + PRINTF("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params, "../z_bg_mori_hashira4.c", + 196); return; } if ((this->dyna.actor.params != 0) && Flags_GetSwitch(play, this->switchFlag)) { @@ -93,7 +93,7 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) { Actor_SetFocus(&this->dyna.actor, 50.0f); BgMoriHashira4_SetupWaitForMoriTex(this); // "(4 pillars of the Forest Temple) Bank danger" - osSyncPrintf("(森の神殿 ４本柱)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(森の神殿 ４本柱)(arg_data 0x%04x)\n", this->dyna.actor.params); sUnkTimer = 0; } diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 3654c3c0d4..0af410e5f0 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -70,8 +70,7 @@ void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) { if (this->moriTexObjectSlot < 0) { Actor_Kill(&this->actor); // "Bank danger!" - osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_bg_mori_idomizu.c", - 202); + PRINTF("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_bg_mori_idomizu.c", 202); return; } BgMoriIdomizu_SetupWaitForMoriTex(this); @@ -79,7 +78,7 @@ void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) { this->isLoaded = true; this->actor.room = -1; // "Forest Temple well water" - osSyncPrintf("(森の神殿 井戸水)(arg_data 0x%04x)\n", this->actor.params); + PRINTF("(森の神殿 井戸水)(arg_data 0x%04x)\n", this->actor.params); } void BgMoriIdomizu_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index 8c5554caa3..836ab229ab 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -51,7 +51,7 @@ void BgMoriKaitenkabe_Init(Actor* thisx, PlayState* play) { CollisionHeader* colHeader = NULL; // "Forest Temple object 【Rotating Wall (arg_data: 0x% 04x)】 appears" - osSyncPrintf("◯◯◯森の神殿オブジェクト【回転壁(arg_data : 0x%04x)】出現 \n", this->dyna.actor.params); + PRINTF("◯◯◯森の神殿オブジェクト【回転壁(arg_data : 0x%04x)】出現 \n", this->dyna.actor.params); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, 0); CollisionHeader_GetVirtual(&gMoriKaitenkabeCol, &colHeader); @@ -60,7 +60,7 @@ void BgMoriKaitenkabe_Init(Actor* thisx, PlayState* play) { if (this->moriTexObjectSlot < 0) { Actor_Kill(&this->dyna.actor); // "【Rotating wall】 Bank danger!" - osSyncPrintf("【回転壁】 バンク危険！(%s %d)\n", "../z_bg_mori_kaitenkabe.c", 176); + PRINTF("【回転壁】 バンク危険！(%s %d)\n", "../z_bg_mori_kaitenkabe.c", 176); } else { this->actionFunc = BgMoriKaitenkabe_WaitForMoriTex; } diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index c9fb615e67..74d4621487 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -53,21 +53,21 @@ void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play) { DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); // "Forest Temple obj. Falling Ceiling" - osSyncPrintf("森の神殿 obj. 落下天井 (home posY %f)\n", this->dyna.actor.home.pos.y); + PRINTF("森の神殿 obj. 落下天井 (home posY %f)\n", this->dyna.actor.home.pos.y); if ((fabsf(1991.0f - this->dyna.actor.home.pos.x) > 0.001f) || (fabsf(683.0f - this->dyna.actor.home.pos.y) > 0.001f) || (fabsf(-2520.0f - this->dyna.actor.home.pos.z) > 0.001f)) { // "The set position has been changed. Let's fix the program." - osSyncPrintf("Warning : セット位置が変更されています。プログラムを修正しましょう。\n"); + PRINTF("Warning : セット位置が変更されています。プログラムを修正しましょう。\n"); } if (this->dyna.actor.home.rot.y != 0x8000) { // "The set Angle has changed. Let's fix the program." - osSyncPrintf("Warning : セット Angle が変更されています。プログラムを修正しましょう。\n"); + PRINTF("Warning : セット Angle が変更されています。プログラムを修正しましょう。\n"); } this->moriTexObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_MORI_TEX); if (this->moriTexObjectSlot < 0) { // "Forest Temple obj Falling Ceiling Bank Danger!" - osSyncPrintf("Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n", "../z_bg_mori_rakkatenjo.c", 205); + PRINTF("Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n", "../z_bg_mori_rakkatenjo.c", 205); Actor_Kill(&this->dyna.actor); return; } @@ -207,13 +207,13 @@ void BgMoriRakkatenjo_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); if (BgMoriRakkatenjo_IsLinkUnder(this, play)) { if (sCamSetting == CAM_SET_NONE) { - osSyncPrintf("camera changed (mori rakka tenjyo) ... \n"); + PRINTF("camera changed (mori rakka tenjyo) ... \n"); sCamSetting = play->cameraPtrs[CAM_ID_MAIN]->setting; Camera_SetCameraData(play->cameraPtrs[CAM_ID_MAIN], 1, &this->dyna.actor, NULL, 0, 0, 0); Camera_RequestSetting(play->cameraPtrs[CAM_ID_MAIN], CAM_SET_FOREST_BIRDS_EYE); } } else if (sCamSetting != CAM_SET_NONE) { - osSyncPrintf("camera changed (previous) ... \n"); + PRINTF("camera changed (previous) ... \n"); Camera_RequestSetting(play->cameraPtrs[CAM_ID_MAIN], CAM_SET_DUNGEON1); sCamSetting = CAM_SET_NONE; } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 99d3e41ea4..513b8c20b3 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -180,7 +180,7 @@ f32 func_808AB1DC(f32 arg0, f32 arg1, u16 arg2, u16 arg3, u16 arg4) { temp_f12 = regFloat * diff43; return (((((arg1 - arg0) - temp_f12) / SQ(diff23)) * diff43) * diff43) + temp_f12; } - osSyncPrintf(VT_FGCOL(RED) "Bg_Spot01_Idohashira_Get_FreeFallで割り算出来ない!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "Bg_Spot01_Idohashira_Get_FreeFallで割り算出来ない!!!!!!!!!!!!!!\n" VT_RST); return 0.0f; } @@ -255,7 +255,7 @@ void func_808AB444(BgSpot01Idohashira* this, PlayState* play) { Actor_Kill(&this->dyna.actor); break; default: - osSyncPrintf("Bg_Spot01_Idohashira_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Bg_Spot01_Idohashira_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; @@ -285,7 +285,7 @@ void BgSpot01Idohashira_Update(Actor* thisx, PlayState* play) { BgSpot01Idohashira* this = (BgSpot01Idohashira*)thisx; if (this->action < 0 || this->action >= 4 || sActionFuncs[this->action] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->action](this, play); @@ -337,7 +337,7 @@ void BgSpot01Idohashira_Draw(Actor* thisx, PlayState* play) { BgSpot01Idohashira* this = (BgSpot01Idohashira*)thisx; if (this->drawConfig < 0 || this->drawConfig > 0 || sDrawFuncs[this->drawConfig] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawConfig](this, play); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index 7f2733aa50..63697a0a80 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -62,7 +62,7 @@ void BgSpot01Objects2_Init(Actor* thisx, PlayState* play) { this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, this->objectId); if (this->requiredObjectSlot < 0) { // "There was no bank setting." - osSyncPrintf("-----------------------------バンク設定ありませんでした."); + PRINTF("-----------------------------バンク設定ありませんでした."); Actor_Kill(&this->dyna.actor); return; } @@ -93,7 +93,7 @@ void func_808AC2BC(BgSpot01Objects2* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { // "---- Successful bank switching!!" - osSyncPrintf("-----バンク切り換え成功！！\n"); + PRINTF("-----バンク切り換え成功！！\n"); gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[this->requiredObjectSlot].segment); this->dyna.actor.objectSlot = this->requiredObjectSlot; diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index fc5a1e0392..8784b28e24 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -99,7 +99,7 @@ void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { this->switchFlag = thisx->params & 0xFF; thisx->params = (thisx->params >> 8) & 0xFF; - osSyncPrintf("spot06 obj nthisx->arg_data=[%d]", thisx->params); + PRINTF("spot06 obj nthisx->arg_data=[%d]", thisx->params); switch (thisx->params) { case LHO_WATER_TEMPLE_ENTRACE_GATE: diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 255f60a09b..f5ced0b3f6 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -48,8 +48,8 @@ void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, PlayState* play, Coll this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning: move BG registration failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xD9, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xD9, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -61,8 +61,8 @@ void BgSpot08Iceblock_CheckParams(BgSpot08Iceblock* this) { break; default: // "Error: arg_data setting error" - osSyncPrintf("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xF6, - this->dyna.actor.params); + PRINTF("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xF6, + this->dyna.actor.params); this->dyna.actor.params = 0x10; break; case 1: @@ -284,7 +284,7 @@ void BgSpot08Iceblock_Init(Actor* thisx, PlayState* play) { CollisionHeader* colHeader; // "spot08 ice floe" - osSyncPrintf("(spot08 流氷)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(spot08 流氷)(arg_data 0x%04x)\n", this->dyna.actor.params); BgSpot08Iceblock_CheckParams(this); switch (this->dyna.actor.params & 0x200) { diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 9160dcdc46..6df0a26576 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -137,13 +137,13 @@ s32 func_808B1D44(BgSpot09Obj* this, PlayState* play) { void BgSpot09Obj_Init(Actor* thisx, PlayState* play) { BgSpot09Obj* this = (BgSpot09Obj*)thisx; - osSyncPrintf("Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n", this->dyna.actor.params, - gSaveContext.save.info.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] & - EVENTCHKINF_CARPENTERS_FREE_MASK_ALL); + PRINTF("Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n", this->dyna.actor.params, + gSaveContext.save.info.eventChkInf[EVENTCHKINF_CARPENTERS_FREE_INDEX] & + EVENTCHKINF_CARPENTERS_FREE_MASK_ALL); this->dyna.actor.params &= 0xFF; if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) { - osSyncPrintf("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", - "../z_bg_spot09_obj.c", 322, this->dyna.actor.params); + PRINTF("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot09_obj.c", + 322, this->dyna.actor.params); } if (!func_808B1C70(this, play)) { diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 2ab8e7f156..590ac93890 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -121,7 +121,7 @@ void BgSpot11Bakudankabe_Init(Actor* thisx, PlayState* play) { CollisionHeader_GetVirtual(&gDesertColossusBombableWallCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); Actor_SetScale(&this->dyna.actor, 1.0f); - osSyncPrintf("(spot11 爆弾壁)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(spot11 爆弾壁)(arg_data 0x%04x)\n", this->dyna.actor.params); } void BgSpot11Bakudankabe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 8984ba9c01..e261a35239 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -52,8 +52,8 @@ void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, PlayState* play, CollisionHea CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot12_gate.c", 145, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot12_gate.c", 145, + this->dyna.actor.id, this->dyna.actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index ec2e405520..9700367f4b 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -49,8 +49,8 @@ void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collisi CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot12_saku.c", 140, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot12_saku.c", 140, + this->dyna.actor.id, this->dyna.actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index fcc642b237..a2ce895d76 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -66,8 +66,8 @@ void func_808B3960(BgSpot15Rrbox* this, PlayState* play, CollisionHeader* collis this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 171, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 171, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -131,7 +131,7 @@ void BgSpot15Rrbox_Init(Actor* thisx, PlayState* play) { } else { func_808B4084(this, play); } - osSyncPrintf("(spot15 ロンロン木箱)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(spot15 ロンロン木箱)(arg_data 0x%04x)\n", this->dyna.actor.params); } void BgSpot15Rrbox_Destroy(Actor* thisx, PlayState* play) { @@ -323,8 +323,8 @@ void func_808B43D0(BgSpot15Rrbox* this, PlayState* play) { if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) { // "Lon Lon wooden crate fell too much" - osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 599, - actor->params); + PRINTF("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 599, + actor->params); Actor_Kill(actor); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 7034420c3c..7a7a485617 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -171,7 +171,7 @@ void func_808B4D04(BgSpot16Bombstone* this, PlayState* play) { s32 func_808B4D9C(BgSpot16Bombstone* this, PlayState* play) { if (Flags_GetSwitch(play, this->switchFlag)) { - osSyncPrintf("Spot16 obj 爆弾石 破壊済み\n"); + PRINTF("Spot16 obj 爆弾石 破壊済み\n"); return false; } Actor_ProcessInitChain(&this->actor, sInitChainBoulder); @@ -221,8 +221,7 @@ s32 func_808B4E58(BgSpot16Bombstone* this, PlayState* play) { this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_BOMBIWA); if (this->requiredObjectSlot < 0) { - osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, "../z_bg_spot16_bombstone.c", - 589); + PRINTF("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, "../z_bg_spot16_bombstone.c", 589); return false; } @@ -251,8 +250,8 @@ void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play) { shouldLive = func_808B4E58(this, play); break; default: - osSyncPrintf("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot16_bombstone.c", 668, - this->actor.params); + PRINTF("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot16_bombstone.c", 668, + this->actor.params); shouldLive = false; break; } @@ -261,7 +260,7 @@ void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->actor); return; } - osSyncPrintf("Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n", this->actor.scale.x, this->actor.params); + PRINTF("Spot16 obj 爆弾石 (scaleX %f)(arg_data 0x%04x)\n", this->actor.scale.x, this->actor.params); } void BgSpot16Bombstone_Destroy(Actor* thisx, PlayState* play) { @@ -384,8 +383,8 @@ void func_808B56BC(BgSpot16Bombstone* this, PlayState* play) { player->actor.world.pos.x += sinValue * this->sinRotation; player->actor.world.pos.z += sinValue * this->cosRotation; } else { - osSyncPrintf("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n", - "../z_bg_spot16_bombstone.c", 935, this->actor.params, adjustedYawDiff); + PRINTF("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n", "../z_bg_spot16_bombstone.c", 935, + this->actor.params, adjustedYawDiff); } } } diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 068917f8f2..8f60a33980 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -69,13 +69,13 @@ void BgSpot16Doughnut_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.1f); break; } - osSyncPrintf(VT_FGCOL(CYAN) "%f" VT_RST "\n", this->actor.scale.x); + PRINTF(VT_FGCOL(CYAN) "%f" VT_RST "\n", this->actor.scale.x); if (!LINK_IS_ADULT || GET_EVENTCHKINF(EVENTCHKINF_2F)) { this->fireFlag &= ~1; } else { this->fireFlag |= 1; } - osSyncPrintf("(ｓｐｏｔ１６ ドーナツ雲)(arg_data 0x%04x)\n", this->actor.params); + PRINTF("(ｓｐｏｔ１６ ドーナツ雲)(arg_data 0x%04x)\n", this->actor.params); } } diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index 0872bc4dbb..b8c93658cf 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -35,7 +35,7 @@ void BgSpot17Funen_Init(Actor* thisx, PlayState* play) { BgSpot17Funen* this = (BgSpot17Funen*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); - osSyncPrintf("spot17 obj. 噴煙 (arg_data 0x%04x)\n", this->actor.params); + PRINTF("spot17 obj. 噴煙 (arg_data 0x%04x)\n", this->actor.params); } void BgSpot17Funen_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 394c6a51ca..84ca72ef57 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -155,9 +155,9 @@ void BgSpot18Basket_Init(Actor* thisx, PlayState* play) { this->dyna.actor.shape.rot.y + 0x1555, this->dyna.actor.shape.rot.z, -1); if (this->dyna.actor.child == NULL) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", "../z_bg_spot18_basket.c", 351); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", "../z_bg_spot18_basket.c", 351); + PRINTF(VT_RST); Actor_Kill(&this->dyna.actor); } } diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 5d98d38b0b..6b3d8095a8 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -96,8 +96,8 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) { } else if (LINK_AGE_IN_YEARS == YEARS_CHILD) { age = 0; } else { - osSyncPrintf("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 182, - this->dyna.actor.params); + PRINTF("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 182, + this->dyna.actor.params); return 0; } @@ -105,16 +105,16 @@ s32 func_808B8910(BgSpot18Obj* this, PlayState* play) { case 0: case 1: if (D_808B90F0[this->dyna.actor.params & 0xF][age] == 0) { - osSyncPrintf("出現しない Object (0x%04x)\n", this->dyna.actor.params); + PRINTF("出現しない Object (0x%04x)\n", this->dyna.actor.params); } return D_808B90F0[this->dyna.actor.params & 0xF][age]; case 2: - osSyncPrintf("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 202, - this->dyna.actor.params); + PRINTF("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 202, + this->dyna.actor.params); break; default: - osSyncPrintf("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 210, - this->dyna.actor.params); + PRINTF("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 210, + this->dyna.actor.params); } return 0; } @@ -182,7 +182,7 @@ s32 func_808B8CC8(BgSpot18Obj* this, PlayState* play) { void BgSpot18Obj_Init(Actor* thisx, PlayState* play) { BgSpot18Obj* this = (BgSpot18Obj*)thisx; - osSyncPrintf("Spot18 Object [arg_data : 0x%04x]\n", this->dyna.actor.params); + PRINTF("Spot18 Object [arg_data : 0x%04x]\n", this->dyna.actor.params); if (!func_808B8B38(this, play)) { Actor_Kill(&this->dyna.actor); } else if (!func_808B8CC8(this, play)) { 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 d21c6d4a65..18f026c33b 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -90,7 +90,7 @@ void BgZg_Update(Actor* thisx, PlayState* play) { if (((action < 0) || (1 < action)) || (sActionFuncs[action] == NULL)) { // "Main Mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sActionFuncs[action](this, play); } @@ -138,7 +138,7 @@ void BgZg_Draw(Actor* thisx, PlayState* play) { if (((drawConfig < 0) || (drawConfig > 0)) || sDrawFuncs[drawConfig] == NULL) { // "Drawing mode is wrong !!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sDrawFuncs[drawConfig](this, play); } diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index ba53be91b8..172fd4c5f2 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -289,7 +289,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { angleToTarget = RAD_TO_BINANG(Math_FAtan2F(dx, dz)); pitchToTarget = RAD_TO_BINANG(Math_FAtan2F(dy, sqrtf(SQ(dx) + SQ(dz)))); - osSyncPrintf("MODE %d\n", this->work[BFD_ACTION_STATE]); + PRINTF("MODE %d\n", this->work[BFD_ACTION_STATE]); Math_ApproachF(&this->fwork[BFD_BODY_PULSE], 0.1f, 1.0f, 0.02); @@ -458,9 +458,9 @@ void BossFd_Fly(BossFd* this, PlayState* play) { } break; case BFD_CS_EMERGE: - osSyncPrintf("WAY_SPD X = %f\n", this->subCamAtVel.x); - osSyncPrintf("WAY_SPD Y = %f\n", this->subCamAtVel.y); - osSyncPrintf("WAY_SPD Z = %f\n", this->subCamAtVel.z); + PRINTF("WAY_SPD X = %f\n", this->subCamAtVel.x); + PRINTF("WAY_SPD Y = %f\n", this->subCamAtVel.y); + PRINTF("WAY_SPD Z = %f\n", this->subCamAtVel.z); if ((this->timers[3] > 190) && !GET_EVENTCHKINF(EVENTCHKINF_73)) { Audio_PlaySfxGeneral(NA_SE_EN_DODO_K_ROLL - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -528,8 +528,8 @@ void BossFd_Fly(BossFd* this, PlayState* play) { break; } } - osSyncPrintf("this->timer[2] = %d\n", this->timers[2]); - osSyncPrintf("this->timer[5] = %d\n", this->timers[5]); + PRINTF("this->timer[2] = %d\n", this->timers[2]); + PRINTF("this->timer[5] = %d\n", this->timers[5]); if (this->timers[2] == 0) { mainCam->eye = this->subCamEye; mainCam->eyeNext = this->subCamEye; @@ -667,7 +667,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { } Actor_UpdateBgCheckInfo(play, &this->actor, 50.0f, 50.0f, 100.0f, UPDBGCHECKINFO_FLAG_1); if (this->timers[1] == 0) { - osSyncPrintf("BGCHECKKKKKKKKKKKKKKKKKKKKKKK\n"); + PRINTF("BGCHECKKKKKKKKKKKKKKKKKKKKKKK\n"); if (this->actor.bgCheckFlags & BGCHECKFLAG_CEILING) { this->fwork[BFD_CEILING_BOUNCE] = -18384.0f; this->timers[1] = 10; @@ -1306,7 +1306,7 @@ void BossFd_Update(Actor* thisx, PlayState* play) { f32 lManeGlow; s16 i; - osSyncPrintf("FD MOVE START \n"); + PRINTF("FD MOVE START \n"); this->work[BFD_VAR_TIMER]++; this->work[BFD_MOVE_TIMER]++; this->actionFunc(this, play); @@ -1421,9 +1421,9 @@ void BossFd_Update(Actor* thisx, PlayState* play) { } } } - osSyncPrintf("FD MOVE END 1\n"); + PRINTF("FD MOVE END 1\n"); BossFd_UpdateEffects(this, play); - osSyncPrintf("FD MOVE END 2\n"); + PRINTF("FD MOVE END 2\n"); } void BossFd_UpdateEffects(BossFd* this, PlayState* play) { @@ -1634,7 +1634,7 @@ void BossFd_Draw(Actor* thisx, PlayState* play) { s32 pad; BossFd* this = (BossFd*)thisx; - osSyncPrintf("FD DRAW START\n"); + PRINTF("FD DRAW START\n"); if (this->actionFunc != BossFd_Wait) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_fd.c", 4217); Gfx_SetupDL_25Opa(play->state.gfxCtx); @@ -1647,9 +1647,9 @@ void BossFd_Draw(Actor* thisx, PlayState* play) { CLOSE_DISPS(play->state.gfxCtx, "../z_boss_fd.c", 4243); } - osSyncPrintf("FD DRAW END\n"); + PRINTF("FD DRAW END\n"); BossFd_DrawEffects(this->effects, play); - osSyncPrintf("FD DRAW END2\n"); + PRINTF("FD DRAW END2\n"); } s32 BossFd_OverrideRightArmDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { @@ -1832,7 +1832,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)this->fwork[BFD_BODY_TEX2_ALPHA]); - osSyncPrintf("LH\n"); + PRINTF("LH\n"); Matrix_Push(); segIndex = (this->work[BFD_LEAD_BODY_SEG] + sBodyIndex[2]) % 100; Matrix_Translate(this->bodySegsPos[segIndex].x, this->bodySegsPos[segIndex].y, this->bodySegsPos[segIndex].z, @@ -1844,7 +1844,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) { SkelAnime_DrawOpa(play, this->skelAnimeRightArm.skeleton, this->skelAnimeRightArm.jointTable, BossFd_OverrideRightArmDraw, NULL, this); Matrix_Pop(); - osSyncPrintf("RH\n"); + PRINTF("RH\n"); Matrix_Push(); segIndex = (this->work[BFD_LEAD_BODY_SEG] + sBodyIndex[2]) % 100; Matrix_Translate(this->bodySegsPos[segIndex].x, this->bodySegsPos[segIndex].y, this->bodySegsPos[segIndex].z, @@ -1856,7 +1856,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) { SkelAnime_DrawOpa(play, this->skelAnimeLeftArm.skeleton, this->skelAnimeLeftArm.jointTable, BossFd_OverrideLeftArmDraw, NULL, this); Matrix_Pop(); - osSyncPrintf("BD\n"); + PRINTF("BD\n"); gSPSegment(POLY_OPA_DISP++, 0x0D, tempMat); Matrix_Push(); @@ -1924,7 +1924,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) { } } Matrix_Pop(); - osSyncPrintf("BH\n"); + PRINTF("BH\n"); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)this->fwork[BFD_HEAD_TEX2_ALPHA]); @@ -1940,14 +1940,14 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) { Matrix_Translate(0.0f, 0.0f, temp_float, MTXMODE_APPLY); Matrix_Push(); Matrix_Translate(0.0f, 0.0f, 25.0f, MTXMODE_APPLY); - osSyncPrintf("BHC\n"); + PRINTF("BHC\n"); Collider_UpdateSpheres(0, &this->collider); Matrix_Pop(); - osSyncPrintf("BHCE\n"); + PRINTF("BHCE\n"); Matrix_Scale(this->actor.scale.x * 0.1f, this->actor.scale.y * 0.1f, this->actor.scale.z * 0.1f, MTXMODE_APPLY); SkelAnime_DrawOpa(play, this->skelAnimeHead.skeleton, this->skelAnimeHead.jointTable, BossFd_OverrideHeadDraw, BossFd_PostHeadDraw, &this->actor); - osSyncPrintf("SK\n"); + PRINTF("SK\n"); { Vec3f spB0 = { 0.0f, 1700.0f, 7000.0f }; Vec3f spA4 = { -1000.0f, 700.0f, 7000.0f }; @@ -1973,6 +1973,6 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) { } Matrix_Pop(); - osSyncPrintf("END\n"); + PRINTF("END\n"); CLOSE_DISPS(play->state.gfxCtx, "../z_boss_fd.c", 4987); } diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 9734713553..16a9ad1fd3 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -199,7 +199,7 @@ void BossFd2_SetupEmerge(BossFd2* this, PlayState* play) { s16 temp_rand; s8 health; - osSyncPrintf("UP INIT 1\n"); + PRINTF("UP INIT 1\n"); Animation_PlayOnce(&this->skelAnime, &gHoleVolvagiaEmergeAnim); this->actionFunc = BossFd2_Emerge; this->skelAnime.playSpeed = 0.0f; @@ -207,7 +207,7 @@ void BossFd2_SetupEmerge(BossFd2* this, PlayState* play) { this->actor.world.pos.x = sHoleLocations[temp_rand].x; this->actor.world.pos.z = sHoleLocations[temp_rand].z; this->work[FD2_ACTION_STATE] = 0; - osSyncPrintf("UP INIT 2\n"); + PRINTF("UP INIT 2\n"); this->timers[0] = 10; if (bossFd != NULL) { health = bossFd->actor.colChkInfo.health; @@ -230,16 +230,16 @@ void BossFd2_Emerge(BossFd2* this, PlayState* play) { s16 i; s16 holeTime; - osSyncPrintf("UP 1 mode %d\n", this->work[FD2_ACTION_STATE]); + PRINTF("UP 1 mode %d\n", this->work[FD2_ACTION_STATE]); SkelAnime_Update(&this->skelAnime); - osSyncPrintf("UP 1.5 \n"); + PRINTF("UP 1.5 \n"); switch (this->work[FD2_ACTION_STATE]) { case 0: - osSyncPrintf("UP time %d \n", this->timers[0]); - osSyncPrintf("PL time %x \n", player); - osSyncPrintf("MT time %x \n", bossFd); + PRINTF("UP time %d \n", this->timers[0]); + PRINTF("PL time %x \n", player); + PRINTF("MT time %x \n", bossFd); if ((this->timers[0] == 0) && (player->actor.world.pos.y > 70.0f)) { - osSyncPrintf("UP 1.6 \n"); + PRINTF("UP 1.6 \n"); bossFd->faceExposed = 0; bossFd->holePosition.x = this->actor.world.pos.x; bossFd->holePosition.z = this->actor.world.pos.z; @@ -261,7 +261,7 @@ void BossFd2_Emerge(BossFd2* this, PlayState* play) { } this->timers[0] = holeTime; bossFd->timers[4] = this->timers[0] + 10; - osSyncPrintf("UP 1.7 \n"); + PRINTF("UP 1.7 \n"); } break; case 1: @@ -302,7 +302,7 @@ void BossFd2_Emerge(BossFd2* this, PlayState* play) { } break; } - osSyncPrintf("UP 2\n"); + PRINTF("UP 2\n"); } void BossFd2_SetupIdle(BossFd2* this, PlayState* play) { @@ -310,7 +310,7 @@ void BossFd2_SetupIdle(BossFd2* this, PlayState* play) { s8 health; s16 idleTime; - osSyncPrintf("UP INIT 1\n"); + PRINTF("UP INIT 1\n"); Animation_PlayLoop(&this->skelAnime, &gHoleVolvagiaTurnAnim); this->actionFunc = BossFd2_Idle; health = bossFd->actor.colChkInfo.health; @@ -335,8 +335,8 @@ void BossFd2_Idle(BossFd2* this, PlayState* play) { prevToLink = this->work[FD2_TURN_TO_LINK]; this->work[FD2_TURN_TO_LINK] = Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x7D0, 0); - osSyncPrintf("SW1 = %d\n", prevToLink); - osSyncPrintf("SW2 = %d\n", this->work[FD2_TURN_TO_LINK]); + PRINTF("SW1 = %d\n", prevToLink); + PRINTF("SW2 = %d\n", this->work[FD2_TURN_TO_LINK]); if ((fabsf(prevToLink) <= 1000.0f) && (1000.0f < fabsf(this->work[FD2_TURN_TO_LINK]))) { Animation_MorphToLoop(&this->skelAnime, &gHoleVolvagiaTurnAnim, -5.0f); } @@ -873,11 +873,11 @@ void BossFd2_CollisionCheck(BossFd2* this, PlayState* play) { } if (((s8)bossFd->actor.colChkInfo.health > 2) || canKill) { bossFd->actor.colChkInfo.health -= damage; - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("damage %d\n", damage); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("damage %d\n", damage); } - osSyncPrintf(VT_RST); - osSyncPrintf("hp %d\n", bossFd->actor.colChkInfo.health); + PRINTF(VT_RST); + PRINTF("hp %d\n", bossFd->actor.colChkInfo.health); if ((s8)bossFd->actor.colChkInfo.health <= 0) { bossFd->actor.colChkInfo.health = 0; @@ -956,7 +956,7 @@ void BossFd2_Update(Actor* thisx, PlayState* play2) { BossFd2* this = (BossFd2*)thisx; s16 i; - osSyncPrintf("FD2 move start \n"); + PRINTF("FD2 move start \n"); this->disableAT = false; this->actor.flags &= ~ACTOR_FLAG_10; this->work[FD2_VAR_TIMER]++; @@ -1191,7 +1191,7 @@ void BossFd2_Draw(Actor* thisx, PlayState* play) { BossFd2* this = (BossFd2*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_fd2.c", 2617); - osSyncPrintf("FD2 draw start \n"); + PRINTF("FD2 draw start \n"); if (this->actionFunc != BossFd2_Wait) { Gfx_SetupDL_25Opa(play->state.gfxCtx); if (this->work[FD2_DAMAGE_FLASH_TIMER] & 2) { diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index d03a5206b1..f0fc45e9bd 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -895,7 +895,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) { if (this->subCamId != SUB_CAM_ID_DONE) { // fake, tricks the compiler into putting some pointers on the stack if (zero) { - osSyncPrintf(NULL, 0, 0); + PRINTF(NULL, 0, 0); } this->subCamAt.y += this->unk_41C; Play_SetCameraAtEyeUp(play, this->subCamId, &this->subCamAt, &this->subCamEye, &this->subCamUp); @@ -1884,14 +1884,14 @@ void func_80902524(BossGanon2* this, PlayState* play) { s16 i; u8 phi_v1_2; - osSyncPrintf("this->no_hit_time %d\n", this->unk_316); + PRINTF("this->no_hit_time %d\n", this->unk_316); if (this->unk_316 != 0 || ((this->unk_334 == 0) && (this->actionFunc == func_80900890))) { for (i = 0; i < ARRAY_COUNT(this->unk_464); i++) { this->unk_424.elements[i].base.bumperFlags &= ~BUMP_HIT; } } - osSyncPrintf("this->look_on %d\n", this->unk_313); + PRINTF("this->look_on %d\n", this->unk_313); if (this->unk_313) { if (this->actionFunc != func_808FFFE0) { if (this->unk_424.elements[0].base.bumperFlags & BUMP_HIT) { diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index fbf301f2cb..248357509c 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -313,7 +313,7 @@ void BossGanondrof_Destroy(Actor* thisx, PlayState* play) { s32 pad; BossGanondrof* this = (BossGanondrof*)thisx; - osSyncPrintf("DT1\n"); + PRINTF("DT1\n"); SkelAnime_Free(&this->skelAnime, play); Collider_DestroyCylinder(play, &this->colliderBody); Collider_DestroyCylinder(play, &this->colliderSpear); @@ -321,7 +321,7 @@ void BossGanondrof_Destroy(Actor* thisx, PlayState* play) { LightContext_RemoveLight(play, &play->lightCtx, this->lightNode); } - osSyncPrintf("DT2\n"); + PRINTF("DT2\n"); } void BossGanondrof_SetupIntro(BossGanondrof* this, PlayState* play) { @@ -339,7 +339,7 @@ void BossGanondrof_Intro(BossGanondrof* this, PlayState* play) { this->actor.world.pos = horse->actor.world.pos; this->actor.shape.rot.y = this->actor.world.rot.y = horse->actor.world.rot.y; - osSyncPrintf("SW %d------------------------------------------------\n", horse->bossGndSignal); + PRINTF("SW %d------------------------------------------------\n", horse->bossGndSignal); if ((this->timers[1] != 0) && (this->timers[1] < 25)) { Vec3f pos; @@ -430,9 +430,9 @@ void BossGanondrof_SetupPaintings(BossGanondrof* this) { void BossGanondrof_Paintings(BossGanondrof* this, PlayState* play) { EnfHG* horse = (EnfHG*)this->actor.child; - osSyncPrintf("RUN 1\n"); + PRINTF("RUN 1\n"); SkelAnime_Update(&this->skelAnime); - osSyncPrintf("RUN 2\n"); + PRINTF("RUN 2\n"); if (horse->bossGndSignal == FHG_RAISE_SPEAR) { EnfHG* horseTemp; @@ -452,7 +452,7 @@ void BossGanondrof_Paintings(BossGanondrof* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_0; } - osSyncPrintf("RUN 3\n"); + PRINTF("RUN 3\n"); this->actor.world.pos = horse->actor.world.pos; this->actor.world.pos.y = horse->actor.world.pos.y; this->actor.shape.rot.y = this->actor.world.rot.y = horse->actor.world.rot.y; @@ -469,7 +469,7 @@ void BossGanondrof_Paintings(BossGanondrof* this, PlayState* play) { this->actor.scale.x = horse->actor.scale.x / 1.15f; this->actor.scale.y = horse->actor.scale.y / 1.15f; this->actor.scale.z = horse->actor.scale.z / 1.15f; - osSyncPrintf("RUN 4\n"); + PRINTF("RUN 4\n"); } } @@ -643,8 +643,8 @@ void BossGanondrof_SetupThrow(BossGanondrof* this, PlayState* play) { void BossGanondrof_Throw(BossGanondrof* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); - osSyncPrintf("this->fwork[GND_END_FRAME] = %d\n", (s16)this->fwork[GND_END_FRAME]); - osSyncPrintf("this->work[GND_SHOT_FRAME] = %d\n", this->work[GND_THROW_FRAME]); + PRINTF("this->fwork[GND_END_FRAME] = %d\n", (s16)this->fwork[GND_END_FRAME]); + PRINTF("this->work[GND_SHOT_FRAME] = %d\n", this->work[GND_THROW_FRAME]); if (Animation_OnFrame(&this->skelAnime, this->fwork[GND_END_FRAME])) { BossGanondrof_SetupNeutral(this, -6.0f); } @@ -694,8 +694,8 @@ void BossGanondrof_Return(BossGanondrof* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 5.0f)) { Actor_PlaySfx(&this->actor, NA_SE_EN_FANTOM_VOICE); - osSyncPrintf("VOISE 2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); - osSyncPrintf("VOISE 2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("VOISE 2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("VOISE 2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); } if (Animation_OnFrame(&this->skelAnime, this->fwork[GND_END_FRAME])) { @@ -732,7 +732,7 @@ void BossGanondrof_SetupStunned(BossGanondrof* this, PlayState* play) { } void BossGanondrof_Stunned(BossGanondrof* this, PlayState* play) { - osSyncPrintf("DAMAGE .................................\n"); + PRINTF("DAMAGE .................................\n"); SkelAnime_Update(&this->skelAnime); this->actor.gravity = -0.2f; if (this->actor.world.pos.y <= 5.0f) { @@ -751,7 +751,7 @@ void BossGanondrof_Stunned(BossGanondrof* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_10; } - osSyncPrintf("TIME0 %d ********************************************\n", this->timers[0]); + PRINTF("TIME0 %d ********************************************\n", this->timers[0]); if (this->timers[0] == 0) { BossGanondrof_SetupNeutral(this, -5.0f); this->timers[0] = 30; @@ -858,7 +858,7 @@ void BossGanondrof_Charge(BossGanondrof* this, PlayState* play) { case CHARGE_FINISH: thisx->gravity = 0.2f; Actor_MoveXZGravity(thisx); - osSyncPrintf("YP %f @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n", thisx->world.pos.y); + PRINTF("YP %f @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n", thisx->world.pos.y); if (thisx->world.pos.y < 5.0f) { thisx->world.pos.y = 5.0f; thisx->velocity.y = 0.0f; @@ -945,7 +945,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) { Player* player = GET_PLAYER(play); Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); - osSyncPrintf("PYP %f\n", player->actor.floorHeight); + PRINTF("PYP %f\n", player->actor.floorHeight); SkelAnime_Update(&this->skelAnime); this->work[GND_DEATH_SFX_TIMER]++; if (((60 < this->work[GND_DEATH_SFX_TIMER]) && (this->work[GND_DEATH_SFX_TIMER] < 500)) || @@ -959,9 +959,9 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) { Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); this->subCamId = Play_CreateSubCamera(play); Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT); - osSyncPrintf("7\n"); + PRINTF("7\n"); Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE); - osSyncPrintf("8\n"); + PRINTF("8\n"); this->deathState = DEATH_THROES; player->actor.speed = 0.0f; this->timers[0] = 50; @@ -1241,7 +1241,7 @@ void BossGanondrof_CollisionCheck(BossGanondrof* this, PlayState* play) { if (acHit && (this->actionFunc != BossGanondrof_Stunned) && (acHitElem->toucher.dmgFlags & DMG_RANGED)) { Actor_PlaySfx(&this->actor, NA_SE_NONE); - osSyncPrintf("hit != 0 \n"); + PRINTF("hit != 0 \n"); } else if (this->actionFunc != BossGanondrof_Charge) { if (this->returnCount == 0) { u8 dmg; @@ -1296,7 +1296,7 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) { BossGanondrof* this = (BossGanondrof*)thisx; EnfHG* horse; - osSyncPrintf("MOVE START %d\n", this->actor.params); + PRINTF("MOVE START %d\n", this->actor.params); this->actor.flags &= ~ACTOR_FLAG_10; this->colliderBody.base.colType = COLTYPE_HIT3; if (this->killActor) { @@ -1305,7 +1305,7 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) { } this->work[GND_VARIANCE_TIMER]++; horse = (EnfHG*)this->actor.child; - osSyncPrintf("MOVE START EEEEEEEEEEEEEEEEEEEEEE%d\n", this->actor.params); + PRINTF("MOVE START EEEEEEEEEEEEEEEEEEEEEE%d\n", this->actor.params); this->actionFunc(this, play); @@ -1325,7 +1325,7 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) { BossGanondrof_CollisionCheck(this, play); } - osSyncPrintf("MOVE END\n"); + PRINTF("MOVE END\n"); BossGanondrof_SetColliderPos(&this->targetPos, &this->colliderBody); BossGanondrof_SetColliderPos(&this->spearTip, &this->colliderSpear); if ((this->flyMode == GND_FLY_PAINTING) && !horse->bossGndInPainting) { @@ -1362,12 +1362,12 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) { s16 j; this->shockTimer--; - osSyncPrintf("F 1\n"); + PRINTF("F 1\n"); for (j = 0; j < 7; j++) { - osSyncPrintf("F 15\n"); + PRINTF("F 15\n"); EffectSsFhgFlash_SpawnShock(play, &this->actor, &this->actor.world.pos, 45, FHGFLASH_SHOCK_PG); } - osSyncPrintf("F 2\n"); + PRINTF("F 2\n"); } if (this->actor.params == GND_REAL_BOSS) { @@ -1489,14 +1489,14 @@ void BossGanondrof_Draw(Actor* thisx, PlayState* play) { EnfHG* horse; OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganondrof.c", 3716); - osSyncPrintf("MOVE P = %x\n", this->actor.update); - osSyncPrintf("STOP TIMER = %d ==============\n", this->actor.freezeTimer); + PRINTF("MOVE P = %x\n", this->actor.update); + PRINTF("STOP TIMER = %d ==============\n", this->actor.freezeTimer); horse = (EnfHG*)this->actor.child; if (this->flyMode == GND_FLY_PAINTING) { Matrix_RotateY((horse->turnRot * 3.1416f) / (f32)0x8000, MTXMODE_APPLY); } - osSyncPrintf("YP %f\n", this->actor.world.pos.y); + PRINTF("YP %f\n", this->actor.world.pos.y); Gfx_SetupDL_25Opa(play->state.gfxCtx); if (this->work[GND_INVINC_TIMER] & 4) { POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 255, 50, 0, 0, 900, 1099); @@ -1506,8 +1506,8 @@ void BossGanondrof_Draw(Actor* thisx, PlayState* play) { (s32)horse->warpColorFilterUnk2 + 1000); } - osSyncPrintf("DRAW 11\n"); - osSyncPrintf("EYE_COL %d\n", (s16)this->fwork[GND_EYE_BRIGHTNESS]); + PRINTF("DRAW 11\n"); + PRINTF("EYE_COL %d\n", (s16)this->fwork[GND_EYE_BRIGHTNESS]); gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->fwork[GND_EYE_BRIGHTNESS], (s16)this->fwork[GND_EYE_BRIGHTNESS], (s16)this->fwork[GND_EYE_BRIGHTNESS], (s16)this->fwork[GND_EYE_ALPHA]); if (this->work[GND_BODY_DECAY_FLAG]) { @@ -1518,8 +1518,8 @@ void BossGanondrof_Draw(Actor* thisx, PlayState* play) { SkelAnime_DrawOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, BossGanondrof_OverrideLimbDraw, BossGanondrof_PostLimbDraw, this); - osSyncPrintf("DRAW 22\n"); + PRINTF("DRAW 22\n"); POLY_OPA_DISP = Play_SetFog(play, POLY_OPA_DISP); CLOSE_DISPS(play->state.gfxCtx, "../z_boss_ganondrof.c", 3814); - osSyncPrintf("DRAW END %d\n", this->actor.params); + PRINTF("DRAW END %d\n", this->actor.params); } diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index d247c6acc0..cb7f787c62 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -695,7 +695,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) { case 1: // player entered the room Cutscene_StartManual(play, &play->csCtx); this->subCamId = Play_CreateSubCamera(play); - osSyncPrintf("MAKE CAMERA !!! 1 !!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("MAKE CAMERA !!! 1 !!!!!!!!!!!!!!!!!!!!!!!!!!\n"); Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT); Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE); this->actionState = 2; diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 40788a433d..99447a19bb 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -1735,8 +1735,8 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { s16 i; Player* player = GET_PLAYER(play); - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("Core_Damage_check START\n"); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("Core_Damage_check START\n"); if (this->coreCollider.base.atFlags & AT_HIT) { this->coreCollider.base.atFlags &= ~AT_HIT; if (this->work[MO_TENT_ACTION_STATE] == MO_CORE_UNDERWATER) { @@ -1747,19 +1747,19 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { if (this->coreCollider.base.acFlags & AC_HIT) { ColliderElement* acHitElem = this->coreCollider.elem.acHitElem; // "hit!!" - osSyncPrintf("Core_Damage_check 当り！！\n"); + PRINTF("Core_Damage_check 当り！！\n"); this->coreCollider.base.acFlags &= ~AC_HIT; if ((acHitElem->toucher.dmgFlags & DMG_MAGIC_FIRE) && (this->work[MO_TENT_ACTION_STATE] == MO_CORE_ATTACK)) { this->work[MO_TENT_ACTION_STATE] = MO_CORE_RETREAT; } // "hit 2 !!" - osSyncPrintf("Core_Damage_check 当り 2 ！！\n"); + PRINTF("Core_Damage_check 当り 2 ！！\n"); if ((this->work[MO_TENT_ACTION_STATE] != MO_CORE_UNDERWATER) && (this->work[MO_TENT_INVINC_TIMER] == 0)) { u8 damage = CollisionCheck_GetSwordDamage(acHitElem->toucher.dmgFlags); if ((damage != 0) && (this->work[MO_TENT_ACTION_STATE] < MO_CORE_ATTACK)) { // "sword hit !!" - osSyncPrintf("Core_Damage_check 剣 当り！！\n"); + PRINTF("Core_Damage_check 剣 当り！！\n"); this->work[MO_TENT_ACTION_STATE] = MO_CORE_STUNNED; this->timers[0] = 25; @@ -1829,8 +1829,8 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) { } } // "end !!" - osSyncPrintf("Core_Damage_check 終わり ！！\n"); - osSyncPrintf(VT_RST); + PRINTF("Core_Damage_check 終わり ！！\n"); + PRINTF(VT_RST); } void BossMo_Core(BossMo* this, PlayState* play) { @@ -2212,7 +2212,7 @@ void BossMo_UpdateCore(Actor* thisx, PlayState* play) { s16 i; Player* player = GET_PLAYER(play); - osSyncPrintf("CORE mode = <%d>\n", this->work[MO_TENT_ACTION_STATE]); + PRINTF("CORE mode = <%d>\n", this->work[MO_TENT_ACTION_STATE]); if (sMorphaTent2 == NULL) { MO_WATER_LEVEL(play) = sMorphaTent1->waterLevelMod + (s16)this->waterLevel; } else { @@ -2272,7 +2272,7 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) { SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->tentPos[40], &this->tentTipPos, &this->actor.projectedW); - osSyncPrintf("MO : Move mode = <%d>\n", this->work[MO_TENT_ACTION_STATE]); + PRINTF("MO : Move mode = <%d>\n", this->work[MO_TENT_ACTION_STATE]); Math_ApproachS(&player->actor.shape.rot.x, 0, 5, 0x3E8); Math_ApproachS(&player->actor.shape.rot.z, 0, 5, 0x3E8); this->work[MO_TENT_VAR_TIMER]++; diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 2dd7ca3b5d..c01a1b590e 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -3124,7 +3124,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) { } CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); - osSyncPrintf("OooooooooooooooooooooooooooooooooCC\n"); + PRINTF("OooooooooooooooooooooooooooooooooCC\n"); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); play->envCtx.lightBlendOverride = LIGHT_BLEND_OVERRIDE_FULL_CONTROL; diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 06cbc92a5b..1a8b35ee4a 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -72,7 +72,7 @@ void Demo6K_Init(Actor* thisx, PlayState* play) { s32 objectSlot; s32 i; - osSyncPrintf("no = %d\n", params); + PRINTF("no = %d\n", params); if (sObjectIds[params] != OBJECT_GAMEPLAY_KEEP) { objectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[params]); @@ -80,7 +80,7 @@ void Demo6K_Init(Actor* thisx, PlayState* play) { objectSlot = 0; } - osSyncPrintf("bank_ID = %d\n", objectSlot); + PRINTF("bank_ID = %d\n", objectSlot); if (objectSlot < 0) { ASSERT(0, "0", "../z_demo_6k.c", 334); @@ -525,7 +525,7 @@ void func_80967DBC(Demo6K* this, PlayState* play) { Actor_SetScale(&this->actor, this->actor.scale.x + 0.03f); if (this->timer2 == 95) { - osSyncPrintf(VT_FGCOL(CYAN) " NA_SE_EN_GANON_FIRE_DEMO\n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " NA_SE_EN_GANON_FIRE_DEMO\n" VT_RST); Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_FIRE_DEMO); } } diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 0704094a0f..d5ff49ceb5 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -899,7 +899,7 @@ void DemoDu_CsCredits_HandleCues(DemoDu* this, PlayState* play) { break; default: // "Demo_Du_inEnding_Check_DemoMode:There is no such operation!!!!!!!!" - osSyncPrintf("Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Du_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } this->cueId = nextCueId; @@ -956,7 +956,7 @@ void DemoDu_Update(Actor* thisx, PlayState* play) { if (this->updateIndex < 0 || this->updateIndex >= 29 || sUpdateFuncs[this->updateIndex] == NULL) { // "The main mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sUpdateFuncs[this->updateIndex](this, play); @@ -1027,7 +1027,7 @@ void DemoDu_Draw(Actor* thisx, PlayState* play) { if (this->drawIndex < 0 || this->drawIndex >= 3 || sDrawFuncs[this->drawIndex] == NULL) { // "The drawing mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawIndex](thisx, play); diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 81853aa9fc..91dc9bf45b 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -158,7 +158,7 @@ void DemoEc_Init(Actor* thisx, PlayState* play) { DemoEc* this = (DemoEc*)thisx; if ((this->actor.params < 0) || (this->actor.params > 34)) { - osSyncPrintf(VT_FGCOL(RED) "Demo_Ec_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "Demo_Ec_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); Actor_Kill(&this->actor); } else { this->updateMode = EC_UPDATE_COMMON; @@ -689,7 +689,7 @@ Gfx* DemoEc_GetCarpenterPostLimbDList(DemoEc* this) { case 13: return object_daiku_DL_005880; default: - osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); return NULL; } } @@ -735,7 +735,7 @@ Gfx* DemoEc_GetGerudoPostLimbDList(DemoEc* this) { case 18: return gGerudoWhiteHairstyleSpikyDL; default: - osSyncPrintf(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "かつらが無い!!!!!!!!!!!!!!!!\n" VT_RST); return NULL; } } @@ -1247,7 +1247,7 @@ void DemoEc_InitNpc(DemoEc* this, PlayState* play) { if (sInitFuncs[type] == NULL) { // "Demo_Ec_main_init: Initialization process is wrong arg_data" - osSyncPrintf(VT_FGCOL(RED) " Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, type); + PRINTF(VT_FGCOL(RED) " Demo_Ec_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, type); Actor_Kill(&this->actor); return; } @@ -1272,7 +1272,7 @@ void DemoEc_InitCommon(DemoEc* this, PlayState* play) { if ((secondaryObjectSlot < 0) || (primaryObjectSlot < 0)) { // "Demo_Ec_main_bank: Bank unreadable arg_data = %d!" - osSyncPrintf(VT_FGCOL(RED) "Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, type); + PRINTF(VT_FGCOL(RED) "Demo_Ec_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, type); Actor_Kill(&this->actor); return; } @@ -1325,7 +1325,7 @@ void DemoEc_Update(Actor* thisx, PlayState* play) { if ((updateMode < 0) || (updateMode >= ARRAY_COUNT(sUpdateFuncs)) || sUpdateFuncs[updateMode] == NULL) { // "The main mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { if (updateMode != EC_UPDATE_COMMON) { DemoEc_UseAnimationObject(this, play); @@ -1358,7 +1358,7 @@ void DemoEc_Draw(Actor* thisx, PlayState* play) { if ((drawConfig < 0) || (drawConfig >= ARRAY_COUNT(sDrawFuncs)) || sDrawFuncs[drawConfig] == NULL) { // "The main mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { if (drawConfig != EC_DRAW_COMMON) { DemoEc_UseDrawObject(this, play); diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index be246852f2..7a7c8be056 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -173,13 +173,13 @@ void DemoEffect_Init(Actor* thisx, PlayState* play2) { effectType = (this->actor.params & 0x00FF); lightEffect = ((this->actor.params & 0xF000) >> 12); - osSyncPrintf(VT_FGCOL(CYAN) " no = %d\n" VT_RST, effectType); + PRINTF(VT_FGCOL(CYAN) " no = %d\n" VT_RST, effectType); objectSlot = sEffectTypeObjects[effectType] == OBJECT_GAMEPLAY_KEEP ? 0 : Object_GetSlot(&play->objectCtx, sEffectTypeObjects[effectType]); - osSyncPrintf(VT_FGCOL(CYAN) " bank_ID = %d\n" VT_RST, objectSlot); + PRINTF(VT_FGCOL(CYAN) " bank_ID = %d\n" VT_RST, objectSlot); if (objectSlot < 0) { ASSERT(0, "0", "../z_demo_effect.c", 723); @@ -524,7 +524,7 @@ void DemoEffect_WaitForObject(DemoEffect* this, PlayState* play) { this->actor.draw = this->initDrawFunc; this->updateFunc = this->initUpdateFunc; - osSyncPrintf(VT_FGCOL(CYAN) " 転送終了 move_wait " VT_RST); + PRINTF(VT_FGCOL(CYAN) " 転送終了 move_wait " VT_RST); } } @@ -682,12 +682,12 @@ void DemoEffect_InitTimeWarp(DemoEffect* this, PlayState* play) { SkelCurve_SetAnim(&this->skelCurve, &gTimeWarpAnim, 1.0f, 59.0f, 59.0f, 0.0f); SkelCurve_Update(play, &this->skelCurve); this->updateFunc = DemoEffect_UpdateTimeWarpReturnFromChamberOfSages; - osSyncPrintf(VT_FGCOL(CYAN) " 縮むバージョン \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " 縮むバージョン \n" VT_RST); } else { SkelCurve_SetAnim(&this->skelCurve, &gTimeWarpAnim, 1.0f, 59.0f, 1.0f, 1.0f); SkelCurve_Update(play, &this->skelCurve); this->updateFunc = DemoEffect_UpdateTimeWarpPullMasterSword; - osSyncPrintf(VT_FGCOL(CYAN) " 通常 バージョン \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " 通常 バージョン \n" VT_RST); } } diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index fd86e78caa..1189fd3bc1 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -110,7 +110,7 @@ void DemoExt_HandleCues(DemoExt* this, PlayState* play) { break; default: // "Demo_Ext_Check_DemoMode: there is no such action!" - osSyncPrintf("Demo_Ext_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Ext_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } this->cueId = nextCueId; @@ -173,7 +173,7 @@ void DemoExt_Update(Actor* thisx, PlayState* play) { if ((this->action < EXT_WAIT) || (this->action > EXT_DISPELL) || sActionFuncs[this->action] == NULL) { // "Main mode is abnormal!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sActionFuncs[this->action](this, play); } @@ -228,7 +228,7 @@ void DemoExt_Draw(Actor* thisx, PlayState* play) { if ((this->drawMode < EXT_DRAW_NOTHING) || (this->drawMode > EXT_DRAW_VORTEX) || sDrawFuncs[this->drawMode] == NULL) { // "Draw mode is abnormal!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sDrawFuncs[this->drawMode](thisx, play); } diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 4297296b5b..7bbd6c7ea4 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -61,7 +61,7 @@ void DemoGeff_Init(Actor* thisx, PlayState* play) { DemoGeff* this = (DemoGeff*)thisx; if (this->actor.params < 0 || this->actor.params >= 9) { - osSyncPrintf(VT_FGCOL(RED) "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); Actor_Kill(&this->actor); return; } @@ -176,7 +176,7 @@ void func_80978370(DemoGeff* this, PlayState* play) { s16 params = this->actor.params; DemoGeffInitFunc initFunc = sInitFuncs[params]; if (initFunc == NULL) { - osSyncPrintf(VT_FGCOL(RED) " Demo_Geff_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, params); + PRINTF(VT_FGCOL(RED) " Demo_Geff_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, params); Actor_Kill(&this->actor); return; } @@ -192,7 +192,7 @@ void func_809783D4(DemoGeff* this, PlayState* play) { s32 pad; if (objectSlot < 0) { - osSyncPrintf(VT_FGCOL(RED) "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, params); + PRINTF(VT_FGCOL(RED) "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, params); Actor_Kill(thisx); return; } @@ -206,7 +206,7 @@ void DemoGeff_Update(Actor* thisx, PlayState* play) { DemoGeff* this = (DemoGeff*)thisx; if (this->action < 0 || this->action >= 2 || sActionFuncs[this->action] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->action](this, play); @@ -220,7 +220,7 @@ void DemoGeff_Draw(Actor* thisx, PlayState* play) { s32 drawConfig = this->drawConfig; if (drawConfig < 0 || drawConfig >= 2 || sDrawFuncs[drawConfig] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } if (drawConfig != 0) { diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 4ae87e233a..867bd9aeb5 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -220,14 +220,14 @@ s32 DemoGj_FindGanon(DemoGj* this, PlayState* play) { this->ganon = (BossGanon2*)actor; // "Demo_Gj_Search_Boss_Ganon %d: Discover Ganon !!!!" - osSyncPrintf("Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n", this->dyna.actor.params); + PRINTF("Demo_Gj_Search_Boss_Ganon %d:ガノン発見!!!!\n", this->dyna.actor.params); return true; } actor = actor->next; } // "Demo_Gj_Search_Boss_Ganon %d: I couldn't find Ganon" - osSyncPrintf("Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n", this->dyna.actor.params); + PRINTF("Demo_Gj_Search_Boss_Ganon %d:ガノン発見出来ず\n", this->dyna.actor.params); return false; } //! @bug: Missing return value when `this->ganon` is already set. @@ -384,8 +384,8 @@ void DemoGj_SetupRotation(DemoGj* this, PlayState* play) { default: // "Demo_Gj_common_Reflect : This arg_data is not supported = %d" - osSyncPrintf(VT_FGCOL(RED) "Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n" VT_RST, - this->dyna.actor.params); + PRINTF(VT_FGCOL(RED) "Demo_Gj_common_Reflect : そんなarg_dataには対応していない = %d\n" VT_RST, + this->dyna.actor.params); return; } @@ -538,8 +538,8 @@ void DemoGj_SetupMovement(DemoGj* this, PlayState* play) { default: // "Demo_Gj_Setup_Move_common : This arg_data is not supported = %d" - osSyncPrintf(VT_FGCOL(RED) "Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n" VT_RST, - actor->params); + PRINTF(VT_FGCOL(RED) "Demo_Gj_Setup_Move_common : そんなarg_dataには対応していない = %d\n" VT_RST, + actor->params); break; } @@ -1345,7 +1345,7 @@ void DemoGj_Update(Actor* thisx, PlayState* play) { if (this->updateMode < 0 || this->updateMode >= ARRAY_COUNT(sUpdateFuncs) || sUpdateFuncs[this->updateMode] == NULL) { // "The main mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } @@ -1402,7 +1402,7 @@ void DemoGj_Init(Actor* thisx, PlayState* play) { default: // "Demo_Gj_Actor_ct There is no such argument!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST, play, this); + PRINTF(VT_FGCOL(RED) "Demo_Gj_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST, play, this); Actor_Kill(&this->dyna.actor); } } @@ -1437,7 +1437,7 @@ void DemoGj_Draw(Actor* thisx, PlayState* play) { if (this->drawConfig < 0 || this->drawConfig >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawConfig] == NULL) { // "The drawing mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 59675db2ad..730b63d49c 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -317,7 +317,7 @@ void DemoGo_Update(Actor* thisx, PlayState* play) { DemoGo* this = (DemoGo*)thisx; if (this->action < 0 || this->action >= 7 || D_8097D44C[this->action] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } D_8097D44C[this->action](this, play); @@ -358,7 +358,7 @@ void DemoGo_Draw(Actor* thisx, PlayState* play) { DemoGo* this = (DemoGo*)thisx; if (this->drawConfig < 0 || this->drawConfig >= 2 || D_8097D468[this->drawConfig] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } D_8097D468[this->drawConfig](this, play); diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index e0d8a8dcfe..5190d79c69 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -1705,7 +1705,7 @@ void DemoGt_Update(Actor* thisx, PlayState* play) { if ((this->updateMode < 0) || (this->updateMode >= 19) || (updateFunc = sUpdateFuncs[this->updateMode]) == NULL) { // "The main mode is strange!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } @@ -1742,7 +1742,7 @@ void DemoGt_Init(Actor* thisx, PlayState* play) { break; default: // "Demo_Gt_Actor_ct There is no such argument !" - osSyncPrintf("Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("Demo_Gt_Actor_ct そんな引数は無い!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); Actor_Kill(&this->dyna.actor); } } @@ -1761,7 +1761,7 @@ void DemoGt_Draw(Actor* thisx, PlayState* play) { if ((this->drawConfig < 0) || (this->drawConfig >= 9) || (drawFunc = sDrawFuncs[this->drawConfig]) == NULL) { // "The drawing mode is strange !!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 9721feb0fe..dd1d7e3cc5 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -230,7 +230,7 @@ void func_809839D0(DemoIk* this, PlayState* play) { break; default: // "there is no such action" - osSyncPrintf("Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Ik_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -381,7 +381,7 @@ void func_80984048(DemoIk* this, PlayState* play) { break; default: // "there is no such action" - osSyncPrintf("Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Ik_inFace_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -473,7 +473,7 @@ void DemoIk_Update(Actor* thisx, PlayState* play) { if (this->actionMode < 0 || this->actionMode >= ARRAY_COUNT(sActionFuncs) || sActionFuncs[this->actionMode] == NULL) { // "The main mode is strange" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->actionMode](this, play); @@ -494,7 +494,7 @@ void DemoIk_Draw(Actor* thisx, PlayState* play) { if (this->drawMode < 0 || this->drawMode >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawMode] == NULL) { // "The draw mode is strange" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawMode](this, play); diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index e0d78d1f7c..71e2ee06ef 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -624,7 +624,7 @@ void func_809861C4(DemoIm* this, PlayState* play) { this->action = 12; break; default: - osSyncPrintf("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -664,7 +664,7 @@ void func_809862E0(DemoIm* this, PlayState* play) { func_80986148(this); break; default: - osSyncPrintf("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Im_Ocarina_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -792,7 +792,7 @@ void func_8098680C(DemoIm* this, PlayState* play) { Actor_Kill(&this->actor); break; default: - osSyncPrintf("Demo_Im_Spot00_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Im_Spot00_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -1055,7 +1055,7 @@ void func_809871E8(DemoIm* this, PlayState* play) { func_80987174(this); break; default: - osSyncPrintf("Demo_Im_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Im_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -1094,7 +1094,7 @@ void DemoIm_Update(Actor* thisx, PlayState* play) { DemoIm* this = (DemoIm*)thisx; if ((this->action < 0) || (this->action >= 31) || (sActionFuncs[this->action] == NULL)) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->action](this, play); @@ -1205,7 +1205,7 @@ void DemoIm_Draw(Actor* thisx, PlayState* play) { DemoIm* this = (DemoIm*)thisx; if ((this->drawConfig < 0) || (this->drawConfig >= 3) || (sDrawFuncs[this->drawConfig] == NULL)) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawConfig](this, play); diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index f7446f0e2c..103ddcb3ce 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -183,7 +183,7 @@ void DemoKankyo_Init(Actor* thisx, PlayState* play) { s16 i; s32 objectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[this->actor.params]); - osSyncPrintf("bank_ID = %d\n", objectSlot); + PRINTF("bank_ID = %d\n", objectSlot); if (objectSlot < 0) { ASSERT(0, "0", "../z_demo_kankyo.c", 521); } else { diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 45882e5fc2..d67bab473c 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -568,7 +568,7 @@ void func_8098F654(DemoSa* this, PlayState* play) { func_8098F5D0(this); break; default: - osSyncPrintf("Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Sa_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -717,7 +717,7 @@ void func_8098FB68(DemoSa* this, PlayState* play) { func_8098FAE0(this); break; default: - osSyncPrintf("Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("Demo_Sa_inPresent_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -757,7 +757,7 @@ void DemoSa_Update(Actor* thisx, PlayState* play) { DemoSa* this = (DemoSa*)thisx; if (this->action < 0 || this->action >= 21 || sActionFuncs[this->action] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->action](this, play); @@ -827,7 +827,7 @@ void DemoSa_Draw(Actor* thisx, PlayState* play) { DemoSa* this = (DemoSa*)thisx; if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawConfig](this, play); diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index 71756f75cc..cd6966eb05 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -50,7 +50,7 @@ void DemoTreLgt_Init(Actor* thisx, PlayState* play) { if (!SkelCurve_Init(play, &this->skelCurve, &gTreasureChestCurveSkel, sAnimations[0])) { // "Demo_Tre_Lgt_Actor_ct (); Construct failed" - osSyncPrintf("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n"); + PRINTF("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n"); } ASSERT(true, "1", "../z_demo_tre_lgt.c", UNK_LINE); diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index ff1e4e6572..d9b03e1694 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -109,8 +109,8 @@ void DoorKiller_Init(Actor* thisx, PlayState* play2) { objectSlot = Object_GetSlot(&play->objectCtx, sDoorTextures[i].objectId); this->textureEntryIndex = i; } - osSyncPrintf("bank_ID = %d\n", objectSlot); - osSyncPrintf("status = %d\n", this->textureEntryIndex); + PRINTF("bank_ID = %d\n", objectSlot); + PRINTF("status = %d\n", this->textureEntryIndex); this->requiredObjectSlot = objectSlot; this->texture = sDoorTextures[this->textureEntryIndex].texture; diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 9cba0725c7..9637be78c4 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -895,13 +895,13 @@ void DoorShutter_GohmaBlockBounce(DoorShutter* this, PlayState* play) { void DoorShutter_PhantomGanonBarsRaise(DoorShutter* this, PlayState* play) { f32 targetOffsetY; - osSyncPrintf("FHG SAKU START !!\n"); + PRINTF("FHG SAKU START !!\n"); if (this->isActive != 0) { this->isActive--; } targetOffsetY = (this->isActive % 2 != 0) ? -3.0f : 0.0f; Math_SmoothStepToF(&this->dyna.actor.world.pos.y, -34.0f + targetOffsetY, 1.0f, 20.0f, 0.0f); - osSyncPrintf("FHG SAKU END !!\n"); + PRINTF("FHG SAKU END !!\n"); } void DoorShutter_Update(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 4e5bbf43fd..52c111c58a 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -76,7 +76,7 @@ void DoorWarp1_Init(Actor* thisx, PlayState* play) { this->actor.world.pos.z, 0, 0, 0, 0); this->lowerLight = LightContext_InsertLight(play2, &play2->lightCtx, &this->lowerLightInfo); } - osSyncPrintf("\nBOSSWARP arg_data=[%d]", this->actor.params); + PRINTF("\nBOSSWARP arg_data=[%d]", this->actor.params); DoorWarp1_ChooseInitialAction(this, play2); } @@ -492,8 +492,7 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) { this->warpTimer++; if (sWarpTimerTarget < this->warpTimer && gSaveContext.nextCutsceneIndex == 0xFFEF) { - osSyncPrintf("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->transitionTrigger, - TRANS_TRIGGER_START); + PRINTF("\n\n\nじかんがきたからおーしまい fade_direction=[%d]", play->transitionTrigger, TRANS_TRIGGER_START); if (play->sceneId == SCENE_DODONGOS_CAVERN_BOSS) { if (!Flags_GetEventChkInf(EVENTCHKINF_25)) { @@ -520,7 +519,7 @@ void DoorWarp1_ChildWarpOut(DoorWarp1* this, PlayState* play) { play->nextEntranceIndex = ENTR_ZORAS_FOUNTAIN_0; gSaveContext.nextCutsceneIndex = 0; } - osSyncPrintf("\n\n\nおわりおわり"); + PRINTF("\n\n\nおわりおわり"); play->transitionTrigger = TRANS_TRIGGER_START; play->transitionType = TRANS_TYPE_FADE_WHITE_SLOW; gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE; @@ -795,7 +794,7 @@ void DoorWarp1_AdultWarpOut(DoorWarp1* this, PlayState* play) { play->envCtx.screenFillColor[2] = 160; play->envCtx.screenFillColor[3] = (u32)(255.0f * screenFillAlpha); - osSyncPrintf("\nparcent=[%f]", screenFillAlpha); + PRINTF("\nparcent=[%f]", screenFillAlpha); } Lights_PointNoGlowSetInfo(&this->upperLightInfo, (s16)player->actor.world.pos.x + 10.0f, (s16)player->actor.world.pos.y + 10.0f, (s16)player->actor.world.pos.z + 10.0f, 235, 255, 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 fbde93043b..dfa44b0cd4 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -72,11 +72,11 @@ void ElfMsg_Init(Actor* thisx, PlayState* play) { ElfMsg* this = (ElfMsg*)thisx; // "Conditions for Elf Tag disappearing" - osSyncPrintf(VT_FGCOL(CYAN) "\nエルフ タグ 消える条件 %d" VT_RST "\n", (thisx->params >> 8) & 0x3F); - osSyncPrintf(VT_FGCOL(CYAN) "\nthisx->shape.angle.sy = %d\n" VT_RST, thisx->shape.rot.y); + PRINTF(VT_FGCOL(CYAN) "\nエルフ タグ 消える条件 %d" VT_RST "\n", (thisx->params >> 8) & 0x3F); + PRINTF(VT_FGCOL(CYAN) "\nthisx->shape.angle.sy = %d\n" VT_RST, thisx->shape.rot.y); if (thisx->shape.rot.y >= 0x41) { // "Conditions for Elf Tag appearing" - osSyncPrintf(VT_FGCOL(CYAN) "\nエルフ タグ 出現条件 %d" VT_RST "\n", thisx->shape.rot.y - 0x41); + PRINTF(VT_FGCOL(CYAN) "\nエルフ タグ 出現条件 %d" VT_RST "\n", thisx->shape.rot.y - 0x41); } if (!ElfMsg_KillCheck(this, play)) { 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 92ca9473f4..d36f9813cb 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -72,7 +72,7 @@ s32 ElfMsg2_KillCheck(ElfMsg2* this, PlayState* play) { void ElfMsg2_Init(Actor* thisx, PlayState* play) { ElfMsg2* this = (ElfMsg2*)thisx; - osSyncPrintf(VT_FGCOL(CYAN) " Elf_Msg2_Actor_ct %04x\n\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(CYAN) " Elf_Msg2_Actor_ct %04x\n\n" VT_RST, this->actor.params); if (!ElfMsg2_KillCheck(this, play)) { if ((this->actor.world.rot.x > 0) && (this->actor.world.rot.x < 8)) { this->actor.targetMode = this->actor.world.rot.x - 1; diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 04775f106f..b8280d1a9a 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -131,9 +131,9 @@ void EnAnubice_Init(Actor* thisx, PlayState* play) { SkelAnime_Init(play, &this->skelAnime, &gAnubiceSkel, &gAnubiceIdleAnim, this->jointTable, this->morphTable, ANUBICE_LIMB_MAX); - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Anubis occurence ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ アヌビス発生 ☆☆☆☆☆ \n" VT_RST); this->actor.naviEnemyId = NAVI_ENEMY_ANUBIS; @@ -182,9 +182,9 @@ void EnAnubice_FindFlameCircles(EnAnubice* this, PlayState* play) { } else { this->flameCircles[flameCirclesFound] = (BgHidanCurtain*)currentProp; // "☆☆☆☆☆ How many fires? ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %d\n" VT_RST, flameCirclesFound); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %x\n" VT_RST, - this->flameCircles[flameCirclesFound]); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %d\n" VT_RST, flameCirclesFound); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 火は幾つ？ ☆☆☆☆☆ %x\n" VT_RST, + this->flameCircles[flameCirclesFound]); if (flameCirclesFound < ARRAY_COUNT(this->flameCircles) - 1) { flameCirclesFound++; } diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 81792d596b..772b1c1372 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -32,9 +32,9 @@ ActorInit En_Anubice_Tag_InitVars = { void EnAnubiceTag_Init(Actor* thisx, PlayState* play) { EnAnubiceTag* this = (EnAnubiceTag*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Anubis control tag generated" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); if (this->actor.params < -1) { this->actor.params = 0; diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 20856856c7..1febc79760 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -171,7 +171,7 @@ void func_809BC598(EnBdfire* this, PlayState* play) { } player->bodyIsBurning = true; func_8002F6D4(play, &this->actor, 20.0f, this->actor.world.rot.y, 0.0f, 8); - osSyncPrintf("POWER\n"); + PRINTF("POWER\n"); } } } diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 37cd13375a..3907b579f5 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -59,10 +59,9 @@ void EnBomBowlMan_Init(Actor* thisx, PlayState* play2) { SkelAnime_InitFlex(play, &this->skelAnime, &gChuGirlSkel, &gChuGirlNoddingOffAnim, this->jointTable, this->morphTable, 11); // "☆ Man, my shoulders hurt~ ☆" - osSyncPrintf(VT_FGCOL(GREEN) "☆ もー 肩こっちゃうよねぇ〜 \t\t ☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆ もー 肩こっちゃうよねぇ〜 \t\t ☆ \n" VT_RST); // "☆ Isn't there some sort of job that will pay better and be more relaxing? ☆ %d" - osSyncPrintf(VT_FGCOL(GREEN) "☆ もっとラクしてもうかるバイトないかしら？ ☆ %d\n" VT_RST, - play->bombchuBowlingStatus); + PRINTF(VT_FGCOL(GREEN) "☆ もっとラクしてもうかるバイトないかしら？ ☆ %d\n" VT_RST, play->bombchuBowlingStatus); this->posCopy = this->actor.world.pos; this->actor.shape.yOffset = -60.0f; Actor_SetScale(&this->actor, 0.013f); @@ -218,14 +217,14 @@ void EnBomBowlMan_RunGame(EnBomBowlMan* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (BREG(3)) { - osSyncPrintf(VT_FGCOL(RED) "☆ game_play->bomchu_game_flag ☆ %d\n" VT_RST, play->bombchuBowlingStatus); + PRINTF(VT_FGCOL(RED) "☆ game_play->bomchu_game_flag ☆ %d\n" VT_RST, play->bombchuBowlingStatus); // "HOW'S THE FIRST WALL DOING?" - osSyncPrintf(VT_FGCOL(RED) "☆ 壁１の状態どう？ ☆ %d\n" VT_RST, this->wallStatus[0]); + PRINTF(VT_FGCOL(RED) "☆ 壁１の状態どう？ ☆ %d\n" VT_RST, this->wallStatus[0]); // "HOW'S THE SECOND WALL DOING?" - osSyncPrintf(VT_FGCOL(RED) "☆ 壁２の状態どう？ ☆ %d\n" VT_RST, this->wallStatus[1]); + PRINTF(VT_FGCOL(RED) "☆ 壁２の状態どう？ ☆ %d\n" VT_RST, this->wallStatus[1]); // "HOLE INFORMATION" - osSyncPrintf(VT_FGCOL(RED) "☆ 穴情報\t ☆ %d\n" VT_RST, this->bowlPit->status); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(RED) "☆ 穴情報\t ☆ %d\n" VT_RST, this->bowlPit->status); + PRINTF("\n\n"); } this->gameResult = 0; @@ -235,14 +234,14 @@ void EnBomBowlMan_RunGame(EnBomBowlMan* this, PlayState* play) { this->gameResult = 1; // Won this->bowlPit->status = 0; // "Center HIT!" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 中央ＨＩＴ！！！！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 中央ＨＩＴ！！！！ ☆☆☆☆☆ \n" VT_RST); } if ((play->bombchuBowlingStatus == -1) && (play->actorCtx.actorLists[ACTORCAT_EXPLOSIVE].length == 0) && (this->bowlPit->status == 0) && (this->wallStatus[0] != 1) && (this->wallStatus[1] != 1)) { this->gameResult = 2; // Lost // "Bombchu lost" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ボムチュウ消化 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ボムチュウ消化 ☆☆☆☆☆ \n" VT_RST); } } @@ -457,7 +456,7 @@ void EnBomBowlMan_BeginPlayGame(EnBomBowlMan* this, PlayState* play) { } // "Wow" - osSyncPrintf(VT_FGCOL(YELLOW) "☆ わー ☆ %d\n" VT_RST, play->bombchuBowlingStatus); + PRINTF(VT_FGCOL(YELLOW) "☆ わー ☆ %d\n" VT_RST, play->bombchuBowlingStatus); Player_SetCsActionWithHaltedActors(play, NULL, PLAYER_CSACTION_7); this->actionFunc = EnBomBowlMan_SetupRunGame; } diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index d0d3a916a1..a1fa88b631 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -202,11 +202,11 @@ void EnBomBowlPit_WaitTillPrizeGiven(EnBomBowlPit* this, PlayState* play) { void EnBomBowlPit_Reset(EnBomBowlPit* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) { // "Normal termination"/"completion" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); if (this->getItemId == GI_HEART_PIECE) { gSaveContext.healthAccumulator = 0x140; // "Ah recovery!" (?) - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ あぁ回復！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ あぁ回復！ ☆☆☆☆☆ \n" VT_RST); } this->exItemDone = 0; this->status = 2; diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 197c4ae140..fe2fb6e3d0 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -417,7 +417,7 @@ void EnBox_WaitOpen(EnBox* this, PlayState* play) { Audio_PlayFanfare(NA_BGM_OPEN_TRE_BOX | 0x900); } } - osSyncPrintf("Actor_Environment_Tbox_On() %d\n", this->dyna.actor.params & 0x1F); + PRINTF("Actor_Environment_Tbox_On() %d\n", this->dyna.actor.params & 0x1F); Flags_SetTreasure(play, this->dyna.actor.params & 0x1F); } else { player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index f2ed8c4de6..42f549b753 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -170,7 +170,7 @@ void EnButte_Init(Actor* thisx, PlayState* play) { this->actor.shape.rot.x -= 0x2320; this->drawSkelAnime = true; // "field keep butterfly" - osSyncPrintf("(field keep 蝶)(%x)(arg_data 0x%04x)\n", this, this->actor.params); + PRINTF("(field keep 蝶)(%x)(arg_data 0x%04x)\n", this, this->actor.params); } void EnButte_Destroy(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index f1cd4baf36..cf5e1efe3e 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -83,16 +83,16 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) { this->roomChestsOpened = true; } - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Treasure generation (which room is it?)" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 宝発生(部屋はどれ？) %d\n" VT_RST, play->roomCtx.curRoom.num); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 宝発生(部屋はどれ？) %d\n" VT_RST, play->roomCtx.curRoom.num); // "How is the Bit?" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ビットは？ \t %x\n" VT_RST, play->actorCtx.flags.chest); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ビットは？ \t %x\n" VT_RST, play->actorCtx.flags.chest); // "How is the Save BIT?" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セーブＢＩＴは？ %x\n" VT_RST, sTreasureFlags[minigameRoomNum]); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セーブＢＩＴは？ %x\n" VT_RST, sTreasureFlags[minigameRoomNum]); // "Is it already a zombie?" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ もう、ゾンビ？\t %d\n" VT_RST, this->roomChestsOpened); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ もう、ゾンビ？\t %d\n" VT_RST, this->roomChestsOpened); + PRINTF("\n\n"); minigameRoomNum *= 2; // Spawn Heart Piece in chest (or Purple Rupee if won Heart Piece) @@ -113,7 +113,7 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) { Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, 20.0f, 20.0f, -2500.0f, 0, 0, 0, ((sTreasureFlags[5] & 0x1F) << 8) + rewardParams); // "Central treasure instance/occurrence (GREAT)" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 中央宝発生(ＧＲＥＡＴ) ☆☆☆☆☆ %x\n" VT_RST, rewardChestParams); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 中央宝発生(ＧＲＥＡＴ) ☆☆☆☆☆ %x\n" VT_RST, rewardChestParams); this->actionFunc = EnChanger_SetHeartPieceFlag; return; } @@ -150,14 +150,14 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) { if (this->leftChest != NULL) { // "Left treasure generation (what does it contain?)" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 左宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" VT_RST, leftChestParams); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 左宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" VT_RST, leftChestParams); // "What is the room number?" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 部屋番号は？ %x\n" VT_RST, play->roomCtx.curRoom.num); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 部屋番号は？ %x\n" VT_RST, play->roomCtx.curRoom.num); // "What is the bit?" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ビットはなぁに？ %x\n" VT_RST, this->rightChestNum); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ビットはなぁに？ %x\n" VT_RST, this->rightChestNum); // "Sukesuke-kun" (something to do with being invisible) - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ すけすけ君？ %x\n" VT_RST, rightChestItem); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ すけすけ君？ %x\n" VT_RST, rightChestItem); + PRINTF("\n\n"); if (this->roomChestsOpened) { Flags_SetTreasure(play, this->leftChestNum & 0x1F); } else { @@ -174,14 +174,14 @@ void EnChanger_Init(Actor* thisx, PlayState* play2) { if (this->rightChest != NULL) { // "Right treasure generation (what does it contain?)" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 右宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" VT_RST, rightChestParams); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 右宝発生(ナニがはいってるの？) ☆☆☆☆☆ %x\n" VT_RST, rightChestParams); // "What is the room number?" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 部屋番号は？ %d\n" VT_RST, play->roomCtx.curRoom.num); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 部屋番号は？ %d\n" VT_RST, play->roomCtx.curRoom.num); // "What is the bit?" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ ビットはなぁに？ %x\n" VT_RST, this->leftChestNum); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ ビットはなぁに？ %x\n" VT_RST, this->leftChestNum); // "Sukesuke-kun" (something to do with being invisible) - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ すけすけ君？ %x\n" VT_RST, leftChestItem); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ すけすけ君？ %x\n" VT_RST, leftChestItem); + PRINTF("\n\n"); if (this->roomChestsOpened) { Flags_SetTreasure(play, this->rightChestNum & 0x1F); @@ -239,7 +239,7 @@ void EnChanger_OpenChests(EnChanger* this, PlayState* play) { } else { temp_s0_2 = (s16)(this->rightChestGetItemId - GI_RUPEE_GREEN_LOSE) + EXITEM_CHEST; // "Open right treasure (chest)" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 右宝開く ☆☆☆☆☆ %d\n" VT_RST, temp_s0_2); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 右宝開く ☆☆☆☆☆ %d\n" VT_RST, temp_s0_2); Actor_Spawn(&play->actorCtx, play, ACTOR_EN_EX_ITEM, xPos, yPos, zPos, 0, 0, 0, temp_s0_2); } break; @@ -254,7 +254,7 @@ void EnChanger_OpenChests(EnChanger* this, PlayState* play) { } else { temp_s0_2 = (s16)(this->leftChestGetItemId - 0x72) + 0xA; // "Open left treasure (chest)" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 左宝開く ☆☆☆☆☆ %d\n" VT_RST, temp_s0_2); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 左宝開く ☆☆☆☆☆ %d\n" VT_RST, temp_s0_2); Actor_Spawn(&play->actorCtx, play, ACTOR_EN_EX_ITEM, xPos, yPos, zPos, 0, 0, 0, temp_s0_2); } break; diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 74ace94ca1..f415f0f100 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -573,8 +573,8 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) { if (this->state < CLEAR_TAG_STATE_LASER) { // Play the Arwing cutscene. - osSyncPrintf("DEMO_MODE %d\n", this->cutsceneMode); - osSyncPrintf("CAMERA_NO %d\n", this->subCamId); + PRINTF("DEMO_MODE %d\n", this->cutsceneMode); + PRINTF("CAMERA_NO %d\n", this->subCamId); if (this->cutsceneMode != CLEAR_TAG_CUTSCENE_MODE_NONE) { f32 subCamCircleX; diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index bf5cb06139..66a136fccf 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -511,7 +511,7 @@ s32 EnDaikuKakariko_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList angle = this->interactInfo.headRot; if (this->flags & 0x1000) { - osSyncPrintf("<%d>\n", this->neckAngle.x); + PRINTF("<%d>\n", this->neckAngle.x); Matrix_RotateX(BINANG_TO_RAD(angle.y + this->neckAngle.y), MTXMODE_APPLY); Matrix_RotateZ(BINANG_TO_RAD(angle.x + this->neckAngle.x), MTXMODE_APPLY); } else { diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 942701c680..df3e4ceab4 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -82,13 +82,13 @@ void EnDivingGame_Init(Actor* thisx, PlayState* play) { SkelAnime_InitFlex(play, &this->skelAnime, &gZoraSkel, &gZoraIdleAnim, this->jointTable, this->morphTable, 20); Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 素もぐりＧＯ ☆☆☆☆☆ \n" VT_RST); this->actor.room = -1; this->actor.scale.x = 0.01f; this->actor.scale.y = 0.012999999f; this->actor.scale.z = 0.0139999995f; if (D_809EF0B0) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); this->unk_31F = 1; Actor_Kill(&this->actor); } else { @@ -478,7 +478,7 @@ void func_809EEAF8(EnDivingGame* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) { // "Successful completion" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0; SET_EVENTCHKINF(EVENTCHKINF_38); this->actionFunc = func_809EDCB0; diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 8835fa716b..233d17d613 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -128,7 +128,7 @@ void EnDns_Init(Actor* thisx, PlayState* play) { if (DNS_GET_TYPE(&this->actor) < 0) { // "Function Error (Deku Salesman)" - osSyncPrintf(VT_FGCOL(RED) "引数エラー（売りナッツ）[ arg_data = %d ]" VT_RST "\n", this->actor.params); + PRINTF(VT_FGCOL(RED) "引数エラー（売りナッツ）[ arg_data = %d ]" VT_RST "\n", this->actor.params); Actor_Kill(&this->actor); return; } @@ -139,7 +139,7 @@ void EnDns_Init(Actor* thisx, PlayState* play) { } // "Deku Salesman" - osSyncPrintf(VT_FGCOL(GREEN) "◆◆◆ 売りナッツ『%s』 ◆◆◆" VT_RST "\n", sItemDebugTxt[DNS_GET_TYPE(&this->actor)]); + PRINTF(VT_FGCOL(GREEN) "◆◆◆ 売りナッツ『%s』 ◆◆◆" VT_RST "\n", sItemDebugTxt[DNS_GET_TYPE(&this->actor)]); Actor_ProcessInitChain(&this->actor, sInitChain); diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index 6c735690b0..4add13e11e 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -74,9 +74,9 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) { s32 i; s32 pad; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Deku Scrub mask show start" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会開始 ☆☆☆☆☆ \n" VT_RST); for (i = 0; i < 9; i++) { this->scrubPos[i] = sScrubPos[i]; this->scrubs[i] = (EnDntNomal*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_DNT_NOMAL, @@ -84,7 +84,7 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) { 0, 0, 0, i + ENDNTNOMAL_STAGE); if (this->scrubs[i] != NULL) { // "zako zako" [small fries] - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n" VT_RST, this->scrubs[i]); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ザコザコ ☆☆☆☆☆ %x\n" VT_RST, this->scrubs[i]); } } @@ -95,7 +95,7 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) { this->leaderPos.x, this->leaderPos.y, this->leaderPos.z, 0, 0, 0, 0); if (this->leader != NULL) { // "jiji jiji jiji jiji jiji" [onomatopoeia for the scrub sound?] - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n" VT_RST, this->leader); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ じじじじじじじじじじい ☆☆☆☆☆ %x\n" VT_RST, this->leader); } this->subCamId = SUB_CAM_ID_DONE; this->actor.flags &= ~ACTOR_FLAG_0; @@ -145,7 +145,7 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { } if (this->judgeTimer > 40) { // "gera gera" [onomatopoeia for loud giggling] - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ げらげら ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ げらげら ☆☆☆☆☆ \n" VT_RST); func_800F436C(&this->actor.projectedPos, NA_SE_EV_CROWD - SFX_FLAG, 2.0f); } if (this->judgeTimer < 120) { @@ -192,14 +192,14 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { delay = 8; reaction = DNT_SIGNAL_HIDE; // "Special!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 特別！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 特別！ ☆☆☆☆☆ \n" VT_RST); } else { if (maskIdx >= PLAYER_MASK_MAX - 1) { // "This is dangerous!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ ヤバいよこれ！ ☆☆☆☆☆ \n" VT_RST); maskIdx = Rand_ZeroFloat(7.99f); } @@ -221,19 +221,19 @@ void EnDntDemo_Judge(EnDntDemo* this, PlayState* play) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_SHOP); break; } - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Each index 1" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス１ ☆☆☆☆☆ %d\n" VT_RST, rand9); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス１ ☆☆☆☆☆ %d\n" VT_RST, rand9); // "Each index 2" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス２ ☆☆☆☆☆ %d\n" VT_RST, maskIdx); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス２ ☆☆☆☆☆ %d\n" VT_RST, maskIdx); // "Each index 3" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス３ ☆☆☆☆☆ %d\n" VT_RST, resultIdx); - osSyncPrintf("\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 各インデックス３ ☆☆☆☆☆ %d\n" VT_RST, resultIdx); + PRINTF("\n"); // "What kind of evaluation?" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ どういう評価？ ☆☆☆☆☆☆ %d\n" VT_RST, reaction); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ どういう評価？ ☆☆☆☆☆☆ %d\n" VT_RST, reaction); // "What kind of action?" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ どういうアクション？ ☆☆☆ %d\n" VT_RST, this->action); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ どういうアクション？ ☆☆☆ %d\n" VT_RST, this->action); + PRINTF("\n\n"); break; } } diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 9ac252bd9b..59c8ed95d7 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -79,9 +79,9 @@ void EnDntJiji_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); this->stage = (EnDntDemo*)this->actor.parent; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Deku Scrub mask show elder" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n" VT_RST, this->stage); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n" VT_RST, this->stage); this->actor.flags &= ~ACTOR_FLAG_0; this->actor.colChkInfo.mass = 0xFF; this->actor.targetMode = 6; @@ -274,23 +274,23 @@ void EnDntJiji_GivePrize(EnDntJiji* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) { if ((this->getItemId == GI_DEKU_NUT_UPGRADE_30) || (this->getItemId == GI_DEKU_NUT_UPGRADE_40)) { // "nut" - osSyncPrintf("実 \n"); - osSyncPrintf("実 \n"); - osSyncPrintf("実 \n"); - osSyncPrintf("実 \n"); - osSyncPrintf("実 \n"); - osSyncPrintf("実 \n"); - osSyncPrintf("実 \n"); - osSyncPrintf("実 \n"); + PRINTF("実 \n"); + PRINTF("実 \n"); + PRINTF("実 \n"); + PRINTF("実 \n"); + PRINTF("実 \n"); + PRINTF("実 \n"); + PRINTF("実 \n"); + PRINTF("実 \n"); SET_ITEMGETINF(ITEMGETINF_1F); } else { // "stick" - osSyncPrintf("棒 \n"); - osSyncPrintf("棒 \n"); - osSyncPrintf("棒 \n"); - osSyncPrintf("棒 \n"); - osSyncPrintf("棒 \n"); - osSyncPrintf("棒 \n"); + PRINTF("棒 \n"); + PRINTF("棒 \n"); + PRINTF("棒 \n"); + PRINTF("棒 \n"); + PRINTF("棒 \n"); + PRINTF("棒 \n"); SET_ITEMGETINF(ITEMGETINF_1E); } this->actor.textId = 0; @@ -375,7 +375,7 @@ void EnDntJiji_Update(Actor* thisx, PlayState* play) { this->unkTimer++; if (BREG(0)) { // "time" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n" VT_RST, this->timer); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 時間 ☆☆☆☆☆ %d\n" VT_RST, this->timer); } if ((this->timer > 1) && (this->timer != 0)) { this->timer--; diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 0ee045349e..f1fefedd8b 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -126,17 +126,17 @@ void EnDntNomal_Init(Actor* thisx, PlayState* play) { this->actor.colChkInfo.mass = 0xFF; this->objectId = -1; if (this->type == ENDNTNOMAL_TARGET) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Deku Scrub target" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツ的当て ☆☆☆☆☆ \n" VT_RST); Collider_InitQuad(play, &this->targetQuad); Collider_SetQuad(play, &this->targetQuad, &this->actor, &sTargetQuadInit); this->actor.world.rot.y = this->actor.shape.rot.y = this->actor.yawTowardsPlayer; this->objectId = OBJECT_HINTNUTS; } else { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Deku Scrub mask show audience" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ デグナッツお面品評会一般人 ☆☆☆☆☆ \n" VT_RST); Collider_InitCylinder(play, &this->bodyCyl); Collider_SetCylinder(play, &this->bodyCyl, &this->actor, &sBodyCylinderInit); this->objectId = OBJECT_DNK; @@ -146,9 +146,9 @@ void EnDntNomal_Init(Actor* thisx, PlayState* play) { if (this->requiredObjectSlot < 0) { Actor_Kill(&this->actor); // "What?" - osSyncPrintf(VT_FGCOL(MAGENTA) " なにみの？ %d\n" VT_RST "\n", this->requiredObjectSlot); + PRINTF(VT_FGCOL(MAGENTA) " なにみの？ %d\n" VT_RST "\n", this->requiredObjectSlot); // "Bank is funny" - osSyncPrintf(VT_FGCOL(CYAN) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params); + PRINTF(VT_FGCOL(CYAN) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params); return; } } else { @@ -245,7 +245,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, PlayState* play) { Audio_StopSfxById(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); // "Big hit" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter); if (!LINK_IS_ADULT && !GET_ITEMGETINF(ITEMGETINF_1D)) { this->hitCounter++; if (this->hitCounter >= 3) { diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 503c77a5d4..1896074334 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -36,9 +36,9 @@ void EnDyExtra_Destroy(Actor* thisx, PlayState* play) { void EnDyExtra_Init(Actor* thisx, PlayState* play) { EnDyExtra* this = (EnDyExtra*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Big fairy effect" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 大妖精効果 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 大妖精効果 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); this->type = this->actor.params; this->scale.x = 0.025f; this->scale.y = 0.039f; 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 4bfcc985a9..c53100adae 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -65,7 +65,7 @@ void EnEg_Update(Actor* thisx, PlayState* play) { if (((action < 0) || (0 < action)) || (sActionFuncs[action] == NULL)) { // "Main Mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sActionFuncs[action](this, play); } diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 73f6911fa8..d942e56c7c 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -32,14 +32,14 @@ void EnEncount1_Init(Actor* thisx, PlayState* play) { f32 spawnRange; if (this->actor.params <= 0) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Input error death!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 入力エラーデッス！ ☆☆☆☆☆ \n" VT_RST); + PRINTF("\n\n"); Actor_Kill(&this->actor); return; } @@ -51,18 +51,18 @@ void EnEncount1_Init(Actor* thisx, PlayState* play) { spawnRange = 120.0f + (40.0f * this->actor.world.rot.z); this->spawnRange = spawnRange; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "It's an enemy spawner!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 敵発生ゾーンでた！ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 敵発生ゾーンでた！ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); // "Type" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 種類\t\t ☆☆☆☆☆ %d\n" VT_RST, this->spawnType); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 種類\t\t ☆☆☆☆☆ %d\n" VT_RST, this->spawnType); // "Maximum number of simultaneous spawns" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 最大同時発生数 ☆☆☆☆☆ %d\n" VT_RST, this->maxCurSpawns); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 最大同時発生数 ☆☆☆☆☆ %d\n" VT_RST, this->maxCurSpawns); // "Maximum number of spawns" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 最大発生数 \t ☆☆☆☆☆ %d\n" VT_RST, this->maxTotalSpawns); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 最大発生数 \t ☆☆☆☆☆ %d\n" VT_RST, this->maxTotalSpawns); // "Spawn check range" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生チェック範囲 ☆☆☆☆☆ %f\n" VT_RST, this->spawnRange); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生チェック範囲 ☆☆☆☆☆ %f\n" VT_RST, this->spawnRange); + PRINTF("\n\n"); this->actor.flags &= ~ACTOR_FLAG_0; switch (this->spawnType) { @@ -164,9 +164,9 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, PlayState* play) { } } else { // "Cannot spawn!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); break; } } @@ -203,9 +203,9 @@ void EnEncount1_SpawnTektites(EnEncount1* this, PlayState* play) { this->totalNumSpawn++; } else { // "Cannot spawn!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); } } } @@ -303,9 +303,9 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) { } } else { // "Cannot spawn!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); break; } } diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 0f062004cf..7efa5a09a6 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -43,18 +43,18 @@ void EnEncount2_Init(Actor* thisx, PlayState* play) { } if (!this->isNotDeathMountain) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Death Mountain Encount2 set ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ デスマウンテンエンカウント２セットされました ☆☆☆☆☆ %d\n" VT_RST, - this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ デスマウンテンエンカウント２セットされました ☆☆☆☆☆ %d\n" VT_RST, + this->actor.params); if (LINK_IS_ADULT && GET_EVENTCHKINF(EVENTCHKINF_49)) { // flag for having used fire temple blue warp Actor_Kill(thisx); } } else { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Ganon Tower Escape Encount2 set ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ガノンタワー脱出エンカウント２セットされました ☆☆☆☆☆ %d\n" VT_RST, - this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ガノンタワー脱出エンカウント２セットされました ☆☆☆☆☆ %d\n" VT_RST, + this->actor.params); } this->actionFunc = EnEncount2_Wait; @@ -236,11 +236,11 @@ void EnEncount2_SpawnRocks(EnEncount2* this, PlayState* play) { return; } // "☆☆☆☆☆ Can't occur! ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生できません！ ☆☆☆☆☆\n\n" VT_RST); } } } diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 2cfd6bdc17..060f97435b 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -54,11 +54,11 @@ void EnExItem_Init(Actor* thisx, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_0; this->type = this->actor.params & 0xFF; this->unusedParam = (this->actor.params >> 8) & 0xFF; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "What will come out?" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n" VT_RST, this->type); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n" VT_RST, this->type); // "What will come out?" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n" VT_RST, this->unusedParam); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ なにがでるかな？ ☆☆☆☆☆ %d\n" VT_RST, this->unusedParam); this->initPos = this->actor.world.pos; this->getItemObjectId = -1; switch (this->type) { @@ -108,9 +108,9 @@ void EnExItem_Init(Actor* thisx, PlayState* play) { if (this->requiredObjectSlot < 0) { Actor_Kill(&this->actor); // "What?" - osSyncPrintf("なにみの？ %d\n", this->actor.params); + PRINTF("なにみの？ %d\n", this->actor.params); // "bank is funny" - osSyncPrintf(VT_FGCOL(MAGENTA) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params); + PRINTF(VT_FGCOL(MAGENTA) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params); return; } this->actionFunc = EnExItem_WaitForObject; @@ -122,11 +122,11 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->requiredObjectSlot)) { // "End of transfer" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this); - osSyncPrintf(VT_FGCOL(BLUE) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this); - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this); - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n\n" VT_RST, this->actor.params, this); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this); + PRINTF(VT_FGCOL(BLUE) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params, this); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 転送終了 ☆☆☆☆☆ %d\n\n" VT_RST, this->actor.params, this); this->actor.objectSlot = this->requiredObjectSlot; this->actor.draw = EnExItem_Draw; this->stopRotate = false; @@ -301,13 +301,13 @@ void EnExItem_BowlPrize(EnExItem* this, PlayState* play) { } } else { // "parent" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 母親ー？ ☆☆☆☆☆ %x\n" VT_RST, this->actor.parent); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 母親ー？ ☆☆☆☆☆ %x\n" VT_RST, this->actor.parent); // "Can it move?" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 動いてねー？ ☆☆☆☆☆ %x\n" VT_RST, this->actor.parent->update); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 動いてねー？ ☆☆☆☆☆ %x\n" VT_RST, this->actor.parent->update); if ((this->actor.parent != NULL) && (this->actor.parent->update != NULL)) { ((EnBomBowlPit*)this->actor.parent)->exItemDone = 1; // "It can't move!" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ さぁきえるぞ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ さぁきえるぞ！ ☆☆☆☆☆ \n" VT_RST); } Actor_Kill(&this->actor); } @@ -413,7 +413,7 @@ void EnExItem_TargetPrizeGive(EnExItem* this, PlayState* play) { void EnExItem_TargetPrizeFinish(EnExItem* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) { // "Successful completion" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); SET_ITEMGETINF(ITEMGETINF_1D); Actor_Kill(&this->actor); } 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 a679892ca1..3417ca1444 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 @@ -49,7 +49,7 @@ void EnExRuppy_Init(Actor* thisx, PlayState* play) { this->type = this->actor.params; // "Index" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x\n" VT_RST, this->type); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x\n" VT_RST, this->type); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f); switch (this->type) { @@ -120,7 +120,7 @@ void EnExRuppy_Init(Actor* thisx, PlayState* play) { } this->actor.gravity = -3.0f; // "Wow Coin" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ わーなーコイン ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ わーなーコイン ☆☆☆☆☆ \n" VT_RST); this->actor.shape.shadowScale = 6.0f; this->actor.shape.yOffset = 700.0f; this->actor.flags &= ~ACTOR_FLAG_0; @@ -142,7 +142,7 @@ void EnExRuppy_Init(Actor* thisx, PlayState* play) { } this->actor.gravity = -3.0f; // "Normal rupee" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ノーマルルピー ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ノーマルルピー ☆☆☆☆☆ \n" VT_RST); this->actor.shape.shadowScale = 6.0f; this->actor.shape.yOffset = 700.0f; this->actor.flags &= ~ACTOR_FLAG_0; @@ -327,9 +327,9 @@ void EnExRuppy_WaitToBlowUp(EnExRuppy* this, PlayState* play) { } } else { // "That idiot! error" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ そ、そんなばかな！エラー！！！！！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ そ、そんなばかな！エラー！！！！！ ☆☆☆☆☆ \n" VT_RST); } - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ バカめ！ ☆☆☆☆☆ \n" VT_RST); // "Stupid!" + PRINTF(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 1d6c8e37a8..f483481622 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 @@ -118,9 +118,9 @@ void EnFhgFire_Init(Actor* thisx, PlayState* play) { this->collider.dim.height = this->actor.world.rot.x * 0.13f; this->collider.dim.yShift = 0; } else if (this->actor.params == FHGFIRE_SPEAR_LIGHT) { - osSyncPrintf("yari hikari ct 1\n"); // "light spear" + PRINTF("yari hikari ct 1\n"); // "light spear" EnFhgFire_SetUpdate(this, EnFhgFire_SpearLight); - osSyncPrintf("yari hikari ct 2\n"); + PRINTF("yari hikari ct 2\n"); this->work[FHGFIRE_TIMER] = this->actor.world.rot.x; this->work[FHGFIRE_FIRE_MODE] = this->actor.world.rot.y; } else if ((this->actor.params == FHGFIRE_WARP_EMERGE) || (this->actor.params == FHGFIRE_WARP_RETREAT) || @@ -246,7 +246,7 @@ void EnFhgFire_LightningStrike(EnFhgFire* this, PlayState* play) { } void EnFhgFire_LightningTrail(EnFhgFire* this, PlayState* play) { - osSyncPrintf("FF MOVE 1\n"); + PRINTF("FF MOVE 1\n"); this->actor.shape.rot.x += (s16)(Rand_ZeroOne() * 4000.0f) + 0x4000; switch (this->work[FHGFIRE_FIRE_MODE]) { @@ -278,7 +278,7 @@ void EnFhgFire_LightningTrail(EnFhgFire* this, PlayState* play) { this->actor.scale.x = 1.0f; } - osSyncPrintf("FF MOVE 2\n"); + PRINTF("FF MOVE 2\n"); } void EnFhgFire_LightningShock(EnFhgFire* this, PlayState* play) { @@ -376,7 +376,7 @@ void EnFhgFire_SpearLight(EnFhgFire* this, PlayState* play) { BossGanondrof* bossGnd; s16 i; - osSyncPrintf("yari hikari 1\n"); + PRINTF("yari hikari 1\n"); bossGnd = (BossGanondrof*)this->actor.parent; if ((this->work[FHGFIRE_VARIANCE_TIMER] % 2) != 0) { Actor_SetScale(&this->actor, 6.0f); @@ -387,13 +387,13 @@ void EnFhgFire_SpearLight(EnFhgFire* this, PlayState* play) { this->actor.world.pos = bossGnd->spearTip; this->actor.shape.rot.z += (s16)(Rand_ZeroOne() * 0x4E20) + 0x4000; - osSyncPrintf("yari hikari 2\n"); + PRINTF("yari hikari 2\n"); if (this->work[FHGFIRE_FIRE_MODE] == FHGFIRE_LIGHT_GREEN) { Vec3f ballPos; Vec3f ballVel = { 0.0f, 0.0f, 0.0f }; Vec3f ballAccel = { 0.0f, 0.0f, 0.0f }; - osSyncPrintf("FLASH !!\n"); + PRINTF("FLASH !!\n"); for (i = 0; i < 2; i++) { ballPos.x = Rand_CenteredFloat(20.0f) + this->actor.world.pos.x; @@ -587,8 +587,8 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { break; } - osSyncPrintf("F_FIRE_MODE %d\n", this->work[FHGFIRE_FIRE_MODE]); - osSyncPrintf("fly_mode %d\n", bossGnd->flyMode); + PRINTF("F_FIRE_MODE %d\n", this->work[FHGFIRE_FIRE_MODE]); + PRINTF("fly_mode %d\n", bossGnd->flyMode); if (this->work[FHGFIRE_FX_TIMER] == 0) { Actor_UpdateBgCheckInfo(play, &this->actor, 50.0f, 50.0f, 100.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_2); @@ -624,9 +624,9 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { return; } else { Collider_UpdateCylinder(&this->actor, &this->collider); - osSyncPrintf("BEFORE setAC %d\n", this->collider.base.shape); + PRINTF("BEFORE setAC %d\n", this->collider.base.shape); CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); - osSyncPrintf("AFTER setAC\n"); + PRINTF("AFTER setAC\n"); } } Lights_PointNoGlowSetInfo(&this->lightInfo, (s16)this->actor.world.pos.x, (s16)this->actor.world.pos.y, @@ -636,7 +636,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { } Actor_PlaySfx(&this->actor, NA_SE_EN_FANTOM_FIRE - SFX_FLAG); // "Why ah ah ah ah" - osSyncPrintf("なぜだああああああああ %d\n", this->work[FHGFIRE_VARIANCE_TIMER]); + PRINTF("なぜだああああああああ %d\n", this->work[FHGFIRE_VARIANCE_TIMER]); } } @@ -673,11 +673,11 @@ void EnFhgFire_PhantomWarp(EnFhgFire* this, PlayState* play) { Math_ApproachZeroF(&this->fwork[FHGFIRE_WARP_ALPHA], 1.0f, 10.2f); } - osSyncPrintf("EFC 1\n"); + PRINTF("EFC 1\n"); if ((this->work[FHGFIRE_TIMER] == 0) || ((this->actor.params == FHGFIRE_WARP_EMERGE) && horse->fhgFireKillWarp)) { Actor_Kill(&this->actor); } - osSyncPrintf("EFC 2\n"); + PRINTF("EFC 2\n"); } void EnFhgFire_Update(Actor* thisx, PlayState* play) { @@ -715,7 +715,7 @@ void EnFhgFire_Draw(Actor* thisx, PlayState* play) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gPhantomLightningBlastDL)); } else if ((this->actor.params == FHGFIRE_SPEAR_LIGHT) || (this->actor.params == FHGFIRE_ENERGY_BALL)) { - osSyncPrintf("yari hikari draw 1\n"); + PRINTF("yari hikari draw 1\n"); Matrix_ReplaceRotation(&play->billboardMtxF); Gfx_SetupDL_25Xlu(play->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]); @@ -745,7 +745,7 @@ void EnFhgFire_Draw(Actor* thisx, PlayState* play) { 0x40, 0x40)); gSPDisplayList(POLY_XLU_DISP++, gPhantomWarpDL); } else { - osSyncPrintf("FF DRAW 1\n"); + PRINTF("FF DRAW 1\n"); Matrix_Translate(0.0f, -100.0f, 0.0f, MTXMODE_APPLY); Gfx_SetupDL_25Xlu(play->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]); @@ -754,7 +754,7 @@ void EnFhgFire_Draw(Actor* thisx, PlayState* play) { gSPMatrix(POLY_XLU_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_en_fhg_fire.c", 1892), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gPhantomLightningDL); - osSyncPrintf("FF DRAW 2\n"); + PRINTF("FF DRAW 2\n"); } CLOSE_DISPS(play->state.gfxCtx, "../z_en_fhg_fire.c", 1900); diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 18cf14662c..5a92f9128b 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -86,7 +86,7 @@ void EnFireRock_Init(Actor* thisx, PlayState* play) { case FIRE_ROCK_CEILING_SPOT_SPAWNER: this->actor.draw = NULL; // "☆☆☆☆☆ ceiling waiting rock ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 天井待ち岩 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 天井待ち岩 ☆☆☆☆☆ \n" VT_RST); this->actionFunc = FireRock_WaitSpawnRocksFromCeiling; break; case FIRE_ROCK_ON_FLOOR: @@ -94,7 +94,7 @@ void EnFireRock_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &D_80A12CCC); // "☆☆☆☆☆ floor rock ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 床岩 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 床岩 ☆☆☆☆☆ \n" VT_RST); this->collider.dim.radius = 23; this->collider.dim.height = 37; this->collider.dim.yShift = -10; @@ -140,7 +140,7 @@ void EnFireRock_Init(Actor* thisx, PlayState* play) { break; default: // "☆☆☆☆☆ No such rock! ERR !!!!!! ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ そんな岩はねぇ！ERR!!!!!! ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ そんな岩はねぇ！ERR!!!!!! ☆☆☆☆☆ \n" VT_RST); Actor_Kill(&this->actor); break; } @@ -153,10 +153,10 @@ void EnFireRock_Destroy(Actor* thisx, PlayState* play) { EnEncount2* spawner = (EnEncount2*)this->actor.parent; if ((spawner->actor.update != NULL) && (spawner->numSpawnedRocks > 0)) { spawner->numSpawnedRocks--; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Number of spawned instances recovery ☆☆☆☆☆%d" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生数回復 ☆☆☆☆☆%d\n" VT_RST, spawner->numSpawnedRocks); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発生数回復 ☆☆☆☆☆%d\n" VT_RST, spawner->numSpawnedRocks); + PRINTF("\n\n"); } } Collider_DestroyCylinder(play, &this->collider); @@ -255,7 +255,7 @@ void EnFireRock_SpawnMoreBrokenPieces(EnFireRock* this, PlayState* play) { } spawnedFireRock->scale = this->scale - 0.01f; } else { - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" VT_RST); } } Actor_PlaySfx(&this->actor, NA_SE_EN_VALVAISA_ROCK); @@ -276,7 +276,7 @@ void FireRock_WaitSpawnRocksFromCeiling(EnFireRock* this, PlayState* play) { if (spawnedFireRock != NULL) { spawnedFireRock->timer = 10; } else { - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ イッパイデッス ☆☆☆☆☆ \n" VT_RST); } } this->playerNearby = 1; @@ -355,7 +355,7 @@ void EnFireRock_Update(Actor* thisx, PlayState* play) { thisx->speed = 0.0f; this->actionFunc = EnFireRock_SpawnMoreBrokenPieces; // "☆☆☆☆☆ Shield Defense Lv1 ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ シールド防御 Lv１ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ シールド防御 Lv１ ☆☆☆☆☆ \n" VT_RST); return; } setCollision = true; diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 750672d10a..051e5e1cb8 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -383,10 +383,10 @@ void EnFish_Dropped_Fall(EnFish* this, PlayState* play) { EnFish_Dropped_SetupSwimAway(this); } else if ((this->timer <= 0) && (this->actor.params == FISH_DROPPED) && (this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f)) { - osSyncPrintf(VT_COL(YELLOW, BLACK)); + PRINTF(VT_COL(YELLOW, BLACK)); // "BG missing? Running Actor_delete" - osSyncPrintf("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_sakana.c", 822); - osSyncPrintf(VT_RST); + PRINTF("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_sakana.c", 822); + PRINTF(VT_RST); Actor_Kill(&this->actor); } } @@ -626,8 +626,8 @@ void EnFish_UpdateCutscene(EnFish* this, PlayState* play) { if (cue == NULL) { // "Warning : DEMO ended without dousa (action) 3 termination being called" - osSyncPrintf("Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c", - 1169, this->actor.params); + PRINTF("Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c", 1169, + this->actor.params); EnFish_ClearCutsceneData(this); Actor_Kill(&this->actor); return; @@ -645,13 +645,13 @@ void EnFish_UpdateCutscene(EnFish* this, PlayState* play) { break; case 3: // "DEMO fish termination" - osSyncPrintf("デモ魚消滅\n"); + PRINTF("デモ魚消滅\n"); EnFish_ClearCutsceneData(this); Actor_Kill(&this->actor); return; default: // "Improper DEMO action" - osSyncPrintf("不正なデモ動作(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c", 1200, this->actor.params); + PRINTF("不正なデモ動作(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c", 1200, this->actor.params); break; } 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 36ec397f2b..c6d57d2385 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -243,20 +243,20 @@ void EnFr_Init(Actor* thisx, PlayState* play) { this->actionFunc = EnFr_Idle; } else { if ((this->actor.params >= 6) || (this->actor.params < 0)) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "The argument is wrong!!" - osSyncPrintf("%s[%d] : 引数が間違っている！！(%d)\n", "../z_en_fr.c", 370, this->actor.params); - osSyncPrintf(VT_RST); + PRINTF("%s[%d] : 引数が間違っている！！(%d)\n", "../z_en_fr.c", 370, this->actor.params); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_fr.c", 372); } this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_GAMEPLAY_FIELD_KEEP); if (this->requiredObjectSlot < 0) { Actor_Kill(&this->actor); - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "There is no bank!!" - osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_fr.c", 380); - osSyncPrintf(VT_RST); + PRINTF("%s[%d] : バンクが無いよ！！\n", "../z_en_fr.c", 380); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_fr.c", 382); } } @@ -985,10 +985,10 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) { for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) { frogLoop1 = sEnFrPointers.frogs[frogIndex]; if (frogLoop1 == NULL) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "There are no frogs!?" - osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1604); - osSyncPrintf(VT_RST); + PRINTF("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1604); + PRINTF(VT_RST); return; } else if (frogLoop1->isDeactivating != true) { return; @@ -998,10 +998,10 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) { for (frogIndex = 0; frogIndex < ARRAY_COUNT(sEnFrPointers.frogs); frogIndex++) { frogLoop2 = sEnFrPointers.frogs[frogIndex]; if (frogLoop2 == NULL) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "There are no frogs!?" - osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1618); - osSyncPrintf(VT_RST); + PRINTF("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1618); + PRINTF(VT_RST); return; } frogLoop2->isDeactivating = false; diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h index 530bb8f662..2bd6fa41a9 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h @@ -47,7 +47,7 @@ typedef struct EnFr { /* 0x0379 */ u8 isJumpingUp; // Conditional for jumping up from the log back onto the log /* 0x037A */ u8 isBelowWaterSurfaceCurrent; // Used for diving effects /* 0x037B */ u8 isBelowWaterSurfacePrevious; - /* 0x037C */ u8 isDeactivating; // Related to debugging (osSyncPrintf) + /* 0x037C */ u8 isDeactivating; // Related to debugging (PRINTF) /* 0x037D */ u8 isActive; // Each Frog grows when their specific song is played. /* 0x037E */ u8 growingScaleIndex; // Target Scale Level 0-3 while growing (3 highest smooth) /* 0x037F */ u8 isGrowing; // While growing, the frog will switch between its larger size and its original size every frame diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index b190c5a5b5..48ddb587d0 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -84,32 +84,32 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) { this->switchFlag = this->actor.params & 0x3F; this->numEffects = EN_GSWITCH_EFFECT_COUNT; // "index" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x\n" VT_RST, this->type); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x\n" VT_RST, this->type); // "save" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ\t ☆☆☆☆☆ %x\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ\t ☆☆☆☆☆ %x\n" VT_RST, this->switchFlag); switch (this->type) { case ENGSWITCH_SILVER_TRACKER: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "parent switch spawn" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 親スイッチ発生 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 親スイッチ発生 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); sCollectedCount = 0; this->silverCount = this->actor.params >> 6; this->silverCount &= 0x3F; // "maximum number of checks" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 最大チェック数 ☆☆☆☆☆ %d\n" VT_RST, this->silverCount); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 最大チェック数 ☆☆☆☆☆ %d\n" VT_RST, this->silverCount); + PRINTF("\n\n"); if (Flags_GetSwitch(play, this->switchFlag)) { // This is a reference to Hokuto no Ken - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); Actor_Kill(&this->actor); } else { this->actionFunc = EnGSwitch_SilverRupeeTracker; } break; case ENGSWITCH_SILVER_RUPEE: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "child switch spawn" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 子スイッチ発生 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 子スイッチ発生 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); this->colorIdx = 5; this->numEffects = 20; Collider_InitCylinder(play, &this->collider); @@ -117,7 +117,7 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) { this->actor.draw = EnGSwitch_DrawRupee; this->actor.shape.yOffset = 700.0f; if (Flags_GetSwitch(play, this->switchFlag)) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); Actor_Kill(&this->actor); } else { Actor_SetScale(&this->actor, 0.03f); @@ -125,9 +125,9 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) { } break; case ENGSWITCH_ARCHERY_POT: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Horseback archery destructible pot" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ やぶさめぶち抜き壷 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ やぶさめぶち抜き壷 ☆☆☆☆☆ \n" VT_RST); this->actor.gravity = -3.0f; this->colorIdx = Rand_ZeroFloat(2.99f); Collider_InitCylinder(play, &this->collider); @@ -141,9 +141,9 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) { if (this->requiredObjectSlot < 0) { Actor_Kill(&this->actor); // "what?" - osSyncPrintf(VT_FGCOL(MAGENTA) " なにみの？ %d\n" VT_RST "\n", this->requiredObjectSlot); + PRINTF(VT_FGCOL(MAGENTA) " なにみの？ %d\n" VT_RST "\n", this->requiredObjectSlot); // "bank is funny" - osSyncPrintf(VT_FGCOL(CYAN) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params); + PRINTF(VT_FGCOL(CYAN) " バンクおかしいしぞ！%d\n" VT_RST "\n", this->actor.params); } this->collider.dim.radius = 24; this->collider.dim.height = 74; @@ -211,7 +211,7 @@ void EnGSwitch_SilverRupeeTracker(EnGSwitch* this, PlayState* play) { if (this->noteIndex < sCollectedCount) { if (sCollectedCount < 5) { // "sound?" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 音？ ☆☆☆☆☆ %d\n" VT_RST, this->noteIndex); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 音？ ☆☆☆☆☆ %d\n" VT_RST, this->noteIndex); Audio_PlaySfxTransposed(&gSfxDefaultPos, NA_SE_EV_FIVE_COUNT_LUPY, majorScale[this->noteIndex]); this->noteIndex = sCollectedCount; } @@ -219,9 +219,9 @@ void EnGSwitch_SilverRupeeTracker(EnGSwitch* this, PlayState* play) { if (sCollectedCount >= this->silverCount) { // "It is now the end of the century." // This another reference to Hokuto no Ken. - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 時はまさに世紀末〜 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 時はまさに世紀末〜 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); // "Last!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ らすとぉ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ らすとぉ！ ☆☆☆☆☆ \n" VT_RST); if ((play->sceneId == SCENE_GERUDO_TRAINING_GROUND) && (this->actor.room == 2)) { Flags_SetTempClear(play, this->actor.room); } else { @@ -345,7 +345,7 @@ void EnGSwitch_GalleryRupee(EnGSwitch* this, PlayState* play) { Sfx_PlaySfxCentered(NA_SE_EV_HIT_SOUND); Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY); // "Yeah !" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ いぇぇーす！ＨＩＴ！！ ☆☆☆☆☆ %d\n" VT_RST, gallery->hitCount); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ いぇぇーす！ＨＩＴ！！ ☆☆☆☆☆ %d\n" VT_RST, gallery->hitCount); EnGSwitch_Break(this, play); this->killTimer = 50; this->broken = true; diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 3a87e6ac20..a4c93dea9c 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -40,14 +40,14 @@ void EnGanonOrgan_Destroy(Actor* thisx, PlayState* play) { void EnGanonOrgan_Update(Actor* thisx, PlayState* play) { BossGanon* dorf; - osSyncPrintf("ORGAN MOVE 1\n"); + PRINTF("ORGAN MOVE 1\n"); if (thisx->params == 1) { dorf = (BossGanon*)thisx->parent; if (dorf->organAlpha == 0) { Actor_Kill(thisx); } } - osSyncPrintf("ORGAN MOVE 2\n"); + PRINTF("ORGAN MOVE 2\n"); } Gfx* EnGanonOrgan_EmptyDList(GraphicsContext* gfxCtx) { @@ -94,7 +94,7 @@ void EnGanonOrgan_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_en_ganon_organ.c", 205); - osSyncPrintf("ORGAN DRAW 1\n"); + PRINTF("ORGAN DRAW 1\n"); Gfx_SetupDL_25Opa(play->state.gfxCtx); if ((thisx->params == 1) && (dorf->organAlpha != 255)) { gSPSegment(POLY_OPA_DISP++, 0x08, func_80A280BC(play->state.gfxCtx, dorf)); @@ -110,7 +110,7 @@ void EnGanonOrgan_Draw(Actor* thisx, PlayState* play) { gSPDisplayList(POLY_OPA_DISP++, sRoomOrganAndFloorDL); gSPDisplayList(POLY_OPA_DISP++, sRoomStatuesDL); - osSyncPrintf("ORGAN DRAW 2\n"); + PRINTF("ORGAN DRAW 2\n"); CLOSE_DISPS(play->state.gfxCtx, "../z_en_ganon_organ.c", 230); } diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index e3c1297b10..cbd0d72844 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -133,7 +133,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { case GE1_TYPE_VALLEY_FLOOR: if (LINK_IS_ADULT) { // "Valley floor Gerudo withdrawal" - osSyncPrintf(VT_FGCOL(CYAN) "谷底 ゲルド 撤退 \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) "谷底 ゲルド 撤退 \n" VT_RST); Actor_Kill(&this->actor); return; } @@ -149,7 +149,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { this->actor.targetMode = 3; this->hairstyle = GE1_HAIR_BOB; // "Horseback archery Gerudo EVENT_INF(0) =" - osSyncPrintf(VT_FGCOL(CYAN) "やぶさめ ゲルド EVENT_INF(0) = %x\n" VT_RST, gSaveContext.eventInf[0]); + PRINTF(VT_FGCOL(CYAN) "やぶさめ ゲルド EVENT_INF(0) = %x\n" VT_RST, gSaveContext.eventInf[0]); if (GET_EVENTINF(EVENTINF_HORSES_08)) { this->actionFunc = EnGe1_TalkAfterGame_Archery; diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 4430ef3f7d..705faf6041 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -573,13 +573,13 @@ void EnGe2_Update(Actor* thisx, PlayState* play) { if (Ge2_DetectPlayerInUpdate(play, this, &this->actor.focus.pos, this->actor.shape.rot.y, this->yDetectRange)) { // "Discovered!" - osSyncPrintf(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST); EnGe2_SetupCapturePlayer(this, play); } if (((this->actor.params & 0xFF) == GE2_TYPE_STATIONARY) && (this->actor.xzDistToPlayer < 100.0f)) { // "Discovered!" - osSyncPrintf(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "発見!!!!!!!!!!!!\n" VT_RST); EnGe2_SetupCapturePlayer(this, play); } } diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 90ac821a82..e05caa58fa 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -376,13 +376,13 @@ s32 EnGirlA_TryChangeShopItem(EnGirlA* this) { void EnGirlA_InitItem(EnGirlA* this, PlayState* play) { s16 params = this->actor.params; - osSyncPrintf("%s(%2d)初期設定\n", sShopItemDescriptions[params], params); + PRINTF("%s(%2d)初期設定\n", sShopItemDescriptions[params], params); if ((params >= SI_MAX) && (params < 0)) { Actor_Kill(&this->actor); - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_girlA.c", 1421); return; } @@ -391,9 +391,9 @@ void EnGirlA_InitItem(EnGirlA* this, PlayState* play) { if (this->requiredObjectSlot < 0) { Actor_Kill(&this->actor); - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("バンクが無いよ！！(%s)\n", sShopItemDescriptions[params]); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("バンクが無いよ！！(%s)\n", sShopItemDescriptions[params]); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_girlA.c", 1434); return; } @@ -407,7 +407,7 @@ void EnGirlA_Init(Actor* thisx, PlayState* play) { EnGirlA_TryChangeShopItem(this); EnGirlA_InitItem(this, play); - osSyncPrintf("%s(%2d)初期設定\n", sShopItemDescriptions[this->actor.params], this->actor.params); + PRINTF("%s(%2d)初期設定\n", sShopItemDescriptions[this->actor.params], this->actor.params); } void EnGirlA_Destroy(Actor* thisx, PlayState* play) { @@ -1056,7 +1056,7 @@ void EnGirlA_WaitForObject(EnGirlA* this, PlayState* play) { this->itemCount = itemEntry->count; this->hiliteFunc = itemEntry->hiliteFunc; this->giDrawId = itemEntry->giDrawId; - osSyncPrintf("%s(%2d)\n", sShopItemDescriptions[params], params); + PRINTF("%s(%2d)\n", sShopItemDescriptions[params], params); this->actor.flags &= ~ACTOR_FLAG_0; Actor_SetScale(&this->actor, 0.25f); this->actor.shape.yOffset = 24.0f; diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index ec0821cf7d..c0ee8b7cf8 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -68,15 +68,15 @@ void EnGm_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); // "Medi Goron" - osSyncPrintf(VT_FGCOL(GREEN) "%s[%d] : 中ゴロン[%d]" VT_RST "\n", "../z_en_gm.c", 133, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "%s[%d] : 中ゴロン[%d]" VT_RST "\n", "../z_en_gm.c", 133, this->actor.params); this->gmObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_GM); if (this->gmObjectSlot < 0) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "There is no model bank! !! (Medi Goron)" - osSyncPrintf("モデル バンクが無いよ！！（中ゴロン）\n"); - osSyncPrintf(VT_RST); + PRINTF("モデル バンクが無いよ！！（中ゴロン）\n"); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_gm.c", 145); } 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 7ffa09b8b2..7742d2f572 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -244,8 +244,8 @@ s32 EnGoroiwa_GetAscendDirection(EnGoroiwa* this, PlayState* play) { if (nextPointPos->x == currentPointPos->x && nextPointPos->z == currentPointPos->z) { if (nextPointPos->y == currentPointPos->y) { // "Error: Invalid path data (points overlap)" - osSyncPrintf("Error : レールデータ不正(点が重なっている)"); - osSyncPrintf("(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 559, this->actor.params); + PRINTF("Error : レールデータ不正(点が重なっている)"); + PRINTF("(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 559, this->actor.params); } if (nextPointPos->y > currentPointPos->y) { @@ -538,14 +538,13 @@ void EnGoroiwa_Init(Actor* thisx, PlayState* play) { pathIdx = this->actor.params & 0xFF; if (pathIdx == 0xFF) { // "Error: Invalid arg_data" - osSyncPrintf("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 1033, - this->actor.params); + PRINTF("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 1033, this->actor.params); Actor_Kill(&this->actor); return; } if (play->pathList[pathIdx].count < 2) { // "Error: Invalid Path Data" - osSyncPrintf("Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n", "../z_en_gr.c", 1043); + PRINTF("Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n", "../z_en_gr.c", 1043); Actor_Kill(&this->actor); return; } @@ -559,9 +558,8 @@ void EnGoroiwa_Init(Actor* thisx, PlayState* play) { EnGoroiwa_FaceNextWaypoint(this, play); EnGoroiwa_SetupRoll(this); // "(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); + PRINTF("(ごろ岩)(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); } void EnGoroiwa_Destroy(Actor* thisx, PlayState* play2) { @@ -597,9 +595,9 @@ void EnGoroiwa_Roll(EnGoroiwa* this, PlayState* play) { } } func_8002F6D4(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0); - osSyncPrintf(VT_FGCOL(CYAN)); - osSyncPrintf("Player ぶっ飛ばし\n"); // "Player knocked down" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(CYAN)); + PRINTF("Player ぶっ飛ばし\n"); // "Player knocked down" + PRINTF(VT_RST); onHitSetupFuncs[(this->actor.params >> 10) & 1](this); Player_PlaySfx(GET_PLAYER(play), NA_SE_PL_BODY_HIT); if ((this->actor.home.rot.z & 1) == 1) { diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index aa8d1f0dec..a122de078a 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -57,10 +57,10 @@ void EnGuest_Init(Actor* thisx, PlayState* play) { } else { this->osAnimeObjectSlot = Object_GetSlot(&play->objectCtx, OBJECT_OS_ANIME); if (this->osAnimeObjectSlot < 0) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "No such bank!!" - osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_guest.c", 129); - osSyncPrintf(VT_RST); + PRINTF("%s[%d] : バンクが無いよ！！\n", "../z_en_guest.c", 129); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_guest.c", 132); } } 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 3bcfb5ec1c..905c1213c7 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -80,27 +80,27 @@ void EnHeishi1_Init(Actor* thisx, PlayState* play) { } // "type" - osSyncPrintf(VT_FGCOL(GREEN) " 種類☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n" VT_RST, this->type); + PRINTF(VT_FGCOL(GREEN) " 種類☆☆☆☆☆☆☆☆☆☆☆☆☆ %d\n" VT_RST, this->type); // "path data" - osSyncPrintf(VT_FGCOL(YELLOW) " れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n" VT_RST, this->path); - osSyncPrintf(VT_FGCOL(MAGENTA) " anime_frame_speed ☆☆☆☆☆☆ %f\n" VT_RST, this->animSpeed); + PRINTF(VT_FGCOL(YELLOW) " れえるでぇたぁ☆☆☆☆☆☆☆☆ %d\n" VT_RST, this->path); + PRINTF(VT_FGCOL(MAGENTA) " anime_frame_speed ☆☆☆☆☆☆ %f\n" VT_RST, this->animSpeed); // "interpolation frame" - osSyncPrintf(VT_FGCOL(MAGENTA) " 補間フレーム☆☆☆☆☆☆☆☆☆ %f\n" VT_RST, this->animMorphFrames); + PRINTF(VT_FGCOL(MAGENTA) " 補間フレーム☆☆☆☆☆☆☆☆☆ %f\n" VT_RST, this->animMorphFrames); // "targeted movement speed value between points" - osSyncPrintf(VT_FGCOL(MAGENTA) " point間の移動スピード目標値 ☆ %f\n" VT_RST, this->moveSpeedTarget); + PRINTF(VT_FGCOL(MAGENTA) " point間の移動スピード目標値 ☆ %f\n" VT_RST, this->moveSpeedTarget); // "maximum movement speed value between points" - osSyncPrintf(VT_FGCOL(MAGENTA) " point間の移動スピード最大 ☆☆ %f\n" VT_RST, this->moveSpeedMax); + PRINTF(VT_FGCOL(MAGENTA) " point間の移動スピード最大 ☆☆ %f\n" VT_RST, this->moveSpeedMax); // "(body) targeted turning angle speed value" - osSyncPrintf(VT_FGCOL(MAGENTA) " (体)反転アングルスピード目標値 %f\n" VT_RST, this->bodyTurnSpeedTarget); + PRINTF(VT_FGCOL(MAGENTA) " (体)反転アングルスピード目標値 %f\n" VT_RST, this->bodyTurnSpeedTarget); // "(body) maximum turning angle speed" - osSyncPrintf(VT_FGCOL(MAGENTA) " (体)反転アングルスピード最大☆ %f\n" VT_RST, this->bodyTurnSpeedMax); + PRINTF(VT_FGCOL(MAGENTA) " (体)反転アングルスピード最大☆ %f\n" VT_RST, this->bodyTurnSpeedMax); // "(head) targeted turning angle speed value" - osSyncPrintf(VT_FGCOL(MAGENTA) " (頭)反転アングルスピード加算値 %f\n" VT_RST, this->headTurnSpeedScale); + PRINTF(VT_FGCOL(MAGENTA) " (頭)反転アングルスピード加算値 %f\n" VT_RST, this->headTurnSpeedScale); // "(head) maximum turning angle speed" - osSyncPrintf(VT_FGCOL(MAGENTA) " (頭)反転アングルスピード最大☆ %f\n" VT_RST, this->headTurnSpeedMax); - osSyncPrintf(VT_FGCOL(GREEN) " 今時間 %d\n" VT_RST, ((void)0, gSaveContext.save.dayTime)); // "current time" - osSyncPrintf(VT_FGCOL(YELLOW) " チェック時間 %d\n" VT_RST, CLOCK_TIME(17, 30) - 1); // "check time" - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(MAGENTA) " (頭)反転アングルスピード最大☆ %f\n" VT_RST, this->headTurnSpeedMax); + PRINTF(VT_FGCOL(GREEN) " 今時間 %d\n" VT_RST, ((void)0, gSaveContext.save.dayTime)); // "current time" + PRINTF(VT_FGCOL(YELLOW) " チェック時間 %d\n" VT_RST, CLOCK_TIME(17, 30) - 1); // "check time" + PRINTF("\n\n"); if (this->path == 3) { for (i = 0; i < ARRAY_COUNT(sRupeePositions); i++) { @@ -183,12 +183,12 @@ void EnHeishi1_Walk(EnHeishi1* this, PlayState* play) { Math_ApproachF(&this->headAngle, this->headAngleTarget, this->headTurnSpeedScale, this->headTurnSpeedMax); if ((this->path == BREG(1)) && (BREG(0) != 0)) { - osSyncPrintf(VT_FGCOL(RED) " 種類 %d\n" VT_RST, this->path); - osSyncPrintf(VT_FGCOL(RED) " ぱす %d\n" VT_RST, this->waypoint); - osSyncPrintf(VT_FGCOL(RED) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); - osSyncPrintf(VT_FGCOL(RED) " 時間 %d\n" VT_RST, this->waypointTimer); - osSyncPrintf(VT_FGCOL(RED) " 点座 %d\n" VT_RST, path->count); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(RED) " 種類 %d\n" VT_RST, this->path); + PRINTF(VT_FGCOL(RED) " ぱす %d\n" VT_RST, this->waypoint); + PRINTF(VT_FGCOL(RED) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); + PRINTF(VT_FGCOL(RED) " 時間 %d\n" VT_RST, this->waypointTimer); + PRINTF(VT_FGCOL(RED) " 点座 %d\n" VT_RST, path->count); + PRINTF("\n\n"); } // when 20 units away from a middle waypoint, decide whether or not to skip it @@ -301,11 +301,11 @@ void EnHeishi1_Wait(EnHeishi1* this, PlayState* play) { this->headTurnSpeedMax + this->headTurnSpeedMax); if ((this->path == BREG(1)) && (BREG(0) != 0)) { - osSyncPrintf(VT_FGCOL(GREEN) " 種類 %d\n" VT_RST, this->path); - osSyncPrintf(VT_FGCOL(GREEN) " ぱす %d\n" VT_RST, this->waypoint); - osSyncPrintf(VT_FGCOL(GREEN) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); - osSyncPrintf(VT_FGCOL(GREEN) " 時間 %d\n" VT_RST, this->waypointTimer); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) " 種類 %d\n" VT_RST, this->path); + PRINTF(VT_FGCOL(GREEN) " ぱす %d\n" VT_RST, this->waypoint); + PRINTF(VT_FGCOL(GREEN) " 反転 %d\n" VT_RST, this->bodyTurnSpeed); + PRINTF(VT_FGCOL(GREEN) " 時間 %d\n" VT_RST, this->waypointTimer); + PRINTF("\n\n"); } } } @@ -371,7 +371,7 @@ void EnHeishi1_WaitNight(EnHeishi1* this, PlayState* play) { if (this->actor.xzDistToPlayer < 100.0f) { Message_StartTextbox(play, 0x702D, &this->actor); Sfx_PlaySfxCentered(NA_SE_SY_FOUND); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); this->actionFunc = EnHeishi1_SetupKick; } @@ -455,7 +455,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) { if (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 60.0f) { Sfx_PlaySfxCentered(NA_SE_SY_FOUND); // "Discovered!" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); sPlayerIsCaught = true; this->actionFunc = EnHeishi1_SetupMoveToLink; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 29f2e9aba0..c7e05bc863 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -98,9 +98,9 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) { this->actionFunc = EnHeishi2_DoNothing1; } else { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "No, I'm completely disappointed" (message for when shooting guard window in courtyard) - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ いやー ついうっかり ☆☆☆☆☆ \n" VT_RST); Actor_SetScale(&this->actor, 0.02f); @@ -139,9 +139,9 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) { this->actor.gravity = -1.0f; break; case 6: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Peep hole soldier!" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 覗き穴奥兵士ふぃ〜 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 覗き穴奥兵士ふぃ〜 ☆☆☆☆☆ \n" VT_RST); Collider_DestroyCylinder(play, collider); this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_3); this->actionFunc = EnHeishi_DoNothing2; @@ -149,14 +149,13 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) { } this->unk_2F0 = (this->actor.params >> 8) & 0xFF; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Soldier Set 2 Completed!" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); // "Identification Completed!" - osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" VT_RST, this->type); + PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！ ☆☆☆☆☆ %d\n" VT_RST, this->type); // "Message completed!" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST, - (this->actor.params >> 8) & 0xF); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST, (this->actor.params >> 8) & 0xF); } } @@ -191,32 +190,32 @@ void func_80A53278(EnHeishi2* this, PlayState* play) { this->actionFunc = func_80A5475C; } else if (GET_EVENTCHKINF(EVENTCHKINF_09) && GET_EVENTCHKINF(EVENTCHKINF_25) && GET_EVENTCHKINF(EVENTCHKINF_37)) { // "Get all spiritual stones!" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 全部の精霊石GET！ ☆☆☆☆☆ \n" VT_RST); this->unk_300 = TEXT_STATE_DONE; this->actor.textId = 0x7006; this->actionFunc = func_80A5475C; } else if (!IS_DAY) { // "Sleep early for children!" - osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 子供ははやくネロ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 子供ははやくネロ！ ☆☆☆☆☆ \n" VT_RST); this->unk_300 = TEXT_STATE_DONE; this->actor.textId = 0x7002; this->actionFunc = func_80A5475C; } else if (this->unk_30C != 0) { // "Anything passes" - osSyncPrintf(VT_FGCOL(BLUE) " ☆☆☆☆☆ なんでも通るよ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) " ☆☆☆☆☆ なんでも通るよ ☆☆☆☆☆ \n" VT_RST); this->unk_300 = TEXT_STATE_DONE; this->actor.textId = 0x7099; this->actionFunc = func_80A5475C; } else if (GET_EVENTCHKINF(EVENTCHKINF_RECEIVED_WEIRD_EGG)) { if (this->unk_30E == 0) { // "Start under the first sleeve!" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ １回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ １回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST); this->actor.textId = 0x7071; this->unk_30E = 1; } else { // "Start under the second sleeve!" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ ２回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ ２回目袖の下開始！ ☆☆☆☆☆ \n" VT_RST); this->actor.textId = 0x7072; } this->unk_300 = TEXT_STATE_CHOICE; @@ -224,7 +223,7 @@ void func_80A53278(EnHeishi2* this, PlayState* play) { } else { // "That's okay" - osSyncPrintf(VT_FGCOL(CYAN) " ☆☆☆☆☆ それはとおらんよぉ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " ☆☆☆☆☆ それはとおらんよぉ ☆☆☆☆☆ \n" VT_RST); this->unk_300 = TEXT_STATE_DONE; this->actor.textId = 0x7029; this->actionFunc = func_80A5475C; @@ -298,7 +297,7 @@ void func_80A53638(EnHeishi2* this, PlayState* play) { } } // "I've come!" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" VT_RST, actor->dyna.actor.next); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" VT_RST, actor->dyna.actor.next); this->actionFunc = func_80A5372C; } } @@ -383,7 +382,7 @@ void func_80A5399C(EnHeishi2* this, PlayState* play) { this->actionFunc = func_80A5475C; } else { // "I don't know" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ とおしゃしねぇちゅーの ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ とおしゃしねぇちゅーの ☆☆☆☆☆ \n" VT_RST); this->actionFunc = func_80A53AD4; } } @@ -462,7 +461,7 @@ void func_80A53D0C(EnHeishi2* this, PlayState* play) { } } // "I've come!" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" VT_RST, gate->dyna.actor.next); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆ きたきたきたぁ！ ☆☆☆ %x\n" VT_RST, gate->dyna.actor.next); this->actionFunc = func_80A53DF8; } } @@ -664,7 +663,7 @@ void func_80A5455C(EnHeishi2* this, PlayState* play) { } // "This is down!" - osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ これでダウンだ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ これでダウンだ！ ☆☆☆☆☆ \n" VT_RST); this->actionFunc = func_80A546DC; } } diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index c2df806634..1f33fb4b47 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -77,7 +77,7 @@ void EnHeishi3_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); // "Castle Gate Soldier - Power Up" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 城門兵パワーアップ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 城門兵パワーアップ ☆☆☆☆☆ \n" VT_RST); this->actor.gravity = -3.0f; this->actor.focus.pos = this->actor.world.pos; @@ -132,7 +132,7 @@ void EnHeishi3_StandSentinelInGrounds(EnHeishi3* this, PlayState* play) { sPlayerCaught = 1; Message_StartTextbox(play, 0x702D, &this->actor); Sfx_PlaySfxCentered(NA_SE_SY_FOUND); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); this->actionFunc = EnHeishi3_CatchStart; } @@ -160,7 +160,7 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, PlayState* play) { sPlayerCaught = 1; Message_StartTextbox(play, 0x702D, &this->actor); Sfx_PlaySfxCentered(NA_SE_SY_FOUND); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!" Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_1); this->actionFunc = EnHeishi3_CatchStart; } diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 0b4007e855..b0a853b023 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -94,11 +94,11 @@ void EnHeishi4_Init(Actor* thisx, PlayState* play) { break; } this->unk_27C = (thisx->params >> 8) & 0xFF; - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" VT_RST, thisx->params); - osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！\t ☆☆☆☆☆ %d\n" VT_RST, this->type); - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST, (thisx->params >> 8) & 0xF); - osSyncPrintf("\n\n"); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 兵士２セット完了！ ☆☆☆☆☆ %d\n" VT_RST, thisx->params); + PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ 識別完了！\t ☆☆☆☆☆ %d\n" VT_RST, this->type); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ メッセージ完了！ ☆☆☆☆☆ %x\n\n" VT_RST, (thisx->params >> 8) & 0xF); + PRINTF("\n\n"); } void EnHeishi4_Destroy(Actor* thisx, PlayState* play) { @@ -167,7 +167,7 @@ void func_80A56544(EnHeishi4* this, PlayState* play) { Animation_Change(&this->skelAnime, &gEnHeishiIdleAnim, 1.0f, 0.0f, (s16)frames, ANIMMODE_LOOP, -10.0f); if (LINK_AGE_IN_YEARS != YEARS_CHILD) { - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ ぎゃぁ！オトナだー ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ ぎゃぁ！オトナだー ☆☆☆☆☆ \n" VT_RST); Actor_Kill(&this->actor); } else { this->actionFunc = func_80A56614; @@ -212,7 +212,7 @@ void func_80A56614(EnHeishi4* this, PlayState* play) { void func_80A5673C(EnHeishi4* this, PlayState* play) { if (GET_EVENTCHKINF(EVENTCHKINF_45)) { - osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ マスターソード祝入手！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ マスターソード祝入手！ ☆☆☆☆☆ \n" VT_RST); Actor_Kill(&this->actor); return; } @@ -225,11 +225,11 @@ void func_80A5673C(EnHeishi4* this, PlayState* play) { this->actor.textId = 0x7007; this->unk_282 = TEXT_STATE_EVENT; this->unk_284 = 1; - osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ デモ開始！ ☆☆☆☆☆ \n" VT_RST); } else { this->actor.textId = 0x7008; this->unk_282 = TEXT_STATE_DONE; - osSyncPrintf(VT_FGCOL(BLUE) " ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) " ☆☆☆☆☆ 返事なし ☆☆☆☆☆ \n" VT_RST); } this->actionFunc = func_80A56874; } else { diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 1c402f3c01..cf28f207c5 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -141,7 +141,7 @@ void EnHonotrap_GetNormal(Vec3f* normal, Vec3f* vec) { f32 mag = Math3D_Vec3fMagnitude(vec); if (mag < 0.001f) { - osSyncPrintf("Warning : vector size zero (%s %d)\n", "../z_en_honotrap.c", 328, normal); + PRINTF("Warning : vector size zero (%s %d)\n", "../z_en_honotrap.c", 328, normal); normal->x = normal->y = 0.0f; normal->z = 1.0f; diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 154f9002ee..ed63cd139b 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -306,7 +306,7 @@ void EnHorseGameCheck_FinishMalonRace(EnHorseGameCheckMalonRace* this, PlayState play->transitionTrigger = TRANS_TRIGGER_START; } else { // "not supported" - osSyncPrintf("En_HGC_Spot20_Ta_end():対応せず\n"); + PRINTF("En_HGC_Spot20_Ta_end():対応せず\n"); gSaveContext.save.cutsceneIndex = 0; play->nextEntranceIndex = ENTR_LON_LON_RANCH_0; play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST); diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 681ea2b558..7fb650ef73 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -75,16 +75,16 @@ void EnHs_Init(Actor* thisx, PlayState* play) { if (this->actor.params == 1) { // "chicken shop (adult era)" - osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST); func_80A6E3A0(this, func_80A6E9AC); if (GET_ITEMGETINF(ITEMGETINF_30)) { // "chicken shop closed" - osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST); Actor_Kill(&this->actor); } } else { // "chicken shop (child era)" - osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST); func_80A6E3A0(this, func_80A6E9AC); } diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 1c065cd1c4..5d402a3c4f 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -60,7 +60,7 @@ void EnHs2_Init(Actor* thisx, PlayState* play) { Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); this->actor.colChkInfo.mass = MASS_IMMOVABLE; Actor_SetScale(&this->actor, 0.01f); - osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST); this->actionFunc = func_80A6F1A4; this->unk_2A8 = 0; this->actor.targetMode = 6; 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 78e09df5e1..10d4addaeb 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 @@ -172,7 +172,7 @@ void EnIceHono_Init(Actor* thisx, PlayState* play) { this->lightNode = LightContext_InsertLight(play, &play->lightCtx, &this->lightInfo); this->unk_154 = Rand_ZeroOne() * (0x1FFFF / 2.0f); this->unk_156 = Rand_ZeroOne() * (0x1FFFF / 2.0f); - osSyncPrintf("(ice 炎)(arg_data 0x%04x)\n", this->actor.params); // "(ice flame)" + PRINTF("(ice 炎)(arg_data 0x%04x)\n", this->actor.params); // "(ice flame)" } } @@ -357,7 +357,7 @@ void EnIceHono_Update(Actor* thisx, PlayState* play) { 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)) { - osSyncPrintf("ありえない値(ratio = %f)\n", intensity); // "impossible value(ratio = %f)" + PRINTF("ありえない値(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_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 9727a18135..618aaddfac 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -1362,7 +1362,7 @@ void EnIk_HandleCsCues(EnIk* this, PlayState* play) { break; default: - osSyncPrintf("En_Ik_inConfrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Ik_inConfrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; @@ -1397,7 +1397,7 @@ void EnIk_UpdateCutscene(Actor* thisx, PlayState* play) { EnIk* this = (EnIk*)thisx; if (this->csAction < 0 || this->csAction >= ARRAY_COUNT(sCsActionFuncs) || sCsActionFuncs[this->csAction] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } @@ -1496,7 +1496,7 @@ void EnIk_DrawCutscene(Actor* thisx, PlayState* play) { if (this->csDrawMode < 0 || this->csDrawMode >= ARRAY_COUNT(sCsDrawFuncs) || sCsDrawFuncs[this->csDrawMode] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } @@ -1515,7 +1515,7 @@ void EnIk_CsInit(EnIk* this, PlayState* play) { } } - osSyncPrintf("En_Ik_inConfrontion_Init : %d !!!!!!!!!!!!!!!!\n", this->actor.params); + PRINTF("En_Ik_inConfrontion_Init : %d !!!!!!!!!!!!!!!!\n", this->actor.params); } void EnIk_ChangeToEnemy(EnIk* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index c872d17a4a..7ffd182239 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -283,7 +283,7 @@ s16 EnIn_UpdateTalkStateOnEvent(PlayState* play, Actor* thisx) { s16 EnIn_UpdateTalkState(PlayState* play, Actor* thisx) { s16 talkState = NPC_TALK_STATE_TALKING; - osSyncPrintf("message_check->(%d[%x])\n", Message_GetState(&play->msgCtx), thisx->textId); + PRINTF("message_check->(%d[%x])\n", Message_GetState(&play->msgCtx), thisx->textId); switch (Message_GetState(&play->msgCtx)) { case TEXT_STATE_NONE: case TEXT_STATE_DONE_HAS_NEXT: diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 69aef2e27e..63d11a8b65 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -577,10 +577,10 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) { distanceSq = Math3D_Vec3fDistSq(&this->actor.world.pos, &this->soilActor->actor.world.pos); } else { if (this->insectFlags & INSECT_FLAG_FOUND_SOIL) { - osSyncPrintf(VT_COL(YELLOW, BLACK)); + PRINTF(VT_COL(YELLOW, BLACK)); // "warning: target Actor is NULL" - osSyncPrintf("warning:目標 Actor が NULL (%s %d)\n", "../z_en_mushi.c", 1046); - osSyncPrintf(VT_RST); + PRINTF("warning:目標 Actor が NULL (%s %d)\n", "../z_en_mushi.c", 1046); + PRINTF(VT_RST); } distanceSq = 40.0f; } @@ -705,10 +705,10 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) { } else if ((type == INSECT_TYPE_FIRST_DROPPED || type == INSECT_TYPE_EXTRA_DROPPED) && (this->insectFlags & INSECT_FLAG_0) && this->lifeTimer <= 0 && this->actionTimer <= 0 && this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f) { - osSyncPrintf(VT_COL(YELLOW, BLACK)); + PRINTF(VT_COL(YELLOW, BLACK)); // "BG missing? To do Actor_delete" - osSyncPrintf("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_mushi.c", 1197); - osSyncPrintf(VT_RST); + PRINTF("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_mushi.c", 1197); + PRINTF(VT_RST); Actor_Kill(&this->actor); } } 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 c70a3f7579..c89b0aef0d 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -125,10 +125,10 @@ s32 EnIshi_SnapToFloor(EnIshi* this, PlayState* play, f32 arg2) { Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos); return true; } else { - osSyncPrintf(VT_COL(YELLOW, BLACK)); + PRINTF(VT_COL(YELLOW, BLACK)); // "Failure attaching to ground" - osSyncPrintf("地面に付着失敗(%s %d)\n", "../z_en_ishi.c", 388); - osSyncPrintf(VT_RST); + PRINTF("地面に付着失敗(%s %d)\n", "../z_en_ishi.c", 388); + PRINTF(VT_RST); return false; } } diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index a4b691936f..e5913e48c4 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -64,8 +64,8 @@ void EnKakasi_Destroy(Actor* thisx, PlayState* play) { void EnKakasi_Init(Actor* thisx, PlayState* play) { EnKakasi* this = (EnKakasi*)thisx; - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ Ｌｅｔ’ｓ ＤＡＮＣＥ！ ☆☆☆☆☆ %f\n" VT_RST, this->actor.world.pos.y); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ Ｌｅｔ’ｓ ＤＡＮＣＥ！ ☆☆☆☆☆ %f\n" VT_RST, this->actor.world.pos.y); Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); @@ -237,7 +237,7 @@ void func_80A8F8D0(EnKakasi* this, PlayState* play) { if (play->msgCtx.ocarinaMode == OCARINA_MODE_04 && play->msgCtx.msgMode == MSGMODE_NONE) { // "end?" - osSyncPrintf(VT_FGCOL(BLUE) "☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) "☆☆☆☆☆ 終り？ ☆☆☆☆☆ \n" VT_RST); if (this->unk_19A != 0) { Message_CloseTextbox(play); @@ -280,7 +280,7 @@ void func_80A8FAA4(EnKakasi* this, PlayState* play) { return; } - osSyncPrintf("game_play->message.msg_mode=%d\n", play->msgCtx.msgMode); + PRINTF("game_play->message.msg_mode=%d\n", play->msgCtx.msgMode); if (play->msgCtx.msgMode == MSGMODE_NONE) { if (this->unk_194) { @@ -339,9 +339,9 @@ void EnKakasi_Draw(Actor* thisx, PlayState* play) { EnKakasi* this = (EnKakasi*)thisx; if (BREG(3) != 0) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "flag!" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.save.info.scarecrowLongSongSet); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.save.info.scarecrowLongSongSet); } Gfx_SetupDL_25Opa(play->state.gfxCtx); SkelAnime_DrawFlexOpa(play, this->skelanime.skeleton, this->skelanime.jointTable, this->skelanime.dListCount, NULL, diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index d7c15346e4..c24e366fe7 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -59,9 +59,9 @@ void EnKakasi2_Init(Actor* thisx, PlayState* play) { f32 spawnRangeY; f32 spawnRangeXZ; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Visit Umeda" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 梅田参号見参！ ☆☆☆☆☆ \n" VT_RST); this->switchFlag = this->actor.params & 0x3F; spawnRangeY = (this->actor.params >> 6) & 0xFF; @@ -74,17 +74,17 @@ void EnKakasi2_Init(Actor* thisx, PlayState* play) { this->maxSpawnDistance.y = (spawnRangeXZ * 40.0f) + 40.0f; // "Former? (Argument 0)" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n" VT_RST, spawnRangeY); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(引数０) ☆☆☆☆ %f\n" VT_RST, spawnRangeY); // "Former? (Z angle)" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n" VT_RST, spawnRangeXZ); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元？(Ｚアングル) ☆☆ %f\n" VT_RST, spawnRangeXZ); // "Correction coordinates X" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｘ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x); // "Correction coordinates Y" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.y); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｙ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.y); // "Correction coordinates Z" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.z); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 補正座標Ｚ ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.z); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ SAVE ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF("\n\n"); this->actor.colChkInfo.mass = MASS_IMMOVABLE; this->height = 60.0f; @@ -131,7 +131,7 @@ void func_80A90264(EnKakasi2* this, PlayState* play) { Flags_SetSwitch(play, this->switchFlag); } - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); this->actionFunc = func_80A904D8; } else if ((this->actor.xzDistToPlayer < this->maxSpawnDistance.x) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < this->maxSpawnDistance.y) && @@ -142,7 +142,7 @@ void func_80A90264(EnKakasi2* this, PlayState* play) { if (this->switchFlag >= 0) { Flags_SetSwitch(play, this->switchFlag); } - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ SAVE 終了 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); play->msgCtx.ocarinaMode = OCARINA_MODE_04; this->actor.draw = func_80A90948; Collider_InitCylinder(play, &this->collider); @@ -215,10 +215,9 @@ void EnKakasi2_Update(Actor* thisx, PlayState* play2) { } if (BREG(0) != 0) { if (BREG(5) != 0) { - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ this->actor.player_distance ☆☆☆☆☆ %f\n" VT_RST, - this->actor.xzDistToPlayer); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ this->hosei.x ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ this->actor.player_distance ☆☆☆☆☆ %f\n" VT_RST, this->actor.xzDistToPlayer); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ this->hosei.x ☆☆☆☆☆ %f\n" VT_RST, this->maxSpawnDistance.x); + PRINTF("\n\n"); } if (this->actor.draw == NULL) { if (this->unk_194 != 0) { 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 0c2e50df62..37b536f0b0 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -68,9 +68,9 @@ void EnKakasi3_Destroy(Actor* thisx, PlayState* play) { void EnKakasi3_Init(Actor* thisx, PlayState* play) { EnKakasi3* this = (EnKakasi3*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Obonur" -- Related to the name of the scarecrow (Bonooru) - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ おーボヌール ☆☆☆☆☆ \n" VT_RST); this->actor.targetMode = 6; Collider_InitCylinder(play, &this->collider); @@ -343,7 +343,7 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) { if (BREG(3) != 0) { // "No way!" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ まさか！ ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); } if ((play->msgCtx.ocarinaMode == OCARINA_MODE_04 || (play->msgCtx.ocarinaMode >= OCARINA_MODE_05 && play->msgCtx.ocarinaMode < OCARINA_MODE_0B)) && @@ -361,9 +361,9 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) { if (play->msgCtx.ocarinaMode == OCARINA_MODE_03 && play->msgCtx.msgMode == MSGMODE_NONE) { play->msgCtx.ocarinaMode = OCARINA_MODE_04; if (BREG(3) != 0) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "With this, other guys are OK! That's it!" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ これで、他の奴もＯＫ！だ！ ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode); } this->unk_195 = true; Message_StartTextbox(play, 0x40A7, NULL); @@ -409,9 +409,9 @@ void EnKakasi3_Update(Actor* thisx, PlayState* play) { s32 i; if (BREG(2) != 0) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "flag!" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.save.info.scarecrowSpawnSongSet); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ フラグ！ ☆☆☆☆☆ %d\n" VT_RST, gSaveContext.save.info.scarecrowSpawnSongSet); } this->unk_198++; diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 2db5dbfcf8..d14687b630 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -213,7 +213,7 @@ void EnKanban_Init(Actor* thisx, PlayState* play) { this->actor.flags |= ACTOR_FLAG_0; Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - osSyncPrintf("KANBAN ARG %x\n", this->actor.params); + PRINTF("KANBAN ARG %x\n", this->actor.params); if (this->actor.params == ENKANBAN_FISHING) { if (LINK_IS_CHILD) { this->actor.textId = 0x409D; @@ -459,7 +459,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) { this->actor.bgCheckFlags = tempBgFlags; this->actor.yDistToWater = tempYDistToWater; - osSyncPrintf(VT_RST); + PRINTF(VT_RST); onGround = (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND); if (this->spinXFlag) { this->spinRot.x += this->spinVel.x; @@ -511,9 +511,9 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) { EffectSsGRipple_Spawn(play, &this->actor.world.pos, 300, 800, 5); this->actor.velocity.y = 0.0f; this->actor.gravity = 0.0f; - osSyncPrintf(" WAT Y = %f\n", this->actor.yDistToWater); - osSyncPrintf(" POS Y = %f\n", this->actor.world.pos.y); - osSyncPrintf(" GROUND Y = %f\n", this->actor.floorHeight); + PRINTF(" WAT Y = %f\n", this->actor.yDistToWater); + PRINTF(" POS Y = %f\n", this->actor.world.pos.y); + PRINTF(" GROUND Y = %f\n", this->actor.floorHeight); break; } @@ -718,9 +718,9 @@ void EnKanban_Update(Actor* thisx, PlayState* play2) { bomb = bomb->next; } } - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("OCARINA_MODE %d\n", play->msgCtx.ocarinaMode); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("OCARINA_MODE %d\n", play->msgCtx.ocarinaMode); + PRINTF(VT_RST); switch (this->ocarinaFlag) { case 0: if (play->msgCtx.ocarinaMode == OCARINA_MODE_01) { diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index bc8a0925c2..3fbf937024 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -1161,7 +1161,7 @@ void func_80A99048(EnKo* this, PlayState* play) { CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit); if (ENKO_TYPE == ENKO_TYPE_CHILD_7) { // "Angle Z" - osSyncPrintf(VT_BGCOL(BLUE) " アングルＺ->(%d)\n" VT_RST, this->actor.shape.rot.z); + PRINTF(VT_BGCOL(BLUE) " アングルＺ->(%d)\n" VT_RST, this->actor.shape.rot.z); if (LINK_IS_ADULT && !CHECK_QUEST_ITEM(QUEST_MEDALLION_FOREST)) { if (this->actor.shape.rot.z != 1) { Actor_Kill(&this->actor); 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 017d77e144..4dbfaeacaa 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -115,10 +115,10 @@ s32 EnKusa_SnapToFloor(EnKusa* this, PlayState* play, f32 yOffset) { Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos); return true; } else { - osSyncPrintf(VT_COL(YELLOW, BLACK)); + PRINTF(VT_COL(YELLOW, BLACK)); // "Failure attaching to ground" - osSyncPrintf("地面に付着失敗(%s %d)\n", "../z_en_kusa.c", 323); - osSyncPrintf(VT_RST); + PRINTF("地面に付着失敗(%s %d)\n", "../z_en_kusa.c", 323); + PRINTF(VT_RST); return false; } } @@ -257,7 +257,7 @@ void EnKusa_Init(Actor* thisx, PlayState* play) { if (this->requiredObjectSlot < 0) { // "Bank danger!" - osSyncPrintf("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", thisx->params, "../z_en_kusa.c", 561); + PRINTF("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", thisx->params, "../z_en_kusa.c", 561); Actor_Kill(&this->actor); return; } diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index d36c0ed3d0..8a683c4627 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -150,7 +150,7 @@ void EnMm2_Init(Actor* thisx, PlayState* play2) { } if (this->actor.params == 1) { if (!GET_INFTABLE(INFTABLE_17F) || !GET_EVENTINF(EVENTINF_MARATHON_ACTIVE)) { - osSyncPrintf(VT_FGCOL(CYAN) " マラソン 開始されていない \n" VT_RST "\n"); + PRINTF(VT_FGCOL(CYAN) " マラソン 開始されていない \n" VT_RST "\n"); Actor_Kill(&this->actor); } } diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 7b54272a33..9feb9d43bc 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -171,7 +171,7 @@ void EnMs_Update(Actor* thisx, PlayState* play) { if (gSaveContext.save.entranceIndex == ENTR_LON_LON_RANCH_0 && gSaveContext.sceneLayer == 8) { // ride carpet if in credits Actor_MoveXZGravity(&this->actor); - osSyncPrintf("OOOHHHHHH %f\n", this->actor.velocity.y); + PRINTF("OOOHHHHHH %f\n", this->actor.velocity.y); Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2); } Collider_UpdateCylinder(&this->actor, &this->collider); 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 dd1df6de7b..ba8d1da1fb 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -121,10 +121,10 @@ void EnNb_UpdatePath(EnNb* this, PlayState* play) { this->pathYaw = RAD_TO_BINANG(Math_FAtan2F(this->finalPos.x - this->initialPos.x, this->finalPos.z - this->initialPos.z)); // "En_Nb_Get_path_info Rail Data Get! = %d!!!!!!!!!!!!!!" - osSyncPrintf("En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", path); + PRINTF("En_Nb_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", path); } else { // "En_Nb_Get_path_info Rail Data Doesn't Exist!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf("En_Nb_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("En_Nb_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n"); } } @@ -666,7 +666,7 @@ void EnNb_CheckKidnapCsMode(EnNb* this, PlayState* play) { break; default: // "Operation Doesn't Exist!!!!!!!!" - osSyncPrintf("En_Nb_Kidnap_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Nb_Kidnap_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } this->cueId = nextCueId; @@ -885,7 +885,7 @@ void EnNb_CheckConfrontationCsMode(EnNb* this, PlayState* play) { break; default: // "En_Nb_Confrontion_Check_DemoMode: Operation doesn't exist!!!!!!!!" - osSyncPrintf("En_Nb_Confrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Nb_Confrontion_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } this->cueId = nextCueId; @@ -1073,7 +1073,7 @@ void EnNb_CheckCreditsCsModeImpl(EnNb* this, PlayState* play) { break; default: // "En_Nb_inEnding_Check_DemoMode: Operation doesn't exist!!!!!!!!" - osSyncPrintf("En_Nb_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Nb_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } this->cueId = nextCueId; @@ -1426,7 +1426,7 @@ void EnNb_Update(Actor* thisx, PlayState* play) { if (this->action < 0 || this->action > 30 || sActionFuncs[this->action] == NULL) { // "Main mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } @@ -1532,7 +1532,7 @@ void EnNb_Draw(Actor* thisx, PlayState* play) { if (this->drawMode < 0 || this->drawMode >= 5 || sDrawFuncs[this->drawMode] == NULL) { // "Draw mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 38f55d45b7..51d3df4a4f 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -132,7 +132,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { if (this->actor.params == 0xB) { if (sLowerRiverSpawned) { Actor_Kill(&this->actor); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n" VT_RST); return; } sLowerRiverSpawned = true; @@ -143,7 +143,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { if (this->actor.params == 0xC) { if (sUpperRiverSpawned) { Actor_Kill(&this->actor); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n" VT_RST); return; } sUpperRiverSpawned = true; @@ -160,7 +160,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { if (fabsf(this->actor.world.pos.x - sKakarikoPosList[i].x) < 40.0f && fabsf(this->actor.world.pos.z - sKakarikoPosList[i].z) < 40.0f) { this->unk_2AA = i; - osSyncPrintf(VT_FGCOL(YELLOW) " 通常鶏index %d\n" VT_RST, this->unk_2AA); + PRINTF(VT_FGCOL(YELLOW) " 通常鶏index %d\n" VT_RST, this->unk_2AA); if (gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX] & sKakarikoFlagList[i]) { this->actor.world.pos.x = 300.0f; @@ -238,8 +238,8 @@ void EnNiw_Init(Actor* thisx, PlayState* play) { break; } - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + PRINTF("\n\n"); this->actionFunc = EnNiw_ResetAction; } @@ -364,8 +364,8 @@ void EnNiw_SpawnAttackCucco(EnNiw* this, PlayState* play) { this->unk_296++; this->timer5 = 10; } else { - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n" VT_RST); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n" VT_RST); } } } @@ -986,17 +986,17 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { UPDBGCHECKINFO_FLAG_4); } if (thisx->floorHeight <= BGCHECK_Y_MIN || thisx->floorHeight >= 32000.0f) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n" VT_RST, thisx->floorHeight); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n" VT_RST, thisx->floorHeight); cam.x = play->view.at.x - play->view.eye.x; cam.y = play->view.at.y - play->view.eye.y; cam.z = play->view.at.z - play->view.eye.z; camResult = cam.y / sqrtf(SQ(cam.x) + SQ(cam.y) + SQ(cam.z)); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.x); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.y); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.z); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.x); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.y); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.z); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.x); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.y); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.z); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.x); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.y); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.z); thisx->world.pos.x = thisx->home.pos.x; thisx->world.pos.z = thisx->home.pos.z; thisx->world.pos.y = ((thisx->home.pos.y + play->view.eye.y) + (camResult * 160.0f)); @@ -1005,10 +1005,10 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { thisx->world.pos.y = thisx->home.pos.y + 300.0f; } - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.x); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.y); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.z); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.x); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.y); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.z); + PRINTF("\n\n"); thisx->speed = 0.0f; thisx->gravity = -2.0f; Math_Vec3f_Copy(&this->unk_2AC, &thisx->home.pos); @@ -1047,9 +1047,9 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { this->timer4 = 30; EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400); this->timer5 = 0; - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf("\n\n"); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n" VT_RST); + PRINTF("\n\n"); this->actionFunc = func_80AB6F04; return; } diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 174b0b5747..b1dadf4c16 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -76,16 +76,16 @@ void EnNiwGirl_Init(Actor* thisx, PlayState* play) { &play->actorCtx, &this->actor, play, ACTOR_EN_NIW, this->actor.world.pos.x + vec2.x, this->actor.world.pos.y + vec2.y, this->actor.world.pos.z + vec2.z, 0, this->actor.world.rot.y, 0, 0xA); if (this->chasedEnNiw != NULL) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n" VT_RST, this->path); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ シツレイしちゃうわね！プンプン ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ きゃははははは、まてー ☆☆☆☆☆ %d\n" VT_RST, this->path); + PRINTF("\n\n"); this->actor.colChkInfo.mass = MASS_IMMOVABLE; this->actionFunc = EnNiwGirl_Talk; } else { - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ なぜか、セットできむぅあせん ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ んんがくく ☆☆☆☆☆ %d\n" VT_RST, this->path); - osSyncPrintf("\n\n"); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ なぜか、セットできむぅあせん ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ んんがくく ☆☆☆☆☆ %d\n" VT_RST, this->path); + PRINTF("\n\n"); Actor_Kill(&this->actor); } } diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index fd59367d8b..847710b580 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -84,8 +84,8 @@ void EnNiwLady_Init(Actor* thisx, PlayState* play) { Actor_Kill(thisx); return; } - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ねぇちゃんうっふん ☆☆☆☆☆ %d\n" VT_RST, this->unk_278); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ねぇちゃんうっふん ☆☆☆☆☆ %d\n" VT_RST, this->unk_278); + PRINTF("\n\n"); this->actionFunc = func_80AB9F24; thisx->uncullZoneForward = 600.0f; } @@ -212,8 +212,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { D_80ABB3B4[currentCucco->unk_2AA]; if (BREG(1) != 0) { // "GET inside the chicken fence!" - osSyncPrintf(VT_FGCOL(GREEN) "☆ 鶏柵内ＧＥＴ！☆ %x\n" VT_RST, - D_80ABB3B4[currentCucco->unk_2AA]); + PRINTF(VT_FGCOL(GREEN) "☆ 鶏柵内ＧＥＴ！☆ %x\n" VT_RST, D_80ABB3B4[currentCucco->unk_2AA]); } } this->cuccosInPen++; @@ -250,14 +249,14 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { this->unk_26E = 11; } if (Actor_TalkOfferAccepted(&this->actor, play)) { - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん選択\t ☆☆☆☆ %d\n" VT_RST, phi_s1); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃんハート ☆☆☆☆ %d\n" VT_RST, this->unk_26C); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん保存 ☆☆☆☆ %d\n" VT_RST, this->unk_26A); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん今\t ☆☆☆☆ %d\n" VT_RST, this->cuccosInPen); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ this->actor.talk_message ☆☆ %x\n" VT_RST, this->actor.textId); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ this->message_end_code ☆☆ %d\n" VT_RST, this->unk_262); - osSyncPrintf("\n\n"); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん選択\t ☆☆☆☆ %d\n" VT_RST, phi_s1); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃんハート ☆☆☆☆ %d\n" VT_RST, this->unk_26C); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん保存 ☆☆☆☆ %d\n" VT_RST, this->unk_26A); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ねぇちゃん今\t ☆☆☆☆ %d\n" VT_RST, this->cuccosInPen); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ this->actor.talk_message ☆☆ %x\n" VT_RST, this->actor.textId); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ this->message_end_code ☆☆ %d\n" VT_RST, this->unk_262); + PRINTF("\n\n"); if (MaskReaction_GetTextId(play, MASK_REACTION_SET_CUCCO_LADY) == 0) { if (this->actor.textId == 0x503C) { Sfx_PlaySfxCentered(NA_SE_SY_ERROR); @@ -272,14 +271,14 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { this->unk_26C = 1; this->unk_262 = TEXT_STATE_EVENT; this->unk_26A = this->cuccosInPen; - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 柵内BIT変更前 ☆☆ %x\n" VT_RST, - gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX]); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 柵内BIT変更前 ☆☆ %x\n" VT_RST, + gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX]); gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX] &= (u16) ~(INFTABLE_199_MASK | INFTABLE_19A_MASK | INFTABLE_19B_MASK | INFTABLE_19C_MASK | INFTABLE_19D_MASK | INFTABLE_19E_MASK | INFTABLE_19F_MASK); - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 柵内BIT変更後 ☆☆ %x\n" VT_RST, - gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX]); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 柵内BIT変更後 ☆☆ %x\n" VT_RST, + gSaveContext.save.info.infTable[INFTABLE_199_19A_19B_19C_19D_19E_19F_INDEX]); + PRINTF("\n\n"); this->actionFunc = func_80ABA654; return; } @@ -303,9 +302,9 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { void func_80ABA654(EnNiwLady* this, PlayState* play) { if (this->unk_262 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) { Message_CloseTextbox(play); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ハート ☆☆☆☆☆ %d\n" VT_RST, this->unk_26C); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 爆弾 ☆☆☆☆☆ %d\n" VT_RST, this->unk_272); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ハート ☆☆☆☆☆ %d\n" VT_RST, this->unk_26C); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 爆弾 ☆☆☆☆☆ %d\n" VT_RST, this->unk_272); + PRINTF("\n\n"); this->unk_26E = 0xB; if (!GET_ITEMGETINF(ITEMGETINF_0C)) { this->actor.parent = NULL; @@ -328,7 +327,7 @@ static s16 sTradeItemTextIds[] = { 0x503E, 0x503F, 0x5047, 0x5040, 0x5042, 0x504 void func_80ABA778(EnNiwLady* this, PlayState* play) { // "☆☆☆☆☆ Adult message check ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ アダルトメッセージチェック ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ アダルトメッセージチェック ☆☆☆☆☆ \n" VT_RST); this->unk_262 = TEXT_STATE_DONE; this->unk_273 = 0; if (!GET_ITEMGETINF(ITEMGETINF_2C)) { @@ -453,7 +452,7 @@ void func_80ABAC84(EnNiwLady* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) != TEXT_STATE_DONE) || !Message_ShouldAdvance(play)) { return; } - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); if (LINK_IS_ADULT) { if (!GET_ITEMGETINF(ITEMGETINF_2C)) { SET_ITEMGETINF(ITEMGETINF_2C); @@ -469,7 +468,7 @@ void func_80ABAC84(EnNiwLady* this, PlayState* play) { } void func_80ABAD38(EnNiwLady* this, PlayState* play) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 通常メッセージチェック ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 通常メッセージチェック ☆☆☆☆☆ \n" VT_RST); this->unk_262 = TEXT_STATE_DONE; this->actionFunc = func_80ABAD7C; } diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index cff5324d64..0ec08037fe 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -127,7 +127,7 @@ void EnNy_Init(Actor* thisx, PlayState* play) { this->unk_1E0 = 0.25f; if (this->actor.params == 0) { // "New initials" - osSyncPrintf("ニュウ イニシャル[ %d ] ！！\n", this->actor.params); + PRINTF("ニュウ イニシャル[ %d ] ！！\n", this->actor.params); this->actor.colChkInfo.mass = 0; this->unk_1D4 = 0; this->unk_1D8 = 0xFF; @@ -136,8 +136,8 @@ void EnNy_Init(Actor* thisx, PlayState* play) { } else { // This mode is unused in the final game // "Dummy new initials" - osSyncPrintf("ダミーニュウ イニシャル[ %d ] ！！\n", this->actor.params); - osSyncPrintf("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused); + PRINTF("ダミーニュウ イニシャル[ %d ] ！！\n", this->actor.params); + PRINTF("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused); this->actor.colChkInfo.mass = 0xFF; this->collider.base.colType = COLTYPE_METAL; this->actor.update = EnNy_UpdateUnused; 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 1374c2ff6b..d898af9d8e 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 @@ -47,10 +47,10 @@ void EnOkarinaEffect_Destroy(Actor* thisx, PlayState* play) { void EnOkarinaEffect_Init(Actor* thisx, PlayState* play) { EnOkarinaEffect* this = (EnOkarinaEffect*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Ocarina Storm Effect" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n" VT_RST); + PRINTF("\n\n"); if (play->envCtx.precipitation[PRECIP_RAIN_CUR] != 0) { Actor_Kill(&this->actor); } @@ -79,9 +79,9 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, PlayState* play) { if ((play->envCtx.lightMode != LIGHT_MODE_TIME) || play->envCtx.lightConfig != 1) { this->timer--; } - osSyncPrintf("\nthis->timer=[%d]", this->timer); + PRINTF("\nthis->timer=[%d]", this->timer); if (this->timer == 308) { - osSyncPrintf("\n\n\n豆よ のびろ 指定\n\n\n"); // "Let's grow some beans" + PRINTF("\n\n\n豆よ のびろ 指定\n\n\n"); // "Let's grow some beans" CutsceneFlags_Set(play, 5); } } @@ -98,8 +98,8 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, PlayState* play) { Audio_SetNatureAmbienceChannelIO(NATURE_CHANNEL_LIGHTNING, CHANNEL_IO_PORT_1, 0); Audio_SetNatureAmbienceChannelIO(NATURE_CHANNEL_RAIN, CHANNEL_IO_PORT_1, 0); } - osSyncPrintf("\n\n\nE_wether_flg=[%d]", gWeatherMode); - osSyncPrintf("\nrain_evt_trg=[%d]\n\n", play->envCtx.stormRequest); + PRINTF("\n\n\nE_wether_flg=[%d]", gWeatherMode); + PRINTF("\nrain_evt_trg=[%d]\n\n", play->envCtx.stormRequest); if (gWeatherMode == WEATHER_MODE_CLEAR && (play->envCtx.stormRequest == STORM_REQUEST_START)) { play->envCtx.stormRequest = STORM_REQUEST_STOP; } else { diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index f6a21f0195..70c2d33c60 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -43,9 +43,9 @@ void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) { void EnOkarinaTag_Init(Actor* thisx, PlayState* play) { EnOkarinaTag* this = (EnOkarinaTag*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Ocarina tag outbreak" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ オカリナタグ発生 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); this->actor.flags &= ~ACTOR_FLAG_0; this->type = (this->actor.params >> 0xA) & 0x3F; this->ocarinaSong = (this->actor.params >> 6) & 0xF; @@ -63,18 +63,18 @@ void EnOkarinaTag_Init(Actor* thisx, PlayState* play) { } // "Save information" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ セーブ情報\t ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セーブ情報\t ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); // "Type index" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" VT_RST, this->type); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 種類インデックス ☆☆☆☆☆ %d\n" VT_RST, this->type); // "Correct answer information" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 正解情報\t ☆☆☆☆☆ %d\n" VT_RST, this->ocarinaSong); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 正解情報\t ☆☆☆☆☆ %d\n" VT_RST, this->ocarinaSong); // "Range information" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 範囲情報\t ☆☆☆☆☆ %d\n" VT_RST, this->actor.world.rot.z); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 範囲情報\t ☆☆☆☆☆ %d\n" VT_RST, this->actor.world.rot.z); // "Processing range information" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 処理範囲情報\t ☆☆☆☆☆ %f\n" VT_RST, this->interactRange); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 処理範囲情報\t ☆☆☆☆☆ %f\n" VT_RST, this->interactRange); // "Hit?" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 当り？\t\t ☆☆☆☆☆ %d\n" VT_RST, this->unk_158); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 当り？\t\t ☆☆☆☆☆ %d\n" VT_RST, this->unk_158); + PRINTF("\n\n"); if ((this->switchFlag >= 0) && (Flags_GetSwitch(play, this->switchFlag))) { Actor_Kill(&this->actor); @@ -117,7 +117,7 @@ void func_80ABEF2C(EnOkarinaTag* this, PlayState* play) { if ((this->ocarinaSong != 6) || (gSaveContext.save.info.scarecrowSpawnSongSet)) { if (player->stateFlags2 & PLAYER_STATE2_24) { // "North! ! ! ! !" - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ 北！！！！！ ☆☆☆☆☆ %f\n" VT_RST, this->actor.xzDistToPlayer); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 北！！！！！ ☆☆☆☆☆ %f\n" VT_RST, this->actor.xzDistToPlayer); } if ((this->actor.xzDistToPlayer < (90.0f + this->interactRange)) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 80.0f)) { @@ -210,8 +210,8 @@ void func_80ABF28C(EnOkarinaTag* this, PlayState* play) { break; default: // "Ocarina Invisible-kun demo start check error source" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n" VT_RST, - this->type); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ オカリナ透明君デモ開始チェックエラー原 ☆☆☆☆☆ %d\n" VT_RST, + this->type); Actor_Kill(&this->actor); break; } @@ -302,7 +302,7 @@ void func_80ABF708(EnOkarinaTag* this, PlayState* play) { void func_80ABF7CC(EnOkarinaTag* this, PlayState* play) { // "Open sesame sesame!" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 開けゴマゴマゴマ！ ☆☆☆☆☆ %d\n" VT_RST, Message_GetState(&play->msgCtx)); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 開けゴマゴマゴマ！ ☆☆☆☆☆ %d\n" VT_RST, Message_GetState(&play->msgCtx)); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) { Message_CloseTextbox(play); diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 0f2dd95718..1f8d80e66d 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -579,9 +579,9 @@ void EnOssan_Init(Actor* thisx, PlayState* play) { //! @bug This check will always evaluate to false, it should be || not && if (this->actor.params > OSSAN_TYPE_MASK && this->actor.params < OSSAN_TYPE_KOKIRI) { Actor_Kill(&this->actor); - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_oB1.c", 1246); return; } @@ -608,18 +608,18 @@ void EnOssan_Init(Actor* thisx, PlayState* play) { if (this->objectSlot1 < 0) { Actor_Kill(&this->actor); - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_oB1.c", 1284); return; } if (EnOssan_TryGetObjBankIndices(this, play, objectIds) == 0) { Actor_Kill(&this->actor); - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("予備バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("予備バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); + PRINTF(VT_RST); ASSERT(0, "0", "../z_en_oB1.c", 1295); return; } @@ -647,7 +647,7 @@ void EnOssan_EndInteraction(PlayState* play, EnOssan* this) { Player* player = GET_PLAYER(play); // "End of conversation!" - osSyncPrintf(VT_FGCOL(YELLOW) "%s[%d]:★★★ 会話終了！！ ★★★" VT_RST "\n", "../z_en_oB1.c", 1337); + PRINTF(VT_FGCOL(YELLOW) "%s[%d]:★★★ 会話終了！！ ★★★" VT_RST "\n", "../z_en_oB1.c", 1337); YREG(31) = 0; Actor_TalkOfferAccepted(&this->actor, play); play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; @@ -735,7 +735,7 @@ void EnOssan_State_Idle(EnOssan* this, PlayState* play, Player* player) { if (Actor_TalkOfferAccepted(&this->actor, play)) { // "Start conversation!!" - osSyncPrintf(VT_FGCOL(YELLOW) "★★★ 会話開始！！ ★★★" VT_RST "\n"); + PRINTF(VT_FGCOL(YELLOW) "★★★ 会話開始！！ ★★★" VT_RST "\n"); player->stateFlags2 |= PLAYER_STATE2_29; Play_SetShopBrowsingViewpoint(play); EnOssan_SetStateStartShopping(play, this, false); @@ -923,7 +923,7 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla if (!EnOssan_TestEndInteraction(this, play, &play->state.input[0])) { // "Shop around by moving the stick left and right" - osSyncPrintf("「スティック左右で品物みてくれ！」\n"); + PRINTF("「スティック左右で品物みてくれ！」\n"); EnOssan_StartShopping(play, this); } } @@ -1176,7 +1176,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe s32 d; if (!EnOssan_ReturnItemToShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2152); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2152); this->delayTimer = 3; return; } @@ -1235,7 +1235,7 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play prevIndex = this->cursorIndex; if (!EnOssan_ReturnItemToShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2244); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2244); this->delayTimer = 3; return; } @@ -1300,7 +1300,7 @@ void EnOssan_State_LookFromShelfToShopkeeper(EnOssan* this, PlayState* play, Pla void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, PlayState* play, Player* player) { if (!EnOssan_ReturnItemToShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2355); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2355); return; } Math_ApproachF(&this->cameraFaceAngle, 0.0f, 0.5f, 10.0f); @@ -1317,7 +1317,7 @@ void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, PlayState* play, Player* void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) { Player* player = GET_PLAYER(play); - osSyncPrintf("\n" VT_FGCOL(YELLOW) "初めて手にいれた！！" VT_RST "\n\n"); + PRINTF("\n" VT_FGCOL(YELLOW) "初めて手にいれた！！" VT_RST "\n\n"); Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f); play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; play->msgCtx.stateTimer = 4; @@ -1327,7 +1327,7 @@ void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) { this->drawCursor = 0; EnOssan_UpdateCameraDirection(this, play, 0.0f); this->stateFlag = OSSAN_STATE_GIVE_ITEM_FANFARE; - osSyncPrintf(VT_FGCOL(YELLOW) "持ち上げ開始！！" VT_RST "\n\n"); + PRINTF(VT_FGCOL(YELLOW) "持ち上げ開始！！" VT_RST "\n\n"); } void EnOssan_SetStateCantGetItem(PlayState* play, EnOssan* this, u16 textId) { @@ -1479,7 +1479,7 @@ void EnOssan_State_ItemSelected(EnOssan* this, PlayState* play2, Player* player) PlayState* play = play2; // Necessary for OKs if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2654); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2654); return; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && @@ -1500,7 +1500,7 @@ void EnOssan_State_SelectMilkBottle(EnOssan* this, PlayState* play2, Player* pla PlayState* play = play2; // Need for OK if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2693); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2693); return; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && @@ -1521,7 +1521,7 @@ void EnOssan_State_SelectWeirdEgg(EnOssan* this, PlayState* play2, Player* playe PlayState* play = play2; // Needed for OK if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2732); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2732); return; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE && @@ -1540,7 +1540,7 @@ void EnOssan_State_SelectWeirdEgg(EnOssan* this, PlayState* play2, Player* playe void EnOssan_State_SelectUnimplementedItem(EnOssan* this, PlayState* play, Player* player) { if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2771); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2771); return; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT && Message_ShouldAdvance(play)) { @@ -1551,10 +1551,10 @@ void EnOssan_State_SelectUnimplementedItem(EnOssan* this, PlayState* play, Playe void EnOssan_State_SelectBombs(EnOssan* this, PlayState* play, Player* player) { if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2798); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2798); return; } - osSyncPrintf("店主の依頼 ( %d )\n", GET_INFTABLE(INFTABLE_FC)); + PRINTF("店主の依頼 ( %d )\n", GET_INFTABLE(INFTABLE_FC)); if (this->actor.params != OSSAN_TYPE_GORON) { EnOssan_State_ItemSelected(this, play, player); return; @@ -1578,7 +1578,7 @@ void EnOssan_State_SelectMaskItem(EnOssan* this, PlayState* play, Player* player EnGirlA* item = this->shelfSlots[this->cursorIndex]; if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2845); + PRINTF("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2845); return; } if (talkState == TEXT_STATE_EVENT) { @@ -1693,7 +1693,7 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, PlayState* play, Player if (!EnOssan_TestEndInteraction(this, play, &play->state.input[0])) { switch (play->msgCtx.choiceIndex) { case 0: - osSyncPrintf(VT_FGCOL(YELLOW) "★★★ 続けるよ！！ ★★★" VT_RST "\n"); + PRINTF(VT_FGCOL(YELLOW) "★★★ 続けるよ！！ ★★★" VT_RST "\n"); player->actor.shape.rot.y += 0x8000; player->stateFlags2 |= PLAYER_STATE2_29; Play_SetViewpoint(play, VIEWPOINT_PIVOT); @@ -1703,7 +1703,7 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, PlayState* play, Player break; case 1: default: - osSyncPrintf(VT_FGCOL(YELLOW) "★★★ やめるよ！！ ★★★" VT_RST "\n"); + PRINTF(VT_FGCOL(YELLOW) "★★★ やめるよ！！ ★★★" VT_RST "\n"); EnOssan_EndInteraction(play, this); break; } @@ -2109,15 +2109,15 @@ void EnOssan_InitActionFunc(EnOssan* this, PlayState* play) { this->shelves = (EnTana*)Actor_Find(&play->actorCtx, ACTOR_EN_TANA, ACTORCAT_PROP); if (this->shelves == NULL) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "Warning!! There are no shelves!!" - osSyncPrintf("★★★ 警告！！ 棚がないよ！！ ★★★\n"); - osSyncPrintf(VT_RST); + PRINTF("★★★ 警告！！ 棚がないよ！！ ★★★\n"); + PRINTF(VT_RST); return; } // "Shopkeeper (params) init" - osSyncPrintf(VT_FGCOL(YELLOW) "◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇" VT_RST "\n", this->actor.params); + PRINTF(VT_FGCOL(YELLOW) "◇◇◇ 店のおやじ( %d ) 初期設定 ◇◇◇" VT_RST "\n", this->actor.params); this->actor.world.pos.x += sShopkeeperPositionOffsets[this->actor.params].x; this->actor.world.pos.y += sShopkeeperPositionOffsets[this->actor.params].y; diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index bfc68d51b4..e0789d8148 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -132,10 +132,10 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { switchFlag = 0x20; } // "conversation owl %4x no = %d, sv = %d" - osSyncPrintf(VT_FGCOL(CYAN) " 会話フクロウ %4x no = %d, sv = %d\n" VT_RST, this->actor.params, owlType, switchFlag); + PRINTF(VT_FGCOL(CYAN) " 会話フクロウ %4x no = %d, sv = %d\n" VT_RST, this->actor.params, owlType, switchFlag); if ((owlType != OWL_DEFAULT) && (switchFlag < 0x20) && Flags_GetSwitch(play, switchFlag)) { - osSyncPrintf("savebitでフクロウ退避\n"); // "Save owl with savebit" + PRINTF("savebitでフクロウ退避\n"); // "Save owl with savebit" Actor_Kill(&this->actor); return; } @@ -160,7 +160,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { case OWL_KAKARIKO: if (GET_EVENTCHKINF(EVENTCHKINF_40)) { // has zelda's letter - osSyncPrintf("フクロウ退避\n"); // "Owl evacuation" + PRINTF("フクロウ退避\n"); // "Owl evacuation" Actor_Kill(&this->actor); return; } @@ -170,7 +170,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { case OWL_HYLIA_GERUDO: if (GET_EVENTCHKINF(EVENTCHKINF_43)) { // has ocarina of time - osSyncPrintf("フクロウ退避\n"); // "Owl evacuation" + PRINTF("フクロウ退避\n"); // "Owl evacuation" Actor_Kill(&this->actor); return; } @@ -182,7 +182,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { case OWL_ZORA_RIVER: if (GET_EVENTCHKINF(EVENTCHKINF_39) || !GET_EVENTCHKINF(EVENTCHKINF_40)) { // opened zora's domain or has zelda's letter - osSyncPrintf("フクロウ退避\n"); // "Owl evacuation" + PRINTF("フクロウ退避\n"); // "Owl evacuation" Actor_Kill(&this->actor); return; } @@ -204,7 +204,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { break; case OWL_LOST_WOODS_PRESARIA: if (!CHECK_QUEST_ITEM(QUEST_SONG_LULLABY)) { - osSyncPrintf("フクロウ退避\n"); // "Owl evacuation" + PRINTF("フクロウ退避\n"); // "Owl evacuation" Actor_Kill(&this->actor); return; } @@ -212,7 +212,7 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { break; case OWL_LOST_WOODS_POSTSARIA: if (!CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) { - osSyncPrintf("フクロウ退避\n"); // "Owl evacuation" + PRINTF("フクロウ退避\n"); // "Owl evacuation" Actor_Kill(&this->actor); return; } @@ -220,11 +220,11 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { break; default: // Outside kokiri forest - osSyncPrintf(VT_FGCOL(CYAN)); - osSyncPrintf("no = %d \n", owlType); + PRINTF(VT_FGCOL(CYAN)); + PRINTF("no = %d \n", owlType); // "Unfinished owl unfinished owl unfinished owl" - osSyncPrintf("未完成のフクロウ未完成のフクロウ未完成のフクロウ\n"); - osSyncPrintf(VT_RST); + PRINTF("未完成のフクロウ未完成のフクロウ未完成のフクロウ\n"); + PRINTF(VT_RST); this->actionFlags |= 2; this->unk_3EE = 0x20; this->actionFunc = EnOwl_WaitOutsideKokiri; @@ -306,7 +306,7 @@ void func_80ACA62C(EnOwl* this, PlayState* play) { if (switchFlag < 0x20) { Flags_SetSwitch(play, switchFlag); - osSyncPrintf(VT_FGCOL(CYAN) " Actor_Environment_sw = %d\n" VT_RST, Flags_GetSwitch(play, switchFlag)); + PRINTF(VT_FGCOL(CYAN) " Actor_Environment_sw = %d\n" VT_RST, Flags_GetSwitch(play, switchFlag)); } func_80ACA5C8(this); } @@ -927,14 +927,14 @@ void func_80ACC00C(EnOwl* this, PlayState* play) { if (this->actor.xzDistToPlayer < 50.0f) { if (!Play_InCsMode(play)) { owlType = (this->actor.params & 0xFC0) >> 6; - osSyncPrintf(VT_FGCOL(CYAN)); - osSyncPrintf("%dのフクロウ\n", owlType); // "%d owl" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(CYAN)); + PRINTF("%dのフクロウ\n", owlType); // "%d owl" + PRINTF(VT_RST); switch (owlType) { case 7: - osSyncPrintf(VT_FGCOL(CYAN)); - osSyncPrintf("SPOT 06 の デモがはしった\n"); // "Demo of SPOT 06 has been completed" - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(CYAN)); + PRINTF("SPOT 06 の デモがはしった\n"); // "Demo of SPOT 06 has been completed" + PRINTF(VT_RST); play->csCtx.script = SEGMENTED_TO_VIRTUAL(gLakeHyliaOwlCs); this->actor.draw = NULL; break; @@ -1085,7 +1085,7 @@ void EnOwl_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); if (this->actor.update == NULL) { // "Owl disappears" - osSyncPrintf("フクロウ消滅!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("フクロウ消滅!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); return; } diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 642dd155f9..609d9087ea 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -130,7 +130,7 @@ void EnReeba_Init(Actor* thisx, PlayState* play) { this->collider.dim.height = 45; this->scale *= 1.5f; // "Reeba Boss Appears %f" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" VT_RST, this->scale); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ リーバぼす登場 ☆☆☆☆☆ %f\n" VT_RST, this->scale); this->actor.colChkInfo.health = 20; this->collider.elem.toucher.effect = 4; this->collider.elem.toucher.damage = 16; @@ -501,9 +501,9 @@ void EnReeba_Die(EnReeba* this, PlayState* play) { spawner->killCount++; } // "How many are dead?" - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" VT_RST, spawner->killCount); - osSyncPrintf("\n\n"); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 何匹ＤＥＡＤ？ ☆☆☆☆☆%d\n" VT_RST, spawner->killCount); + PRINTF("\n\n"); } Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 9f5ad79c1c..068bd64b64 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -328,7 +328,7 @@ void EnRl_Update(Actor* thisx, PlayState* play) { EnRl* this = (EnRl*)thisx; if ((this->action < 0) || (this->action > 7) || (sActionFuncs[this->action] == NULL)) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->action](this, play); @@ -377,7 +377,7 @@ void EnRl_Draw(Actor* thisx, PlayState* play) { EnRl* this = (EnRl*)thisx; if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawConfig](this, play); diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 547a12b7f3..b2bf3132bd 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -321,7 +321,7 @@ void EnRr_SetupReleasePlayer(EnRr* this, PlayState* play) { Message_StartTextbox(play, 0x3061, NULL); break; } - osSyncPrintf(VT_FGCOL(YELLOW) "%s[%d] : Rr_Catch_Cancel" VT_RST "\n", "../z_en_rr.c", 650); + PRINTF(VT_FGCOL(YELLOW) "%s[%d] : Rr_Catch_Cancel" VT_RST "\n", "../z_en_rr.c", 650); func_8002F6D4(play, &this->actor, 4.0f, this->actor.shape.rot.y, 12.0f, 8); if (this->actor.colorFilterTimer == 0) { this->actionFunc = EnRr_Approach; @@ -416,7 +416,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { if (this->collider2.base.acFlags & AC_HIT) { this->collider2.base.acFlags &= ~AC_HIT; // "Kakin" (not sure what this means) - osSyncPrintf(VT_FGCOL(GREEN) "カキン(%d)！！" VT_RST "\n", this->frameCount); + PRINTF(VT_FGCOL(GREEN) "カキン(%d)！！" VT_RST "\n", this->frameCount); hitPos.x = this->collider2.elem.bumper.hitPos.x; hitPos.y = this->collider2.elem.bumper.hitPos.y; hitPos.z = this->collider2.elem.bumper.hitPos.z; @@ -447,9 +447,9 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { FALLTHROUGH; case RR_DMG_NORMAL: // "ouch" - osSyncPrintf(VT_FGCOL(RED) "いてっ( %d : LIFE %d : DAMAGE %d : %x )！！" VT_RST "\n", - this->frameCount, this->actor.colChkInfo.health, this->actor.colChkInfo.damage, - this->actor.colChkInfo.damageEffect); + PRINTF(VT_FGCOL(RED) "いてっ( %d : LIFE %d : DAMAGE %d : %x )！！" VT_RST "\n", this->frameCount, + this->actor.colChkInfo.health, this->actor.colChkInfo.damage, + this->actor.colChkInfo.damageEffect); this->stopScroll = false; Actor_ApplyDamage(&this->actor); this->invincibilityTimer = 40; @@ -506,7 +506,7 @@ void EnRr_CollisionCheck(EnRr* this, PlayState* play) { this->collider1.base.ocFlags1 &= ~OC1_HIT; this->collider2.base.ocFlags1 &= ~OC1_HIT; // "catch" - osSyncPrintf(VT_FGCOL(GREEN) "キャッチ(%d)！！" VT_RST "\n", this->frameCount); + PRINTF(VT_FGCOL(GREEN) "キャッチ(%d)！！" VT_RST "\n", this->frameCount); if (play->grabPlayer(play, player)) { player->actor.parent = &this->actor; this->stopScroll = false; @@ -688,7 +688,7 @@ void EnRr_Death(EnRr* this, PlayState* play) { break; } // "dropped" - osSyncPrintf(VT_FGCOL(GREEN) "「%s」が出た！！" VT_RST "\n", sDropNames[this->dropType]); + PRINTF(VT_FGCOL(GREEN) "「%s」が出た！！" VT_RST "\n", sDropNames[this->dropType]); switch (this->dropType) { case RR_DROP_MAGIC: Item_DropCollectible(play, &dropPos, ITEM00_MAGIC_SMALL); diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index a2132969b2..0fbbdb75d6 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -303,7 +303,7 @@ BgBdanObjects* EnRu1_FindSwitch(PlayState* play) { actorIt = actorIt->next; } // "There is no stand" - osSyncPrintf(VT_FGCOL(RED) "お立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "お立ち台が無い!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return NULL; } @@ -2189,10 +2189,10 @@ void func_80AEFF94(EnRu1* this, PlayState* play) { this->roomNum3 = actorRoom; this->roomNum2 = actorRoom; // "Ruto switch set" - osSyncPrintf("スイッチルトセット!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("スイッチルトセット!!!!!!!!!!!!!!!!!!!!!!\n"); } else { // "Ruto switch not set" - osSyncPrintf("スイッチルトセットしない!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("スイッチルトセットしない!!!!!!!!!!!!!!!!!!!!!!\n"); Actor_Kill(&this->actor); } } @@ -2210,7 +2210,7 @@ void EnRu1_Update(Actor* thisx, PlayState* play) { if (this->action < 0 || this->action >= ARRAY_COUNT(sActionFuncs) || sActionFuncs[this->action] == NULL) { // "Main mode is improper!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } @@ -2252,7 +2252,7 @@ void EnRu1_Init(Actor* thisx, PlayState* play) { default: Actor_Kill(&this->actor); // "Relevant arge_data = %d unacceptable" - osSyncPrintf("該当 arge_data = %d 無し\n", func_80AEADF0(this)); + PRINTF("該当 arge_data = %d 無し\n", func_80AEADF0(this)); break; } } @@ -2279,7 +2279,7 @@ s32 EnRu1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p if ((this->unk_290 < 0) || (this->unk_290 > 0) || (*sPreLimbDrawFuncs[this->unk_290] == NULL)) { // "Neck rotation mode is improper!" - osSyncPrintf(VT_FGCOL(RED) "首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "首回しモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sPreLimbDrawFuncs[this->unk_290](this, play, limbIndex, rot); } @@ -2361,7 +2361,7 @@ void EnRu1_Draw(Actor* thisx, PlayState* play) { if (this->drawConfig < 0 || this->drawConfig >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawConfig] == NULL) { // "Draw mode is improper!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawConfig](this, play); diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 283b51c8c1..b86112f534 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -555,7 +555,7 @@ void func_80AF3564(EnRu2* this, PlayState* play) { break; default: // "There is no such action!" - osSyncPrintf("En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } this->cueId = nextCueId; @@ -671,12 +671,12 @@ void func_80AF39DC(EnRu2* this, PlayState* play) { if (dialogState == TEXT_STATE_DONE_FADING) { if (this->unk_2C3 != TEXT_STATE_DONE_FADING) { // "I'm Komatsu!" (cinema scene dev) - osSyncPrintf("おれが小松だ！ \n"); + PRINTF("おれが小松だ！ \n"); this->unk_2C2++; if (this->unk_2C2 % 6 == 3) { player = GET_PLAYER(play); // "uorya-!" (screeming sound) - osSyncPrintf("うおりゃー！ \n"); + PRINTF("うおりゃー！ \n"); Camera_SetFinishedFlag(GET_ACTIVE_CAM(play)); player->actor.world.pos.x = 820.0f; player->actor.world.pos.y = 0.0f; @@ -760,7 +760,7 @@ void EnRu2_Update(Actor* thisx, PlayState* play) { if ((this->action < 0) || (this->action >= ARRAY_COUNT(sActionFuncs)) || (sActionFuncs[this->action] == NULL)) { // "Main Mode is improper!" - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->action](this, play); @@ -821,7 +821,7 @@ void EnRu2_Draw(Actor* thisx, PlayState* play) { if ((this->drawConfig < 0) || (this->drawConfig >= ARRAY_COUNT(sDrawFuncs)) || (sDrawFuncs[this->drawConfig] == NULL)) { // "Draw Mode is improper!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawConfig](this, play); 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 8f646fcded..07b4d9042e 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -267,7 +267,7 @@ void EnSb_TurnAround(EnSb* this, PlayState* play) { this->bouncesLeft = 3; EnSb_SetupLunge(this); // "Attack!!" - osSyncPrintf("アタァ〜ック！！\n"); + PRINTF("アタァ〜ック！！\n"); } } @@ -311,7 +311,7 @@ void EnSb_Bounce(EnSb* this, PlayState* play) { this->actor.speed = 0.0f; this->timer = 1; EnSb_SetupWaitClosed(this); - osSyncPrintf(VT_FGCOL(RED) "攻撃終了！！" VT_RST "\n"); // "Attack Complete!" + PRINTF(VT_FGCOL(RED) "攻撃終了！！" VT_RST "\n"); // "Attack Complete!" } } } diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 01111465ec..7a3b1c81fd 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -99,7 +99,7 @@ void EnSda_Update(Actor* thisx, PlayState* play) { EnSda* this = (EnSda*)thisx; Player* player; - osSyncPrintf("SDA MOVE\n"); + PRINTF("SDA MOVE\n"); if (this->actor.params == 1) { player = (Player*)this->actor.parent; @@ -109,7 +109,7 @@ void EnSda_Update(Actor* thisx, PlayState* play) { this->actor.world.pos = player->actor.world.pos; - osSyncPrintf("SDA MOVE END\n"); + PRINTF("SDA MOVE END\n"); } void EnSda_Draw(Actor* thisx, PlayState* play) { @@ -117,7 +117,7 @@ void EnSda_Draw(Actor* thisx, PlayState* play) { Player* player; u8* shadowTexture = GRAPH_ALLOC(play->state.gfxCtx, 0x1000); - osSyncPrintf("SDA DRAW \n"); + PRINTF("SDA DRAW \n"); if (this->actor.params == 1) { player = (Player*)this->actor.parent; @@ -132,7 +132,7 @@ void EnSda_Draw(Actor* thisx, PlayState* play) { func_80AF9C70(shadowTexture, player, play); } - osSyncPrintf("SDA DRAW END\n"); + PRINTF("SDA DRAW END\n"); } void func_80AF8F60(Player* player, u8* shadowTexture, f32 arg2) { @@ -251,7 +251,7 @@ void func_80AF95C4(EnSda* this, u8* shadowTexture, Player* player, PlayState* pl Vec3f sp16C; Vec3f sp64[22]; - osSyncPrintf("SDA CONT \n"); + PRINTF("SDA CONT \n"); if (BREG(57) != 0) { for (shadowTextureTemp = shadowTexture, i = 0; i < 0x1000; i++, shadowTextureTemp++) { if ((i >= 0 && i < 0x40) || (i >= 0xFC0 && i < 0x1000) || ((i & 0x3F) == 0) || ((i & 0x3F) == 0x3F)) { @@ -271,7 +271,7 @@ void func_80AF95C4(EnSda* this, u8* shadowTexture, Player* player, PlayState* pl D_80AFA660[D_80AFA16C[i]] = player->bodyPartsPos[i]; } } - osSyncPrintf("SDA CONT 2\n"); + PRINTF("SDA CONT 2\n"); D_80AFA660[0].y += 3.0f; D_80AFA660[15].x = D_80AFA660[0].x + ((D_80AFA660[15].x - D_80AFA660[0].x) * 1.2f); D_80AFA660[15].y = D_80AFA660[0].y + ((D_80AFA660[15].y - D_80AFA660[0].y) * -1.2f); @@ -279,7 +279,7 @@ void func_80AF95C4(EnSda* this, u8* shadowTexture, Player* player, PlayState* pl for (i = 0; i < 6; i++) { func_80AF8F60(player, shadowTexture, i / 5.0f); } - osSyncPrintf("SDA CONT 3\n"); + PRINTF("SDA CONT 3\n"); if (this->actor.params != 1) { Matrix_MtxFToYXZRotS(&player->shieldMf, &sp178, false); sp178.y += (KREG(87) << 0xF) + 0x8000; @@ -327,7 +327,7 @@ void func_80AF95C4(EnSda* this, u8* shadowTexture, Player* player, PlayState* pl } } } - osSyncPrintf("SDA CONT 4\n"); + PRINTF("SDA CONT 4\n"); } void func_80AF9C70(u8* shadowTexture, Player* player, PlayState* play) { @@ -339,7 +339,7 @@ void func_80AF9C70(u8* shadowTexture, Player* player, PlayState* play) { OPEN_DISPS(gfxCtx, "../z_en_sda.c", 826); - osSyncPrintf("SDA D 1\n"); + PRINTF("SDA D 1\n"); Gfx_SetupDL_44Xlu(play->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x00, 0, 0, 0, (BREG(52) + 50)); gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 0); @@ -364,6 +364,6 @@ void func_80AF9C70(u8* shadowTexture, Player* player, PlayState* play) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_80AFA3F8); } - osSyncPrintf("SDA D 2\n"); + PRINTF("SDA D 2\n"); CLOSE_DISPS(gfxCtx, "../z_en_sda.c", 882); } diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 24a6f12a62..ab0ab2a230 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -446,12 +446,12 @@ void EnSkj_Init(Actor* thisx, PlayState* play2) { EnSkj_CalculateCenter(this); player = GET_PLAYER(play); - osSyncPrintf("Player_X : %f\n", player->actor.world.pos.x); - osSyncPrintf("Player_Z : %f\n", player->actor.world.pos.z); - osSyncPrintf("World_X : %f\n", this->actor.world.pos.x); - osSyncPrintf("World_Z : %f\n", this->actor.world.pos.z); - osSyncPrintf("Center_X : %f\n", this->center.x); - osSyncPrintf("Center_Z : %f\n\n", this->center.z); + PRINTF("Player_X : %f\n", player->actor.world.pos.x); + PRINTF("Player_Z : %f\n", player->actor.world.pos.z); + PRINTF("World_X : %f\n", this->actor.world.pos.x); + PRINTF("World_Z : %f\n", this->actor.world.pos.z); + PRINTF("Center_X : %f\n", this->center.x); + PRINTF("Center_Z : %f\n\n", this->center.z); break; } 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 e2b13abf16..2918e8adea 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -99,18 +99,18 @@ void EnSth_Init(Actor* thisx, PlayState* play) { s32 params = this->actor.params; s32 objectSlot; - osSyncPrintf(VT_FGCOL(BLUE) "金スタル屋 no = %d\n" VT_RST, params); // "Gold Skulltula Shop" + PRINTF(VT_FGCOL(BLUE) "金スタル屋 no = %d\n" VT_RST, params); // "Gold Skulltula Shop" if (this->actor.params == 0) { if (gSaveContext.save.info.inventory.gsTokens < 100) { Actor_Kill(&this->actor); // "Gold Skulltula Shop I still can't be a human" - osSyncPrintf("金スタル屋 まだ 人間に戻れない \n"); + PRINTF("金スタル屋 まだ 人間に戻れない \n"); return; } } else if (gSaveContext.save.info.inventory.gsTokens < (this->actor.params * 10)) { Actor_Kill(&this->actor); // "Gold Skulltula Shop I still can't be a human" - osSyncPrintf(VT_FGCOL(BLUE) "金スタル屋 まだ 人間に戻れない \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) "金スタル屋 まだ 人間に戻れない \n" VT_RST); return; } @@ -121,7 +121,7 @@ void EnSth_Init(Actor* thisx, PlayState* play) { objectSlot = 0; } - osSyncPrintf("bank_ID = %d\n", objectSlot); + PRINTF("bank_ID = %d\n", objectSlot); if (objectSlot < 0) { ASSERT(0, "0", "../z_en_sth.c", 1564); } diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index ebb57479a8..b40a57038f 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -76,7 +76,7 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) { 0.0f, 255.0f, 0, -0x4000, 0, 0); if (this->man == NULL) { // "Spawn error" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ エラー原 ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ エラー原 ☆☆☆☆ \n" VT_RST); Actor_Kill(&this->actor); return; } @@ -85,7 +85,7 @@ void EnSyatekiItm_Init(Actor* thisx, PlayState* play2) { sRupeePos[i].x, sRupeePos[i].y, sRupeePos[i].z, 0, 0, 0, 4); if (this->markers[i] == NULL) { // "Second spawn error" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ エラー原セカンド ☆☆☆☆ \n" VT_RST); Actor_Kill(&this->actor); return; } @@ -237,7 +237,7 @@ void EnSyatekiItm_SpawnTargets(EnSyatekiItm* this, PlayState* play) { this->targetHome[i].z, 0, 0, 0, (ENGSWITCH_TARGET_RUPEE << 0xC) | 0x3F); if (this->targets[i] == NULL) { // "Rupee spawn error" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ルピーでエラー原 ☆☆☆☆ \n" VT_RST); Actor_Kill(&this->actor); return; } @@ -315,16 +315,16 @@ void EnSyatekiItm_EndGame(EnSyatekiItm* this, PlayState* play) { } if (this->signal == ENSYATEKI_START) { // "1 frame attack and defense!" - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ １フレームの攻防！ ☆☆☆☆ \n" VT_RST); this->signal = ENSYATEKI_NONE; this->actionFunc = EnSyatekiItm_Idle; } diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 3f267dcf8e..4aa759f569 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -153,9 +153,9 @@ void EnSyatekiMan_Init(Actor* thisx, PlayState* play) { s32 pad; EnSyatekiMan* this = (EnSyatekiMan*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Old man appeared!! Muhohohohohohohon" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 親父登場！！むほほほほほほほーん ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 親父登場！！むほほほほほほほーん ☆☆☆☆☆ \n" VT_RST); this->actor.targetMode = 1; Actor_SetScale(&this->actor, 0.01f); SkelAnime_InitFlex(play, &this->skelAnime, &gObjectOssanSkel, &gObjectOssanAnim_000338, this->jointTable, @@ -338,8 +338,8 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) { this->actor.parent = NULL; if (!LINK_IS_ADULT) { if (!GET_ITEMGETINF(ITEMGETINF_0D)) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Pachinko ☆☆☆☆☆ %d\n" VT_RST, - CUR_UPG_VALUE(UPG_BULLET_BAG)); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Pachinko ☆☆☆☆☆ %d\n" VT_RST, + CUR_UPG_VALUE(UPG_BULLET_BAG)); if (CUR_UPG_VALUE(UPG_BULLET_BAG) == 1) { this->getItemId = GI_BULLET_BAG_40; } else { @@ -350,8 +350,7 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) { } } else { if (!GET_ITEMGETINF(ITEMGETINF_0E)) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Bow ☆☆☆☆☆ %d\n" VT_RST, - CUR_UPG_VALUE(UPG_QUIVER)); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ Equip_Bow ☆☆☆☆☆ %d\n" VT_RST, CUR_UPG_VALUE(UPG_QUIVER)); switch (CUR_UPG_VALUE(UPG_QUIVER)) { case 0: this->getItemId = GI_RUPEE_PURPLE; @@ -404,7 +403,7 @@ void EnSyatekiMan_FinishPrize(EnSyatekiMan* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) { // "Successful completion" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 正常終了 ☆☆☆☆☆ \n" VT_RST); if (!LINK_IS_ADULT) { SET_ITEMGETINF(ITEMGETINF_0D); } else if ((this->getItemId == GI_QUIVER_40) || (this->getItemId == GI_QUIVER_50)) { @@ -427,7 +426,7 @@ void EnSyatekiMan_RestartGame(EnSyatekiMan* this, PlayState* play) { this->gameResult = SYATEKI_RESULT_NONE; this->actionFunc = EnSyatekiMan_WaitForGame; // "Let's try again! Baby!" - osSyncPrintf(VT_FGCOL(BLUE) "再挑戦だぜ！ベイビー！" VT_RST "\n", this); + PRINTF(VT_FGCOL(BLUE) "再挑戦だぜ！ベイビー！" VT_RST "\n", this); } } } diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 4b6fc0151d..5d306488a6 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -80,14 +80,14 @@ void EnSyatekiNiw_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); if (this->minigameType == SYATEKI_MINIGAME_ARCHERY) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Archery range chicken" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 射的場鶏 ☆☆☆☆☆ \n" VT_RST); Actor_SetScale(&this->actor, 0.01f); } else { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Bomb chicken" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ボムにわ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ ボムにわ！ ☆☆☆☆☆ \n" VT_RST); this->actor.colChkInfo.mass = MASS_IMMOVABLE; Actor_SetScale(&this->actor, 0.01f); } diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 1468ffc362..0cd64c8cdf 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -156,7 +156,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { switch (this->actor.params) { case ENTA_IN_KAKARIKO: // "Exile Talon" - osSyncPrintf(VT_FGCOL(CYAN) " 追放タロン \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " 追放タロン \n" VT_RST); if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) { Actor_Kill(&this->actor); } else if (!LINK_IS_ADULT) { @@ -177,14 +177,14 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { case ENTA_RETURNED_FROM_KAKARIKO: // "Return Talon" - osSyncPrintf(VT_FGCOL(CYAN) " 出戻りタロン \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " 出戻りタロン \n" VT_RST); if (!GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_KAKARIKO)) { Actor_Kill(&this->actor); } else if (!LINK_IS_ADULT) { Actor_Kill(&this->actor); } else if (play->sceneId == SCENE_STABLE && !IS_DAY) { Actor_Kill(&this->actor); - osSyncPrintf(VT_FGCOL(CYAN) " 夜はいない \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " 夜はいない \n" VT_RST); } else { EnTa_SetupAction(this, EnTa_IdleAtRanch, EnTa_AnimRepeatCurrent); this->eyeIndex = TALON_EYE_INDEX_OPEN; @@ -195,7 +195,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { default: // Child era Talon // "Other Talon" - osSyncPrintf(VT_FGCOL(CYAN) " その他のタロン \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " その他のタロン \n" VT_RST); if (play->sceneId == SCENE_HYRULE_CASTLE) { if (GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { Actor_Kill(&this->actor); @@ -212,7 +212,7 @@ void EnTa_Init(Actor* thisx, PlayState* play2) { this->actor.shape.shadowScale = 54.0f; } } else if (play->sceneId == SCENE_LON_LON_BUILDINGS) { - osSyncPrintf(VT_FGCOL(CYAN) " ロンロン牧場の倉庫 の タロン\n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " ロンロン牧場の倉庫 の タロン\n" VT_RST); if (!GET_EVENTCHKINF(EVENTCHKINF_TALON_RETURNED_FROM_CASTLE)) { Actor_Kill(&this->actor); } else if (LINK_IS_ADULT) { diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 5831adc961..b0c4c92495 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -44,14 +44,14 @@ void EnTakaraMan_Init(Actor* thisx, PlayState* play) { if (sTakaraIsInitialized) { Actor_Kill(&this->actor); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); // "Already initialized" + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ もういてる原 ☆☆☆☆☆ \n" VT_RST); // "Already initialized" return; } sTakaraIsInitialized = true; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Bun! %x" (needs a better translation) - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n" VT_RST, play->actorCtx.flags.chest); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ ばぅん！ ☆☆☆☆☆ %x\n" VT_RST, play->actorCtx.flags.chest); play->actorCtx.flags.chest = 0; gSaveContext.save.info.inventory.dungeonKeys[gSaveContext.mapIndex] = -1; SkelAnime_InitFlex(play, &this->skelAnime, &object_ts_Skel_004FE0, &object_ts_Anim_000498, this->jointTable, diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index 29a0637152..aa7aeb97f0 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -59,7 +59,7 @@ static void* sStoneTextures[] = { void EnTana_Init(Actor* thisx, PlayState* play) { EnTana* this = (EnTana*)thisx; - osSyncPrintf("☆☆☆ %s ☆☆☆\n", sShelfTypes[thisx->params]); + PRINTF("☆☆☆ %s ☆☆☆\n", sShelfTypes[thisx->params]); Actor_SetScale(thisx, 1.0f); thisx->flags &= ~ACTOR_FLAG_0; thisx->draw = sDrawFuncs[thisx->params]; diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 03277a73d7..cdd8d34020 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -210,10 +210,10 @@ void EnTite_Destroy(Actor* thisx, PlayState* play) { if (spawner->curNumSpawn > 0) { spawner->curNumSpawn--; } - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Number of simultaneous occurrences" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, spawner->curNumSpawn); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, spawner->curNumSpawn); + PRINTF("\n\n"); } Collider_DestroyJntSph(play, &this->collider); } diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 3891c70ffa..28bf2a3a2d 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -56,8 +56,8 @@ void EnTuboTrap_Init(Actor* thisx, PlayState* play) { EnTuboTrap* this = (EnTuboTrap*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 2.0f); - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); // "Urn Trap" + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); // "Urn Trap" Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); Actor_SetScale(&this->actor, 0.1f); @@ -222,9 +222,9 @@ void EnTuboTrap_WaitForProximity(EnTuboTrap* this, PlayState* play) { f32 targetHeight; if (BREG(2) != 0) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ わて ☆☆☆☆☆ %f\n" VT_RST, this->actor.world.pos.y); // "You" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n" VT_RST, player->actor.world.pos.y); // "Me" - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ わて ☆☆☆☆☆ %f\n" VT_RST, this->actor.world.pos.y); // "You" + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n" VT_RST, player->actor.world.pos.y); // "Me" + PRINTF("\n\n"); } if (this->actor.xzDistToPlayer < 200.0f && this->actor.world.pos.y <= player->actor.world.pos.y) { diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 71f63bed12..d10ebe4539 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -392,7 +392,7 @@ void EnVm_CheckHealth(EnVm* this, PlayState* play) { if (Actor_GetCollidedExplosive(play, &this->colliderCylinder.base) != NULL) { this->actor.colChkInfo.health--; - osSyncPrintf("hp down %d\n", this->actor.colChkInfo.health); + PRINTF("hp down %d\n", this->actor.colChkInfo.health); } else { if (!(this->colliderQuad2.base.acFlags & AC_HIT) || this->unk_21C == 2) { return; diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index f426a8b487..d865c5e48e 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -36,9 +36,9 @@ ActorInit En_Wall_Tubo_InitVars = { void EnWallTubo_Init(Actor* thisx, PlayState* play) { EnWallTubo* this = (EnWallTubo*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Wall Target" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 壁のツボ ☆☆☆☆☆ \n" VT_RST); this->unk_164 = this->actor.world.pos; this->actionFunc = EnWallTubo_FindGirl; } @@ -127,11 +127,11 @@ void EnWallTubo_SetWallFall(EnWallTubo* this, PlayState* play) { if ((wall != NULL) && (wall->dyna.actor.update != NULL)) { wall->isHit = true; // "You did it field!" (repeated 5 times) - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(BLUE) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(BLUE) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆ やった原！ ☆☆☆☆☆ \n" VT_RST); } Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index d07f9b97c9..3c89d4bf42 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -57,24 +57,24 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { switch (this->actor.params & 0xF) { case EN_WEATHER_TAG_TYPE_CLOUDY_MARKET: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ (;o;) About ☆☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ （;o;) くらいよー ☆☆☆☆☆ \n" VT_RST); EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyHyruleMarket); break; case EN_WEATHER_TAG_TYPE_CLOUDY_LON_LON_RANCH: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED)) { Actor_Kill(&this->actor); } EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyLonLonRanch); break; case EN_WEATHER_TAG_TYPE_SNOW_ZORAS_DOMAIN: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Yukigafuru You won't come (._.) ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ゆきがふるー あなたはこないー (._.) ☆☆☆☆☆ \n" VT_RST); if (GET_EVENTCHKINF(EVENTCHKINF_4A)) { Actor_Kill(&this->actor); @@ -82,9 +82,9 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudySnow); break; case EN_WEATHER_TAG_TYPE_RAIN_LAKE_HYLIA: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); if (GET_EVENTCHKINF(EVENTCHKINF_4A)) { Actor_Kill(&this->actor); @@ -92,18 +92,18 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledRainLakeHylia); break; case EN_WEATHER_TAG_TYPE_CLOUDY_DEATH_MOUNTAIN: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Cloudy (._.) Ah Melancholy ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり (._.) あーあ 憂鬱 ☆☆☆☆☆ \n" VT_RST); if (GET_EVENTCHKINF(EVENTCHKINF_49)) { Actor_Kill(&this->actor); } EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyDeathMountain); break; case EN_WEATHER_TAG_TYPE_THUNDERSTORM_KAKARIKO: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Cloudy Rain Thunder (;O;) Uo Melancholy ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ くもり雨雷 (;O;) うおお 憂鬱 ☆☆☆☆☆ \n" VT_RST); if (!GET_EVENTCHKINF(EVENTCHKINF_48) || !GET_EVENTCHKINF(EVENTCHKINF_49) || !GET_EVENTCHKINF(EVENTCHKINF_4A) || CHECK_QUEST_ITEM(QUEST_MEDALLION_SHADOW)) { @@ -112,15 +112,15 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledCloudyRainThunderKakariko); break; case EN_WEATHER_TAG_TYPE_SANDSTORM_INTENSITY: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ The desert becomes thicker ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 砂漠が濃くなります ☆☆☆☆☆ \n" VT_RST); EnWeatherTag_SetupAction(this, EnWeatherTag_SetSandstormIntensity); break; case EN_WEATHER_TAG_TYPE_THUNDERSTORM_GRAVEYARD: - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Wow wa wa na wa saa ki ha (^o^) ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ わわわわー なーがーさーきーはー (^o^) ☆☆☆☆☆ \n" VT_RST); EnWeatherTag_SetupAction(this, EnWeatherTag_DisabledRainThunder); break; diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 7fca408f7f..27d1641141 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -272,10 +272,10 @@ void EnWf_Destroy(Actor* thisx, PlayState* play) { parent->curNumSpawn--; } - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "☆☆☆☆☆ Number of concurrent events ☆☆☆☆☆" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, parent->curNumSpawn); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 同時発生数 ☆☆☆☆☆%d\n" VT_RST, parent->curNumSpawn); + PRINTF("\n\n"); } } } diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index f475b77e92..5f4d3f5462 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -117,9 +117,9 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) { s16 rotZover10; s16 tagIndex; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Mysterious mystery, very mysterious" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 不思議不思議まか不思議 \t ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 不思議不思議まか不思議 \t ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); this->actor.flags &= ~ACTOR_FLAG_0; this->wonderMode = (this->actor.params >> 0xB) & 0x1F; @@ -130,7 +130,7 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) { } this->actor.targetMode = 1; if ((this->switchFlag >= 0) && Flags_GetSwitch(play, this->switchFlag)) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); Actor_Kill(&this->actor); return; } @@ -314,7 +314,7 @@ void EnWonderItem_BombSoldier(EnWonderItem* this, PlayState* play) { if (Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HEISHI2, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, this->actor.yawTowardsPlayer, 0, 9) != NULL) { // "Careless soldier spawned" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ うっかり兵セット完了 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ うっかり兵セット完了 ☆☆☆☆☆ \n" VT_RST); } if (this->switchFlag >= 0) { Flags_SetSwitch(play, this->switchFlag); diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index 1256a781ce..ecdd5252db 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -35,9 +35,9 @@ void EnWonderTalk_Destroy(Actor* thisx, PlayState* play) { void EnWonderTalk_Init(Actor* thisx, PlayState* play) { EnWonderTalk* this = (EnWonderTalk*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Special conversation" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 特殊会話くん ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 特殊会話くん ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); this->unk_150 = (this->actor.params >> 0xB) & 0x1F; this->unk_152 = (this->actor.params >> 6) & 0x1F; @@ -48,7 +48,7 @@ void EnWonderTalk_Init(Actor* thisx, PlayState* play) { this->actor.targetMode = 1; if (this->switchFlag >= 0) { if (Flags_GetSwitch(play, this->switchFlag)) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); Actor_Kill(&this->actor); return; } @@ -62,33 +62,33 @@ void func_80B391CC(EnWonderTalk* this, PlayState* play) { switch (this->unk_150) { case 1: // "Slate GO!" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 石板ＧＯ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 石板ＧＯ！ ☆☆☆☆☆ \n" VT_RST); this->height = 0.0f; this->unk_15C = 80.0f; // "Attention coordinates" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); if (!LINK_IS_ADULT) { this->actor.textId = 0x7040; // "Children" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ こども ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ こども ☆☆☆☆☆ \n" VT_RST); } else { // "Adult" - osSyncPrintf(VT_FGCOL(CYAN) " ☆☆☆☆☆ おとな ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(CYAN) " ☆☆☆☆☆ おとな ☆☆☆☆☆ \n" VT_RST); this->actor.textId = 0x7088; } this->unk_156 = TEXT_STATE_EVENT; - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" VT_RST, this->actor.textId); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" VT_RST, this->actor.textId); break; case 2: // "Diary start!" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 日記帳スタート！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 日記帳スタート！ ☆☆☆☆☆ \n" VT_RST); this->actor.textId = 0x5002; this->unk_156 = TEXT_STATE_CHOICE; this->height = 30.0f; this->unk_15C = 40.0f; // "Attention coordinates" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 30.0f); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 30.0f); break; case 3: this->actor.textId = 0x501E; @@ -96,14 +96,14 @@ void func_80B391CC(EnWonderTalk* this, PlayState* play) { this->height = 0.0f; this->unk_15C = 110.0f; // "Attention coordinates" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); break; case 4: this->actor.textId = 0x5020; this->unk_156 = TEXT_STATE_DONE; this->height = 0.0f; // "Attention coordinates" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); this->unk_15C = 120.0f; if (GET_EVENTCHKINF(EVENTCHKINF_1D)) { Actor_Kill(&this->actor); @@ -115,7 +115,7 @@ void func_80B391CC(EnWonderTalk* this, PlayState* play) { this->height = 0.0f; this->unk_15C = 110.0f; // "Attention coordinates" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 注目座標\t \t☆☆☆☆☆ %f\n" VT_RST, 0.0f); break; default: this->actor.textId = 0x7072; @@ -123,7 +123,7 @@ void func_80B391CC(EnWonderTalk* this, PlayState* play) { break; } - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" VT_RST, this->actor.textId); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ this->actor.talk_message ☆☆☆☆☆ %x\n" VT_RST, this->actor.textId); this->actionFunc = func_80B3943C; } } @@ -154,16 +154,16 @@ void func_80B3943C(EnWonderTalk* this, PlayState* play) { if (yawDiff < 0x4000) { if (this->unk_15A >= 2) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Save information" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報\t\t☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報\t\t☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); // "Type index" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 種類インデックス\t☆☆☆☆☆ %d\n" VT_RST, this->unk_150); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 種類インデックス\t☆☆☆☆☆ %d\n" VT_RST, this->unk_150); // "Actual message type" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); // "Specified range" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); + PRINTF("\n\n"); } this->unk_15A = 0; Actor_OfferTalk(&this->actor, play, this->unk_15C); @@ -188,17 +188,17 @@ void func_80B395F0(EnWonderTalk* this, PlayState* play) { case 0: if (!LINK_IS_ADULT) { // "I'm still a child!" - osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ まだコドモなの！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ まだコドモなの！ ☆☆☆☆☆ \n" VT_RST); this->actor.textId = 0x5001; } else { // "I'm an adult. .. .." - osSyncPrintf(VT_FGCOL(YELLOW) " ☆☆☆☆☆ アダルトなの。。。 ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(YELLOW) " ☆☆☆☆☆ アダルトなの。。。 ☆☆☆☆☆ \n" VT_RST); this->actor.textId = 0x5003; } break; case 1: // "Out!" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ はずれ！ ☆☆☆☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ はずれ！ ☆☆☆☆☆ \n" VT_RST); this->actor.textId = 0x5004; break; } diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index a831460a80..77abdf2167 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -40,9 +40,9 @@ void EnWonderTalk2_Init(Actor* thisx, PlayState* play) { s32 pad; EnWonderTalk2* this = (EnWonderTalk2*)thisx; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Transparent message" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君 ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); this->baseMsgId = (this->actor.params >> 6) & 0xFF; if (this->actor.world.rot.z > 0) { s32 rangeIndex = 0; @@ -60,16 +60,16 @@ void EnWonderTalk2_Init(Actor* thisx, PlayState* play) { this->actor.targetMode = D_80B3A8E0[rangeIndex]; - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "originally?" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元は？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.world.rot.z); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 元は？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.world.rot.z); // "The range is?" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ レンジは？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.targetMode); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ レンジは？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.targetMode); // "Is the range?" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n" VT_RST, this->triggerRange); - osSyncPrintf("\n\n"); - osSyncPrintf("\n\n"); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ は、範囲わ？ ☆☆☆☆☆ %f\n" VT_RST, this->triggerRange); + PRINTF("\n\n"); + PRINTF("\n\n"); + PRINTF("\n\n"); } this->initPos = this->actor.world.pos; @@ -80,7 +80,7 @@ void EnWonderTalk2_Init(Actor* thisx, PlayState* play) { this->switchFlag = -1; } if (this->switchFlag >= 0 && Flags_GetSwitch(play, this->switchFlag)) { - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag); Actor_Kill(&this->actor); return; } @@ -121,7 +121,7 @@ void func_80B3A15C(EnWonderTalk2* this, PlayState* play) { if ((this->switchFlag >= 0) && (this->talkMode != 2)) { Flags_SetSwitch(play, this->switchFlag); // "I saved it! All of it!" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag); } this->actionFunc = func_80B3A10C; @@ -131,31 +131,31 @@ void func_80B3A15C(EnWonderTalk2* this, PlayState* play) { if (!((this->actor.xzDistToPlayer > 40.0f + this->triggerRange) || (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) > 100.0f) || (yawDiff >= 0x4000))) { if (this->unk_158 >= 2) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Transparent Message Kimi Set" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params); // "Save Information" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t %x\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t %x\n" VT_RST, this->switchFlag); // "Specified message type" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 指定メッセージ種類 %x\n" VT_RST, this->baseMsgId); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 指定メッセージ種類 %x\n" VT_RST, this->baseMsgId); // "Actual message type" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); // "Specified range" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); // "Processing range" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲 %f\n" VT_RST, this->triggerRange); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲 %f\n" VT_RST, this->triggerRange); switch (this->talkMode) { case 0: // "Normal" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆ 通常 ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆ 通常 ☆☆ \n" VT_RST); break; case 2: // "Check only" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆ チェックのみ ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆ チェックのみ ☆☆ \n" VT_RST); break; case 3: // "Lock only" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆ ロックのみ ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆ ロックのみ ☆☆ \n" VT_RST); break; } } @@ -169,7 +169,7 @@ void func_80B3A15C(EnWonderTalk2* this, PlayState* play) { void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) { if (BREG(2) != 0) { // "Oh" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ わー %d\n" VT_RST, Message_GetState(&play->msgCtx)); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ わー %d\n" VT_RST, Message_GetState(&play->msgCtx)); } switch (Message_GetState(&play->msgCtx)) { @@ -186,8 +186,7 @@ void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) { if ((this->switchFlag >= 0) && (this->talkMode != 4)) { Flags_SetSwitch(play, this->switchFlag); // "(Forced) I saved it! All of it!" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" VT_RST, - this->switchFlag); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ (強制)セーブしたよ！おもいっきり！ %x\n" VT_RST, this->switchFlag); } if (this->talkMode == 4) { @@ -214,41 +213,41 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) { } else if ((this->talkMode != 4) || !this->unk_15A) { if (BREG(2) != 0) { // "distance" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ きょり %f\n" VT_RST, this->actor.xzDistToPlayer); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ きょり %f\n" VT_RST, this->actor.xzDistToPlayer); } if (((this->actor.xzDistToPlayer < (40.0f + this->triggerRange)) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 100.0f)) && !Play_InCsMode(play)) { if (this->unk_158 >= 2) { - osSyncPrintf("\n\n"); + PRINTF("\n\n"); // "Transparent Message Kimi Seto" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 透明メッセージ君せっと %x\n" VT_RST, this->actor.params); // "Save Information" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t %x\n" VT_RST, this->switchFlag); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ セーブ情報 \t %x\n" VT_RST, this->switchFlag); // "Specified message type" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 指定メッセージ種類 %x\n" VT_RST, this->baseMsgId); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 指定メッセージ種類 %x\n" VT_RST, this->baseMsgId); // "Real message type" - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ 実質メッセージ種類 %x\n" VT_RST, this->actor.textId); // "Specified range" - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 指定範囲 %d\n" VT_RST, this->actor.world.rot.z); // "Processing range" - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲 %f\n" VT_RST, this->triggerRange); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 処理範囲 %f\n" VT_RST, this->triggerRange); // "What is your range?" - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ レンジは？ \t\t %d\n" VT_RST, this->actor.targetMode); - osSyncPrintf("\n\n"); - osSyncPrintf("\n\n"); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ レンジは？ \t\t %d\n" VT_RST, this->actor.targetMode); + PRINTF("\n\n"); + PRINTF("\n\n"); switch (this->talkMode) { case 1: // "Compulsion" - osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆ 強制 ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(MAGENTA) " ☆☆ 強制 ☆☆ \n" VT_RST); break; case 4: // "Gerudo Training Grounds Forced Check Only" - osSyncPrintf(VT_FGCOL(RED) " ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n" VT_RST); + PRINTF(VT_FGCOL(RED) " ☆☆ ゲルドの修練場強制チェックのみ ☆☆ \n" VT_RST); break; } - osSyncPrintf("\n\n"); + PRINTF("\n\n"); } this->unk_158 = 0; if (!this->unk_156) { 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 16529db093..d6fb2b59b9 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -340,10 +340,10 @@ void EnXc_SetupSerenadeAction(EnXc* this, PlayState* play) { if (!CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !GET_EVENTCHKINF(EVENTCHKINF_52) && LINK_IS_ADULT) { this->action = SHEIK_ACTION_SERENADE; - osSyncPrintf("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n"); + PRINTF("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n"); } else { Actor_Kill(&this->actor); - osSyncPrintf("水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n"); + PRINTF("水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n"); } } @@ -358,10 +358,10 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) { gSaveContext.cutsceneTrigger = 1; SET_EVENTCHKINF(EVENTCHKINF_52); // Learned Serenade of Water Flag Item_Give(play, ITEM_SONG_SERENADE); - osSyncPrintf("ブーツを取った!!!!!!!!!!!!!!!!!!\n"); + PRINTF("ブーツを取った!!!!!!!!!!!!!!!!!!\n"); return true; } - osSyncPrintf("はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n"); + PRINTF("はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n"); return false; } return true; @@ -473,7 +473,7 @@ void EnXc_SetColossusWindSFX(PlayState* play) { sMaxSpeed = CLAMP_MIN(sMaxSpeed, speed); - osSyncPrintf("MAX speed = %f\n", sMaxSpeed); + PRINTF("MAX speed = %f\n", sMaxSpeed); speed = CLAMP_MAX(speed, 2.0f); func_800F436C(&sPos, NA_SE_EV_FLYING_AIR - SFX_FLAG, 0.6f + (0.4f * speed)); @@ -1990,7 +1990,7 @@ s32 EnXc_SetupNocturneState(Actor* thisx, PlayState* play) { Actor_Kill(thisx); break; default: - osSyncPrintf("En_Oa2_Stalker_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Oa2_Stalker_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } @@ -2297,7 +2297,7 @@ void EnXc_Update(Actor* thisx, PlayState* play) { s32 action = this->action; if ((action < 0) || (action >= ARRAY_COUNT(sActionFuncs)) || (sActionFuncs[action] == NULL)) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sActionFuncs[action](this, play); } @@ -2343,7 +2343,7 @@ void EnXc_Init(Actor* thisx, PlayState* play) { EnXc_DoNothing(this, play); break; default: - osSyncPrintf(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); EnXc_DoNothing(this, play); } } @@ -2411,7 +2411,7 @@ void EnXc_Draw(Actor* thisx, PlayState* play) { if (this->drawMode < 0 || this->drawMode > 5 || sDrawFuncs[this->drawMode] == NULL) { // "Draw mode is abnormal!!!!!!!!!!!!!!!!!!!!!!!!!" - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); } else { sDrawFuncs[this->drawMode](thisx, play); } diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index 741f7d59b8..8eeb0e034b 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -78,12 +78,12 @@ void EnYabusameMark_Destroy(Actor* thisx, PlayState* play) { void EnYabusameMark_Init(Actor* thisx, PlayState* play) { EnYabusameMark* this = (EnYabusameMark*)thisx; - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ やぶさめまと ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ やぶさめまと ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); this->actor.flags &= ~ACTOR_FLAG_0; this->typeIndex = this->actor.params; this->actor.targetMode = 5; - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 種類インデックス \t ☆☆☆☆☆ %d\n" VT_RST, this->typeIndex); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 種類インデックス \t ☆☆☆☆☆ %d\n" VT_RST, this->typeIndex); switch (this->typeIndex) { case 0: this->subTypeIndex = 0; @@ -109,8 +109,8 @@ void EnYabusameMark_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->actor); return; } - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 種類 ☆☆☆☆☆ %d\n" VT_RST, this->typeIndex); - osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ さらに分類 ☆☆☆☆☆ %d\n" VT_RST, this->subTypeIndex); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 種類 ☆☆☆☆☆ %d\n" VT_RST, this->typeIndex); + PRINTF(VT_FGCOL(CYAN) "☆☆☆☆☆ さらに分類 ☆☆☆☆☆ %d\n" VT_RST, this->subTypeIndex); this->actionFunc = func_80B42F74; } @@ -159,17 +159,17 @@ void func_80B42F74(EnYabusameMark* this, PlayState* play) { } } - osSyncPrintf("\n\n"); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ posＸ ☆☆☆☆☆ %f\n" VT_RST, arrowHitPos.x); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ posＹ ☆☆☆☆☆ %f\n" VT_RST, arrowHitPos.y); - osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ posＺ ☆☆☆☆☆ %f\n" VT_RST, arrowHitPos.z); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＸ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].x); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＹ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].y); - osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＺ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].z); - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 小 ☆☆☆☆☆ %f\n" VT_RST, scoreDistance100); - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 大 ☆☆☆☆☆ %f\n" VT_RST, scoreDistance60); - osSyncPrintf(VT_FGCOL(MAGENTA) "☆☆☆☆☆ point ☆☆☆☆☆ %d\n" VT_RST, scoreIndex); - osSyncPrintf("\n\n"); + PRINTF("\n\n"); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ posＸ ☆☆☆☆☆ %f\n" VT_RST, arrowHitPos.x); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ posＹ ☆☆☆☆☆ %f\n" VT_RST, arrowHitPos.y); + PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ posＺ ☆☆☆☆☆ %f\n" VT_RST, arrowHitPos.z); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＸ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].x); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＹ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].y); + PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ hitＺ ☆☆☆☆☆ %f\n" VT_RST, sTargetPos[this->subTypeIndex].z); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 小 ☆☆☆☆☆ %f\n" VT_RST, scoreDistance100); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ 大 ☆☆☆☆☆ %f\n" VT_RST, scoreDistance60); + PRINTF(VT_FGCOL(MAGENTA) "☆☆☆☆☆ point ☆☆☆☆☆ %d\n" VT_RST, scoreIndex); + PRINTF("\n\n"); if (scoreIndex == 2) { Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900); diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index ac4102120e..f0a2d69a21 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -974,7 +974,7 @@ void func_80B50A04(EnZl2* this, PlayState* play) { func_80B50644(this, play); break; default: - osSyncPrintf("En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Zl2_inAgain_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -1365,7 +1365,7 @@ void func_80B51948(EnZl2* this, PlayState* play) { func_80B513A8(this, play); break; default: - osSyncPrintf("En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Zl2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->cueId = nextCueId; } @@ -1529,7 +1529,7 @@ void func_80B51FA8(EnZl2* this, PlayState* play) { Actor_Kill(&this->actor); break; default: - osSyncPrintf("En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Zl2_inRunning_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } this->cueId = nextCueId; @@ -1567,7 +1567,7 @@ void func_80B52114(EnZl2* this, PlayState* play) { func_80B4FD90(this, play); break; default: - osSyncPrintf(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); func_80B4FD90(this, play); } } @@ -1579,7 +1579,7 @@ void func_80B521A0(EnZl2* this, PlayState* play) { s32 pad2; if (objectSlot < 0) { - osSyncPrintf(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); return; } @@ -1595,7 +1595,7 @@ void EnZl2_Update(Actor* thisx, PlayState* play) { EnZl2* this = (EnZl2*)thisx; if (this->action < 0 || this->action >= 0x24 || sActionFuncs[this->action] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->action](this, play); @@ -1626,7 +1626,7 @@ s32 EnZl2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p if (this->overrideLimbDrawConfig < 0 || this->overrideLimbDrawConfig > 0 || sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return 0; } return sOverrideLimbDrawFuncs[this->overrideLimbDrawConfig](play, limbIndex, dList, pos, rot, thisx, gfx); @@ -1691,7 +1691,7 @@ void EnZl2_Draw(Actor* thisx, PlayState* play) { EnZl2* this = (EnZl2*)thisx; if ((this->drawConfig < 0) || (this->drawConfig >= 3) || (sDrawFuncs[this->drawConfig] == NULL)) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawConfig](this, play); diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 86867bfb8d..24e97ebd1d 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -775,7 +775,7 @@ void func_80B54F18(EnZl3* this, PlayState* play) { } void func_80B54FB4(EnZl3* this, PlayState* play) { - osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); func_80B54E14(this, &gZelda2Anime2Anim_008AD0, 0, 0.0f, 0); EnZl3_setEyeIndex(this, 4); EnZl3_setMouthIndex(this, 2); @@ -785,7 +785,7 @@ void func_80B54FB4(EnZl3* this, PlayState* play) { this->actor.shape.rot.z = 0; this->unk_3C4 = this->actor.world.rot.z; this->actor.world.rot.z = this->actor.shape.rot.z; - osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); } void func_80B55054(EnZl3* this) { @@ -928,7 +928,7 @@ void func_80B55444(EnZl3* this, PlayState* play) { this->unk_328 = 1; FALLTHROUGH; default: - osSyncPrintf("En_Zl3_inFinal_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Zl3_inFinal_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); break; } this->unk_2F0 = temp_v0; @@ -987,11 +987,11 @@ void func_80B5572C(EnZl3* this, PlayState* play) { } void func_80B55780(EnZl3* this, PlayState* play) { - osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal2_Init通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); func_80B54E14(this, &gZelda2Anime2Anim_005A0C, 0, 0.0f, 0); this->action = 7; this->drawConfig = 1; - osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("ゼルダ姫のEn_Zl3_Actor_inFinal2_Initは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); EnZl3_setMouthIndex(this, 1); this->actor.flags &= ~ACTOR_FLAG_0; } @@ -1344,7 +1344,7 @@ void func_80B564A8(EnZl3* this, PlayState* play) { Actor_Kill(&this->actor); break; default: - osSyncPrintf("En_Zl3_inFinal2_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + PRINTF("En_Zl3_inFinal2_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); } this->unk_2F0 = temp_v0; } @@ -1564,9 +1564,9 @@ void func_80B56F10(EnZl3* this, PlayState* play) { pathHead += waypoint; this->unk_30C = pathHead; this->unk_310 = pathHead->count; - osSyncPrintf("En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", waypoint); + PRINTF("En_Zl3_Get_path_info レールデータをゲットだぜ = %d!!!!!!!!!!!!!!\n", waypoint); } else { - osSyncPrintf("En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("En_Zl3_Get_path_info レールデータが無い!!!!!!!!!!!!!!!!!!!!\n"); } } @@ -2605,7 +2605,7 @@ void func_80B59B6C(EnZl3* this, PlayState* play) { func_80B59828(this, play); break; default: - osSyncPrintf(VT_FGCOL(RED) " En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) " En_Oa3 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); Actor_Kill(&this->actor); } } @@ -2617,7 +2617,7 @@ void func_80B59DB8(EnZl3* this, PlayState* play) { s32 pad2; if (objectSlot < 0) { - osSyncPrintf(VT_FGCOL(RED) "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); return; } @@ -2641,7 +2641,7 @@ void EnZl3_Update(Actor* thisx, PlayState* play) { EnZl3* this = (EnZl3*)thisx; if (this->action < 0 || this->action >= ARRAY_COUNT(sActionFuncs) || sActionFuncs[this->action] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sActionFuncs[this->action](this, play); @@ -2652,7 +2652,7 @@ void EnZl3_Init(Actor* thisx, PlayState* play) { ActorShape* shape = &this->actor.shape; s32 pad; - osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); ActorShape_Init(shape, 0.0f, ActorShadow_DrawCircle, 30.0f); shape->shadowAlpha = 0; func_80B533B0(thisx, play); @@ -2667,7 +2667,7 @@ void EnZl3_Init(Actor* thisx, PlayState* play) { break; } - osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("ゼルダ姫のEn_Zl3_Actor_ctは通った!!!!!!!!!!!!!!!!!!!!!!!!!\n"); } static OverrideLimbDraw sOverrideLimbDrawFuncs[] = { @@ -2681,7 +2681,7 @@ s32 EnZl3_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p if (this->unk_308 < 0 || this->unk_308 >= ARRAY_COUNT(sOverrideLimbDrawFuncs) || sOverrideLimbDrawFuncs[this->unk_308] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画前処理モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return 0; } return sOverrideLimbDrawFuncs[this->unk_308](play, limbIndex, dList, pos, rot, thisx, gfx); @@ -2750,7 +2750,7 @@ void EnZl3_Draw(Actor* thisx, PlayState* play) { EnZl3* this = (EnZl3*)thisx; if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) { - osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } sDrawFuncs[this->drawConfig](this, play); diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 5ba154bd76..7a5502c4b0 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -93,9 +93,9 @@ void EnfHG_Destroy(Actor* thisx, PlayState* play) { s32 pad; EnfHG* this = (EnfHG*)thisx; - osSyncPrintf("F DT1\n"); + PRINTF("F DT1\n"); Skin_Free(play, &this->skin); - osSyncPrintf("F DT2\n"); + PRINTF("F DT2\n"); } void EnfHG_SetupIntro(EnfHG* this, PlayState* play) { @@ -373,7 +373,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) { } Math_ApproachF(&this->subCamAt.x, this->actor.world.pos.x, 0.2f, 50.0f); Math_ApproachF(&this->subCamAt.z, this->actor.world.pos.z, 0.2f, 50.0f); - osSyncPrintf("TIME %d-------------------------------------------------\n", this->timers[0]); + PRINTF("TIME %d-------------------------------------------------\n", this->timers[0]); if (fabsf(this->actor.world.pos.z - (GND_BOSSROOM_CENTER_Z + 400.0f - 0.5f)) < 1.0f) { play->envCtx.lightSettingOverride = 0; play->envCtx.lightBlendRateOverride = 20; @@ -418,16 +418,16 @@ void EnfHG_SetupApproach(EnfHG* this, PlayState* play, s16 paintingIndex) { this->curPainting = paintingIndex; this->targetPainting = oppositeIndex[this->curPainting]; - osSyncPrintf("KABE NO 1 = %d\n", this->curPainting); - osSyncPrintf("KABE NO 2 = %d\n", this->targetPainting); + PRINTF("KABE NO 1 = %d\n", this->curPainting); + PRINTF("KABE NO 2 = %d\n", this->targetPainting); this->actor.world.pos.x = (1.3f * sPaintings[this->curPainting].pos.x) + (GND_BOSSROOM_CENTER_X - 4.0f); this->actor.world.pos.y = sPaintings[this->curPainting].pos.y + (GND_BOSSROOM_CENTER_Y + 153.0f); this->actor.world.pos.z = (1.3f * sPaintings[this->curPainting].pos.z) - -(GND_BOSSROOM_CENTER_Z - 10.0f); this->actor.world.rot.y = sPaintings[this->curPainting].yRot; - osSyncPrintf("XP1 = %f\n", this->actor.world.pos.x); - osSyncPrintf("ZP1 = %f\n", this->actor.world.pos.z); + PRINTF("XP1 = %f\n", this->actor.world.pos.x); + PRINTF("ZP1 = %f\n", this->actor.world.pos.z); this->inPaintingPos.x = (sPaintings[this->targetPainting].pos.x * 1.3f) + (GND_BOSSROOM_CENTER_X - 4.0f); this->inPaintingPos.y = sPaintings[this->targetPainting].pos.y + (GND_BOSSROOM_CENTER_Y + 33.0f); @@ -459,9 +459,9 @@ void EnfHG_SetupApproach(EnfHG* this, PlayState* play, s16 paintingIndex) { } void EnfHG_Approach(EnfHG* this, PlayState* play) { - osSyncPrintf("STANDBY !!\n"); - osSyncPrintf("XP2 = %f\n", this->actor.world.pos.x); - osSyncPrintf("ZP2 = %f\n", this->actor.world.pos.z); + PRINTF("STANDBY !!\n"); + PRINTF("XP2 = %f\n", this->actor.world.pos.x); + PRINTF("ZP2 = %f\n", this->actor.world.pos.z); if (this->actor.params == GND_REAL_BOSS) { this->hoofSfxPos.x = this->actor.projectedPos.x / (this->actor.scale.x * 100.0f); this->hoofSfxPos.y = this->actor.projectedPos.y / (this->actor.scale.x * 100.0f); @@ -476,7 +476,7 @@ void EnfHG_Approach(EnfHG* this, PlayState* play) { Math_ApproachF(&this->actor.world.pos.y, 60.0f, 0.1f, 1.0f); this->actor.scale.y = this->actor.scale.x; if (this->timers[0] == 0) { - osSyncPrintf("arg_data ------------------------------------>%d\n", this->actor.params); + PRINTF("arg_data ------------------------------------>%d\n", this->actor.params); if (this->actor.params != GND_REAL_BOSS) { this->timers[0] = 140; this->actionFunc = EnfHG_Retreat; @@ -495,7 +495,7 @@ void EnfHG_Approach(EnfHG* this, PlayState* play) { } void EnfHG_Attack(EnfHG* this, PlayState* play) { - osSyncPrintf("KABE OUT !!\n"); + PRINTF("KABE OUT !!\n"); this->bossGndInPainting = false; SkelAnime_Update(&this->skin.skelAnime); if (this->timers[0] != 0) { @@ -563,10 +563,10 @@ void EnfHG_Attack(EnfHG* this, PlayState* play) { FHGFIRE_WARP_RETREAT); this->fhgFireKillWarp = true; } - osSyncPrintf("SPD X %f\n", this->inPaintingVelX); - osSyncPrintf("SPD Z %f\n", this->inPaintingVelZ); - osSyncPrintf("X=%f\n", dx); - osSyncPrintf("Z=%f\n", dz); + PRINTF("SPD X %f\n", this->inPaintingVelX); + PRINTF("SPD Z %f\n", this->inPaintingVelZ); + PRINTF("X=%f\n", dx); + PRINTF("Z=%f\n", dz); if (dxz == 0.0f) { this->timers[0] = 140; this->actionFunc = EnfHG_Retreat; @@ -581,7 +581,7 @@ void EnfHG_Damage(EnfHG* this, PlayState* play) { f32 dz; f32 dxz2; - osSyncPrintf("REVISE !!\n"); + PRINTF("REVISE !!\n"); SkelAnime_Update(&this->skin.skelAnime); Math_ApproachF(&this->warpColorFilterR, play->lightCtx.fogColor[0], 1.0f, 10.0f); Math_ApproachF(&this->warpColorFilterG, play->lightCtx.fogColor[0], 1.0f, 10.0f); @@ -627,7 +627,7 @@ void EnfHG_Damage(EnfHG* this, PlayState* play) { } void EnfHG_Retreat(EnfHG* this, PlayState* play) { - osSyncPrintf("KABE IN !!\n"); + PRINTF("KABE IN !!\n"); if (this->turnTarget != 0) { Math_ApproachS(&this->turnRot, this->turnTarget, 5, 2000); } @@ -664,10 +664,10 @@ void EnfHG_Retreat(EnfHG* this, PlayState* play) { do { paintingIdxFake = Rand_ZeroOne() * 5.99f; } while (paintingIdxFake == paintingIdxReal); - osSyncPrintf("ac1 = %x `````````````````````````````````````````````````\n", - Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_GANONDROF, - this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, - 0, 0, 0, paintingIdxFake + GND_FAKE_BOSS)); + PRINTF("ac1 = %x `````````````````````````````````````````````````\n", + Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_BOSS_GANONDROF, + this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, + 0, paintingIdxFake + GND_FAKE_BOSS)); } } } diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index c80c7e32f5..2107869563 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -3579,7 +3579,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { this->actor.uncullZoneScale = 200.0f; sFishFightTime++; - osSyncPrintf("HIT FISH %dcm\n", (u8)this->fishLength); + PRINTF("HIT FISH %dcm\n", (u8)this->fishLength); Math_ApproachS(&this->fishLimbDRotZDelta, 0x2AF8, 4, 0xBB8); sFishingHookedFish = this; @@ -5115,11 +5115,11 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { if (0) { // Strings existing only in rodata - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("plays %x\n"); - osSyncPrintf("ys %x\n"); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("plays %x\n"); + PRINTF("ys %x\n"); + PRINTF(VT_RST); } playerShadowAlpha = player->actor.shape.shadowAlpha; @@ -5617,9 +5617,9 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { sREG(14) = 0; - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("zelda_time %x\n", ((void)0, gSaveContext.save.dayTime)); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("zelda_time %x\n", ((void)0, gSaveContext.save.dayTime)); + PRINTF(VT_RST); if (sStormChanceTimer >= 2) { sStormChanceTimer--; @@ -5711,7 +5711,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { Message_StartTextbox(play, 0x407B + BREG(27), NULL); } - osSyncPrintf("HI_SCORE = %x\n", HIGH_SCORE(HS_FISHING)); + PRINTF("HI_SCORE = %x\n", HIGH_SCORE(HS_FISHING)); } s32 Fishing_OwnerOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 9b9b79bcff..a1d99a01af 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -97,9 +97,9 @@ void ItemEtcetera_Init(Actor* thisx, PlayState* play) { s32 objectSlot; type = this->actor.params & 0xFF; - osSyncPrintf("no = %d\n", type); + PRINTF("no = %d\n", type); objectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[type]); - osSyncPrintf("bank_ID = %d\n", objectSlot); + PRINTF("bank_ID = %d\n", objectSlot); if (objectSlot < 0) { ASSERT(0, "0", "../z_item_etcetera.c", 241); } else { diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index 2763add1e2..aefb205dd3 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -87,7 +87,7 @@ void ItemShield_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.01f); Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); - osSyncPrintf(VT_FGCOL(GREEN) "Item_Shild %d \n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(GREEN) "Item_Shild %d \n" VT_RST, this->actor.params); } void ItemShield_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 6cdb1bc0e8..38458db6b9 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -47,7 +47,7 @@ void MagicWind_Init(Actor* thisx, PlayState* play) { if (!SkelCurve_Init(play, &this->skelCurve, &sSkel, &sAnim)) { // "Magic_Wind_Actor_ct (): Construct failed" - osSyncPrintf("Magic_Wind_Actor_ct():コンストラクト失敗\n"); + PRINTF("Magic_Wind_Actor_ct():コンストラクト失敗\n"); } this->actor.room = -1; switch (this->actor.params) { diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 5d4c824c6f..889a9ccaf2 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -166,7 +166,7 @@ void MirRay_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f); // "Generation of reflectable light!" - osSyncPrintf("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + PRINTF("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); LOG_NUM("this->actor.arg_data", this->actor.params, "../z_mir_ray.c", 518); if (this->actor.params >= 0xA) { diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 7299654c9d..ac0524ea35 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -145,8 +145,8 @@ void ObjBean_InitDynaPoly(ObjBean* this, PlayState* play, CollisionHeader* colli this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_bean.c", 374, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_bean.c", 374, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -472,20 +472,18 @@ void ObjBean_Init(Actor* thisx, PlayState* play) { if (Flags_GetSwitch(play, this->dyna.actor.params & 0x3F) || (mREG(1) == 1)) { path = (this->dyna.actor.params >> 8) & 0x1F; if (path == 0x1F) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "No path data?" - osSyncPrintf("パスデータが無い？(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 909, - this->dyna.actor.params); - osSyncPrintf(VT_RST); + PRINTF("パスデータが無い？(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 909, this->dyna.actor.params); + PRINTF(VT_RST); Actor_Kill(&this->dyna.actor); return; } if (play->pathList[path].count < 3) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "Incorrect number of path data" - osSyncPrintf("パスデータ数が不正(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 921, - this->dyna.actor.params); - osSyncPrintf(VT_RST); + PRINTF("パスデータ数が不正(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 921, this->dyna.actor.params); + PRINTF(VT_RST); Actor_Kill(&this->dyna.actor); return; } @@ -513,7 +511,7 @@ void ObjBean_Init(Actor* thisx, PlayState* play) { } this->dyna.actor.world.rot.z = this->dyna.actor.home.rot.z = this->dyna.actor.shape.rot.z = 0; // "Magic bean tree lift" - osSyncPrintf("(魔法の豆の木リフト)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(魔法の豆の木リフト)(arg_data 0x%04x)\n", this->dyna.actor.params); } void ObjBean_Destroy(Actor* thisx, PlayState* play) { @@ -889,10 +887,10 @@ void ObjBean_Update(Actor* thisx, PlayState* play) { this->dyna.actor.shape.shadowScale = this->dyna.actor.scale.x * 88.0f; if (ObjBean_CheckForHorseTrample(this, play)) { - osSyncPrintf(VT_FGCOL(CYAN)); + PRINTF(VT_FGCOL(CYAN)); // "Horse and bean tree lift collision" - osSyncPrintf("馬と豆の木リフト衝突！！！\n"); - osSyncPrintf(VT_RST); + PRINTF("馬と豆の木リフト衝突！！！\n"); + PRINTF(VT_RST); ObjBean_Break(this, play); DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); func_80B908EC(this); diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index b24c6f18de..fa22cfaab4 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -53,8 +53,8 @@ void func_80B92B08(ObjElevator* this, PlayState* play, CollisionHeader* collisio CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, thisx, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_elevator.c", 136, - thisx->id, thisx->params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_elevator.c", 136, thisx->id, + thisx->params); } } @@ -68,7 +68,7 @@ void ObjElevator_Init(Actor* thisx, PlayState* play) { temp_f0 = (thisx->params >> 8) & 0xF; this->unk_16C = temp_f0 + temp_f0; func_80B92C5C(this); - osSyncPrintf("(Dungeon Elevator)(arg_data 0x%04x)\n", thisx->params); + PRINTF("(Dungeon Elevator)(arg_data 0x%04x)\n", thisx->params); } void ObjElevator_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 18c2f7bd6f..edf6b71a69 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -61,8 +61,8 @@ void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_hsblock.c", 163, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_hsblock.c", 163, + this->dyna.actor.id, this->dyna.actor.params); } } diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index dc20f68921..9b2fe8884f 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -98,7 +98,7 @@ void ObjKibako_Init(Actor* thisx, PlayState* play) { CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sCCInfoInit); ObjKibako_SetupIdle(this); // "wooden box" - osSyncPrintf("(dungeon keep 木箱)(arg_data 0x%04x)\n", this->actor.params); + PRINTF("(dungeon keep 木箱)(arg_data 0x%04x)\n", this->actor.params); } void ObjKibako_Destroy(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 9c2b507a38..2954fb1717 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -131,8 +131,8 @@ void ObjKibako2_Init(Actor* thisx, PlayState* play) { this->dyna.actor.home.rot.z = this->dyna.actor.world.rot.z = this->dyna.actor.shape.rot.z = this->dyna.actor.world.rot.x = this->dyna.actor.shape.rot.x = 0; // "Wooden box (stationary)" - osSyncPrintf("木箱(据置)(arg %04xH)(item %04xH %d)\n", this->dyna.actor.params, this->collectibleFlag, - this->dyna.actor.home.rot.x); + PRINTF("木箱(据置)(arg %04xH)(item %04xH %d)\n", this->dyna.actor.params, this->collectibleFlag, + this->dyna.actor.home.rot.x); } void ObjKibako2_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 413b87aa66..63f6635a30 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -71,8 +71,8 @@ void ObjLift_InitDynaPoly(ObjLift* this, PlayState* play, CollisionHeader* colli this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_lift.c", 188, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_lift.c", 188, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -120,7 +120,7 @@ void ObjLift_Init(Actor* thisx, PlayState* play) { this->shakeOrientation.y = Rand_ZeroOne() * 65535.5f; this->shakeOrientation.z = Rand_ZeroOne() * 65535.5f; ObjLift_SetupWait(this); - osSyncPrintf("(Dungeon Lift)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(Dungeon Lift)(arg_data 0x%04x)\n", this->dyna.actor.params); } void ObjLift_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 21f5f4c228..e03527e4c7 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -188,11 +188,10 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) { if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_OBJ_OSHIHIKI, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, 0, this->actor.home.rot.y, 0, (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) { - osSyncPrintf(VT_COL(RED, WHITE)); + PRINTF(VT_COL(RED, WHITE)); // "Push-pull block occurrence failure" - osSyncPrintf("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_obj_lightswitch.c", 452, - this->actor.params); - osSyncPrintf(VT_RST); + PRINTF("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_obj_lightswitch.c", 452, this->actor.params); + PRINTF(VT_RST); removeSelf = true; } } @@ -202,7 +201,7 @@ void ObjLightswitch_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->actor); } // "Light switch" - osSyncPrintf("(光スイッチ)(arg_data 0x%04x)\n", this->actor.params); + PRINTF("(光スイッチ)(arg_data 0x%04x)\n", this->actor.params); } void ObjLightswitch_Destroy(Actor* thisx, PlayState* play2) { 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 2bee0cefa5..2e4abf070e 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -31,15 +31,15 @@ void ObjMakekinsuta_Init(Actor* thisx, PlayState* play) { ObjMakekinsuta* this = (ObjMakekinsuta*)thisx; if ((this->actor.params & 0x6000) == 0x4000) { - osSyncPrintf(VT_FGCOL(BLUE)); + PRINTF(VT_FGCOL(BLUE)); // "Gold Star Enemy(arg_data %x)" - osSyncPrintf("金スタ発生敵(arg_data %x)\n", this->actor.params); - osSyncPrintf(VT_RST); + PRINTF("金スタ発生敵(arg_data %x)\n", this->actor.params); + PRINTF(VT_RST); } else { - osSyncPrintf(VT_COL(YELLOW, BLACK)); + PRINTF(VT_COL(YELLOW, BLACK)); // "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); + PRINTF("引数不正 (arg_data %x)(%s %d)\n", this->actor.params, "../z_obj_makekinsuta.c", 119); + PRINTF(VT_RST); } this->actionFunc = func_80B98320; } diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 03f78ac331..98f5d45fbc 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -72,9 +72,9 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play) { if (Actor_SpawnAsChild(&play->actorCtx, thisx, play, ACTOR_OBJ_OSHIHIKI, spawnPos->x, spawnPos->y, spawnPos->z, 0, block->rotY, 0, ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) { // "Push-pull block failure" - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194); + PRINTF(VT_RST); Actor_Kill(thisx); return; } @@ -82,7 +82,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play) { ((ObjOshihiki*)thisx->child)->cantMove = true; } thisx->world.rot.z = thisx->shape.rot.z = 0; - osSyncPrintf("(%s)(arg_data %04xF)(angleZ %d)\n", "../z_obj_makeoshihiki.c", thisx->params, thisx->home.rot.z); + PRINTF("(%s)(arg_data %04xF)(angleZ %d)\n", "../z_obj_makeoshihiki.c", thisx->params, thisx->home.rot.z); } void ObjMakeoshihiki_Draw(Actor* thisx, PlayState* play) { 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 d52d8ca2d8..4968e8ec68 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -72,8 +72,8 @@ s32 ObjMure_SetCullingImpl(Actor* thisx, PlayState* play) { break; default: // "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); + PRINTF("Error : カリングの設定がされていません。(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 204, + this->actor.params); return false; } return result; @@ -95,11 +95,11 @@ void ObjMure_Init(Actor* thisx, PlayState* play) { this->type = thisx->params & 0x1F; if (this->ptn >= 4) { - osSyncPrintf("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 237, thisx->params); + PRINTF("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 237, thisx->params); Actor_Kill(&this->actor); return; } else if (this->type >= 5) { - osSyncPrintf("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 245, thisx->params); + PRINTF("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 245, thisx->params); Actor_Kill(&this->actor); return; } else if (!ObjMure_SetCulling(thisx, play)) { @@ -107,11 +107,10 @@ void ObjMure_Init(Actor* thisx, PlayState* play) { return; } this->actionFunc = ObjMure_InitialAction; - osSyncPrintf("群れな敵 (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n", thisx->params, this->chNum, - this->ptn, this->svNum, this->type); + PRINTF("群れな敵 (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n", thisx->params, this->chNum, this->ptn, + this->svNum, this->type); if (ObjMure_GetMaxChildSpawns(this) <= 0) { - osSyncPrintf("Warning : 個体数が設定されていません(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 268, - thisx->params); + PRINTF("Warning : 個体数が設定されていません(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 268, thisx->params); } } @@ -127,7 +126,7 @@ s32 ObjMure_GetMaxChildSpawns(ObjMure* this) { void ObjMure_GetSpawnPos(Vec3f* outPos, Vec3f* inPos, s32 ptn, s32 idx) { if (ptn >= 4) { - osSyncPrintf("おかしなの (%s %d)\n", "../z_obj_mure.c", 307); + PRINTF("おかしなの (%s %d)\n", "../z_obj_mure.c", 307); } *outPos = *inPos; } @@ -142,8 +141,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { for (i = 0; i < maxChildren; i++) { if (this->children[i] != NULL) { // "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); + PRINTF("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 333, this->actor.params); } switch (this->childrenStates[i]) { case OBJMURE_CHILD_STATE_1: @@ -158,7 +156,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { this->children[i]->flags |= ACTOR_FLAG_ENKUSA_CUT; this->children[i]->room = this->actor.room; } else { - osSyncPrintf("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 359); + PRINTF("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 359); } break; default: @@ -170,7 +168,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { if (this->children[i] != NULL) { this->children[i]->room = this->actor.room; } else { - osSyncPrintf("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 382); + PRINTF("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 382); } break; } @@ -186,7 +184,7 @@ void ObjMure_SpawnActors1(ObjMure* this, PlayState* play) { for (i = 0; i < maxChildren; i++) { if (this->children[i] != NULL) { - osSyncPrintf("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 407, actor->params); + PRINTF("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 407, actor->params); } ac = &play->actorCtx; ObjMure_GetSpawnPos(&spawnPos, &actor->world.pos, this->ptn, i); @@ -198,7 +196,7 @@ void ObjMure_SpawnActors1(ObjMure* this, PlayState* play) { this->children[i]->room = actor->room; } else { this->childrenStates[i] = OBJMURE_CHILD_STATE_1; - osSyncPrintf("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 438); + PRINTF("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 438); } } } 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 d58be08026..21c3ca6eb4 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -112,8 +112,7 @@ void ObjMure2_SpawnActors(ObjMure2* this, PlayState* play) { for (i = 0; i < D_80B9A818[actorNum]; i++) { if (this->actorSpawnPtrList[i] != NULL) { // "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); + PRINTF("Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure2.c", 269, this->actor.params); continue; } diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 960ff58659..b8b6fbcf2f 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -95,8 +95,8 @@ void ObjOshihiki_InitDynapoly(ObjOshihiki* this, PlayState* play, CollisionHeade if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG registration failure" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 280, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 280, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -213,8 +213,8 @@ void ObjOshihiki_CheckType(ObjOshihiki* this, PlayState* play) { break; default: // "Error : type cannot be determined" - osSyncPrintf("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 444, - this->dyna.actor.params); + PRINTF("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 444, + this->dyna.actor.params); break; } } @@ -258,7 +258,7 @@ void ObjOshihiki_SetColor(ObjOshihiki* this, PlayState* play) { if (i >= ARRAY_COUNT(sColors)) { // "Error : scene_data_ID cannot be determined" - osSyncPrintf("Error : scene_data_ID が判別できない。(%s %d)\n", "../z_obj_oshihiki.c", 579); + PRINTF("Error : scene_data_ID が判別できない。(%s %d)\n", "../z_obj_oshihiki.c", 579); color->r = color->g = color->b = 255; } else { src = &sColors[i][paramsColorIdx]; @@ -304,7 +304,7 @@ void ObjOshihiki_Init(Actor* thisx, PlayState* play2) { ObjOshihiki_ResetFloors(this); ObjOshihiki_SetupOnActor(this, play); // "(dungeon keep push-pull block)" - osSyncPrintf("(dungeon keep 押し引きブロック)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(dungeon keep 押し引きブロック)(arg_data 0x%04x)\n", this->dyna.actor.params); } void ObjOshihiki_Destroy(Actor* thisx, PlayState* play) { @@ -375,8 +375,8 @@ s32 ObjOshihiki_CheckFloor(ObjOshihiki* this, PlayState* play) { s32 ObjOshihiki_CheckGround(ObjOshihiki* this, PlayState* play) { if (this->dyna.actor.world.pos.y <= BGCHECK_Y_MIN + 10.0f) { // "Warning : Push-pull block fell too much" - osSyncPrintf("Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 809, - this->dyna.actor.params); + PRINTF("Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 809, + this->dyna.actor.params); Actor_Kill(&this->dyna.actor); return 0; } diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index c8203ac698..089c781641 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -200,8 +200,8 @@ void ObjSwitch_InitDynaPoly(ObjSwitch* this, PlayState* play, CollisionHeader* c if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG registration failure" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_switch.c", 531, - this->dyna.actor.id, this->dyna.actor.params); + PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_switch.c", 531, + this->dyna.actor.id, this->dyna.actor.params); } } @@ -321,9 +321,9 @@ void ObjSwitch_Init(Actor* thisx, PlayState* play) { this->dyna.actor.colChkInfo.mass = MASS_IMMOVABLE; if (OBJSWITCH_FROZEN(&this->dyna.actor) && (ObjSwitch_SpawnIce(this, play) == NULL)) { - osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Error : 氷発生失敗 (%s %d)\n", "../z_obj_switch.c", 732); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(RED)); + PRINTF("Error : 氷発生失敗 (%s %d)\n", "../z_obj_switch.c", 732); + PRINTF(VT_RST); this->dyna.actor.params &= ~OBJSWITCH_FROZEN_FLAG; } @@ -351,7 +351,7 @@ void ObjSwitch_Init(Actor* thisx, PlayState* play) { } } - osSyncPrintf("(Dungeon switch)(arg_data 0x%04x)\n", this->dyna.actor.params); + PRINTF("(Dungeon switch)(arg_data 0x%04x)\n", this->dyna.actor.params); } void ObjSwitch_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index f5b41cc439..a081e363c2 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -134,9 +134,9 @@ void ObjTimeblock_Init(Actor* thisx, PlayState* play) { } // "Block of time" - osSyncPrintf("時のブロック ( %04xH save:%d color:%d range:%d move:%d)\n", (u16)this->dyna.actor.params, - this->unk_177, this->dyna.actor.home.rot.z & 7, (this->dyna.actor.params >> 11) & 7, - (this->dyna.actor.params >> 10) & 1); + PRINTF("時のブロック ( %04xH save:%d color:%d range:%d move:%d)\n", (u16)this->dyna.actor.params, + this->unk_177, this->dyna.actor.home.rot.z & 7, (this->dyna.actor.params >> 11) & 7, + (this->dyna.actor.params >> 10) & 1); } void ObjTimeblock_Destroy(Actor* thisx, PlayState* play) { @@ -218,7 +218,7 @@ void ObjTimeblock_Normal(ObjTimeblock* this, PlayState* play) { // Possibly points the camera to this actor OnePointCutscene_Attention(play, &this->dyna.actor); // "◯◯◯◯ Time Block Attention Camera (frame counter %d)\n" - osSyncPrintf("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", play->state.frames); + PRINTF("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", play->state.frames); this->demoEffectFirstPartTimer = 12; @@ -276,7 +276,7 @@ void ObjTimeblock_AltBehaviorVisible(ObjTimeblock* this, PlayState* play) { this->demoEffectTimer = 160; OnePointCutscene_Attention(play, &this->dyna.actor); // "Time Block Attention Camera (frame counter)" - osSyncPrintf("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", play->state.frames); + PRINTF("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", play->state.frames); ObjTimeblock_ToggleSwitchFlag(play, this->dyna.actor.params & 0x3F); } diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index e99e3a673d..0096e67318 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -112,7 +112,7 @@ s32 ObjTsubo_SnapToFloor(ObjTsubo* this, PlayState* play) { Math_Vec3f_Copy(&this->actor.home.pos, &this->actor.world.pos); return true; } else { - osSyncPrintf("地面に付着失敗\n"); + PRINTF("地面に付着失敗\n"); return false; } } @@ -137,11 +137,11 @@ void ObjTsubo_Init(Actor* thisx, PlayState* play) { } this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[(this->actor.params >> 8) & 1]); if (this->requiredObjectSlot < 0) { - osSyncPrintf("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_obj_tsubo.c", 410); + PRINTF("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_obj_tsubo.c", 410); Actor_Kill(&this->actor); } else { ObjTsubo_SetupWaitForObject(this); - osSyncPrintf("(dungeon keep 壷)(arg_data 0x%04x)\n", this->actor.params); + PRINTF("(dungeon keep 壷)(arg_data 0x%04x)\n", this->actor.params); } } diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index df2a727f7d..76d6eff609 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -219,8 +219,8 @@ void ObjWarp2block_Init(Actor* thisx, PlayState* play2) { ObjWarp2block_SetInactive(this); } - osSyncPrintf("時のブロック(ワープ２) ( %04xH color:%d range:%d)\n", this->dyna.actor.params & 0xFFFF, - this->dyna.actor.home.rot.z & 7, (this->dyna.actor.params >> 0xB) & 7); + PRINTF("時のブロック(ワープ２) ( %04xH color:%d range:%d)\n", this->dyna.actor.params & 0xFFFF, + this->dyna.actor.home.rot.z & 7, (this->dyna.actor.params >> 0xB) & 7); } void ObjWarp2block_Destroy(Actor* thisx, PlayState* play) { @@ -262,9 +262,9 @@ void func_80BA24F8(ObjWarp2block* this, PlayState* play) { this->unk_174++; if (this->unk_174 > 60) { - osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n", "../z_obj_warp2block.c", 505); - osSyncPrintf(VT_RST); + PRINTF(VT_COL(RED, WHITE)); + PRINTF("Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n", "../z_obj_warp2block.c", 505); + PRINTF(VT_RST); Actor_Kill(&this->dyna.actor); } } diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 59a43a19d5..4220f879e4 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -85,17 +85,17 @@ void OceffSpot_End(OceffSpot* this, PlayState* play) { if (play->msgCtx.ocarinaAction != OCARINA_ACTION_CHECK_NOWARP_DONE || play->msgCtx.ocarinaMode != OCARINA_MODE_08) { gSaveContext.sunsSongState = SUNSSONG_START; - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "Sun's Song Flag" - osSyncPrintf("z_oceff_spot 太陽の歌フラグ\n"); - osSyncPrintf(VT_RST); + PRINTF("z_oceff_spot 太陽の歌フラグ\n"); + PRINTF(VT_RST); } } else { play->msgCtx.ocarinaMode = OCARINA_MODE_04; - osSyncPrintf(VT_FGCOL(YELLOW)); + PRINTF(VT_FGCOL(YELLOW)); // "Ocarina End" - osSyncPrintf("z_oceff_spot オカリナ終了\n"); - osSyncPrintf(VT_RST); + PRINTF("z_oceff_spot オカリナ終了\n"); + PRINTF(VT_RST); } } } diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 1d3dd164fa..27373e2b76 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -32,7 +32,7 @@ void OceffWipe_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.1f); this->timer = 0; this->actor.world.pos = GET_ACTIVE_CAM(play)->eye; - osSyncPrintf(VT_FGCOL(CYAN) " WIPE arg_data = %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(CYAN) " WIPE arg_data = %d\n" VT_RST, this->actor.params); } void OceffWipe_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 23b54709a2..1f659aa1d3 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -32,7 +32,7 @@ void OceffWipe2_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.1f); this->timer = 0; this->actor.world.pos = GET_ACTIVE_CAM(play)->eye; - osSyncPrintf(VT_FGCOL(CYAN) " WIPE2 arg_data = %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(CYAN) " WIPE2 arg_data = %d\n" VT_RST, this->actor.params); } void OceffWipe2_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 07f8e37855..f9fdd00cb5 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -35,7 +35,7 @@ void OceffWipe3_Init(Actor* thisx, PlayState* play) { this->counter = 0; this->actor.world.pos = GET_ACTIVE_CAM(play)->eye; // it's actually WIPE3... - osSyncPrintf(VT_FGCOL(CYAN) " WIPE2 arg_data = %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(CYAN) " WIPE2 arg_data = %d\n" VT_RST, this->actor.params); } void OceffWipe3_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 0e40c6181a..954992a60f 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -32,7 +32,7 @@ void OceffWipe4_Init(Actor* thisx, PlayState* play) { Actor_SetScale(&this->actor, 0.1f); this->timer = 0; this->actor.world.pos = GET_ACTIVE_CAM(play)->eye; - osSyncPrintf(VT_FGCOL(CYAN) " WIPE4 arg_data = %d\n" VT_RST, this->actor.params); + PRINTF(VT_FGCOL(CYAN) " WIPE4 arg_data = %d\n" VT_RST, this->actor.params); } void OceffWipe4_Destroy(Actor* thisx, PlayState* play) { 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 c83c870ec7..6bb83051e6 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -64,7 +64,7 @@ void ShotSun_Init(Actor* thisx, PlayState* play) { s32 params; // "Ocarina secret occurrence" - osSyncPrintf("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", this->actor.params); + PRINTF("%d ---- オカリナの秘密発生!!!!!!!!!!!!!\n", this->actor.params); params = this->actor.params & 0xFF; if (params == 0x40 || params == 0x41) { this->fairySpawnerState = SPAWNER_OUT_OF_RANGE; @@ -167,7 +167,7 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); - osSyncPrintf(VT_FGCOL(CYAN) "SHOT_SUN HIT!!!!!!!\n" VT_RST); + PRINTF(VT_FGCOL(CYAN) "SHOT_SUN HIT!!!!!!!\n" VT_RST); if (INV_CONTENT(ITEM_ARROW_FIRE) == ITEM_NONE) { Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_ETCETERA, 700.0f, -800.0f, 7261.0f, 0, 0, 0, 7); play->csCtx.script = SEGMENTED_TO_VIRTUAL(gLakeHyliaFireArrowsCS); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index b9fce8f4e9..e50810babb 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -15149,7 +15149,7 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorCue* cueUnused) { D_80858AA0 = this->skelAnime.moveFlags; func_80832DBC(this); - osSyncPrintf("TOOL MODE=%d\n", csAction); + PRINTF("TOOL MODE=%d\n", csAction); func_80852C0C(play, this, ABS(csAction)); func_80852B4C(play, this, cue, &D_80854B18[ABS(csAction)]); @@ -15168,7 +15168,7 @@ void Player_Action_CsAction(Player* this, PlayState* play) { func_80832DBC(this); this->prevCsAction = this->csAction; - osSyncPrintf("DEMO MODE=%d\n", this->csAction); + PRINTF("DEMO MODE=%d\n", this->csAction); func_80852C0C(play, this, this->csAction); func_80852B4C(play, this, NULL, &D_80854B18[this->csAction]); } diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index 955697d1d3..a0cfd80c39 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -82,7 +82,7 @@ u32 EffectSsDeadDd_Init(PlayState* play, u32 index, EffectSs* this, void* initPa this->accel.z = this->velocity.z = (Rand_ZeroOne() - 0.5f) * 2.0f; } } else { - osSyncPrintf("Effect_SS_Dd_disp_mode():mode_swが変です。\n"); + PRINTF("Effect_SS_Dd_disp_mode():mode_swが変です。\n"); return 0; } 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 696fe684f9..dae17d0ff2 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,7 +29,7 @@ u32 EffectSsDeadSound_Init(PlayState* play, u32 index, EffectSs* this, void* ini this->update = EffectSsDeadSound_Update; this->rRepeatMode = initParams->repeatMode; this->rSfxId = initParams->sfxId; - osSyncPrintf("コンストラクター3\n"); // "constructor 3" + PRINTF("コンストラクター3\n"); // "constructor 3" return 1; } diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 931a41602d..16ea95d8de 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -78,7 +78,7 @@ u32 EffectSsEnIce_Init(PlayState* play, u32 index, EffectSs* this, void* initPar this->rEnvColorB = initParams->envColor.b; this->rAlphaMode = 0; } else { - osSyncPrintf("Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n"); + PRINTF("Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n"); return 0; } diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index 403438a231..186ed88766 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -56,7 +56,7 @@ u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* init this->gfx = SEGMENTED_TO_VIRTUAL(gPhantomEnergyBallDL); gSegments[6] = prevSeg6; } else { - osSyncPrintf("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n"); + PRINTF("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n"); return 0; } } else { diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index 982ece70df..89bd579292 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -45,7 +45,7 @@ u32 EffectSsIceSmoke_Init(PlayState* play, u32 index, EffectSs* this, void* init return 1; } - osSyncPrintf("Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n"); + PRINTF("Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n"); return 0; } diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index c8acb10b6e..b466818adc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -53,7 +53,7 @@ u32 EffectSsKakera_Init(PlayState* play, u32 index, EffectSs* this, void* initPa } } else { - osSyncPrintf("shape_modelがNULL\n"); + PRINTF("shape_modelがNULL\n"); LogUtils_HungupThread("../z_eff_kakera.c", 178); } @@ -79,7 +79,7 @@ f32 func_809A9818(f32 arg0, f32 arg1) { f32 temp_f2; if (arg1 < 0.0f) { - osSyncPrintf("範囲がマイナス！！(randomD_sectionUniformity)\n"); + PRINTF("範囲がマイナス！！(randomD_sectionUniformity)\n"); } temp_f2 = Rand_ZeroOne() * arg1; diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index c32ee81be4..2ae447fe55 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -59,9 +59,9 @@ void FileSelect_InitModeUpdate(GameState* thisx) { this->menuMode = FS_MENU_MODE_CONFIG; this->configMode = CM_FADE_IN_START; this->nextTitleLabel = FS_TITLE_OPEN_FILE; - osSyncPrintf("Ｓｒａｍ Ｓｔａｒｔ─Ｌｏａｄ 》》》》》 "); + PRINTF("Ｓｒａｍ Ｓｔａｒｔ─Ｌｏａｄ 》》》》》 "); Sram_VerifyAndLoadAllSaves(this, &this->sramCtx); - osSyncPrintf("終了！！！\n"); + PRINTF("終了！！！\n"); } } @@ -176,10 +176,10 @@ void FileSelect_UpdateMainMenu(GameState* thisx) { if (CHECK_BTN_ALL(input->press.button, BTN_START) || CHECK_BTN_ALL(input->press.button, BTN_A)) { if (this->buttonIndex <= FS_BTN_MAIN_FILE_3) { - osSyncPrintf("REGCK_ALL[%x]=%x,%x,%x,%x,%x,%x\n", this->buttonIndex, - GET_NEWF(sramCtx, this->buttonIndex, 0), GET_NEWF(sramCtx, this->buttonIndex, 1), - GET_NEWF(sramCtx, this->buttonIndex, 2), GET_NEWF(sramCtx, this->buttonIndex, 3), - GET_NEWF(sramCtx, this->buttonIndex, 4), GET_NEWF(sramCtx, this->buttonIndex, 5)); + PRINTF("REGCK_ALL[%x]=%x,%x,%x,%x,%x,%x\n", this->buttonIndex, GET_NEWF(sramCtx, this->buttonIndex, 0), + GET_NEWF(sramCtx, this->buttonIndex, 1), GET_NEWF(sramCtx, this->buttonIndex, 2), + GET_NEWF(sramCtx, this->buttonIndex, 3), GET_NEWF(sramCtx, this->buttonIndex, 4), + GET_NEWF(sramCtx, this->buttonIndex, 5)); if (!SLOT_OCCUPIED(sramCtx, this->buttonIndex)) { Audio_PlaySfxGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -387,39 +387,39 @@ void FileSelect_PulsateCursor(GameState* thisx) { *((u8*)0x80000002) = LANGUAGE_ENG; SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, 3, OS_WRITE); - osSyncPrintf("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], - sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], - sramCtx->readBuff[SRAM_HEADER_MAGIC]); + PRINTF("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], + sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], + sramCtx->readBuff[SRAM_HEADER_MAGIC]); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_READ); - osSyncPrintf("read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], - sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], - sramCtx->readBuff[SRAM_HEADER_MAGIC]); + PRINTF("read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], + sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], + sramCtx->readBuff[SRAM_HEADER_MAGIC]); } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DUP)) { sramCtx->readBuff[SRAM_HEADER_LANGUAGE] = gSaveContext.language = LANGUAGE_GER; *((u8*)0x80000002) = LANGUAGE_GER; SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, 3, OS_WRITE); - osSyncPrintf("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], - sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], - sramCtx->readBuff[SRAM_HEADER_MAGIC]); + PRINTF("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], + sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], + sramCtx->readBuff[SRAM_HEADER_MAGIC]); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_READ); - osSyncPrintf("read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], - sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], - sramCtx->readBuff[SRAM_HEADER_MAGIC]); + PRINTF("read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], + sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], + sramCtx->readBuff[SRAM_HEADER_MAGIC]); } else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DRIGHT)) { sramCtx->readBuff[SRAM_HEADER_LANGUAGE] = gSaveContext.language = LANGUAGE_FRA; *((u8*)0x80000002) = LANGUAGE_FRA; SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, 3, OS_WRITE); - osSyncPrintf("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], - sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], - sramCtx->readBuff[SRAM_HEADER_MAGIC]); + PRINTF("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], + sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], + sramCtx->readBuff[SRAM_HEADER_MAGIC]); SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_SIZE, OS_READ); - osSyncPrintf("read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], - sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], - sramCtx->readBuff[SRAM_HEADER_MAGIC]); + PRINTF("read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND], + sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE], + sramCtx->readBuff[SRAM_HEADER_MAGIC]); } alphaStep = ABS(this->highlightColor[3] - cursorAlphaTargets[this->highlightPulseDir]) / XREG(35); @@ -1495,10 +1495,10 @@ void FileSelect_LoadGame(GameState* thisx) { // capacity and `magicFillTarget` gSaveContext.save.info.playerData.magicLevel = gSaveContext.save.info.playerData.magic = 0; - osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("Z_MAGIC_NOW_NOW=%d MAGIC_NOW=%d\n", ((void)0, gSaveContext.magicFillTarget), - gSaveContext.save.info.playerData.magic); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(GREEN)); + PRINTF("Z_MAGIC_NOW_NOW=%d MAGIC_NOW=%d\n", ((void)0, gSaveContext.magicFillTarget), + gSaveContext.save.info.playerData.magic); + PRINTF(VT_RST); gSaveContext.save.info.playerData.naviTimer = 0; @@ -1877,7 +1877,7 @@ void FileSelect_Init(GameState* thisx) { s32 pad; SREG(30) = 1; - osSyncPrintf("SIZE=%x\n", size); + PRINTF("SIZE=%x\n", size); this->staticSegment = GAME_STATE_ALLOC(&this->state, size, "../z_file_choose.c", 3392); ASSERT(this->staticSegment != NULL, "this->staticSegment != NULL", "../z_file_choose.c", 3393); diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index 19be72b62f..827aca8a1c 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -455,8 +455,8 @@ void FileSelect_CopyAnim1(GameState* thisx) { this->titleAlpha[0] = 0; this->actionTimer = 8; this->configMode++; - osSyncPrintf("connect_alpha=%d decision_alpha[%d]=%d\n", this->connectorAlpha[this->copyDestFileIndex], - this->copyDestFileIndex, this->fileInfoAlpha[this->copyDestFileIndex]); + PRINTF("connect_alpha=%d decision_alpha[%d]=%d\n", this->connectorAlpha[this->copyDestFileIndex], + this->copyDestFileIndex, this->fileInfoAlpha[this->copyDestFileIndex]); } } diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index 07c0900bbd..766c42c766 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -283,7 +283,7 @@ void FileSelect_DrawNameEntry(GameState* thisx) { if ((this->kbdButton == FS_KBD_BTN_HIRA) || (this->kbdButton == FS_KBD_BTN_KATA) || (this->kbdButton == FS_KBD_BTN_END)) { if (this->kbdX != this->kbdButton) { - osSyncPrintf("014 xpos=%d contents=%d\n", this->kbdX, this->kbdButton); + PRINTF("014 xpos=%d contents=%d\n", this->kbdX, this->kbdButton); } this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = D_80811BB0[(this->kbdX + 1) * 4].v.ob[0] - 4; this->nameEntryVtx[41].v.ob[0] = this->nameEntryVtx[43].v.ob[0] = this->nameEntryVtx[40].v.ob[0] + 52; @@ -291,15 +291,15 @@ void FileSelect_DrawNameEntry(GameState* thisx) { } else if ((this->kbdButton == FS_KBD_BTN_ENG) || (this->kbdButton == FS_KBD_BTN_BACKSPACE)) { if (this->kbdX != this->kbdButton) { - osSyncPrintf("23 xpos=%d contents=%d\n", this->kbdX, this->kbdButton); + PRINTF("23 xpos=%d contents=%d\n", this->kbdX, this->kbdButton); } this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = D_80811BB0[(this->kbdX + 1) * 4].v.ob[0] - 4; this->nameEntryVtx[41].v.ob[0] = this->nameEntryVtx[43].v.ob[0] = this->nameEntryVtx[40].v.ob[0] + 40; this->nameEntryVtx[40].v.ob[1] = this->nameEntryVtx[41].v.ob[1] = D_80811BB0[(this->kbdX + 1) * 4].v.ob[1] + 4; } else { if (this->charIndex >= 65) { - osSyncPrintf("mjp=%d xpos=%d ypos=%d name_contents=%d\n", this->charIndex, this->kbdX, this->kbdY, - this->kbdButton); + PRINTF("mjp=%d xpos=%d ypos=%d name_contents=%d\n", this->charIndex, this->kbdX, this->kbdY, + this->kbdButton); } this->nameEntryVtx[40].v.ob[0] = this->nameEntryVtx[42].v.ob[0] = @@ -672,17 +672,17 @@ void FileSelect_UpdateOptionsMenu(GameState* thisx) { this->configMode = CM_OPTIONS_TO_MAIN; sramCtx->readBuff[0] = gSaveContext.audioSetting; sramCtx->readBuff[1] = gSaveContext.zTargetSetting; - osSyncPrintf("ＳＡＶＥ"); + PRINTF("ＳＡＶＥ"); Sram_WriteSramHeader(sramCtx); - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("sram->read_buff[2] = J_N = %x\n", sramCtx->readBuff[2]); - osSyncPrintf("sram->read_buff[2] = J_N = %x\n", &sramCtx->readBuff[2]); - osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); - osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); - osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("sram->read_buff[2] = J_N = %x\n", sramCtx->readBuff[2]); + PRINTF("sram->read_buff[2] = J_N = %x\n", &sramCtx->readBuff[2]); + PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); + PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); + PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); + PRINTF(VT_RST); func_800F6700(gSaveContext.audioSetting); - osSyncPrintf("終了\n"); + PRINTF("終了\n"); return; } diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 7dcc4f0f23..144be13e1f 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -15,9 +15,9 @@ void MapSelect_LoadTitle(MapSelectState* this) { } void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) { - osSyncPrintf(VT_FGCOL(BLUE)); - osSyncPrintf("\n\n\nＦＩＬＥ＿ＮＯ＝%x\n\n\n", gSaveContext.fileNum); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(BLUE)); + PRINTF("\n\n\nＦＩＬＥ＿ＮＯ＝%x\n\n\n", gSaveContext.fileNum); + PRINTF(VT_RST); if (gSaveContext.fileNum == 0xFF) { Sram_InitDebugSave(); // Set the fill target to be the saved magic amount @@ -704,9 +704,9 @@ void MapSelect_Main(GameState* thisx) { } void MapSelect_Destroy(GameState* thisx) { - osSyncPrintf("%c", BEL); + PRINTF("%c", BEL); // "view_cleanup will hang, so it won't be called" - osSyncPrintf("*** view_cleanupはハングアップするので、呼ばない ***\n"); + PRINTF("*** view_cleanupはハングアップするので、呼ばない ***\n"); } void MapSelect_Init(GameState* thisx) { diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index c29750e1e9..056cdf4443 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -158,7 +158,7 @@ void ConsoleLogo_Init(GameState* thisx) { ConsoleLogoState* this = (ConsoleLogoState*)thisx; this->staticSegment = GAME_STATE_ALLOC(&this->state, size, "../z_title.c", 611); - osSyncPrintf("z_title.c\n"); + PRINTF("z_title.c\n"); ASSERT(this->staticSegment != NULL, "this->staticSegment != NULL", "../z_title.c", 614); DMA_REQUEST_SYNC(this->staticSegment, (uintptr_t)_nintendo_rogo_staticSegmentRomStart, size, "../z_title.c", 615); R_UPDATE_RATE = 1; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index bad87200ab..a372bdf153 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -148,19 +148,18 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { if (CHECK_QUEST_ITEM(pauseCtx->cursorPoint[PAUSE_QUEST])) { if (pauseCtx->cursorPoint[PAUSE_QUEST] < 6) { cursorItem = ITEM_MEDALLION_FOREST + pauseCtx->cursorPoint[PAUSE_QUEST]; - osSyncPrintf("000 ccc=%d\n", cursorItem); + PRINTF("000 ccc=%d\n", cursorItem); } else if (pauseCtx->cursorPoint[PAUSE_QUEST] < 0x12) { cursorItem = ITEM_SCALE_GOLDEN + pauseCtx->cursorPoint[PAUSE_QUEST]; - osSyncPrintf("111 ccc=%d\n", cursorItem); + PRINTF("111 ccc=%d\n", cursorItem); } else { cursorItem = ITEM_SONG_MINUET + pauseCtx->cursorPoint[PAUSE_QUEST]; - osSyncPrintf("222 ccc=%d (%d, %d, %d)\n", cursorItem, pauseCtx->cursorPoint[PAUSE_QUEST], - 0x12, 0x6C); + PRINTF("222 ccc=%d (%d, %d, %d)\n", cursorItem, pauseCtx->cursorPoint[PAUSE_QUEST], 0x12, + 0x6C); } } else { cursorItem = PAUSE_ITEM_NONE; - osSyncPrintf("999 ccc=%d (%d, %d)\n", PAUSE_ITEM_NONE, pauseCtx->cursorPoint[PAUSE_QUEST], - 0x18); + PRINTF("999 ccc=%d (%d, %d)\n", PAUSE_ITEM_NONE, pauseCtx->cursorPoint[PAUSE_QUEST], 0x18); } } else { if ((gSaveContext.save.info.inventory.questItems & 0xF0000000) != 0) { @@ -168,8 +167,8 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { } else { cursorItem = PAUSE_ITEM_NONE; } - osSyncPrintf("888 ccc=%d (%d, %d, %x)\n", cursorItem, pauseCtx->cursorPoint[PAUSE_QUEST], - ITEM_HEART_CONTAINER, gSaveContext.save.info.inventory.questItems & 0xF0000000); + PRINTF("888 ccc=%d (%d, %d, %x)\n", cursorItem, pauseCtx->cursorPoint[PAUSE_QUEST], + ITEM_HEART_CONTAINER, gSaveContext.save.info.inventory.questItems & 0xF0000000); } sp216 = pauseCtx->cursorPoint[PAUSE_QUEST]; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index 90c740027e..3c0bc39a5b 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -533,7 +533,7 @@ void KaleidoScope_DrawDebugEditor(PlayState* play) { } } else { j = sSlotItems[i]; - osSyncPrintf("i=%d j=%d\n", i, j); + PRINTF("i=%d j=%d\n", i, j); if (gSaveContext.save.info.inventory.items[i] == ITEM_NONE) { gSaveContext.save.info.inventory.items[i] = j; } else { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 3dd50e6fa9..e5a3a9918a 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -407,7 +407,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { } else { cursorItem = ITEM_QUIVER_30 + sUpgradeItemOffsets[pauseCtx->cursorY[PAUSE_EQUIP]] + CUR_UPG_VALUE(pauseCtx->cursorY[PAUSE_EQUIP]) - 1; - osSyncPrintf("H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem); + PRINTF("H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem); } } else { if ((pauseCtx->cursorY[PAUSE_EQUIP] == 0) && (CUR_UPG_VALUE(UPG_QUIVER) == 0)) { @@ -415,12 +415,12 @@ void KaleidoScope_DrawEquipment(PlayState* play) { } else { cursorItem = ITEM_QUIVER_30 + sUpgradeItemOffsets[pauseCtx->cursorY[PAUSE_EQUIP]] + CUR_UPG_VALUE(pauseCtx->cursorY[PAUSE_EQUIP]) - 1; - osSyncPrintf("大人 H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem); + PRINTF("大人 H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem); } } } else { cursorItem = ITEM_SWORD_KOKIRI + sEquipmentItemOffsets[pauseCtx->cursorPoint[PAUSE_EQUIP]]; - osSyncPrintf("ccc=%d\n", cursorItem); + PRINTF("ccc=%d\n", cursorItem); if (pauseCtx->cursorSpecialPos == 0) { pauseCtx->cursorColorSet = 8; @@ -440,7 +440,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { pauseCtx->cursorItem[PAUSE_EQUIP] = cursorItem; pauseCtx->cursorSlot[PAUSE_EQUIP] = cursorSlot; - osSyncPrintf("kscope->select_name[Display_Equipment] = %d\n", pauseCtx->cursorItem[PAUSE_EQUIP]); + PRINTF("kscope->select_name[Display_Equipment] = %d\n", pauseCtx->cursorItem[PAUSE_EQUIP]); if (!CHECK_AGE_REQ_EQUIP(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP])) { pauseCtx->nameColorSet = 1; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 7a0c995036..090fa4114c 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -123,7 +123,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { cursorX = pauseCtx->cursorX[PAUSE_ITEM]; cursorY = pauseCtx->cursorY[PAUSE_ITEM]; - osSyncPrintf("now=%d ccc=%d\n", cursorPoint, cursorItem); + PRINTF("now=%d ccc=%d\n", cursorPoint, cursorItem); // Seems necessary to match if (pauseCtx->cursorX[PAUSE_ITEM]) {} @@ -203,9 +203,9 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { cursorItem = gSaveContext.save.info.inventory.items[pauseCtx->cursorPoint[PAUSE_ITEM]]; } - osSyncPrintf("【Ｘ cursor=%d(%) (cur_xpt=%d)(ok_fg=%d)(ccc=%d)(key_angle=%d)】 ", - pauseCtx->cursorPoint[PAUSE_ITEM], pauseCtx->cursorX[PAUSE_ITEM], moveCursorResult, - cursorItem, pauseCtx->cursorSpecialPos); + PRINTF("【Ｘ cursor=%d(%) (cur_xpt=%d)(ok_fg=%d)(ccc=%d)(key_angle=%d)】 ", + pauseCtx->cursorPoint[PAUSE_ITEM], pauseCtx->cursorX[PAUSE_ITEM], moveCursorResult, cursorItem, + pauseCtx->cursorSpecialPos); } } else if (pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) { if (pauseCtx->stickAdjX > 30) { @@ -322,9 +322,8 @@ void KaleidoScope_DrawItemSelect(PlayState* play) { } cursorPoint = PAUSE_ITEM; - osSyncPrintf("【Ｙ cursor=%d(%) (cur_ypt=%d)(ok_fg=%d)(ccc=%d)】 ", - pauseCtx->cursorPoint[cursorPoint], pauseCtx->cursorY[PAUSE_ITEM], moveCursorResult, - cursorItem); + PRINTF("【Ｙ cursor=%d(%) (cur_ypt=%d)(ok_fg=%d)(ccc=%d)】 ", pauseCtx->cursorPoint[cursorPoint], + pauseCtx->cursorY[PAUSE_ITEM], moveCursorResult, cursorItem); } } @@ -588,7 +587,7 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { return; } - osSyncPrintf("\n＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝\n"); + PRINTF("\n＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝\n"); if (pauseCtx->equipTargetCBtn == 0) { @@ -655,21 +654,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { gSaveContext.save.info.equips.cButtonSlots[0] = pauseCtx->equipTargetSlot; Interface_LoadItemIcon1(play, 1); - osSyncPrintf("Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - osSyncPrintf("Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], - gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF("Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, + gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], + gSaveContext.save.info.equips.buttonItems[3]); + PRINTF("Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, + gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], + gSaveContext.save.info.equips.cButtonSlots[2]); } else if (pauseCtx->equipTargetCBtn == 1) { - osSyncPrintf("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - osSyncPrintf("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], - gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, + gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], + gSaveContext.save.info.equips.buttonItems[3]); + PRINTF("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, + gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], + gSaveContext.save.info.equips.cButtonSlots[2]); if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) { if (gSaveContext.save.info.equips.buttonItems[2] != ITEM_NONE) { @@ -732,21 +729,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { gSaveContext.save.info.equips.cButtonSlots[1] = pauseCtx->equipTargetSlot; Interface_LoadItemIcon1(play, 2); - osSyncPrintf("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - osSyncPrintf("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], - gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, + gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], + gSaveContext.save.info.equips.buttonItems[3]); + PRINTF("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, + gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], + gSaveContext.save.info.equips.cButtonSlots[2]); } else { - osSyncPrintf("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - osSyncPrintf("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], - gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, + gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], + gSaveContext.save.info.equips.buttonItems[3]); + PRINTF("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, + gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], + gSaveContext.save.info.equips.cButtonSlots[2]); if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) { if (gSaveContext.save.info.equips.buttonItems[3] != ITEM_NONE) { @@ -809,13 +804,12 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) { gSaveContext.save.info.equips.cButtonSlots[2] = pauseCtx->equipTargetSlot; Interface_LoadItemIcon1(play, 3); - osSyncPrintf("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, - gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], - gSaveContext.save.info.equips.buttonItems[3]); - osSyncPrintf("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, - gSaveContext.save.info.equips.cButtonSlots[0], - gSaveContext.save.info.equips.cButtonSlots[1], - gSaveContext.save.info.equips.cButtonSlots[2]); + PRINTF("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, + gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], + gSaveContext.save.info.equips.buttonItems[3]); + PRINTF("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, + gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], + gSaveContext.save.info.equips.cButtonSlots[2]); } pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c index 91ed62d4b8..5bf7b93d4e 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c @@ -74,7 +74,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) { } else { pauseCtx->cursorX[PAUSE_MAP] = 0; pauseCtx->cursorPoint[PAUSE_MAP] = pauseCtx->dungeonMapSlot; - osSyncPrintf("kscope->cursor_point=%d\n", pauseCtx->cursorPoint[PAUSE_MAP]); + PRINTF("kscope->cursor_point=%d\n", pauseCtx->cursorPoint[PAUSE_MAP]); R_MAP_TEX_INDEX = R_MAP_TEX_INDEX_BASE + gMapData->floorTexIndexOffset[gSaveContext.mapIndex][pauseCtx->cursorPoint[PAUSE_MAP] - 3]; @@ -174,7 +174,7 @@ void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) { pauseCtx->cursorSlot[PAUSE_MAP] = pauseCtx->cursorPoint[PAUSE_MAP]; } - osSyncPrintf("kscope->cursor_point====%d\n", pauseCtx->cursorPoint[PAUSE_MAP]); + PRINTF("kscope->cursor_point====%d\n", pauseCtx->cursorPoint[PAUSE_MAP]); j = 72 + (pauseCtx->cursorSlot[PAUSE_MAP] * 4); KaleidoScope_SetCursorVtx(pauseCtx, j, pauseCtx->mapPageVtx); Audio_PlaySfxGeneral(NA_SE_SY_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 2003275545..df23e99a94 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -511,7 +511,7 @@ void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) { gSaveContext.buttonStatus[3] = D_8082AB6C[pauseCtx->pageIndex + pt][3]; gSaveContext.buttonStatus[4] = D_8082AB6C[pauseCtx->pageIndex + pt][4]; - osSyncPrintf("kscope->kscp_pos+pt = %d\n", pauseCtx->pageIndex + pt); + PRINTF("kscope->kscp_pos+pt = %d\n", pauseCtx->pageIndex + pt); gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE; Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_ALL); @@ -1281,10 +1281,10 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { if (pauseCtx->pageIndex == PAUSE_MAP) { if (YREG(7) != 0) { - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("キンスタ数(%d) Get_KIN_STA=%x (%x) (%x)\n", YREG(6), GET_GS_FLAGS(YREG(6)), - gAreaGsFlags[YREG(6)], gSaveContext.save.info.gsFlags[YREG(6) >> 2]); - osSyncPrintf(VT_RST); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("キンスタ数(%d) Get_KIN_STA=%x (%x) (%x)\n", YREG(6), GET_GS_FLAGS(YREG(6)), + gAreaGsFlags[YREG(6)], gSaveContext.save.info.gsFlags[YREG(6) >> 2]); + PRINTF(VT_RST); YREG(7) = 0; SET_GS_FLAGS(D_8082AE30[pauseCtx->cursorPoint[PAUSE_WORLD_MAP]], @@ -1494,7 +1494,7 @@ void KaleidoScope_UpdateNamePanel(PlayState* play) { (uintptr_t)_map_name_staticSegmentRomStart + (sp2A * MAP_NAME_TEX1_SIZE), MAP_NAME_TEX1_SIZE, "../z_kaleido_scope_PAL.c", 2093); } else { - osSyncPrintf("zoom_name=%d\n", pauseCtx->namedItem); + PRINTF("zoom_name=%d\n", pauseCtx->namedItem); if (gSaveContext.language) { // != LANGUAGE_ENG sp2A += 123; @@ -1503,7 +1503,7 @@ void KaleidoScope_UpdateNamePanel(PlayState* play) { sp2A += 123; } - osSyncPrintf("J_N=%d point=%d\n", gSaveContext.language, sp2A); + PRINTF("J_N=%d point=%d\n", gSaveContext.language, sp2A); DMA_REQUEST_SYNC(pauseCtx->nameSegment, (uintptr_t)_item_name_staticSegmentRomStart + (sp2A * ITEM_NAME_TEX_SIZE), @@ -2597,7 +2597,7 @@ void KaleidoScope_UpdateDungeonMap(PlayState* play) { PauseContext* pauseCtx = &play->pauseCtx; InterfaceContext* interfaceCtx = &play->interfaceCtx; - osSyncPrintf("ＭＡＰ ＤＭＡ = %d\n", play->interfaceCtx.mapPaletteIndex); + PRINTF("ＭＡＰ ＤＭＡ = %d\n", play->interfaceCtx.mapPaletteIndex); KaleidoScope_LoadDungeonMap(play); Map_SetFloorPalettesData(play, pauseCtx->dungeonMapSlot - 3); @@ -2678,12 +2678,12 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->playerSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F); size1 = Player_InitPauseDrawData(play, pauseCtx->playerSegment, &pauseCtx->playerSkelAnime); - osSyncPrintf("プレイヤー size1＝%x\n", size1); + PRINTF("プレイヤー size1＝%x\n", size1); pauseCtx->iconItemSegment = (void*)ALIGN16((uintptr_t)pauseCtx->playerSegment + size1); size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart; - osSyncPrintf("icon_item size0=%x\n", size0); + PRINTF("icon_item size0=%x\n", size0); DMA_REQUEST_SYNC(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0, "../z_kaleido_scope_PAL.c", 3662); @@ -2699,7 +2699,7 @@ void KaleidoScope_Update(PlayState* play) { pauseCtx->iconItem24Segment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItemSegment + size0); size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart; - osSyncPrintf("icon_item24 size=%x\n", size); + PRINTF("icon_item24 size=%x\n", size); DMA_REQUEST_SYNC(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size, "../z_kaleido_scope_PAL.c", 3675); @@ -2727,7 +2727,7 @@ void KaleidoScope_Update(PlayState* play) { sInDungeonScene = true; size2 = (uintptr_t)_icon_item_dungeon_staticSegmentRomEnd - (uintptr_t)_icon_item_dungeon_staticSegmentRomStart; - osSyncPrintf("icon_item_dungeon dungeon-size2=%x\n", size2); + PRINTF("icon_item_dungeon dungeon-size2=%x\n", size2); DMA_REQUEST_SYNC(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_dungeon_staticSegmentRomStart, size2, "../z_kaleido_scope_PAL.c", 3712); @@ -2740,7 +2740,7 @@ void KaleidoScope_Update(PlayState* play) { sInDungeonScene = false; size2 = (uintptr_t)_icon_item_field_staticSegmentRomEnd - (uintptr_t)_icon_item_field_staticSegmentRomStart; - osSyncPrintf("icon_item_field field-size2=%x\n", size2); + PRINTF("icon_item_field field-size2=%x\n", size2); DMA_REQUEST_SYNC(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_field_staticSegmentRomStart, size2, "../z_kaleido_scope_PAL.c", 3726); break; @@ -2750,27 +2750,27 @@ void KaleidoScope_Update(PlayState* play) { if (gSaveContext.language == LANGUAGE_ENG) { size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart; - osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); + PRINTF("icon_item_dungeon dungeon-size=%x\n", size); DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size, "../z_kaleido_scope_PAL.c", 3739); } else if (gSaveContext.language == LANGUAGE_GER) { size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart; - osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); + PRINTF("icon_item_dungeon dungeon-size=%x\n", size); DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size, "../z_kaleido_scope_PAL.c", 3746); } else { size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart; - osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); + PRINTF("icon_item_dungeon dungeon-size=%x\n", size); DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size, "../z_kaleido_scope_PAL.c", 3753); } pauseCtx->nameSegment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItemLangSegment + size); - osSyncPrintf("サイズ＝%x\n", size2 + size1 + size0 + size); - osSyncPrintf("item_name I_N_PT=%x\n", 0x800); + PRINTF("サイズ＝%x\n", size2 + size1 + size0 + size); + PRINTF("item_name I_N_PT=%x\n", 0x800); Interface_SetDoAction(play, DO_ACTION_DECIDE); - osSyncPrintf("サイズ＝%x\n", size2 + size1 + size0 + size + 0x800); + PRINTF("サイズ＝%x\n", size2 + size1 + size0 + size + 0x800); if (((void)0, gSaveContext.worldMapArea) < 22) { if (gSaveContext.language == LANGUAGE_ENG) { @@ -3304,20 +3304,20 @@ void KaleidoScope_Update(PlayState* play) { //! @bug messed up alignment, should match `ALIGN64` pauseCtx->iconItemSegment = (void*)(((uintptr_t)play->objectCtx.spaceStart + 0x30) & ~0x3F); size0 = (uintptr_t)_icon_item_staticSegmentRomEnd - (uintptr_t)_icon_item_staticSegmentRomStart; - osSyncPrintf("icon_item size0=%x\n", size0); + PRINTF("icon_item size0=%x\n", size0); DMA_REQUEST_SYNC(pauseCtx->iconItemSegment, (uintptr_t)_icon_item_staticSegmentRomStart, size0, "../z_kaleido_scope_PAL.c", 4356); pauseCtx->iconItem24Segment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItemSegment + size0); size = (uintptr_t)_icon_item_24_staticSegmentRomEnd - (uintptr_t)_icon_item_24_staticSegmentRomStart; - osSyncPrintf("icon_item24 size=%x\n", size); + PRINTF("icon_item24 size=%x\n", size); DMA_REQUEST_SYNC(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size, "../z_kaleido_scope_PAL.c", 4363); pauseCtx->iconItemAltSegment = (void*)ALIGN16((uintptr_t)pauseCtx->iconItem24Segment + size); size2 = (uintptr_t)_icon_item_gameover_staticSegmentRomEnd - (uintptr_t)_icon_item_gameover_staticSegmentRomStart; - osSyncPrintf("icon_item_dungeon gameover-size2=%x\n", size2); + PRINTF("icon_item_dungeon gameover-size2=%x\n", size2); DMA_REQUEST_SYNC(pauseCtx->iconItemAltSegment, (uintptr_t)_icon_item_gameover_staticSegmentRomStart, size2, "../z_kaleido_scope_PAL.c", 4370); @@ -3325,17 +3325,17 @@ void KaleidoScope_Update(PlayState* play) { if (gSaveContext.language == LANGUAGE_ENG) { size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart; - osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); + PRINTF("icon_item_dungeon dungeon-size=%x\n", size); DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size, "../z_kaleido_scope_PAL.c", 4379); } else if (gSaveContext.language == LANGUAGE_GER) { size = (uintptr_t)_icon_item_ger_staticSegmentRomEnd - (uintptr_t)_icon_item_ger_staticSegmentRomStart; - osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); + PRINTF("icon_item_dungeon dungeon-size=%x\n", size); DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_ger_staticSegmentRomStart, size, "../z_kaleido_scope_PAL.c", 4386); } else { size = (uintptr_t)_icon_item_fra_staticSegmentRomEnd - (uintptr_t)_icon_item_fra_staticSegmentRomStart; - osSyncPrintf("icon_item_dungeon dungeon-size=%x\n", size); + PRINTF("icon_item_dungeon dungeon-size=%x\n", size); DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_fra_staticSegmentRomStart, size, "../z_kaleido_scope_PAL.c", 4393); } @@ -3443,7 +3443,7 @@ void KaleidoScope_Update(PlayState* play) { gSaveContext.save.info.playerData.deaths = 999; } } - osSyncPrintf("kscope->angle_s = %f\n", pauseCtx->unk_204); + PRINTF("kscope->angle_s = %f\n", pauseCtx->unk_204); break; case PAUSE_STATE_14: @@ -3569,18 +3569,18 @@ void KaleidoScope_Update(PlayState* play) { gSaveContext.healthAccumulator = 0; gSaveContext.magicState = MAGIC_STATE_IDLE; gSaveContext.prevMagicState = MAGIC_STATE_IDLE; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic); - osSyncPrintf("Z_MAGIC_NOW_NOW=%d → ", gSaveContext.magicFillTarget); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic); + PRINTF("Z_MAGIC_NOW_NOW=%d → ", gSaveContext.magicFillTarget); gSaveContext.magicCapacity = 0; // Set the fill target to be the magic amount before game over gSaveContext.magicFillTarget = gSaveContext.save.info.playerData.magic; // Set `magicLevel` and `magic` to 0 so `magicCapacity` then `magic` grows from nothing // to respectively the full capacity and `magicFillTarget` gSaveContext.save.info.playerData.magicLevel = gSaveContext.save.info.playerData.magic = 0; - osSyncPrintf("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic); - osSyncPrintf("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget); - osSyncPrintf(VT_RST); + PRINTF("MAGIC_NOW=%d ", gSaveContext.save.info.playerData.magic); + PRINTF("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget); + PRINTF(VT_RST); } else { play->state.running = false; SET_NEXT_GAMESTATE(&play->state, TitleSetup_Init, TitleSetupState); @@ -3650,13 +3650,13 @@ void KaleidoScope_Update(PlayState* play) { gSaveContext.buttonStatus[3] = D_808321A8[3]; gSaveContext.buttonStatus[4] = D_808321A8[4]; interfaceCtx->unk_1FA = interfaceCtx->unk_1FC = 0; - osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("i=%d LAST_TIME_TYPE=%d\n", i, gSaveContext.prevHudVisibilityMode); + PRINTF(VT_FGCOL(YELLOW)); + PRINTF("i=%d LAST_TIME_TYPE=%d\n", i, gSaveContext.prevHudVisibilityMode); gSaveContext.hudVisibilityMode = HUD_VISIBILITY_NO_CHANGE; Interface_ChangeHudVisibilityMode(gSaveContext.prevHudVisibilityMode); player->targetActor = NULL; Player_SetEquipmentData(play, player); - osSyncPrintf(VT_RST); + PRINTF(VT_RST); break; } }