diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 0e8b54df8..539af1051 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -76,7 +76,7 @@ glabel aiSetList /* f04dd2c: afa30024 */ sw $v1,0x24($sp) /* f04dd30: 0018ca00 */ sll $t9,$t8,0x8 /* f04dd34: 03281025 */ or $v0,$t9,$t0 -/* f04dd38: 0c006134 */ jal 0x184d0 +/* f04dd38: 0c006134 */ jal ailistFindById /* f04dd3c: 3044ffff */ andi $a0,$v0,0xffff /* f04dd40: 8fa30024 */ lw $v1,0x24($sp) /* f04dd44: 3c06800a */ lui $a2,0x800a @@ -114,14 +114,14 @@ glabel aiSetList /** * Commented because ld is refusing to link to the library binary, making the - * call to func000184d0 unresolvable. Matches otherwise. - * Assumes func000184d0 is defined as u8 *func000184d0(u16 ailistid); + * call to ailistFindById unresolvable. Matches otherwise. + * Assumes ailistFindById is defined as u8 *ailistFindById(u16 ailistid); */ //bool aiSetList(void) //{ // u8 *cmd = g_Vars.ailist + g_Vars.aioffset; // u32 ailistid = cmd[4] | (cmd[3] << 8); -// u8 *ailist = func000184d0(ailistid); +// u8 *ailist = ailistFindById(ailistid); // // struct chrdata *chr = g_Vars.chrdata; // @@ -296,7 +296,7 @@ glabel aiReturn /* f04e004: afbf0014 */ sw $ra,0x14($sp) /* f04e008: 10400007 */ beqz $v0,.L0f04e028 /* f04e00c: 00001825 */ or $v1,$zero,$zero -/* f04e010: 0c006134 */ jal 0x184d0 +/* f04e010: 0c006134 */ jal ailistFindById /* f04e014: 8444010e */ lh $a0,0x10e($v0) /* f04e018: 3c05800a */ lui $a1,0x800a /* f04e01c: 24a59fc0 */ addiu $a1,$a1,-24640 @@ -306,7 +306,7 @@ glabel aiReturn /* f04e028: 8ca20428 */ lw $v0,0x428($a1) /* f04e02c: 50400008 */ beqzl $v0,.L0f04e050 /* f04e030: 8ca2042c */ lw $v0,0x42c($a1) -/* f04e034: 0c006134 */ jal 0x184d0 +/* f04e034: 0c006134 */ jal ailistFindById /* f04e038: 84440062 */ lh $a0,0x62($v0) /* f04e03c: 3c05800a */ lui $a1,0x800a /* f04e040: 24a59fc0 */ addiu $a1,$a1,-24640 @@ -316,7 +316,7 @@ glabel aiReturn .L0f04e050: /* f04e050: 50400008 */ beqzl $v0,.L0f04e074 /* f04e054: 8ca20430 */ lw $v0,0x430($a1) -/* f04e058: 0c006134 */ jal 0x184d0 +/* f04e058: 0c006134 */ jal ailistFindById /* f04e05c: 84440062 */ lh $a0,0x62($v0) /* f04e060: 3c05800a */ lui $a1,0x800a /* f04e064: 24a59fc0 */ addiu $a1,$a1,-24640 @@ -326,7 +326,7 @@ glabel aiReturn .L0f04e074: /* f04e074: 50400007 */ beqzl $v0,.L0f04e094 /* f04e078: 8fbf0014 */ lw $ra,0x14($sp) -/* f04e07c: 0c006134 */ jal 0x184d0 +/* f04e07c: 0c006134 */ jal ailistFindById /* f04e080: 84440062 */ lh $a0,0x62($v0) /* f04e084: 3c05800a */ lui $a1,0x800a /* f04e088: 24a59fc0 */ addiu $a1,$a1,-24640 @@ -343,21 +343,21 @@ glabel aiReturn /** * Commented because ld is refusing to link to the library binary, making the - * call to func000184d0 unresolvable. Matches otherwise. - * Assumes func000184d0 is defined as u8 *func000184d0(s16 ailistid); + * call to ailistFindById unresolvable. Matches otherwise. + * Assumes ailistFindById is defined as u8 *ailistFindById(s16 ailistid); */ //bool aiReturn(void) //{ // u8 *ailist = NULL; // // if (g_Vars.chrdata) { -// ailist = func000184d0(g_Vars.chrdata->aireturnlist); +// ailist = ailistFindById(g_Vars.chrdata->aireturnlist); // } else if (g_Vars.objdata) { -// ailist = func000184d0(g_Vars.objdata->aireturnlist); +// ailist = ailistFindById(g_Vars.objdata->aireturnlist); // } else if (g_Vars.aicdata) { -// ailist = func000184d0(g_Vars.aicdata->aireturnlist); +// ailist = ailistFindById(g_Vars.aicdata->aireturnlist); // } else if (g_Vars.aiddata) { -// ailist = func000184d0(g_Vars.aiddata->aireturnlist); +// ailist = ailistFindById(g_Vars.aiddata->aireturnlist); // } // // g_Vars.ailist = ailist; @@ -8425,7 +8425,7 @@ glabel ai00c6 /* f0556c4: 01af1025 */ or $v0,$t5,$t7 /* f0556c8: 3044ffff */ andi $a0,$v0,0xffff /* f0556cc: afa8002c */ sw $t0,0x2c($sp) -/* f0556d0: 0c006134 */ jal 0x184d0 +/* f0556d0: 0c006134 */ jal ailistFindById /* f0556d4: afa30034 */ sw $v1,0x34($sp) /* f0556d8: 8fa30034 */ lw $v1,0x34($sp) /* f0556dc: 8fa8002c */ lw $t0,0x2c($sp) @@ -8486,7 +8486,7 @@ glabel ai00c7 /* f055794: afa3002c */ sw $v1,0x2c($sp) /* f055798: 00184200 */ sll $t0,$t8,0x8 /* f05579c: 01191025 */ or $v0,$t0,$t9 -/* f0557a0: 0c006134 */ jal 0x184d0 +/* f0557a0: 0c006134 */ jal ailistFindById /* f0557a4: 3044ffff */ andi $a0,$v0,0xffff /* f0557a8: 8fa3002c */ lw $v1,0x2c($sp) /* f0557ac: 8fab0028 */ lw $t3,0x28($sp) @@ -8767,7 +8767,7 @@ glabel ai00ca /* f055b70: afa50064 */ sw $a1,0x64($sp) /* f055b74: 00184200 */ sll $t0,$t8,0x8 /* f055b78: 01191025 */ or $v0,$t0,$t9 -/* f055b7c: 0c006134 */ jal 0x184d0 +/* f055b7c: 0c006134 */ jal ailistFindById /* f055b80: 3044ffff */ andi $a0,$v0,0xffff /* f055b84: 8fab0064 */ lw $t3,0x64($sp) /* f055b88: afa00054 */ sw $zero,0x54($sp) diff --git a/src/game/game_000000.c b/src/game/game_000000.c index 80721dbca..0cfbdaff3 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -17696,7 +17696,7 @@ glabel func0f00f174 /* f00fe0c: e6540078 */ swc1 $f20,0x78($s2) /* f00fe10: e654007c */ swc1 $f20,0x7c($s2) /* f00fe14: 8e44005c */ lw $a0,0x5c($s2) -/* f00fe18: 0c006134 */ jal 0x184d0 +/* f00fe18: 0c006134 */ jal ailistFindById /* f00fe1c: e6500074 */ swc1 $f16,0x74($s2) /* f00fe20: 2419ffff */ addiu $t9,$zero,-1 /* f00fe24: ae42005c */ sw $v0,0x5c($s2) @@ -17726,7 +17726,7 @@ glabel func0f00f174 /* f00fe84: e654007c */ swc1 $f20,0x7c($s2) /* f00fe88: e6540080 */ swc1 $f20,0x80($s2) /* f00fe8c: 8e44005c */ lw $a0,0x5c($s2) -/* f00fe90: 0c006134 */ jal 0x184d0 +/* f00fe90: 0c006134 */ jal ailistFindById /* f00fe94: e652006c */ swc1 $f18,0x6c($s2) /* f00fe98: 8e4e0008 */ lw $t6,0x8($s2) /* f00fe9c: 240cffff */ addiu $t4,$zero,-1 @@ -17776,7 +17776,7 @@ glabel func0f00f174 /* f00ff48: e65400d4 */ swc1 $f20,0xd4($s2) /* f00ff4c: e65400dc */ swc1 $f20,0xdc($s2) /* f00ff50: e65400d8 */ swc1 $f20,0xd8($s2) -/* f00ff54: 0c006134 */ jal 0x184d0 +/* f00ff54: 0c006134 */ jal ailistFindById /* f00ff58: 8e44005c */ lw $a0,0x5c($s2) /* f00ff5c: 2403ffff */ addiu $v1,$zero,-1 /* f00ff60: ae42005c */ sw $v0,0x5c($s2) @@ -17853,7 +17853,7 @@ glabel func0f00f174 /* f01007c: e6540080 */ swc1 $f20,0x80($s2) /* f010080: 8e44005c */ lw $a0,0x5c($s2) /* f010084: e640007c */ swc1 $f0,0x7c($s2) -/* f010088: 0c006134 */ jal 0x184d0 +/* f010088: 0c006134 */ jal ailistFindById /* f01008c: e6400070 */ swc1 $f0,0x70($s2) /* f010090: 2418ffff */ addiu $t8,$zero,-1 /* f010094: ae42005c */ sw $v0,0x5c($s2) @@ -22997,7 +22997,7 @@ glabel func0f014848 /* f0148f4: 8da10008 */ lw $at,0x8($t5) /* f0148f8: 24040029 */ addiu $a0,$zero,0x29 /* f0148fc: ad8f0004 */ sw $t7,0x4($t4) -/* f014900: 0c006134 */ jal 0x184d0 +/* f014900: 0c006134 */ jal ailistFindById /* f014904: ad810008 */ sw $at,0x8($t4) /* f014908: 4480a000 */ mtc1 $zero,$f20 /* f01490c: 02002025 */ or $a0,$s0,$zero @@ -50956,7 +50956,7 @@ glabel func0f02d4fc /* f02d714: 0fc259d4 */ jal func0f096750 /* f02d718: c7ae0078 */ lwc1 $f14,0x78($sp) /* f02d71c: e7a00044 */ swc1 $f0,0x44($sp) -/* f02d720: 0c006134 */ jal 0x184d0 +/* f02d720: 0c006134 */ jal ailistFindById /* f02d724: 9604000e */ lhu $a0,0xe($s0) /* f02d728: 8fa40054 */ lw $a0,0x54($sp) /* f02d72c: 27a50064 */ addiu $a1,$sp,0x64 @@ -51318,7 +51318,7 @@ glabel func0f02dbac /* f02dc40: 00002825 */ or $a1,$zero,$zero /* f02dc44: 10400055 */ beqz $v0,.L0f02dd9c /* f02dc48: 00408025 */ or $s0,$v0,$zero -/* f02dc4c: 0c006134 */ jal 0x184d0 +/* f02dc4c: 0c006134 */ jal ailistFindById /* f02dc50: 00002025 */ or $a0,$zero,$zero /* f02dc54: 02002025 */ or $a0,$s0,$zero /* f02dc58: 8fa50080 */ lw $a1,0x80($sp) @@ -60932,7 +60932,7 @@ glabel func0f036358 /* f0363b8: 24040028 */ addiu $a0,$zero,0x28 /* f0363bc: e6000030 */ swc1 $f0,0x30($s0) /* f0363c0: e6000034 */ swc1 $f0,0x34($s0) -/* f0363c4: 0c006134 */ jal 0x184d0 +/* f0363c4: 0c006134 */ jal ailistFindById /* f0363c8: e6040038 */ swc1 $f4,0x38($s0) /* f0363cc: ae020108 */ sw $v0,0x108($s0) /* f0363d0: a600010c */ sh $zero,0x10c($s0) @@ -81013,7 +81013,7 @@ glabel func0f047c80 /* f047e14: a20e033b */ sb $t6,0x33b($s0) /* f047e18: 04800011 */ bltz $a0,.L0f047e60 /* f047e1c: 00000000 */ sll $zero,$zero,0x0 -/* f047e20: 0c006134 */ jal 0x184d0 +/* f047e20: 0c006134 */ jal ailistFindById /* f047e24: 00000000 */ sll $zero,$zero,0x0 /* f047e28: 8e0f0108 */ lw $t7,0x108($s0) /* f047e2c: 3c07800a */ lui $a3,0x800a @@ -81049,7 +81049,7 @@ glabel func0f047c80 /* f047e98: 28410019 */ slti $at,$v0,0x19 /* f047e9c: 1020000b */ beqz $at,.L0f047ecc /* f047ea0: 24e79fc0 */ addiu $a3,$a3,-24640 -/* f047ea4: 0c006134 */ jal 0x184d0 +/* f047ea4: 0c006134 */ jal ailistFindById /* f047ea8: 8604035a */ lh $a0,0x35a($s0) /* f047eac: 8e0d0108 */ lw $t5,0x108($s0) /* f047eb0: 3c07800a */ lui $a3,0x800a @@ -81144,7 +81144,7 @@ glabel func0f047c80 .L0f047fec: /* f047fec: 5040000c */ beqzl $v0,.L0f048020 /* f047ff0: 8fb9004c */ lw $t9,0x4c($sp) -/* f047ff4: 0c006134 */ jal 0x184d0 +/* f047ff4: 0c006134 */ jal ailistFindById /* f047ff8: 8604035c */ lh $a0,0x35c($s0) /* f047ffc: 8e0d0108 */ lw $t5,0x108($s0) /* f048000: 3c07800a */ lui $a3,0x800a @@ -81362,7 +81362,7 @@ glabel func0f0482cc /* f048318: 5440fffc */ bnezl $v0,.L0f04830c /* f04831c: a4430038 */ sh $v1,0x38($v0) .L0f048320: -/* f048320: 0c006134 */ jal 0x184d0 +/* f048320: 0c006134 */ jal ailistFindById /* f048324: 00a02025 */ or $a0,$a1,$zero /* f048328: 3c048006 */ lui $a0,0x8006 /* f04832c: 24847e60 */ addiu $a0,$a0,0x7e60 @@ -87604,7 +87604,7 @@ glabel func0f04d6b4 /* f04d86c: 03214024 */ and $t0,$t9,$at /* f04d870: ace80018 */ sw $t0,0x18($a3) /* f04d874: 8e090424 */ lw $t1,0x424($s0) -/* f04d878: 0c006134 */ jal 0x184d0 +/* f04d878: 0c006134 */ jal ailistFindById /* f04d87c: 85240110 */ lh $a0,0x110($t1) /* f04d880: ae020434 */ sw $v0,0x434($s0) /* f04d884: ae000438 */ sw $zero,0x438($s0) @@ -87625,7 +87625,7 @@ glabel func0f04d6b4 /* f04d8b8: 85840356 */ lh $a0,0x356($t4) /* f04d8bc: 0482003b */ bltzl $a0,.L0f04d9ac /* f04d8c0: 8e070424 */ lw $a3,0x424($s0) -/* f04d8c4: 0c006134 */ jal 0x184d0 +/* f04d8c4: 0c006134 */ jal ailistFindById /* f04d8c8: 00000000 */ sll $zero,$zero,0x0 /* f04d8cc: 8e0d0424 */ lw $t5,0x424($s0) /* f04d8d0: 8dae0108 */ lw $t6,0x108($t5) @@ -87653,7 +87653,7 @@ glabel func0f04d6b4 /* f04d928: 54400020 */ bnezl $v0,.L0f04d9ac /* f04d92c: 8e070424 */ lw $a3,0x424($s0) /* f04d930: 8e190424 */ lw $t9,0x424($s0) -/* f04d934: 0c006134 */ jal 0x184d0 +/* f04d934: 0c006134 */ jal ailistFindById /* f04d938: 87240356 */ lh $a0,0x356($t9) /* f04d93c: 8e070424 */ lw $a3,0x424($s0) /* f04d940: 8ce80108 */ lw $t0,0x108($a3) @@ -87675,7 +87675,7 @@ glabel func0f04d6b4 /* f04d980: 2401000a */ addiu $at,$zero,0xa /* f04d984: 50410009 */ beql $v0,$at,.L0f04d9ac /* f04d988: 8e070424 */ lw $a3,0x424($s0) -/* f04d98c: 0c006134 */ jal 0x184d0 +/* f04d98c: 0c006134 */ jal ailistFindById /* f04d990: 84e40356 */ lh $a0,0x356($a3) /* f04d994: 8e090424 */ lw $t1,0x424($s0) /* f04d998: ae020434 */ sw $v0,0x434($s0) @@ -87712,7 +87712,7 @@ glabel func0f04d6b4 /* f04da04: 5440002c */ bnezl $v0,.L0f04dab8 /* f04da08: 8e040434 */ lw $a0,0x434($s0) /* f04da0c: 8e180424 */ lw $t8,0x424($s0) -/* f04da10: 0c006134 */ jal 0x184d0 +/* f04da10: 0c006134 */ jal ailistFindById /* f04da14: 8704035a */ lh $a0,0x35a($t8) /* f04da18: 8e070424 */ lw $a3,0x424($s0) /* f04da1c: 8cf90108 */ lw $t9,0x108($a3) @@ -87747,7 +87747,7 @@ glabel func0f04d6b4 /* f04da90: 8e0c0424 */ lw $t4,0x424($s0) /* f04da94: a1800113 */ sb $zero,0x113($t4) /* f04da98: 8e0d0424 */ lw $t5,0x424($s0) -/* f04da9c: 0c006134 */ jal 0x184d0 +/* f04da9c: 0c006134 */ jal ailistFindById /* f04daa0: 85a4035a */ lh $a0,0x35a($t5) /* f04daa4: ae020434 */ sw $v0,0x434($s0) /* f04daa8: ae000438 */ sw $zero,0x438($s0) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 15d36483f..614766a1a 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -107462,7 +107462,7 @@ glabel func0f0bd904 /* f0becc0: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0becc4: 14540015 */ bne $v0,$s4,.L0f0bed1c /* f0becc8: 00000000 */ sll $zero,$zero,0x0 -/* f0beccc: 0c006134 */ jal 0x184d0 +/* f0beccc: 0c006134 */ jal ailistFindById /* f0becd0: 24040012 */ addiu $a0,$zero,0x12 /* f0becd4: 8e700284 */ lw $s0,0x284($s3) /* f0becd8: 3c014000 */ lui $at,0x4000 @@ -107488,7 +107488,7 @@ glabel func0f0bd904 /* f0bed24: 24010023 */ addiu $at,$zero,0x23 /* f0bed28: 14410012 */ bne $v0,$at,.L0f0bed74 /* f0bed2c: 00000000 */ sll $zero,$zero,0x0 -/* f0bed30: 0c006134 */ jal 0x184d0 +/* f0bed30: 0c006134 */ jal ailistFindById /* f0bed34: 24040012 */ addiu $a0,$zero,0x12 /* f0bed38: 8e700284 */ lw $s0,0x284($s3) /* f0bed3c: 240e0010 */ addiu $t6,$zero,0x10 @@ -107506,7 +107506,7 @@ glabel func0f0bd904 /* f0bed6c: 10000014 */ beqz $zero,.L0f0bedc0 /* f0bed70: 00408825 */ or $s1,$v0,$zero .L0f0bed74: -/* f0bed74: 0c006134 */ jal 0x184d0 +/* f0bed74: 0c006134 */ jal ailistFindById /* f0bed78: 24040012 */ addiu $a0,$zero,0x12 /* f0bed7c: 8e700284 */ lw $s0,0x284($s3) /* f0bed80: 3c014000 */ lui $at,0x4000 @@ -107592,7 +107592,7 @@ glabel func0f0bd904 /* f0beeb0: 24010023 */ addiu $at,$zero,0x23 /* f0beeb4: 14410012 */ bne $v0,$at,.L0f0bef00 /* f0beeb8: 00000000 */ sll $zero,$zero,0x0 -/* f0beebc: 0c006134 */ jal 0x184d0 +/* f0beebc: 0c006134 */ jal ailistFindById /* f0beec0: 24040012 */ addiu $a0,$zero,0x12 /* f0beec4: 8e700284 */ lw $s0,0x284($s3) /* f0beec8: 24180010 */ addiu $t8,$zero,0x10 @@ -107610,7 +107610,7 @@ glabel func0f0bd904 /* f0beef8: 10000011 */ beqz $zero,.L0f0bef40 /* f0beefc: 00408825 */ or $s1,$v0,$zero .L0f0bef00: -/* f0bef00: 0c006134 */ jal 0x184d0 +/* f0bef00: 0c006134 */ jal ailistFindById /* f0bef04: 02802025 */ or $a0,$s4,$zero /* f0bef08: 8e700284 */ lw $s0,0x284($s3) /* f0bef0c: 240f0010 */ addiu $t7,$zero,0x10 @@ -107688,7 +107688,7 @@ glabel func0f0bd904 /* f0bf01c: 24010023 */ addiu $at,$zero,0x23 /* f0bf020: 14410012 */ bne $v0,$at,.L0f0bf06c /* f0bf024: 00000000 */ sll $zero,$zero,0x0 -/* f0bf028: 0c006134 */ jal 0x184d0 +/* f0bf028: 0c006134 */ jal ailistFindById /* f0bf02c: 24040012 */ addiu $a0,$zero,0x12 /* f0bf030: 8e700284 */ lw $s0,0x284($s3) /* f0bf034: 240f0010 */ addiu $t7,$zero,0x10 @@ -107706,7 +107706,7 @@ glabel func0f0bd904 /* f0bf064: 10000011 */ beqz $zero,.L0f0bf0ac /* f0bf068: 00408825 */ or $s1,$v0,$zero .L0f0bf06c: -/* f0bf06c: 0c006134 */ jal 0x184d0 +/* f0bf06c: 0c006134 */ jal ailistFindById /* f0bf070: 24040012 */ addiu $a0,$zero,0x12 /* f0bf074: 8e700284 */ lw $s0,0x284($s3) /* f0bf078: 24090010 */ addiu $t1,$zero,0x10 @@ -107790,7 +107790,7 @@ glabel func0f0bd904 /* f0bf1a0: 24010023 */ addiu $at,$zero,0x23 /* f0bf1a4: 14410012 */ bne $v0,$at,.L0f0bf1f0 /* f0bf1a8: 00000000 */ sll $zero,$zero,0x0 -/* f0bf1ac: 0c006134 */ jal 0x184d0 +/* f0bf1ac: 0c006134 */ jal ailistFindById /* f0bf1b0: 24040012 */ addiu $a0,$zero,0x12 /* f0bf1b4: 8e700284 */ lw $s0,0x284($s3) /* f0bf1b8: 240b0010 */ addiu $t3,$zero,0x10 @@ -107808,7 +107808,7 @@ glabel func0f0bd904 /* f0bf1e8: 10000011 */ beqz $zero,.L0f0bf230 /* f0bf1ec: 00408825 */ or $s1,$v0,$zero .L0f0bf1f0: -/* f0bf1f0: 0c006134 */ jal 0x184d0 +/* f0bf1f0: 0c006134 */ jal ailistFindById /* f0bf1f4: 24040012 */ addiu $a0,$zero,0x12 /* f0bf1f8: 8e700284 */ lw $s0,0x284($s3) /* f0bf1fc: 240d0010 */ addiu $t5,$zero,0x10 @@ -107896,7 +107896,7 @@ glabel func0f0bd904 /* f0bf334: 24010023 */ addiu $at,$zero,0x23 /* f0bf338: 14410012 */ bne $v0,$at,.L0f0bf384 /* f0bf33c: 00000000 */ sll $zero,$zero,0x0 -/* f0bf340: 0c006134 */ jal 0x184d0 +/* f0bf340: 0c006134 */ jal ailistFindById /* f0bf344: 24040012 */ addiu $a0,$zero,0x12 /* f0bf348: 8e700284 */ lw $s0,0x284($s3) /* f0bf34c: 240c0010 */ addiu $t4,$zero,0x10 @@ -107914,7 +107914,7 @@ glabel func0f0bd904 /* f0bf37c: 10000011 */ beqz $zero,.L0f0bf3c4 /* f0bf380: 00408825 */ or $s1,$v0,$zero .L0f0bf384: -/* f0bf384: 0c006134 */ jal 0x184d0 +/* f0bf384: 0c006134 */ jal ailistFindById /* f0bf388: 24040012 */ addiu $a0,$zero,0x12 /* f0bf38c: 8e700284 */ lw $s0,0x284($s3) /* f0bf390: 240e0010 */ addiu $t6,$zero,0x10 @@ -177701,7 +177701,7 @@ glabel func0f0fdd84 /* f0fddf8: 02002025 */ or $a0,$s0,$zero /* f0fddfc: 54400014 */ bnezl $v0,.L0f0fde50 /* f0fde00: 8e790474 */ lw $t9,0x474($s3) -/* f0fde04: 0c006134 */ jal 0x184d0 +/* f0fde04: 0c006134 */ jal ailistFindById /* f0fde08: 24040015 */ addiu $a0,$zero,0x15 /* f0fde0c: 8e180108 */ lw $t8,0x108($s0) /* f0fde10: 5058000f */ beql $v0,$t8,.L0f0fde50 @@ -177715,7 +177715,7 @@ glabel func0f0fdd84 /* f0fde30: 8e790474 */ lw $t9,0x474($s3) /* f0fde34: 0fc0fe3d */ jal func0f03f8f4 /* f0fde38: 02002025 */ or $a0,$s0,$zero -/* f0fde3c: 0c006134 */ jal 0x184d0 +/* f0fde3c: 0c006134 */ jal ailistFindById /* f0fde40: 24040015 */ addiu $a0,$zero,0x15 /* f0fde44: ae020108 */ sw $v0,0x108($s0) /* f0fde48: a600010c */ sh $zero,0x10c($s0) diff --git a/src/include/library/library.h b/src/include/library/library.h index 59bf4271f..32502256e 100644 --- a/src/include/library/library.h +++ b/src/include/library/library.h @@ -4,4 +4,7 @@ u8 random(void); +// Not sure what type the argument is +u8 *ailistFindById(s32 ailistid); + #endif diff --git a/src/library/library.c b/src/library/library.c index 32fd169aa..381a623e2 100644 --- a/src/library/library.c +++ b/src/library/library.c @@ -30660,7 +30660,7 @@ glabel func00018148 ); GLOBAL_ASM( -glabel func000184d0 +glabel ailistFindById /* 184d0: 28810401 */ slti $at,$a0,0x401 /* 184d4: 14200020 */ bnez $at,.L00018558 /* 184d8: 3c058006 */ lui $a1,0x8006