diff options
| author | fig02 <fig02srl@gmail.com> | 2020-03-18 05:37:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 05:37:12 -0400 |
| commit | 5fc1f7aec513c04e4625a9b4243fec64814e03e4 (patch) | |
| tree | 3368f674fd32ec864c8d167ee3c86b25bcb8b5f7 /src/code/code_800A9F30.c | |
| parent | 2c7a339a81ddb3698bac0a3bb4238dd3e65d34ce (diff) | |
| parent | 76eb52ab5277ad69cd0908f8492483ef5881ee75 (diff) | |
Merge pull request #3 from Roman971/fixes-matches
Various fixes/matches
Diffstat (limited to 'src/code/code_800A9F30.c')
| -rw-r--r-- | src/code/code_800A9F30.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/code/code_800A9F30.c b/src/code/code_800A9F30.c index c5248faca..ad603fabe 100644 --- a/src/code/code_800A9F30.c +++ b/src/code/code_800A9F30.c @@ -45,22 +45,18 @@ void func_800AA0B4(void) if (0) ; // Necessary to match } -#ifdef NON_MATCHING void func_800AA0F0(void) { - if ((gPadMgr.unk_460 == func_800A9F30) && (gPadMgr.unk_464 == 0)) + PadMgr* padmgr = &gPadMgr; + + if ((padmgr->unk_460 == func_800A9F30) && (padmgr->unk_464 == 0)) { - // asm loads/writes directly to 0x80166D20 and 0x80166D24 - // but the compiler wants to reuse offsets from 0x801668C0 - gPadMgr.unk_460 = NULL; - gPadMgr.unk_464 = 0; + padmgr->unk_460 = NULL; + padmgr->unk_464 = 0; } func_800D3178(&D_80160FD0); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800A9F30/func_800AA0F0.s") -#endif u32 func_800AA148(void) { |