From 18b7030534c5e6ba68abeb0b37c267bd344de426 Mon Sep 17 00:00:00 2001 From: cadmic Date: Tue, 30 Jan 2024 12:19:00 -0800 Subject: [PATCH] Revert bad uses of `if (OOT_DEBUG)` (#1666) --- src/code/main.c | 4 +++- src/code/z_parameter.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/code/main.c b/src/code/main.c index a777e8c700..15eeed80c4 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -55,7 +55,8 @@ void Main(void* arg) { PRINTF("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize); SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap - if (OOT_DEBUG) { +#if OOT_DEBUG + { void* debugHeapStart; u32 debugHeapSize; @@ -70,6 +71,7 @@ void Main(void* arg) { PRINTF("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize); DebugArena_Init(debugHeapStart, debugHeapSize); } +#endif Regs_Init(); diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 464405c561..dd3e89d78c 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3958,7 +3958,8 @@ void Interface_Update(PlayState* play) { s16 risingAlpha; u16 action; - if (OOT_DEBUG) { +#if OOT_DEBUG + { Input* debugInput = &play->state.input[2]; if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) { @@ -3972,6 +3973,7 @@ void Interface_Update(PlayState* play) { PRINTF("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } } +#endif if (!IS_PAUSED(&play->pauseCtx)) { if ((gSaveContext.minigameState == 1) || !IS_CUTSCENE_LAYER ||