falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile contGetConnectedControllers

This commit is contained in:
Ryan Dwyer 2020-10-30 19:15:25 +10:00
parent 9e92df13b5
commit e08682a161
7 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/data/data_003dc0.c
View File

@ -655,7 +655,7 @@ u32 var8005ee6c[4] = {0};
u32 var8005ee7c[4] = {0};
u32 var8005ee8c[4] = {0};
u32 var8005ee9c[4] = {0};
u8 var8005eeac = 0;
u8 g_ConnectedControllers = 0;
u32 var8005eeb0 = 0x00000000;
u32 var8005eeb4 = 0x00000000;
u32 var8005eeb8 = 0x00000001;

2
src/game/game_0f09f0.c
View File

@ -12917,7 +12917,7 @@ glabel var7f1b2afc
/* f0fc3e0: 02f28821 */ addu $s1,$s7,$s2
/* f0fc3e4: 0fc55cbe */ jal textMeasure
/* f0fc3e8: afaf0010 */ sw $t7,0x10($sp)
/* f0fc3ec: 0c005013 */ jal getConnectedControllers
/* f0fc3ec: 0c005013 */ jal contGetConnectedControllers
/* f0fc3f0: 00000000 */ nop
/* f0fc3f4: 3c19800b */ lui $t9,%hi(g_MpSetup+0x16)
/* f0fc3f8: 9739cb9e */ lhu $t9,%lo(g_MpSetup+0x16)($t9)

10
src/game/game_102240.c
View File

@ -1336,7 +1336,7 @@ glabel menuhandlerCoopBuddy
/* f104304: 0fc41023 */ jal getMaxAiBuddies
/* f104308: 00000000 */ nop
/* f10430c: afa20030 */ sw $v0,0x30($sp)
/* f104310: 0c005013 */ jal getConnectedControllers
/* f104310: 0c005013 */ jal contGetConnectedControllers
/* f104314: afa0002c */ sw $zero,0x2c($sp)
/* f104318: 30490002 */ andi $t1,$v0,0x2
/* f10431c: 11200002 */ beqz $t1,.L0f104328
@ -1349,7 +1349,7 @@ glabel menuhandlerCoopBuddy
/* f104334: 10000035 */ b .L0f10440c
/* f104338: ad8b0000 */ sw $t3,0x0($t4)
.L0f10433c:
/* f10433c: 0c005013 */ jal getConnectedControllers
/* f10433c: 0c005013 */ jal contGetConnectedControllers
/* f104340: afa30028 */ sw $v1,0x28($sp)
/* f104344: 304d0002 */ andi $t5,$v0,0x2
/* f104348: 11a00002 */ beqz $t5,.L0f104354
@ -1367,7 +1367,7 @@ glabel menuhandlerCoopBuddy
/* f104374: 10000027 */ b .L0f104414
/* f104378: 8fbf0014 */ lw $ra,0x14($sp)
.L0f10437c:
/* f10437c: 0c005013 */ jal getConnectedControllers
/* f10437c: 0c005013 */ jal contGetConnectedControllers
/* f104380: afa30024 */ sw $v1,0x24($sp)
/* f104384: 30490002 */ andi $t1,$v0,0x2
/* f104388: 11200002 */ beqz $t1,.L0f104394
@ -1385,7 +1385,7 @@ glabel menuhandlerCoopBuddy
/* f1043b4: 10000015 */ b .L0f10440c
/* f1043b8: ac590458 */ sw $t9,0x458($v0)
.L0f1043bc:
/* f1043bc: 0c005013 */ jal getConnectedControllers
/* f1043bc: 0c005013 */ jal contGetConnectedControllers
/* f1043c0: afa50020 */ sw $a1,0x20($sp)
/* f1043c4: 30580002 */ andi $t8,$v0,0x2
/* f1043c8: 8fa30020 */ lw $v1,0x20($sp)
@ -4221,7 +4221,7 @@ s32 menuhandlerMainMenuCooperative(u32 operation, struct menuitem *item, union h
s32 menuhandlerMainMenuCounterOperative(u32 operation, struct menuitem *item, union handlerdata *data)
{
if (operation == MENUOP_CHECKDISABLED) {
if ((getConnectedControllers() & 2) == 0) {
if ((contGetConnectedControllers() & 2) == 0) {
return true;
}
}

6
src/game/title.c
View File

@ -455,7 +455,7 @@ void titleTickCheckControllers(void)
viSetUseZBuf(false);
if (g_TitleTimer > 6) {
if ((getConnectedControllers() & 1) == 0) {
if ((contGetConnectedControllers() & 1) == 0) {
titleSetNextMode(TITLEMODE_NOCONTROLLER);
} else {
titleSetNextMode(TITLEMODE_RARELOGO);
@ -4487,7 +4487,7 @@ glabel titleRenderNoController
/* f01a510: 27bdff98 */ addiu $sp,$sp,-104
/* f01a514: afbf003c */ sw $ra,0x3c($sp)
/* f01a518: afb00038 */ sw $s0,0x38($sp)
/* f01a51c: 0c005013 */ jal getConnectedControllers
/* f01a51c: 0c005013 */ jal contGetConnectedControllers
/* f01a520: 00808025 */ or $s0,$a0,$zero
/* f01a524: 0fc06bf0 */ jal func0f01afc0
/* f01a528: 02002025 */ or $a0,$s0,$zero
@ -4692,7 +4692,7 @@ glabel titleRenderNoController
// u16 stack[6];
//
// // This was likely printed to console
// getConnectedControllers();
// contGetConnectedControllers();
//
// gdl = func0f01afc0(gdl);
// gdl = func0f153628(gdl);

2
src/include/game/data/data_000000.h
View File

@ -119,7 +119,7 @@ extern u32 var8005ee6c[4];
extern u32 var8005ee7c[4];
extern u32 var8005ee8c[4];
extern u32 var8005ee9c[4];
extern u8 var8005eeac;
extern u8 g_ConnectedControllers;
extern u32 var8005eeb8;
extern u32 var8005eebc;
extern u32 var8005eecc;

2
src/include/lib/lib_13900.h
View File

@ -17,7 +17,7 @@ void func00013c94(void);
void func00013dd4(void);
void func00013dfc(void);
u32 func00013e84(void);
u32 getConnectedControllers(void);
u32 contGetConnectedControllers(void);
u32 func00014058(void);
u32 func00014238(void);
void func000142f0(void);

52
src/lib/lib_13900.c
View File

@ -472,13 +472,13 @@ glabel func00013e84
/* 13e9c: 11c00018 */ beqz $t6,.L00013f00
/* 13ea0: afb00014 */ sw $s0,0x14($sp)
/* 13ea4: 3c11800a */ lui $s1,%hi(var80099e78)
/* 13ea8: 3c058006 */ lui $a1,%hi(var8005eeac)
/* 13ea8: 3c058006 */ lui $a1,%hi(g_ConnectedControllers)
/* 13eac: 3c06800a */ lui $a2,%hi(var80099f38)
/* 13eb0: 26249e78 */ addiu $a0,$s1,%lo(var80099e78)
/* 13eb4: ac400000 */ sw $zero,0x0($v0)
/* 13eb8: 24c69f38 */ addiu $a2,$a2,%lo(var80099f38)
/* 13ebc: 0c012a60 */ jal osContInit
/* 13ec0: 24a5eeac */ addiu $a1,$a1,%lo(var8005eeac)
/* 13ec0: 24a5eeac */ addiu $a1,$a1,%lo(g_ConnectedControllers)
/* 13ec4: 240f0001 */ addiu $t7,$zero,0x1
/* 13ec8: 3c018006 */ lui $at,%hi(var8005eeb4)
/* 13ecc: ac2feeb4 */ sw $t7,%lo(var8005eeb4)($at)
@ -524,13 +524,13 @@ glabel func00013e84
.L00013f60:
/* 13f60: 1451fff7 */ bne $v0,$s1,.L00013f40
/* 13f64: 24630004 */ addiu $v1,$v1,0x4
/* 13f68: 3c018006 */ lui $at,%hi(var8005eeac)
/* 13f6c: a030eeac */ sb $s0,%lo(var8005eeac)($at)
/* 13f68: 3c018006 */ lui $at,%hi(g_ConnectedControllers)
/* 13f6c: a030eeac */ sb $s0,%lo(g_ConnectedControllers)($at)
.L00013f70:
/* 13f70: 3c068006 */ lui $a2,%hi(var8005eeac)
/* 13f70: 3c068006 */ lui $a2,%hi(g_ConnectedControllers)
/* 13f74: 3c0b8006 */ lui $t3,%hi(var8005ef00)
/* 13f78: 916bef00 */ lbu $t3,%lo(var8005ef00)($t3)
/* 13f7c: 90c6eeac */ lbu $a2,%lo(var8005eeac)($a2)
/* 13f7c: 90c6eeac */ lbu $a2,%lo(g_ConnectedControllers)($a2)
/* 13f80: 00001025 */ or $v0,$zero,$zero
/* 13f84: 00001825 */ or $v1,$zero,$zero
/* 13f88: 10cb000f */ beq $a2,$t3,.L00013fc8
@ -559,7 +559,7 @@ glabel func00013e84
/* 13fd8: 27bd0020 */ addiu $sp,$sp,0x20
/* 13fdc: 3c0e8006 */ lui $t6,%hi(var8005ee60)
/* 13fe0: 8dceee60 */ lw $t6,%lo(var8005ee60)($t6)
/* 13fe4: 3c028006 */ lui $v0,%hi(var8005eeac)
/* 13fe4: 3c028006 */ lui $v0,%hi(g_ConnectedControllers)
/* 13fe8: 24040004 */ addiu $a0,$zero,0x4
/* 13fec: 8dc30200 */ lw $v1,0x200($t6)
/* 13ff0: 04620006 */ bltzl $v1,.L0001400c
@ -570,7 +570,7 @@ glabel func00013e84
/* 14004: 01e01025 */ or $v0,$t7,$zero
/* 14008: 00001825 */ or $v1,$zero,$zero
.L0001400c:
/* 1400c: 9042eeac */ lbu $v0,%lo(var8005eeac)($v0)
/* 1400c: 9042eeac */ lbu $v0,%lo(g_ConnectedControllers)($v0)
/* 14010: 24180001 */ addiu $t8,$zero,0x1
.L00014014:
/* 14014: 0078c804 */ sllv $t9,$t8,$v1
@ -590,12 +590,10 @@ glabel func00013e84
/* 14048: 00000000 */ nop
);
GLOBAL_ASM(
glabel getConnectedControllers
/* 1404c: 3c028006 */ lui $v0,%hi(var8005eeac)
/* 14050: 03e00008 */ jr $ra
/* 14054: 9042eeac */ lbu $v0,%lo(var8005eeac)($v0)
);
u32 contGetConnectedControllers(void)
{
return g_ConnectedControllers;
}
GLOBAL_ASM(
glabel func00014058
@ -1192,8 +1190,8 @@ glabel func00014484
/* 14780: 3c048006 */ lui $a0,%hi(var8005ee7c)
/* 14784: 3c058006 */ lui $a1,%hi(var8005ee8c)
/* 14788: 3c028006 */ lui $v0,%hi(var8005ee9c)
/* 1478c: 3c068006 */ lui $a2,%hi(var8005eeac)
/* 14790: 24c6eeac */ addiu $a2,$a2,%lo(var8005eeac)
/* 1478c: 3c068006 */ lui $a2,%hi(g_ConnectedControllers)
/* 14790: 24c6eeac */ addiu $a2,$a2,%lo(g_ConnectedControllers)
/* 14794: 2442ee9c */ addiu $v0,$v0,%lo(var8005ee9c)
/* 14798: 24a5ee8c */ addiu $a1,$a1,%lo(var8005ee8c)
/* 1479c: 2484ee7c */ addiu $a0,$a0,%lo(var8005ee7c)
@ -1246,7 +1244,7 @@ s32 contGetNumSamples(void)
s32 func00014848(s32 samplenum, s8 contpadnum)
{
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee6c[contpadnum]++;
return 0;
}
@ -1260,7 +1258,7 @@ s32 func00014848(s32 samplenum, s8 contpadnum)
s32 func00014904(s32 samplenum, s8 contpadnum)
{
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee7c[contpadnum]++;
return 0;
}
@ -1274,7 +1272,7 @@ s32 func00014904(s32 samplenum, s8 contpadnum)
s32 func000149c0(s32 samplenum, s8 contpadnum)
{
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee7c[contpadnum]++;
return 0;
}
@ -1290,7 +1288,7 @@ u16 func00014a78(s32 samplenum, s8 contpadnum, u16 mask)
{
u16 button;
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee8c[contpadnum]++;
return 0;
}
@ -1309,7 +1307,7 @@ u16 func00014b50(s32 samplenum, s8 contpadnum, u16 mask)
u16 button1;
u16 button2;
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee9c[contpadnum]++;
return 0;
}
@ -1342,8 +1340,8 @@ glabel func00014c98
/* 14ccc: 00001825 */ or $v1,$zero,$zero
/* 14cd0: 07010010 */ bgez $t8,.L00014d14
/* 14cd4: 00001025 */ or $v0,$zero,$zero
/* 14cd8: 3c198006 */ lui $t9,%hi(var8005eeac)
/* 14cdc: 9339eeac */ lbu $t9,%lo(var8005eeac)($t9)
/* 14cd8: 3c198006 */ lui $t9,%hi(g_ConnectedControllers)
/* 14cdc: 9339eeac */ lbu $t9,%lo(g_ConnectedControllers)($t9)
/* 14ce0: 00056880 */ sll $t5,$a1,0x2
/* 14ce4: 00b95807 */ srav $t3,$t9,$a1
/* 14ce8: 316c0001 */ andi $t4,$t3,0x1
@ -1435,7 +1433,7 @@ glabel func00014c98
s8 contGetStickX(s8 contpadnum)
{
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee6c[contpadnum]++;
return 0;
}
@ -1449,7 +1447,7 @@ s8 contGetStickX(s8 contpadnum)
s8 contGetStickY(s8 contpadnum)
{
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee7c[contpadnum]++;
return 0;
}
@ -1463,7 +1461,7 @@ s8 contGetStickY(s8 contpadnum)
u16 contGetButtons(s8 contpadnum, u16 mask)
{
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee8c[contpadnum]++;
return 0;
}
@ -1477,7 +1475,7 @@ u16 contGetButtons(s8 contpadnum, u16 mask)
u16 func00015020(s8 contpadnum, u16 mask)
{
if (var8005ee60->unk200 < 0 && (var8005eeac >> contpadnum & 1) == 0) {
if (var8005ee60->unk200 < 0 && (g_ConnectedControllers >> contpadnum & 1) == 0) {
var8005ee9c[contpadnum]++;
return 0;
}