mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-14 03:44:34 +00:00
Various fixes/matches
- Matched all remaining functions in `__osMalloc.c`, 2 functions in `code_8007BF90.c`, 1 in `code_800A9F30.c`, 2 in `fault.c`, 1 in `fault_drawer.c`, 1 in `gfxprint.c`, 2 in `z_camera.c` - Improved most other remaining non matchings to ensure they are actually equivalent and to get them closer to matching - Added a `alloc.h` header file in the process of working on `fault.c` non matchings - Decompiled `padmgr.c` data/bss in order to improve padmgr non matchings - Removed unused `z_en_wallmas.c` data files - Moved functions confirmed to be in `z_cheap_proc.c` to their own file with that name
This commit is contained in:
parent
2c7a339a81
commit
76eb52ab52
37 changed files with 549 additions and 2829 deletions
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue