diff options
| author | shawlucas <lgs84@cornell.edu> | 2020-03-20 11:11:08 -0700 |
|---|---|---|
| committer | shawlucas <lgs84@cornell.edu> | 2020-03-20 11:11:08 -0700 |
| commit | 1ed67c4b218bb4228fcb02ecdd37ebb80a1394bb (patch) | |
| tree | a5a41287f996eb6df00f5726e4c74382b5dfe421 /src/code/code_800A9F30.c | |
| parent | 37497e427c0cd154fd969b450aa8a4956adf197a (diff) | |
| parent | 9c9ad6160b15e1ce0294fe00da29bf20cca6a591 (diff) | |
Merge branch 'master' of https://github.com/zeldaret/oot
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) { |