diff options
| author | Revo <projectrevotpp@hotmail.com> | 2020-05-29 14:17:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 14:17:03 -0400 |
| commit | e6c0d16a679663e816130ca7bc793cab682f911c (patch) | |
| tree | 57a330cbec60b4033531c452406771e79301a680 /arm9/src/main.c | |
| parent | d6fd8d1ed926feebffab4154a84eb70a84083bfc (diff) | |
| parent | 96183df2b89ae0f2294520550ed382d06250c177 (diff) | |
Merge pull request #128 from PikalaxALT/pikalax_work
Decompile unk_02006234.s; misc cleanup
Diffstat (limited to 'arm9/src/main.c')
| -rw-r--r-- | arm9/src/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c index ae3961cd..82b8b734 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -54,8 +54,8 @@ extern struct Unk21DBE18 MOD52_UNK_021D76C8; extern u8 SDK_STATIC_BSS_START[]; -const enum GameVersion gGameVersion = VERSION_DIAMOND; -const enum GameLanguage gGameLanguage = LANGUAGE_ENGLISH; +const enum GameVersion gGameVersion = GAME_VERSION; +const enum GameLanguage gGameLanguage = GAME_LANGUAGE; THUMB_FUNC void NitroMain(void) { @@ -85,7 +85,7 @@ THUMB_FUNC void NitroMain(void) } else { - switch (*((s32 *)HW_RESET_PARAMETER_BUF)) + switch (OS_GetResetParameter()) { case 0: gBacklightTop.unk1C = 0; @@ -156,18 +156,18 @@ THUMB_FUNC void FUN_02000E0C(void) { if (gBacklightTop.unk14 == NULL) return; - if (gBacklightTop.unk10 != -1u) + if (gBacklightTop.unk10 != SDK_OVERLAY_INVALID_ID) HandleLoadOverlay(gBacklightTop.unk10, 0); gBacklightTop.unk8 = gBacklightTop.unk10; gBacklightTop.unkC = FUN_02006234(gBacklightTop.unk14, &gBacklightTop.unk18, 0); - gBacklightTop.unk10 = -1u; + gBacklightTop.unk10 = SDK_OVERLAY_INVALID_ID; gBacklightTop.unk14 = NULL; } if (FUN_02006290(gBacklightTop.unkC)) { FUN_02006260(gBacklightTop.unkC); gBacklightTop.unkC = 0; - if (gBacklightTop.unk8 != -1u) + if (gBacklightTop.unk8 != SDK_OVERLAY_INVALID_ID) UnloadOverlayByID(gBacklightTop.unk8); } } |