mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00
Code Issues Projects Releases Wiki Activity

Restore terminal colors in retail, except in __osMalloc.c (#1899)

Browse Source
This commit is contained in:
cadmic 2024-02-27 11:08:20 -08:00 committed by GitHub
parent dcf61174e9
commit 350b82c675
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/terminal.h
View File

@ -28,24 +28,12 @@
#define VT_SGR(n) VT_ESC VT_CSI n "m" #define VT_SGR(n) VT_ESC VT_CSI n "m"
// Add more macros if necessary // 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_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_FGCOL(color) VT_SGR(VT_COLOR(FOREGROUND, color))
#define VT_BGCOL(color) VT_SGR(VT_COLOR(BACKGROUND, color)) #define VT_BGCOL(color) VT_SGR(VT_COLOR(BACKGROUND, color))
#define VT_RST VT_SGR("") #define VT_RST VT_SGR("")
#define VT_CLS VT_ED(2) #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 // ASCII BEL character, plays an alert tone
#define BEL '\a' #define BEL '\a'

4
src/code/__osMalloc.c
View File

@ -852,7 +852,11 @@ u32 __osCheckArena(Arena* arena) {
while (iter != NULL) { while (iter != NULL) {
if (iter && iter->magic == NODE_MAGIC) { if (iter && iter->magic == NODE_MAGIC) {
// "Oops!! (%08x %08x)" // "Oops!! (%08x %08x)"
#if OOT_DEBUG
osSyncPrintf(VT_COL(RED, WHITE) "おおっと！！ (%08x %08x)\n" VT_RST, iter, iter->magic); osSyncPrintf(VT_COL(RED, WHITE) "おおっと！！ (%08x %08x)\n" VT_RST, iter, iter->magic);
#else
osSyncPrintf("おおっと！！ (%08x %08x)\n", iter, iter->magic);
#endif
error = 1; error = 1;
break; break;
} }