mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-14 20:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix init controllers (#10)

Browse Source 
* Match init_controllers and func_80000BEC
This commit is contained in:
Duncan
2021-03-02 08:30:25 +00:00
committed by CoderStig
parent 51608e6776
commit 5183f9cd02
3 changed files with 14 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+14 -15
View File
@@ -77,6 +77,15 @@ extern OSIoMesg *D_8014F0A0;
extern u32 gHeapEndPtr;
extern u32 *D_801978D0;
extern OSMesgQueue gSIEventMesgQueue;
extern OSMesg gSIEventMesgBuf[3];
extern u8 gControllerBits;
extern OSContStatus gControllerStatuses;
extern u16 sController1Unplugged;
extern u32 D_801502B4;
extern u32 D_802F9F80;
// Declarations (in this file)
void thread1_idle(void *arg0);
void thread3_video(void *arg0);
@@ -180,21 +189,16 @@ void func_800006E8(void) {
GLOBAL_ASM("asm/non_matchings/main/func_800006E8.s")
#endif
#ifdef MIPS_TO_C
// generated by mips_to_c commit cae1414eb1bf34873a831a523692fe29870a6f3b
void init_controllers(void) {
osCreateMesgQueue(&gSIEventMesgQueue, &gSIEventMesgBuf, 3);
osSetEventMesg(5, &gSIEventMesgQueue, (OSMesg) 0x33333333);
osCreateMesgQueue(&gSIEventMesgQueue, &gSIEventMesgBuf, ARRAY_COUNT(gSIEventMesgBuf));
osSetEventMesg(OS_EVENT_SI, &gSIEventMesgQueue, (OSMesg) 0x33333333);
osContInit(&gSIEventMesgQueue, &gControllerBits, &gControllerStatuses);
if ((gControllerBits & 1) == 0) {
sController1Unplugged = (u16)1;
sController1Unplugged = TRUE;
return;
}
*(void *)0x80160000 = (u16)0;
sController1Unplugged = FALSE;
}
#else
GLOBAL_ASM("asm/non_matchings/main/init_controllers.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit ffee479fae41a1cdc3e454e9b9d75bbd226a160f
@@ -276,14 +280,9 @@ void *read_controllers(void) {
GLOBAL_ASM("asm/non_matchings/main/read_controllers.s")
#endif
#ifdef MIPS_TO_C
// generated by mips_to_c commit cae1414eb1bf34873a831a523692fe29870a6f3b
void func_80000BEC(void) {
*(void *)0x801502B4 = (s32) ((s32) &D_802F9F80 & 0x1FFFFFFF);
D_801502B4 = VIRTUAL_TO_PHYSICAL(&D_802F9F80);
}
#else
GLOBAL_ASM("asm/non_matchings/main/func_80000BEC.s")
#endif
// send_sp_task_message from SM64
void func_80000C0C(OSMesg arg0) {