From 350b82c6755bc317fea184e4d769c8884f98c8aa Mon Sep 17 00:00:00 2001 From: cadmic Date: Tue, 27 Feb 2024 11:08:20 -0800 Subject: [PATCH] Restore terminal colors in retail, except in __osMalloc.c (#1899) --- include/terminal.h | 12 ------------ src/code/__osMalloc.c | 4 ++++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/terminal.h b/include/terminal.h index 99213b1792..f4ed8d6103 100644 --- a/include/terminal.h +++ b/include/terminal.h @@ -28,24 +28,12 @@ #define VT_SGR(n) VT_ESC VT_CSI n "m" // Add more macros if necessary -#if OOT_DEBUG - #define VT_COL(back, fore) VT_SGR(VT_COLOR(BACKGROUND, back) ";" VT_COLOR(FOREGROUND, fore)) #define VT_FGCOL(color) VT_SGR(VT_COLOR(FOREGROUND, color)) #define VT_BGCOL(color) VT_SGR(VT_COLOR(BACKGROUND, color)) #define VT_RST VT_SGR("") #define VT_CLS VT_ED(2) -#else - -#define VT_COL(back, fore) "" -#define VT_FGCOL(color) "" -#define VT_BGCOL(color) "" -#define VT_RST "" -#define VT_CLS "" - -#endif - // ASCII BEL character, plays an alert tone #define BEL '\a' diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 52b9a973c6..5c4a423d2c 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -852,7 +852,11 @@ u32 __osCheckArena(Arena* arena) { while (iter != NULL) { if (iter && iter->magic == NODE_MAGIC) { // "Oops!! (%08x %08x)" +#if OOT_DEBUG osSyncPrintf(VT_COL(RED, WHITE) "おおっと!! (%08x %08x)\n" VT_RST, iter, iter->magic); +#else + osSyncPrintf("おおっと!! (%08x %08x)\n", iter, iter->magic); +#endif error = 1; break; }