Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

padsetup OK (#383)

Browse Source 
* padsetup OK

* Made tharo's suggestions

* Made arg name consistent
This commit is contained in:
kyleburnette 2021-11-02 14:35:57 -07:00 committed by GitHub
parent c761477799
commit 4841a4a0bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -168,7 +168,7 @@ void func_800863AC(u32 param_1, s32 param_2, s32 param_3, UNK_PTR param_4);
// void func_800864EC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_80086588(void);
void SystemArena_Init(u32 base, u32 size);
s32 func_80086620(OSMesgQueue* param_1, PadMgr* param_2, OSContStatus* param_3);
s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status);
// void func_80086760(void);
// void func_80086794(void);
// void func_800867B4(void);

33
src/boot_O2/padsetup.c
View File

@ -1,3 +1,34 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/boot/padsetup/func_80086620.s")
s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status) {
s32 ret;
s32 i;
*outMask = 0xFF;
ret = osContInit(mq, outMask, status);
if (ret != 0) {
return ret;
}
if (*outMask == 0xFF) {
if (osContStartQuery(mq) != 0) {
return 1;
}
osRecvMesg(mq, NULL, OS_MESG_BLOCK);
osContGetQuery(status);
*outMask = 0;
for (i = 0; i < MAXCONTROLLERS; i++) {
switch (status[i].errno) {
case 0:
if (status[i].type == CONT_TYPE_NORMAL) {
*outMask |= 1 << i;
}
break;
default:
break;
}
}
}
return 0;
}

2
tools/disasm/functions.txt
View File

@ -165,7 +165,7 @@
0x800864EC:("func_800864EC",),
0x80086588:("func_80086588",),
0x800865F8:("SystemArena_Init",),
0x80086620:("func_80086620",),
0x80086620:("PadSetup_Init",),
0x80086760:("func_80086760",),
0x80086794:("func_80086794",),
0x800867B4:("func_800867B4",),