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

Revert bad uses of if (OOT_DEBUG) (#1666)

Browse Source
This commit is contained in:
cadmic 2024-01-30 12:19:00 -08:00 committed by GitHub
parent 7b770dc1e0
commit 18b7030534
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/code/main.c
View File

@ -55,7 +55,8 @@ void Main(void* arg) {
PRINTF("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize); PRINTF("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize);
SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap
if (OOT_DEBUG) { #if OOT_DEBUG
{
void* debugHeapStart; void* debugHeapStart;
u32 debugHeapSize; u32 debugHeapSize;
@ -70,6 +71,7 @@ void Main(void* arg) {
PRINTF("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize); PRINTF("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize);
DebugArena_Init(debugHeapStart, debugHeapSize); DebugArena_Init(debugHeapStart, debugHeapSize);
} }
#endif
Regs_Init(); Regs_Init();

4
src/code/z_parameter.c
View File

@ -3958,7 +3958,8 @@ void Interface_Update(PlayState* play) {
s16 risingAlpha; s16 risingAlpha;
u16 action; u16 action;
if (OOT_DEBUG) { #if OOT_DEBUG
{
Input* debugInput = &play->state.input[2]; Input* debugInput = &play->state.input[2];
if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) { 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); PRINTF("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language);
} }
} }
#endif
if (!IS_PAUSED(&play->pauseCtx)) { if (!IS_PAUSED(&play->pauseCtx)) {
if ((gSaveContext.minigameState == 1) || !IS_CUTSCENE_LAYER || if ((gSaveContext.minigameState == 1) || !IS_CUTSCENE_LAYER ||