izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

More controller variables fixed up

Browse Source
This commit is contained in:
Ryan Myers
2021-09-30 22:24:16 -04:00
parent dd3937a113
commit d16ab2cec5
2 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/asm/non_matchings/unknown_0CD820/osContInit.s
+4 -4
View File
@@ -117,10 +117,10 @@ glabel osContInit
/* 0CD9E0 800CCDE0 3C018013 */ lui $at, %hi(__osContLastCmd) # $at, 0x8013
/* 0CD9E4 800CCDE4 0C033580 */ jal __osSiCreateAccessQueue
/* 0CD9E8 800CCDE8 A020CD90 */ sb $zero, %lo(__osContLastCmd)($at)
/* 0CD9EC 800CCDEC 3C048013 */ lui $a0, %hi(D_8012CDB8) # $a0, 0x8013
/* 0CD9F0 800CCDF0 3C058013 */ lui $a1, %hi(D_8012CDD0) # $a1, 0x8013
/* 0CD9F4 800CCDF4 24A5CDD0 */ addiu $a1, %lo(D_8012CDD0) # addiu $a1, $a1, -0x3230
/* 0CD9F8 800CCDF8 2484CDB8 */ addiu $a0, %lo(D_8012CDB8) # addiu $a0, $a0, -0x3248
/* 0CD9EC 800CCDEC 3C048013 */ lui $a0, %hi(__osEepromTimerQ) # $a0, 0x8013
/* 0CD9F0 800CCDF0 3C058013 */ lui $a1, %hi(__osEepromTimerMsg) # $a1, 0x8013
/* 0CD9F4 800CCDF4 24A5CDD0 */ addiu $a1, %lo(__osEepromTimerMsg) # addiu $a1, $a1, -0x3230
/* 0CD9F8 800CCDF8 2484CDB8 */ addiu $a0, %lo(__osEepromTimerQ) # addiu $a0, $a0, -0x3248
/* 0CD9FC 800CCDFC 0C032208 */ jal osCreateMesgQueue
/* 0CDA00 800CCE00 24060001 */ li $a2, 1
/* 0CDA04 800CCE04 8FA20078 */ lw $v0, 0x78($sp)
lib/src/os/controller.c
+6 -22
View File
@@ -8,31 +8,15 @@
#define HALF_A_SECOND OS_USEC_TO_CYCLES(500000)
// u32 __osContinitialized = 0;
// OSPifRam __osContPifRam;
// u8 __osContLastCmd;
// u8 __osMaxControllers; // 8012CD91
// s32 D_8012CD94;
// s32 D_8012CD98[6];
// s32 D_8012CDB0;
// s32 D_8012CDB4;
// OSMesgQueue __osEepromTimerQ;
// OSMesg __osEepromTimerMsg;
// OSPifRam __osPfsPifRam; // 8012CDE0
u32 __osContinitialized = 0;
OSPifRam __osContPifRam;
u8 __osContLastCmd;
u8 __osMaxControllers; // 8012CD91
s32 D_8012CD94;
s32 D_8012CD98[6];
s32 D_8012CDB0;
s32 D_8012CDB4;
s32 D_8012CDB8;
s32 D_8012CDBC;
s32 D_8012CDC0[4];
s32 D_8012CDD0[4];
OSPifRam __osPfsPifRam; // 8012CDE0
u8 __osMaxControllers;
OSTimer __osEepromTimer;
OSMesgQueue __osEepromTimerQ;
OSMesg __osEepromTimerMsg;
s32 D_8012CDD4[2]; //Padding?
OSPifRam __osPfsPifRam;
#if 1
GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContInit.s")