Skip to content

Commit

Permalink
Revert bad uses of if (OOT_DEBUG) (zeldaret#1666)
Browse files Browse the repository at this point in the history
  • Loading branch information
cadmic authored Jan 30, 2024
1 parent 7b770dc commit 18b7030
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/code/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -70,6 +71,7 @@ void Main(void* arg) {
PRINTF("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize);
DebugArena_Init(debugHeapStart, debugHeapSize);
}
#endif

Regs_Init();

Expand Down
4 changes: 3 additions & 1 deletion src/code/z_parameter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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 ||
Expand Down

0 comments on commit 18b7030

Please sign in to comment.