diff options
| author | cadmic <cadmic24@gmail.com> | 2024-09-17 12:40:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-17 15:40:50 -0400 |
| commit | 306abef46b9af0cc17b2e2a049df9ff2acd5e9a4 (patch) | |
| tree | 4a40e93f1eb25575431b09c8942b9e45eb9f4503 /src | |
| parent | cc0b1bb127d932389b56f49362b572f636013741 (diff) | |
Consistently use "OOT_VERSION <" and "OOT_VERSION >=" (#2199)
Diffstat (limited to 'src')
| -rw-r--r-- | src/n64dd/n64dd_801C8000.c | 4 | ||||
| -rw-r--r-- | src/n64dd/z_n64dd.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/n64dd/n64dd_801C8000.c b/src/n64dd/n64dd_801C8000.c index 3bf7159aa..9b0a4b3ad 100644 --- a/src/n64dd/n64dd_801C8000.c +++ b/src/n64dd/n64dd_801C8000.c @@ -301,7 +301,7 @@ s32 func_801C885C(void) { B_801E0D18.unk_64 = 3; func_801C85F0(&B_801E0D18, 1); -#if OOT_VERSION > NTSC_1_0 +#if OOT_VERSION >= NTSC_1_1 D_801D2E90 = 0; #endif @@ -317,7 +317,7 @@ s32 func_801C88AC(void) { B_801E0D18.unk_64 = 4; func_801C85F0(&B_801E0D18, 1); -#if OOT_VERSION > NTSC_1_0 +#if OOT_VERSION >= NTSC_1_1 D_801D2E90 = 0; #endif diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c index fd06d0252..f169371a1 100644 --- a/src/n64dd/z_n64dd.c +++ b/src/n64dd/z_n64dd.c @@ -131,7 +131,7 @@ s32 func_801C7064(void) { s32 func_801C7098(void) { s32 phi_v1; -#if OOT_VERSION <= NTSC_1_1 +#if OOT_VERSION < PAL_1_0 if (0) {} #endif @@ -186,7 +186,7 @@ void func_801C711C(void* arg) { IrqMgr_RemoveClient(arg0->unk_98, &arg0->unk_90); } -#if OOT_VERSION > NTSC_1_0 +#if OOT_VERSION >= NTSC_1_1 void func_801C7B28_ne2(void) { s32 temp; @@ -268,7 +268,7 @@ void func_801C746C(void* arg0, void* arg1, void* arg2) { if (arg2 != NULL) { func_801CA1F0(arg2, 0, 176, 320, 32, 11, sp2C, SCREEN_WIDTH); } -#if OOT_VERSION <= NTSC_1_1 +#if OOT_VERSION < PAL_1_0 osViBlack(0); #endif } @@ -306,7 +306,7 @@ s32 func_801C7658(void) { return 0; } -#if OOT_VERSION <= NTSC_1_1 +#if OOT_VERSION < PAL_1_0 StackCheck_Init(&B_801DAF88, B_801D9F88, STACK_TOP(B_801D9F88), 0, 0x100, "ddmsg"); osCreateThread(&B_801D9DD8, THREAD_ID_DDMSG, &func_801C711C, &B_801D9B90, STACK_TOP(B_801D9F88), THREAD_PRI_DDMSG); osStartThread(&B_801D9DD8); @@ -348,7 +348,7 @@ s32 func_801C7658(void) { } s32 func_801C7818(void) { -#if OOT_VERSION > NTSC_1_0 +#if OOT_VERSION >= NTSC_1_1 B_801D9DB8 = 1; B_801D9DC0 = 0; #endif @@ -361,7 +361,7 @@ s32 func_801C7818(void) { Sleep_Usec(1000000 * 1 / 60); } -#if OOT_VERSION > NTSC_1_0 +#if OOT_VERSION >= NTSC_1_1 if (D_801D2EA8 == 1 || B_801E0F60 == 1 || B_801E0F64 == 1) { B_801D9DC0 = osGetTime(); } |