diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-03 02:48:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 02:48:35 +0100 |
| commit | 33a7ec1fd719b9321357aa59460cbdb9f7779053 (patch) | |
| tree | 993c0c156f6a3c310cccd2a3e0ac802b59ab149e /arm9/src/main.c | |
| parent | 7e32d3758e7e36d7a67a1442cdb9386f9aa18a6e (diff) | |
| parent | 6e3af5fa580d0f6aca3bb310d979323bf2a09a84 (diff) | |
Merge pull request #400 from PikalaxALT/doc_heap_etc
SDK-informed refactoring
Diffstat (limited to 'arm9/src/main.c')
| -rw-r--r-- | arm9/src/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arm9/src/main.c b/arm9/src/main.c index 749bec41..fa35c81c 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -53,10 +53,10 @@ THUMB_FUNC void NitroMain(void) { InitSystemForTheGame(); InitGraphicMemory(); - FUN_020163BC(); + InitKeypadAndTouchpad(); FUN_02016438(0); - PM_GetBackLight((PMBackLightSwitch *)SDK_STATIC_BSS_START, NULL); + PM_GetBackLight(&gBacklightTop, NULL); FUN_02022294(); GF_InitRTCWork(); @@ -104,8 +104,8 @@ THUMB_FUNC void NitroMain(void) { FUN_02000EE8(); HandleDSLidAction(); - FUN_02016464(); - if ((gMain.unk38 & SOFT_RESET_KEY) == SOFT_RESET_KEY && !gMain.unk68) // soft reset? + ReadKeypadAndTocuhpad(); + if ((gMain.heldKeysRaw & SOFT_RESET_KEY) == SOFT_RESET_KEY && !gMain.softResetDisabled) // soft reset? { DoSoftReset(0); // soft reset? } @@ -248,7 +248,7 @@ THUMB_FUNC void FUN_02000F4C(u32 arg0, u32 arg1) while (1) { HandleDSLidAction(); - FUN_02016464(); + ReadKeypadAndTocuhpad(); if (gMain.newKeys & 1) break; FUN_02000E9C(); |