diff --git a/src/game/game.c b/src/game/game.c index 17b61d5f5..520201bd7 100644 --- a/src/game/game.c +++ b/src/game/game.c @@ -2,6 +2,7 @@ #include "src/include/constants.h" #include "src/include/gvars.h" #include "src/include/game.h" +#include "src/include/library.h" GLOBAL_ASM( glabel func0f000000 @@ -64191,7 +64192,7 @@ glabel func0f038f40 /* f03911c: 11c0001e */ beqz $t6,.L0f039198 /* f039120: 30490008 */ andi $t1,$v0,0x8 /* f039124: 8fa40078 */ lw $a0,0x78($sp) -/* f039128: 0fc126d1 */ jal func0f049b44 +/* f039128: 0fc126d1 */ jal chrFindById /* f03912c: 8fa5008c */ lw $a1,0x8c($sp) /* f039130: 10400004 */ beqz $v0,.L0f039144 /* f039134: 00402025 */ or $a0,$v0,$zero @@ -66118,7 +66119,7 @@ glabel func0f03aac8 /* f03ab18: 05030012 */ bgezl $t0,.L0f03ab64 /* f03ab1c: 00001025 */ or $v0,$zero,$zero .L0f03ab20: -/* f03ab20: 0fc126d1 */ jal func0f049b44 +/* f03ab20: 0fc126d1 */ jal chrFindById /* f03ab24: afa40018 */ sw $a0,0x18($sp) /* f03ab28: 1040000d */ beqz $v0,.L0f03ab60 /* f03ab2c: 8fa40018 */ lw $a0,0x18($sp) @@ -81970,7 +81971,7 @@ glabel func0f048b78 /* f048b84: afbf0014 */ sw $ra,0x14($sp) /* f048b88: 00c02825 */ or $a1,$a2,$zero /* f048b8c: afa40080 */ sw $a0,0x80($sp) -/* f048b90: 0fc126d1 */ jal func0f049b44 +/* f048b90: 0fc126d1 */ jal chrFindById /* f048b94: afa7008c */ sw $a3,0x8c($sp) /* f048b98: 8fa40080 */ lw $a0,0x80($sp) /* f048b9c: 8fa7008c */ lw $a3,0x8c($sp) @@ -83117,7 +83118,7 @@ glabel func0f049810 ); GLOBAL_ASM( -glabel func0f049b44 +glabel chrFindById /* f049b44: 27bdffe8 */ addiu $sp,$sp,-24 /* f049b48: afbf0014 */ sw $ra,0x14($sp) /* f049b4c: 0fc12604 */ jal func0f049810 @@ -83201,7 +83202,7 @@ glabel func0f049c14 /* f049c50: 10000013 */ beqz $zero,.L0f049ca0 /* f049c54: 8fbf0014 */ lw $ra,0x14($sp) .L0f049c58: -/* f049c58: 0fc126d1 */ jal func0f049b44 +/* f049c58: 0fc126d1 */ jal chrFindById /* f049c5c: 00000000 */ sll $zero,$zero,0x0 /* f049c60: 5040000e */ beqzl $v0,.L0f049c9c /* f049c64: 2403ffff */ addiu $v1,$zero,-1 @@ -83232,7 +83233,7 @@ glabel func0f049cb0 /* f049cb0: 27bdffe0 */ addiu $sp,$sp,-32 /* f049cb4: afbf0014 */ sw $ra,0x14($sp) /* f049cb8: 8c83001c */ lw $v1,0x1c($a0) -/* f049cbc: 0fc126d1 */ jal func0f049b44 +/* f049cbc: 0fc126d1 */ jal chrFindById /* f049cc0: afa3001c */ sw $v1,0x1c($sp) /* f049cc4: 44801000 */ mtc1 $zero,$f2 /* f049cc8: 10400015 */ beqz $v0,.L0f049d20 @@ -83372,7 +83373,7 @@ glabel func0f049e78 /* f049e78: 27bdffe8 */ addiu $sp,$sp,-24 /* f049e7c: afbf0014 */ sw $ra,0x14($sp) /* f049e80: afa60020 */ sw $a2,0x20($sp) -/* f049e84: 0fc126d1 */ jal func0f049b44 +/* f049e84: 0fc126d1 */ jal chrFindById /* f049e88: afa70024 */ sw $a3,0x24($sp) /* f049e8c: 10400004 */ beqz $v0,.L0f049ea0 /* f049e90: 00402025 */ or $a0,$v0,$zero @@ -83391,7 +83392,7 @@ glabel func0f049eb0 /* f049eb0: 27bdffe8 */ addiu $sp,$sp,-24 /* f049eb4: afbf0014 */ sw $ra,0x14($sp) /* f049eb8: afa60020 */ sw $a2,0x20($sp) -/* f049ebc: 0fc126d1 */ jal func0f049b44 +/* f049ebc: 0fc126d1 */ jal chrFindById /* f049ec0: afa70024 */ sw $a3,0x24($sp) /* f049ec4: 10400004 */ beqz $v0,.L0f049ed8 /* f049ec8: 00402025 */ or $a0,$v0,$zero @@ -83410,7 +83411,7 @@ glabel func0f049ee8 /* f049ee8: 27bdffe8 */ addiu $sp,$sp,-24 /* f049eec: afbf0014 */ sw $ra,0x14($sp) /* f049ef0: afa60020 */ sw $a2,0x20($sp) -/* f049ef4: 0fc126d1 */ jal func0f049b44 +/* f049ef4: 0fc126d1 */ jal chrFindById /* f049ef8: afa70024 */ sw $a3,0x24($sp) /* f049efc: 10400006 */ beqz $v0,.L0f049f18 /* f049f00: 00402025 */ or $a0,$v0,$zero @@ -83616,7 +83617,7 @@ glabel func0f04a110 /* f04a150: 14a1000f */ bne $a1,$at,.L0f04a190 /* f04a154: 00c02825 */ or $a1,$a2,$zero /* f04a158: afa3001c */ sw $v1,0x1c($sp) -/* f04a15c: 0fc126d1 */ jal func0f049b44 +/* f04a15c: 0fc126d1 */ jal chrFindById /* f04a160: afa40020 */ sw $a0,0x20($sp) /* f04a164: 8fa3001c */ lw $v1,0x1c($sp) /* f04a168: 8fa40020 */ lw $a0,0x20($sp) @@ -83660,7 +83661,7 @@ glabel func0f04a1ac /* f04a1e4: 14a10013 */ bne $a1,$at,.L0f04a234 /* f04a1e8: 00c02825 */ or $a1,$a2,$zero /* f04a1ec: afa3001c */ sw $v1,0x1c($sp) -/* f04a1f0: 0fc126d1 */ jal func0f049b44 +/* f04a1f0: 0fc126d1 */ jal chrFindById /* f04a1f4: afa40020 */ sw $a0,0x20($sp) /* f04a1f8: 8fa3001c */ lw $v1,0x1c($sp) /* f04a1fc: 8fa40020 */ lw $a0,0x20($sp) @@ -84440,7 +84441,7 @@ glabel func0f04ac60 /* f04ac60: 27bdffe0 */ addiu $sp,$sp,-32 /* f04ac64: afbf0014 */ sw $ra,0x14($sp) /* f04ac68: afa40020 */ sw $a0,0x20($sp) -/* f04ac6c: 0fc126d1 */ jal func0f049b44 +/* f04ac6c: 0fc126d1 */ jal chrFindById /* f04ac70: afa60028 */ sw $a2,0x28($sp) /* f04ac74: 10400006 */ beqz $v0,.L0f04ac90 /* f04ac78: 8fa40020 */ lw $a0,0x20($sp) @@ -84475,7 +84476,7 @@ glabel func0f04acc8 /* f04acc8: 27bdffe0 */ addiu $sp,$sp,-32 /* f04accc: afbf0014 */ sw $ra,0x14($sp) /* f04acd0: afa40020 */ sw $a0,0x20($sp) -/* f04acd4: 0fc126d1 */ jal func0f049b44 +/* f04acd4: 0fc126d1 */ jal chrFindById /* f04acd8: afa60028 */ sw $a2,0x28($sp) /* f04acdc: 10400006 */ beqz $v0,.L0f04acf8 /* f04ace0: 8fa40020 */ lw $a0,0x20($sp) @@ -85130,7 +85131,7 @@ glabel func0f04b5f4 /* f04b5f8: afbf0024 */ sw $ra,0x24($sp) /* f04b5fc: afa50034 */ sw $a1,0x34($sp) /* f04b600: afa60038 */ sw $a2,0x38($sp) -/* f04b604: 0fc126d1 */ jal func0f049b44 +/* f04b604: 0fc126d1 */ jal chrFindById /* f04b608: 00e02825 */ or $a1,$a3,$zero /* f04b60c: 00402025 */ or $a0,$v0,$zero /* f04b610: 0fc0f917 */ jal func0f03e45c @@ -87893,7 +87894,7 @@ bool aiYield(void) * @cmd 0005 */ GLOBAL_ASM( -glabel ai0005 +glabel aiSetAilist /* f04dd08: 3c06800a */ lui $a2,0x800a /* f04dd0c: 24c69fc0 */ addiu $a2,$a2,-24640 /* f04dd10: 8cce0434 */ lw $t6,0x434($a2) @@ -87921,7 +87922,7 @@ glabel ai0005 /* f04dd68: 1000000d */ beqz $zero,.L0f04dda0 /* f04dd6c: acc00438 */ sw $zero,0x438($a2) .L0f04dd70: -/* f04dd70: 0fc126d1 */ jal func0f049b44 +/* f04dd70: 0fc126d1 */ jal chrFindById /* f04dd74: afa7001c */ sw $a3,0x1c($sp) /* f04dd78: 3c06800a */ lui $a2,0x800a /* f04dd7c: 24c69fc0 */ addiu $a2,$a2,-24640 @@ -87942,6 +87943,37 @@ glabel ai0005 /* f04ddb0: 00000000 */ sll $zero,$zero,0x0 ); +/** + * 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); + */ +//bool aiSetAilist(void) +//{ +// u8 *cmd = g_Vars.ailist + g_Vars.aioffset; +// u32 ailistid = cmd[4] | (cmd[3] << 8); +// u8 *ailist = func000184d0(ailistid); +// +// struct chrdata *chr = g_Vars.chrdata; +// +// if ((cmd[2] & 0xff) == CHR_SELF) { +// g_Vars.ailist = ailist; +// g_Vars.aioffset = 0; +// } else { +// chr = chrFindById(chr, cmd[2]); +// +// if (chr) { +// chr->ailist = ailist; +// chr->aioffset = 0; +// chr->sleep = 0; +// } +// +// g_Vars.aioffset += 5; +// } +// +// return false; +//} + /** * @cmd 0006 */ @@ -87969,7 +88001,7 @@ glabel ai0006 /* f04de00: 10000008 */ beqz $zero,.L0f04de24 /* f04de04: a488010e */ sh $t0,0x10e($a0) .L0f04de08: -/* f04de08: 0fc126d1 */ jal func0f049b44 +/* f04de08: 0fc126d1 */ jal chrFindById /* f04de0c: a7a6001a */ sh $a2,0x1a($sp) /* f04de10: 3c07800a */ lui $a3,0x800a /* f04de14: 24e79fc0 */ addiu $a3,$a3,-24640 @@ -88297,7 +88329,7 @@ glabel ai000b /* f04e1d4: 9065000a */ lbu $a1,0xa($v1) /* f04e1d8: afa80034 */ sw $t0,0x34($sp) /* f04e1dc: afa60030 */ sw $a2,0x30($sp) -/* f04e1e0: 0fc126d1 */ jal func0f049b44 +/* f04e1e0: 0fc126d1 */ jal chrFindById /* f04e1e4: afa3003c */ sw $v1,0x3c($sp) /* f04e1e8: 3c09800a */ lui $t1,0x800a /* f04e1ec: 25299fc0 */ addiu $t1,$t1,-24640 @@ -88555,7 +88587,7 @@ glabel ai0033 /* f04e514: 8e040424 */ lw $a0,0x424($s0) /* f04e518: 01cf1021 */ addu $v0,$t6,$t7 /* f04e51c: 90450002 */ lbu $a1,0x2($v0) -/* f04e520: 0fc126d1 */ jal func0f049b44 +/* f04e520: 0fc126d1 */ jal chrFindById /* f04e524: afa20024 */ sw $v0,0x24($sp) /* f04e528: 10400008 */ beqz $v0,.L0f04e54c /* f04e52c: 00402025 */ or $a0,$v0,$zero @@ -88611,7 +88643,7 @@ glabel ai0034 /* f04e5c8: 8e040424 */ lw $a0,0x424($s0) /* f04e5cc: 01cf1021 */ addu $v0,$t6,$t7 /* f04e5d0: 90450002 */ lbu $a1,0x2($v0) -/* f04e5d4: 0fc126d1 */ jal func0f049b44 +/* f04e5d4: 0fc126d1 */ jal chrFindById /* f04e5d8: afa20024 */ sw $v0,0x24($sp) /* f04e5dc: 10400004 */ beqz $v0,.L0f04e5f0 /* f04e5e0: 00402825 */ or $a1,$v0,$zero @@ -88672,7 +88704,7 @@ glabel ai017b /* f04e688: 01cf4021 */ addu $t0,$t6,$t7 /* f04e68c: 91050002 */ lbu $a1,0x2($t0) /* f04e690: afa8001c */ sw $t0,0x1c($sp) -/* f04e694: 0fc126d1 */ jal func0f049b44 +/* f04e694: 0fc126d1 */ jal chrFindById /* f04e698: 8ce40424 */ lw $a0,0x424($a3) /* f04e69c: 3c07800a */ lui $a3,0x800a /* f04e6a0: 24e79fc0 */ addiu $a3,$a3,-24640 @@ -89302,7 +89334,7 @@ glabel ai0019 /* f04ee28: 01cf1821 */ addu $v1,$t6,$t7 /* f04ee2c: 90650002 */ lbu $a1,0x2($v1) /* f04ee30: afa3003c */ sw $v1,0x3c($sp) -/* f04ee34: 0fc126d1 */ jal func0f049b44 +/* f04ee34: 0fc126d1 */ jal chrFindById /* f04ee38: 8c440424 */ lw $a0,0x424($v0) /* f04ee3c: 3c198007 */ lui $t9,0x8007 /* f04ee40: afa20038 */ sw $v0,0x38($sp) @@ -89360,12 +89392,12 @@ glabel ai001a /* f04eef0: 01cf1021 */ addu $v0,$t6,$t7 /* f04eef4: 90450002 */ lbu $a1,0x2($v0) /* f04eef8: afa20054 */ sw $v0,0x54($sp) -/* f04eefc: 0fc126d1 */ jal func0f049b44 +/* f04eefc: 0fc126d1 */ jal chrFindById /* f04ef00: 8e440424 */ lw $a0,0x424($s2) /* f04ef04: 8fb80054 */ lw $t8,0x54($sp) /* f04ef08: 00408025 */ or $s0,$v0,$zero /* f04ef0c: 8e440424 */ lw $a0,0x424($s2) -/* f04ef10: 0fc126d1 */ jal func0f049b44 +/* f04ef10: 0fc126d1 */ jal chrFindById /* f04ef14: 93050003 */ lbu $a1,0x3($t8) /* f04ef18: 12000044 */ beqz $s0,.L0f04f02c /* f04ef1c: 00408825 */ or $s1,$v0,$zero @@ -89598,7 +89630,7 @@ glabel ai0026 /* f04f200: afbf0014 */ sw $ra,0x14($sp) /* f04f204: 01cf1021 */ addu $v0,$t6,$t7 /* f04f208: 90450002 */ lbu $a1,0x2($v0) -/* f04f20c: 0fc126d1 */ jal func0f049b44 +/* f04f20c: 0fc126d1 */ jal chrFindById /* f04f210: 8c640424 */ lw $a0,0x424($v1) /* f04f214: 3c03800a */ lui $v1,0x800a /* f04f218: 10400007 */ beqz $v0,.L0f04f238 @@ -90906,7 +90938,7 @@ glabel ai0045 /* f050194: 8e040424 */ lw $a0,0x424($s0) /* f050198: 01cf1021 */ addu $v0,$t6,$t7 /* f05019c: 90450002 */ lbu $a1,0x2($v0) -/* f0501a0: 0fc126d1 */ jal func0f049b44 +/* f0501a0: 0fc126d1 */ jal chrFindById /* f0501a4: afa20024 */ sw $v0,0x24($sp) /* f0501a8: 50400012 */ beqzl $v0,.L0f0501f4 /* f0501ac: 8e080438 */ lw $t0,0x438($s0) @@ -91028,7 +91060,7 @@ glabel ai0048 /* f05030c: afb00018 */ sw $s0,0x18($sp) /* f050310: 01cf1021 */ addu $v0,$t6,$t7 /* f050314: 90450002 */ lbu $a1,0x2($v0) -/* f050318: 0fc126d1 */ jal func0f049b44 +/* f050318: 0fc126d1 */ jal chrFindById /* f05031c: 8e840424 */ lw $a0,0x424($s4) /* f050320: 00408825 */ or $s1,$v0,$zero /* f050324: 10400015 */ beqz $v0,.L0f05037c @@ -91693,7 +91725,7 @@ glabel ai0054 /* f050b80: 8e040424 */ lw $a0,0x424($s0) /* f050b84: 01cf3821 */ addu $a3,$t6,$t7 /* f050b88: 90e50002 */ lbu $a1,0x2($a3) -/* f050b8c: 0fc126d1 */ jal func0f049b44 +/* f050b8c: 0fc126d1 */ jal chrFindById /* f050b90: afa7002c */ sw $a3,0x2c($sp) /* f050b94: 8fa7002c */ lw $a3,0x2c($sp) /* f050b98: 3c014120 */ lui $at,0x4120 @@ -91764,7 +91796,7 @@ glabel ai01df /* f050c70: 8e040424 */ lw $a0,0x424($s0) /* f050c74: 01cf1821 */ addu $v1,$t6,$t7 /* f050c78: 90650002 */ lbu $a1,0x2($v1) -/* f050c7c: 0fc126d1 */ jal func0f049b44 +/* f050c7c: 0fc126d1 */ jal chrFindById /* f050c80: afa3002c */ sw $v1,0x2c($sp) /* f050c84: 8fa3002c */ lw $v1,0x2c($sp) /* f050c88: 3c014120 */ lui $at,0x4120 @@ -91833,7 +91865,7 @@ glabel ai0055 /* f050d5c: 8e040424 */ lw $a0,0x424($s0) /* f050d60: 01cf1821 */ addu $v1,$t6,$t7 /* f050d64: 90650002 */ lbu $a1,0x2($v1) -/* f050d68: 0fc126d1 */ jal func0f049b44 +/* f050d68: 0fc126d1 */ jal chrFindById /* f050d6c: afa3002c */ sw $v1,0x2c($sp) /* f050d70: 8fa3002c */ lw $v1,0x2c($sp) /* f050d74: 3c014120 */ lui $at,0x4120 @@ -92176,7 +92208,7 @@ glabel ai005b /* f0511d8: 8e040424 */ lw $a0,0x424($s0) /* f0511dc: 01cf1021 */ addu $v0,$t6,$t7 /* f0511e0: 90450002 */ lbu $a1,0x2($v0) -/* f0511e4: 0fc126d1 */ jal func0f049b44 +/* f0511e4: 0fc126d1 */ jal chrFindById /* f0511e8: afa2005c */ sw $v0,0x5c($sp) /* f0511ec: 8fa7005c */ lw $a3,0x5c($sp) /* f0511f0: 8e040424 */ lw $a0,0x424($s0) @@ -92429,7 +92461,7 @@ glabel ai005d /* f05153c: 8fb80034 */ lw $t8,0x34($sp) /* f051540: afa20030 */ sw $v0,0x30($sp) /* f051544: 8e040424 */ lw $a0,0x424($s0) -/* f051548: 0fc126d1 */ jal func0f049b44 +/* f051548: 0fc126d1 */ jal chrFindById /* f05154c: 93050002 */ lbu $a1,0x2($t8) /* f051550: 8fa70030 */ lw $a3,0x30($sp) /* f051554: 00002825 */ or $a1,$zero,$zero @@ -92599,7 +92631,7 @@ glabel ai0060 /* f051768: 8e040424 */ lw $a0,0x424($s0) /* f05176c: 01cf1021 */ addu $v0,$t6,$t7 /* f051770: 90450002 */ lbu $a1,0x2($v0) -/* f051774: 0fc126d1 */ jal func0f049b44 +/* f051774: 0fc126d1 */ jal chrFindById /* f051778: afa2002c */ sw $v0,0x2c($sp) /* f05177c: 10400018 */ beqz $v0,.L0f0517e0 /* f051780: afa00024 */ sw $zero,0x24($sp) @@ -92802,7 +92834,7 @@ glabel ai0063 .L0f051a10: /* f051a10: afa60028 */ sw $a2,0x28($sp) /* f051a14: afa70020 */ sw $a3,0x20($sp) -/* f051a18: 0fc126d1 */ jal func0f049b44 +/* f051a18: 0fc126d1 */ jal chrFindById /* f051a1c: afa8002c */ sw $t0,0x2c($sp) /* f051a20: 8fa60028 */ lw $a2,0x28($sp) /* f051a24: 8fa70020 */ lw $a3,0x20($sp) @@ -93052,7 +93084,7 @@ glabel ai0068 /* f051d58: afbf0014 */ sw $ra,0x14($sp) /* f051d5c: 01cf1021 */ addu $v0,$t6,$t7 /* f051d60: 90450002 */ lbu $a1,0x2($v0) -/* f051d64: 0fc126d1 */ jal func0f049b44 +/* f051d64: 0fc126d1 */ jal chrFindById /* f051d68: 8c640424 */ lw $a0,0x424($v1) /* f051d6c: 3c03800a */ lui $v1,0x800a /* f051d70: 24639fc0 */ addiu $v1,$v1,-24640 @@ -93089,7 +93121,7 @@ glabel ai0069 /* f051dc8: afbf0014 */ sw $ra,0x14($sp) /* f051dcc: 01cf1021 */ addu $v0,$t6,$t7 /* f051dd0: 90450002 */ lbu $a1,0x2($v0) -/* f051dd4: 0fc126d1 */ jal func0f049b44 +/* f051dd4: 0fc126d1 */ jal chrFindById /* f051dd8: 8c640424 */ lw $a0,0x424($v1) /* f051ddc: 10400019 */ beqz $v0,.L0f051e44 /* f051de0: 00401825 */ or $v1,$v0,$zero @@ -93177,7 +93209,7 @@ glabel ai006a /* f051f00: 3c04800a */ lui $a0,0x800a /* f051f04: 00408025 */ or $s0,$v0,$zero /* f051f08: 8c84a3e4 */ lw $a0,-0x5c1c($a0) -/* f051f0c: 0fc126d1 */ jal func0f049b44 +/* f051f0c: 0fc126d1 */ jal chrFindById /* f051f10: 90650003 */ lbu $a1,0x3($v1) /* f051f14: 12000050 */ beqz $s0,.L0f052058 /* f051f18: afa2002c */ sw $v0,0x2c($sp) @@ -94099,7 +94131,7 @@ glabel ai0081 /* f052ad4: 460a3402 */ mul.s $f16,$f6,$f10 /* f052ad8: e7b00020 */ swc1 $f16,0x20($sp) /* f052adc: 90e50002 */ lbu $a1,0x2($a3) -/* f052ae0: 0fc126d1 */ jal func0f049b44 +/* f052ae0: 0fc126d1 */ jal chrFindById /* f052ae4: afa70024 */ sw $a3,0x24($sp) /* f052ae8: 8fa70024 */ lw $a3,0x24($sp) /* f052aec: 00402825 */ or $a1,$v0,$zero @@ -94192,7 +94224,7 @@ glabel ai0082 /* f052c18: 460a3402 */ mul.s $f16,$f6,$f10 /* f052c1c: e7b00020 */ swc1 $f16,0x20($sp) /* f052c20: 90e50002 */ lbu $a1,0x2($a3) -/* f052c24: 0fc126d1 */ jal func0f049b44 +/* f052c24: 0fc126d1 */ jal chrFindById /* f052c28: afa70024 */ sw $a3,0x24($sp) /* f052c2c: 8fa70024 */ lw $a3,0x24($sp) /* f052c30: 00402825 */ or $a1,$v0,$zero @@ -94282,7 +94314,7 @@ glabel ai010f /* f052d54: 46083282 */ mul.s $f10,$f6,$f8 /* f052d58: e7aa0020 */ swc1 $f10,0x20($sp) /* f052d5c: 90650002 */ lbu $a1,0x2($v1) -/* f052d60: 0fc126d1 */ jal func0f049b44 +/* f052d60: 0fc126d1 */ jal chrFindById /* f052d64: afa30024 */ sw $v1,0x24($sp) /* f052d68: 8fa30024 */ lw $v1,0x24($sp) /* f052d6c: 1040000f */ beqz $v0,.L0f052dac @@ -94339,7 +94371,7 @@ glabel ai0110 /* f052e10: 46083282 */ mul.s $f10,$f6,$f8 /* f052e14: e7aa0020 */ swc1 $f10,0x20($sp) /* f052e18: 90650002 */ lbu $a1,0x2($v1) -/* f052e1c: 0fc126d1 */ jal func0f049b44 +/* f052e1c: 0fc126d1 */ jal chrFindById /* f052e20: afa30024 */ sw $v1,0x24($sp) /* f052e24: 8fa30024 */ lw $v1,0x24($sp) /* f052e28: 1040000f */ beqz $v0,.L0f052e68 @@ -94385,7 +94417,7 @@ glabel ai0083 /* f052ea0: 01cf3821 */ addu $a3,$t6,$t7 /* f052ea4: 90e50002 */ lbu $a1,0x2($a3) /* f052ea8: afa7001c */ sw $a3,0x1c($sp) -/* f052eac: 0fc126d1 */ jal func0f049b44 +/* f052eac: 0fc126d1 */ jal chrFindById /* f052eb0: 8c640424 */ lw $a0,0x424($v1) /* f052eb4: 3c03800a */ lui $v1,0x800a /* f052eb8: 24639fc0 */ addiu $v1,$v1,-24640 @@ -94434,7 +94466,7 @@ glabel ai0168 /* f052f3c: 01cf3821 */ addu $a3,$t6,$t7 /* f052f40: 90e50002 */ lbu $a1,0x2($a3) /* f052f44: afa7001c */ sw $a3,0x1c($sp) -/* f052f48: 0fc126d1 */ jal func0f049b44 +/* f052f48: 0fc126d1 */ jal chrFindById /* f052f4c: 8c640424 */ lw $a0,0x424($v1) /* f052f50: 3c03800a */ lui $v1,0x800a /* f052f54: 24639fc0 */ addiu $v1,$v1,-24640 @@ -94793,7 +94825,7 @@ glabel ai0086 /* f0533a0: 01cf3021 */ addu $a2,$t6,$t7 /* f0533a4: 90c50003 */ lbu $a1,0x3($a2) /* f0533a8: afa6001c */ sw $a2,0x1c($sp) -/* f0533ac: 0fc126d1 */ jal func0f049b44 +/* f0533ac: 0fc126d1 */ jal chrFindById /* f0533b0: 8c640424 */ lw $a0,0x424($v1) /* f0533b4: 8fa6001c */ lw $a2,0x1c($sp) /* f0533b8: 24440112 */ addiu $a0,$v0,0x112 @@ -94966,7 +94998,7 @@ glabel ai008c /* f0535a0: 01cf1821 */ addu $v1,$t6,$t7 /* f0535a4: 90650003 */ lbu $a1,0x3($v1) /* f0535a8: afa3001c */ sw $v1,0x1c($sp) -/* f0535ac: 0fc126d1 */ jal func0f049b44 +/* f0535ac: 0fc126d1 */ jal chrFindById /* f0535b0: 8cc40424 */ lw $a0,0x424($a2) /* f0535b4: 3c06800a */ lui $a2,0x800a /* f0535b8: 24c69fc0 */ addiu $a2,$a2,-24640 @@ -95079,7 +95111,7 @@ glabel ai008f /* f0536f8: 01cf3821 */ addu $a3,$t6,$t7 /* f0536fc: 90e50003 */ lbu $a1,0x3($a3) /* f053700: afa7001c */ sw $a3,0x1c($sp) -/* f053704: 0fc126d1 */ jal func0f049b44 +/* f053704: 0fc126d1 */ jal chrFindById /* f053708: 8c640424 */ lw $a0,0x424($v1) /* f05370c: 3c03800a */ lui $v1,0x800a /* f053710: 24639fc0 */ addiu $v1,$v1,-24640 @@ -95332,7 +95364,7 @@ glabel ai0096 /* f053a1c: 90450002 */ lbu $a1,0x2($v0) .L0f053a20: /* f053a20: e7a00028 */ swc1 $f0,0x28($sp) -/* f053a24: 0fc126d1 */ jal func0f049b44 +/* f053a24: 0fc126d1 */ jal chrFindById /* f053a28: 8e040424 */ lw $a0,0x424($s0) /* f053a2c: c7a00028 */ lwc1 $f0,0x28($sp) /* f053a30: 10400019 */ beqz $v0,.L0f053a98 @@ -96096,7 +96128,7 @@ glabel ai00a7 /* f054390: 01ae7825 */ or $t7,$t5,$t6 /* f054394: afaf0018 */ sw $t7,0x18($sp) /* f054398: 90450002 */ lbu $a1,0x2($v0) -/* f05439c: 0fc126d1 */ jal func0f049b44 +/* f05439c: 0fc126d1 */ jal chrFindById /* f0543a0: 8c640424 */ lw $a0,0x424($v1) /* f0543a4: 3c03800a */ lui $v1,0x800a /* f0543a8: 10400005 */ beqz $v0,.L0f0543c0 @@ -96139,7 +96171,7 @@ glabel ai00a8 /* f05441c: 01ae7825 */ or $t7,$t5,$t6 /* f054420: afaf0018 */ sw $t7,0x18($sp) /* f054424: 90450002 */ lbu $a1,0x2($v0) -/* f054428: 0fc126d1 */ jal func0f049b44 +/* f054428: 0fc126d1 */ jal chrFindById /* f05442c: 8c640424 */ lw $a0,0x424($v1) /* f054430: 3c03800a */ lui $v1,0x800a /* f054434: 10400006 */ beqz $v0,.L0f054450 @@ -96184,7 +96216,7 @@ glabel ai00a9 /* f0544b0: 01ae3025 */ or $a2,$t5,$t6 /* f0544b4: afa60018 */ sw $a2,0x18($sp) /* f0544b8: afa3001c */ sw $v1,0x1c($sp) -/* f0544bc: 0fc126d1 */ jal func0f049b44 +/* f0544bc: 0fc126d1 */ jal chrFindById /* f0544c0: 8ce40424 */ lw $a0,0x424($a3) /* f0544c4: 3c07800a */ lui $a3,0x800a /* f0544c8: 24e79fc0 */ addiu $a3,$a3,-24640 @@ -96240,7 +96272,7 @@ glabel ai011b /* f054568: 01ae7825 */ or $t7,$t5,$t6 /* f05456c: afaf0018 */ sw $t7,0x18($sp) /* f054570: 90450002 */ lbu $a1,0x2($v0) -/* f054574: 0fc126d1 */ jal func0f049b44 +/* f054574: 0fc126d1 */ jal chrFindById /* f054578: 8c640424 */ lw $a0,0x424($v1) /* f05457c: 3c03800a */ lui $v1,0x800a /* f054580: 10400005 */ beqz $v0,.L0f054598 @@ -96283,7 +96315,7 @@ glabel ai011c /* f0545f4: 01ae7825 */ or $t7,$t5,$t6 /* f0545f8: afaf0018 */ sw $t7,0x18($sp) /* f0545fc: 90450002 */ lbu $a1,0x2($v0) -/* f054600: 0fc126d1 */ jal func0f049b44 +/* f054600: 0fc126d1 */ jal chrFindById /* f054604: 8c640424 */ lw $a0,0x424($v1) /* f054608: 3c03800a */ lui $v1,0x800a /* f05460c: 10400006 */ beqz $v0,.L0f054628 @@ -96328,7 +96360,7 @@ glabel ai011d /* f054688: 01ae3025 */ or $a2,$t5,$t6 /* f05468c: afa60018 */ sw $a2,0x18($sp) /* f054690: afa3001c */ sw $v1,0x1c($sp) -/* f054694: 0fc126d1 */ jal func0f049b44 +/* f054694: 0fc126d1 */ jal chrFindById /* f054698: 8ce40424 */ lw $a0,0x424($a3) /* f05469c: 3c07800a */ lui $a3,0x800a /* f0546a0: 24e79fc0 */ addiu $a3,$a3,-24640 @@ -96956,14 +96988,14 @@ glabel ai00b4 /* f054e64: 01cf3021 */ addu $a2,$t6,$t7 /* f054e68: 90c50002 */ lbu $a1,0x2($a2) /* f054e6c: afa6001c */ sw $a2,0x1c($sp) -/* f054e70: 0fc126d1 */ jal func0f049b44 +/* f054e70: 0fc126d1 */ jal chrFindById /* f054e74: 8c640424 */ lw $a0,0x424($v1) /* f054e78: 8fa6001c */ lw $a2,0x1c($sp) /* f054e7c: 3c03800a */ lui $v1,0x800a /* f054e80: 24639fc0 */ addiu $v1,$v1,-24640 /* f054e84: afa20018 */ sw $v0,0x18($sp) /* f054e88: 8c640424 */ lw $a0,0x424($v1) -/* f054e8c: 0fc126d1 */ jal func0f049b44 +/* f054e8c: 0fc126d1 */ jal chrFindById /* f054e90: 90c50003 */ lbu $a1,0x3($a2) /* f054e94: 8fb80018 */ lw $t8,0x18($sp) /* f054e98: 3c03800a */ lui $v1,0x800a @@ -98001,7 +98033,7 @@ glabel ai00ca /* f055b8c: 3c04800a */ lui $a0,0x800a /* f055b90: 00408025 */ or $s0,$v0,$zero /* f055b94: 8c84a3e4 */ lw $a0,-0x5c1c($a0) -/* f055b98: 0fc126d1 */ jal func0f049b44 +/* f055b98: 0fc126d1 */ jal chrFindById /* f055b9c: 91650002 */ lbu $a1,0x2($t3) /* f055ba0: 00408825 */ or $s1,$v0,$zero /* f055ba4: afa00048 */ sw $zero,0x48($sp) @@ -98189,7 +98221,7 @@ glabel ai00cb /* f055e34: 8fa3002c */ lw $v1,0x2c($sp) /* f055e38: afa20028 */ sw $v0,0x28($sp) /* f055e3c: 8e040424 */ lw $a0,0x424($s0) -/* f055e40: 0fc126d1 */ jal func0f049b44 +/* f055e40: 0fc126d1 */ jal chrFindById /* f055e44: 90650002 */ lbu $a1,0x2($v1) /* f055e48: 8e04028c */ lw $a0,0x28c($s0) /* f055e4c: 1040000b */ beqz $v0,.L0f055e7c @@ -98303,7 +98335,7 @@ glabel ai00cc /* f055fb4: 03282025 */ or $a0,$t9,$t0 /* f055fb8: afa20028 */ sw $v0,0x28($sp) /* f055fbc: 92050002 */ lbu $a1,0x2($s0) -/* f055fc0: 0fc126d1 */ jal func0f049b44 +/* f055fc0: 0fc126d1 */ jal chrFindById /* f055fc4: 8e240424 */ lw $a0,0x424($s1) /* f055fc8: 8e24028c */ lw $a0,0x28c($s1) /* f055fcc: 1040000b */ beqz $v0,.L0f055ffc @@ -98353,7 +98385,7 @@ glabel ai00cd /* f05605c: afbf0024 */ sw $ra,0x24($sp) /* f056060: 01cf8021 */ addu $s0,$t6,$t7 /* f056064: 92050002 */ lbu $a1,0x2($s0) -/* f056068: 0fc126d1 */ jal func0f049b44 +/* f056068: 0fc126d1 */ jal chrFindById /* f05606c: 8e240424 */ lw $a0,0x424($s1) /* f056070: 92180005 */ lbu $t8,0x5($s0) /* f056074: 92080006 */ lbu $t0,0x6($s0) @@ -98875,7 +98907,7 @@ glabel ai0179 /* f056750: a7a90030 */ sh $t1,0x30($sp) /* f056754: a7a80032 */ sh $t0,0x32($sp) /* f056758: afa30034 */ sw $v1,0x34($sp) -/* f05675c: 0fc126d1 */ jal func0f049b44 +/* f05675c: 0fc126d1 */ jal chrFindById /* f056760: 8c440424 */ lw $a0,0x424($v0) /* f056764: 8fa30034 */ lw $v1,0x34($sp) /* f056768: 97a80032 */ lhu $t0,0x32($sp) @@ -99714,7 +99746,7 @@ glabel ai0114 /* f0571dc: afbf0014 */ sw $ra,0x14($sp) /* f0571e0: 01cf1021 */ addu $v0,$t6,$t7 /* f0571e4: 90450002 */ lbu $a1,0x2($v0) -/* f0571e8: 0fc126d1 */ jal func0f049b44 +/* f0571e8: 0fc126d1 */ jal chrFindById /* f0571ec: 8c640424 */ lw $a0,0x424($v1) /* f0571f0: 1040000f */ beqz $v0,.L0f057230 /* f0571f4: 00000000 */ sll $zero,$zero,0x0 @@ -99757,7 +99789,7 @@ glabel ai0115 /* f057268: afbf0014 */ sw $ra,0x14($sp) /* f05726c: 01cf1021 */ addu $v0,$t6,$t7 /* f057270: 90450002 */ lbu $a1,0x2($v0) -/* f057274: 0fc126d1 */ jal func0f049b44 +/* f057274: 0fc126d1 */ jal chrFindById /* f057278: 8c640424 */ lw $a0,0x424($v1) /* f05727c: 10400010 */ beqz $v0,.L0f0572c0 /* f057280: 00000000 */ sll $zero,$zero,0x0 @@ -99962,7 +99994,7 @@ glabel ai00e0 /* f057518: 8e040424 */ lw $a0,0x424($s0) /* f05751c: 01cf1021 */ addu $v0,$t6,$t7 /* f057520: 90450002 */ lbu $a1,0x2($v0) -/* f057524: 0fc126d1 */ jal func0f049b44 +/* f057524: 0fc126d1 */ jal chrFindById /* f057528: afa2002c */ sw $v0,0x2c($sp) /* f05752c: 5040002a */ beqzl $v0,.L0f0575d8 /* f057530: 8e0e0438 */ lw $t6,0x438($s0) @@ -100033,7 +100065,7 @@ glabel ai00e1 /* f05760c: afbf001c */ sw $ra,0x1c($sp) /* f057610: 8e040424 */ lw $a0,0x424($s0) /* f057614: 01cf1021 */ addu $v0,$t6,$t7 -/* f057618: 0fc126d1 */ jal func0f049b44 +/* f057618: 0fc126d1 */ jal chrFindById /* f05761c: 90450002 */ lbu $a1,0x2($v0) /* f057620: 50400022 */ beqzl $v0,.L0f0576ac /* f057624: 8e0b0438 */ lw $t3,0x438($s0) @@ -100095,7 +100127,7 @@ glabel ai00e2 /* f0576e4: afbf0024 */ sw $ra,0x24($sp) /* f0576e8: 01cf8021 */ addu $s0,$t6,$t7 /* f0576ec: 92050002 */ lbu $a1,0x2($s0) -/* f0576f0: 0fc126d1 */ jal func0f049b44 +/* f0576f0: 0fc126d1 */ jal chrFindById /* f0576f4: 8e240424 */ lw $a0,0x424($s1) /* f0576f8: afa20098 */ sw $v0,0x98($sp) /* f0576fc: 1040003a */ beqz $v0,.L0f0577e8 @@ -100110,7 +100142,7 @@ glabel ai00e2 /* f057720: 920a0003 */ lbu $t2,0x3($s0) /* f057724: 92050004 */ lbu $a1,0x4($s0) /* f057728: afa00094 */ sw $zero,0x94($sp) -/* f05772c: 0fc126d1 */ jal func0f049b44 +/* f05772c: 0fc126d1 */ jal chrFindById /* f057730: 8e240424 */ lw $a0,0x424($s1) /* f057734: 8fa30094 */ lw $v1,0x94($sp) /* f057738: 1040002b */ beqz $v0,.L0f0577e8 @@ -100194,7 +100226,7 @@ glabel ai00e3 /* f057844: afbf001c */ sw $ra,0x1c($sp) /* f057848: 8e040424 */ lw $a0,0x424($s0) /* f05784c: 01cf1021 */ addu $v0,$t6,$t7 -/* f057850: 0fc126d1 */ jal func0f049b44 +/* f057850: 0fc126d1 */ jal chrFindById /* f057854: 90450002 */ lbu $a1,0x2($v0) /* f057858: 50400020 */ beqzl $v0,.L0f0578dc /* f05785c: 8e090438 */ lw $t1,0x438($s0) @@ -100382,7 +100414,7 @@ glabel ai00e5 /* f057ac4: 01cf1021 */ addu $v0,$t6,$t7 /* f057ac8: 90450002 */ lbu $a1,0x2($v0) /* f057acc: afa20024 */ sw $v0,0x24($sp) -/* f057ad0: 0fc126d1 */ jal func0f049b44 +/* f057ad0: 0fc126d1 */ jal chrFindById /* f057ad4: 8e040424 */ lw $a0,0x424($s0) /* f057ad8: 50400016 */ beqzl $v0,.L0f057b34 /* f057adc: 8fab0020 */ lw $t3,0x20($sp) @@ -100492,7 +100524,7 @@ glabel ai00e9 /* f057c34: 01cf3021 */ addu $a2,$t6,$t7 /* f057c38: 90c50002 */ lbu $a1,0x2($a2) /* f057c3c: afa6001c */ sw $a2,0x1c($sp) -/* f057c40: 0fc126d1 */ jal func0f049b44 +/* f057c40: 0fc126d1 */ jal chrFindById /* f057c44: 8c640424 */ lw $a0,0x424($v1) /* f057c48: 3c03800a */ lui $v1,0x800a /* f057c4c: 24639fc0 */ addiu $v1,$v1,-24640 @@ -100593,7 +100625,7 @@ glabel ai00eb /* f057d70: afbf001c */ sw $ra,0x1c($sp) /* f057d74: 01cf8821 */ addu $s1,$t6,$t7 /* f057d78: 92250002 */ lbu $a1,0x2($s1) -/* f057d7c: 0fc126d1 */ jal func0f049b44 +/* f057d7c: 0fc126d1 */ jal chrFindById /* f057d80: 8e040424 */ lw $a0,0x424($s0) /* f057d84: 10400018 */ beqz $v0,.L0f057de8 /* f057d88: afa00024 */ sw $zero,0x24($sp) @@ -100660,7 +100692,7 @@ glabel ai00ec /* f057e4c: 8e040424 */ lw $a0,0x424($s0) /* f057e50: 01cf1021 */ addu $v0,$t6,$t7 /* f057e54: 90450002 */ lbu $a1,0x2($v0) -/* f057e58: 0fc126d1 */ jal func0f049b44 +/* f057e58: 0fc126d1 */ jal chrFindById /* f057e5c: afa2002c */ sw $v0,0x2c($sp) /* f057e60: 50400018 */ beqzl $v0,.L0f057ec4 /* f057e64: 8e090438 */ lw $t1,0x438($s0) @@ -100716,7 +100748,7 @@ glabel ai00ed /* f057efc: 8e040424 */ lw $a0,0x424($s0) /* f057f00: 01cf1021 */ addu $v0,$t6,$t7 /* f057f04: 90450002 */ lbu $a1,0x2($v0) -/* f057f08: 0fc126d1 */ jal func0f049b44 +/* f057f08: 0fc126d1 */ jal chrFindById /* f057f0c: afa2002c */ sw $v0,0x2c($sp) /* f057f10: 50400014 */ beqzl $v0,.L0f057f64 /* f057f14: 8e090438 */ lw $t1,0x438($s0) @@ -100764,7 +100796,7 @@ glabel ai00ee /* f057f9c: 8e040424 */ lw $a0,0x424($s0) /* f057fa0: 01cf1021 */ addu $v0,$t6,$t7 /* f057fa4: 90450002 */ lbu $a1,0x2($v0) -/* f057fa8: 0fc126d1 */ jal func0f049b44 +/* f057fa8: 0fc126d1 */ jal chrFindById /* f057fac: afa2002c */ sw $v0,0x2c($sp) /* f057fb0: 50400021 */ beqzl $v0,.L0f058038 /* f057fb4: 8e0d0438 */ lw $t5,0x438($s0) @@ -100901,7 +100933,7 @@ glabel ai00f3 /* f05815c: afbf001c */ sw $ra,0x1c($sp) /* f058160: 8e040424 */ lw $a0,0x424($s0) /* f058164: 01cf1021 */ addu $v0,$t6,$t7 -/* f058168: 0fc126d1 */ jal func0f049b44 +/* f058168: 0fc126d1 */ jal chrFindById /* f05816c: 90450002 */ lbu $a1,0x2($v0) /* f058170: 50400014 */ beqzl $v0,.L0f0581c4 /* f058174: 8e090438 */ lw $t1,0x438($s0) @@ -101114,7 +101146,7 @@ glabel ai00f8 /* f058410: 01cf1021 */ addu $v0,$t6,$t7 /* f058414: 90450002 */ lbu $a1,0x2($v0) /* f058418: afa2002c */ sw $v0,0x2c($sp) -/* f05841c: 0fc126d1 */ jal func0f049b44 +/* f05841c: 0fc126d1 */ jal chrFindById /* f058420: 8e040424 */ lw $a0,0x424($s0) /* f058424: 50400014 */ beqzl $v0,.L0f058478 /* f058428: 8fa90028 */ lw $t1,0x28($sp) @@ -101372,7 +101404,7 @@ glabel ai00fb /* f058708: afbf001c */ sw $ra,0x1c($sp) /* f05870c: 8e040424 */ lw $a0,0x424($s0) /* f058710: 01cf1021 */ addu $v0,$t6,$t7 -/* f058714: 0fc126d1 */ jal func0f049b44 +/* f058714: 0fc126d1 */ jal chrFindById /* f058718: 90450002 */ lbu $a1,0x2($v0) /* f05871c: 50400013 */ beqzl $v0,.L0f05876c /* f058720: 8e080438 */ lw $t0,0x438($s0) @@ -101510,7 +101542,7 @@ glabel ai00fd /* f0588c8: 01cf3821 */ addu $a3,$t6,$t7 /* f0588cc: 90e50002 */ lbu $a1,0x2($a3) /* f0588d0: afa7001c */ sw $a3,0x1c($sp) -/* f0588d4: 0fc126d1 */ jal func0f049b44 +/* f0588d4: 0fc126d1 */ jal chrFindById /* f0588d8: 8c640424 */ lw $a0,0x424($v1) /* f0588dc: 3c03800a */ lui $v1,0x800a /* f0588e0: 24639fc0 */ addiu $v1,$v1,-24640 @@ -101828,7 +101860,7 @@ glabel ai0106 .L0f058c98: /* f058c98: 55000009 */ bnezl $t0,.L0f058cc0 /* f058c9c: 87a3001a */ lh $v1,0x1a($sp) -/* f058ca0: 0fc126d1 */ jal func0f049b44 +/* f058ca0: 0fc126d1 */ jal chrFindById /* f058ca4: 90450002 */ lbu $a1,0x2($v0) /* f058ca8: 8443017e */ lh $v1,0x17e($v0) /* f058cac: 3c06800a */ lui $a2,0x800a @@ -101945,7 +101977,7 @@ glabel ai0108 /* f058e0c: 8e040424 */ lw $a0,0x424($s0) /* f058e10: 01cf3821 */ addu $a3,$t6,$t7 /* f058e14: 90e50002 */ lbu $a1,0x2($a3) -/* f058e18: 0fc126d1 */ jal func0f049b44 +/* f058e18: 0fc126d1 */ jal chrFindById /* f058e1c: afa7002c */ sw $a3,0x2c($sp) /* f058e20: 8fa7002c */ lw $a3,0x2c($sp) /* f058e24: 00403025 */ or $a2,$v0,$zero @@ -101971,7 +102003,7 @@ glabel ai0108 /* f058e6c: afa80024 */ sw $t0,0x24($sp) /* f058e70: afa7002c */ sw $a3,0x2c($sp) /* f058e74: afa60028 */ sw $a2,0x28($sp) -/* f058e78: 0fc126d1 */ jal func0f049b44 +/* f058e78: 0fc126d1 */ jal chrFindById /* f058e7c: 8e040424 */ lw $a0,0x424($s0) /* f058e80: 8fa60028 */ lw $a2,0x28($sp) /* f058e84: 8fa7002c */ lw $a3,0x2c($sp) @@ -102146,7 +102178,7 @@ glabel ai010b /* f0590b4: 01cf3021 */ addu $a2,$t6,$t7 /* f0590b8: 90c50002 */ lbu $a1,0x2($a2) /* f0590bc: afa6001c */ sw $a2,0x1c($sp) -/* f0590c0: 0fc126d1 */ jal func0f049b44 +/* f0590c0: 0fc126d1 */ jal chrFindById /* f0590c4: 8c640424 */ lw $a0,0x424($v1) /* f0590c8: 3c03800a */ lui $v1,0x800a /* f0590cc: 24639fc0 */ addiu $v1,$v1,-24640 @@ -102179,7 +102211,7 @@ glabel ai010c /* f059118: 8e040424 */ lw $a0,0x424($s0) /* f05911c: 01cfc021 */ addu $t8,$t6,$t7 /* f059120: afb80024 */ sw $t8,0x24($sp) -/* f059124: 0fc126d1 */ jal func0f049b44 +/* f059124: 0fc126d1 */ jal chrFindById /* f059128: 240500fc */ addiu $a1,$zero,0xfc /* f05912c: 10400009 */ beqz $v0,.L0f059154 /* f059130: 00402025 */ or $a0,$v0,$zero @@ -102196,7 +102228,7 @@ glabel ai010c /* f059158: 0fc12b0e */ jal func0f04ac38 /* f05915c: 240500f8 */ addiu $a1,$zero,0xf8 /* f059160: 8e040424 */ lw $a0,0x424($s0) -/* f059164: 0fc126d1 */ jal func0f049b44 +/* f059164: 0fc126d1 */ jal chrFindById /* f059168: 240500fc */ addiu $a1,$zero,0xfc /* f05916c: 00402025 */ or $a0,$v0,$zero /* f059170: 8faa0024 */ lw $t2,0x24($sp) @@ -102238,7 +102270,7 @@ glabel ai011e /* f0591d8: 01cf3821 */ addu $a3,$t6,$t7 /* f0591dc: 90e50002 */ lbu $a1,0x2($a3) /* f0591e0: afa7001c */ sw $a3,0x1c($sp) -/* f0591e4: 0fc126d1 */ jal func0f049b44 +/* f0591e4: 0fc126d1 */ jal chrFindById /* f0591e8: 8c640424 */ lw $a0,0x424($v1) /* f0591ec: 3c03800a */ lui $v1,0x800a /* f0591f0: 24639fc0 */ addiu $v1,$v1,-24640 @@ -102289,7 +102321,7 @@ glabel ai011f /* f059278: 01cf3821 */ addu $a3,$t6,$t7 /* f05927c: 90e50002 */ lbu $a1,0x2($a3) /* f059280: afa7001c */ sw $a3,0x1c($sp) -/* f059284: 0fc126d1 */ jal func0f049b44 +/* f059284: 0fc126d1 */ jal chrFindById /* f059288: 8c640424 */ lw $a0,0x424($v1) /* f05928c: 3c03800a */ lui $v1,0x800a /* f059290: 24639fc0 */ addiu $v1,$v1,-24640 @@ -103340,7 +103372,7 @@ glabel ai012a /* f05a0a8: 10000005 */ beqz $zero,.L0f05a0c0 /* f05a0ac: 00000000 */ sll $zero,$zero,0x0 .L0f05a0b0: -/* f05a0b0: 0fc126d1 */ jal func0f049b44 +/* f05a0b0: 0fc126d1 */ jal chrFindById /* f05a0b4: 8e040424 */ lw $a0,0x424($s0) /* f05a0b8: 0fc13160 */ jal func0f04c580 /* f05a0bc: 00402025 */ or $a0,$v0,$zero @@ -103493,7 +103525,7 @@ glabel ai0130 /* f05a274: 8e040424 */ lw $a0,0x424($s0) /* f05a278: 01cf1021 */ addu $v0,$t6,$t7 /* f05a27c: 90450002 */ lbu $a1,0x2($v0) -/* f05a280: 0fc126d1 */ jal func0f049b44 +/* f05a280: 0fc126d1 */ jal chrFindById /* f05a284: afa2009c */ sw $v0,0x9c($sp) /* f05a288: 8e18028c */ lw $t8,0x28c($s0) /* f05a28c: 8e070424 */ lw $a3,0x424($s0) @@ -105678,7 +105710,7 @@ glabel ai0148 /* f05bfc0: 01cf3021 */ addu $a2,$t6,$t7 /* f05bfc4: 90c50002 */ lbu $a1,0x2($a2) /* f05bfc8: afa6001c */ sw $a2,0x1c($sp) -/* f05bfcc: 0fc126d1 */ jal func0f049b44 +/* f05bfcc: 0fc126d1 */ jal chrFindById /* f05bfd0: 8c640424 */ lw $a0,0x424($v1) /* f05bfd4: 3c03800a */ lui $v1,0x800a /* f05bfd8: 24639fc0 */ addiu $v1,$v1,-24640 @@ -105715,7 +105747,7 @@ glabel ai0149 /* f05c030: 8e040424 */ lw $a0,0x424($s0) /* f05c034: 01cf1821 */ addu $v1,$t6,$t7 /* f05c038: 90650002 */ lbu $a1,0x2($v1) -/* f05c03c: 0fc126d1 */ jal func0f049b44 +/* f05c03c: 0fc126d1 */ jal chrFindById /* f05c040: afa30024 */ sw $v1,0x24($sp) /* f05c044: 8fa30024 */ lw $v1,0x24($sp) /* f05c048: 90780004 */ lbu $t8,0x4($v1) @@ -105941,7 +105973,7 @@ glabel ai0165 /* f05c2fc: 01cf3821 */ addu $a3,$t6,$t7 /* f05c300: 90e50002 */ lbu $a1,0x2($a3) /* f05c304: afa7001c */ sw $a3,0x1c($sp) -/* f05c308: 0fc126d1 */ jal func0f049b44 +/* f05c308: 0fc126d1 */ jal chrFindById /* f05c30c: 8c640424 */ lw $a0,0x424($v1) /* f05c310: 3c03800a */ lui $v1,0x800a /* f05c314: 24639fc0 */ addiu $v1,$v1,-24640 @@ -106126,7 +106158,7 @@ glabel ai016a /* f05c558: 8c460004 */ lw $a2,0x4($v0) /* f05c55c: 8ce40424 */ lw $a0,0x424($a3) .L0f05c560: -/* f05c560: 0fc126d1 */ jal func0f049b44 +/* f05c560: 0fc126d1 */ jal chrFindById /* f05c564: afa80024 */ sw $t0,0x24($sp) /* f05c568: 3c07800a */ lui $a3,0x800a /* f05c56c: 24e79fc0 */ addiu $a3,$a3,-24640 @@ -106206,7 +106238,7 @@ glabel ai016d /* f05c648: 01cf1821 */ addu $v1,$t6,$t7 /* f05c64c: 90650002 */ lbu $a1,0x2($v1) /* f05c650: afa3001c */ sw $v1,0x1c($sp) -/* f05c654: 0fc126d1 */ jal func0f049b44 +/* f05c654: 0fc126d1 */ jal chrFindById /* f05c658: 8cc40424 */ lw $a0,0x424($a2) /* f05c65c: 3c06800a */ lui $a2,0x800a /* f05c660: 24c69fc0 */ addiu $a2,$a2,-24640 @@ -106258,7 +106290,7 @@ glabel ai016e /* f05c6f4: 01cf1821 */ addu $v1,$t6,$t7 /* f05c6f8: acc10008 */ sw $at,0x8($a2) /* f05c6fc: 90650002 */ lbu $a1,0x2($v1) -/* f05c700: 0fc126d1 */ jal func0f049b44 +/* f05c700: 0fc126d1 */ jal chrFindById /* f05c704: afa3003c */ sw $v1,0x3c($sp) /* f05c708: 8fa3003c */ lw $v1,0x3c($sp) /* f05c70c: 27a60030 */ addiu $a2,$sp,0x30 @@ -106341,7 +106373,7 @@ glabel ai016f /* f05c818: 01cf3821 */ addu $a3,$t6,$t7 /* f05c81c: 90e50002 */ lbu $a1,0x2($a3) /* f05c820: afa7001c */ sw $a3,0x1c($sp) -/* f05c824: 0fc126d1 */ jal func0f049b44 +/* f05c824: 0fc126d1 */ jal chrFindById /* f05c828: 8c640424 */ lw $a0,0x424($v1) /* f05c82c: 3c03800a */ lui $v1,0x800a /* f05c830: 24639fc0 */ addiu $v1,$v1,-24640 @@ -106582,7 +106614,7 @@ glabel ai0173 /* f05cb48: 01cf4021 */ addu $t0,$t6,$t7 /* f05cb4c: 91050002 */ lbu $a1,0x2($t0) /* f05cb50: afa8001c */ sw $t0,0x1c($sp) -/* f05cb54: 0fc126d1 */ jal func0f049b44 +/* f05cb54: 0fc126d1 */ jal chrFindById /* f05cb58: 8c640424 */ lw $a0,0x424($v1) /* f05cb5c: 3c03800a */ lui $v1,0x800a /* f05cb60: 24639fc0 */ addiu $v1,$v1,-24640 @@ -106675,7 +106707,7 @@ glabel ai0177 /* f05cc94: 03284825 */ or $t1,$t9,$t0 /* f05cc98: a7a90032 */ sh $t1,0x32($sp) /* f05cc9c: 90650002 */ lbu $a1,0x2($v1) -/* f05cca0: 0fc126d1 */ jal func0f049b44 +/* f05cca0: 0fc126d1 */ jal chrFindById /* f05cca4: afa30034 */ sw $v1,0x34($sp) /* f05cca8: 10400019 */ beqz $v0,.L0f05cd10 /* f05ccac: 8fa30034 */ lw $v1,0x34($sp) @@ -106731,7 +106763,7 @@ glabel ai0178 /* f05cd50: 01cf1021 */ addu $v0,$t6,$t7 /* f05cd54: 90450002 */ lbu $a1,0x2($v0) /* f05cd58: afa2002c */ sw $v0,0x2c($sp) -/* f05cd5c: 0fc126d1 */ jal func0f049b44 +/* f05cd5c: 0fc126d1 */ jal chrFindById /* f05cd60: 8e040424 */ lw $a0,0x424($s0) /* f05cd64: 50400017 */ beqzl $v0,.L0f05cdc4 /* f05cd68: 8faa0028 */ lw $t2,0x28($sp) @@ -106800,7 +106832,7 @@ glabel ai0181 /* f05ce38: afa20030 */ sw $v0,0x30($sp) /* f05ce3c: afa0002c */ sw $zero,0x2c($sp) /* f05ce40: 8e040424 */ lw $a0,0x424($s0) -/* f05ce44: 0fc126d1 */ jal func0f049b44 +/* f05ce44: 0fc126d1 */ jal chrFindById /* f05ce48: 93050002 */ lbu $a1,0x2($t8) /* f05ce4c: 50400019 */ beqzl $v0,.L0f05ceb4 /* f05ce50: 8fae002c */ lw $t6,0x2c($sp) @@ -107301,7 +107333,7 @@ glabel ai018c /* f05d480: 01cf3021 */ addu $a2,$t6,$t7 /* f05d484: 90c50002 */ lbu $a1,0x2($a2) /* f05d488: afa6001c */ sw $a2,0x1c($sp) -/* f05d48c: 0fc126d1 */ jal func0f049b44 +/* f05d48c: 0fc126d1 */ jal chrFindById /* f05d490: 8c640424 */ lw $a0,0x424($v1) /* f05d494: 3c03800a */ lui $v1,0x800a /* f05d498: 24639fc0 */ addiu $v1,$v1,-24640 @@ -107764,7 +107796,7 @@ glabel ai01a0 /* f05da64: 01cf3021 */ addu $a2,$t6,$t7 /* f05da68: 90c50002 */ lbu $a1,0x2($a2) /* f05da6c: afa6001c */ sw $a2,0x1c($sp) -/* f05da70: 0fc126d1 */ jal func0f049b44 +/* f05da70: 0fc126d1 */ jal chrFindById /* f05da74: 8c640424 */ lw $a0,0x424($v1) /* f05da78: 3c03800a */ lui $v1,0x800a /* f05da7c: 24639fc0 */ addiu $v1,$v1,-24640 @@ -107792,7 +107824,7 @@ glabel ai01a1 /* f05dab4: 24c69fc0 */ addiu $a2,$a2,-24640 /* f05dab8: afbf0014 */ sw $ra,0x14($sp) /* f05dabc: 8cc40424 */ lw $a0,0x424($a2) -/* f05dac0: 0fc126d1 */ jal func0f049b44 +/* f05dac0: 0fc126d1 */ jal chrFindById /* f05dac4: 240500f6 */ addiu $a1,$zero,0xf6 /* f05dac8: 3c06800a */ lui $a2,0x800a /* f05dacc: 10400007 */ beqz $v0,.L0f05daec @@ -108395,7 +108427,7 @@ glabel ai01af /* f05e2c0: 8fa3002c */ lw $v1,0x2c($sp) /* f05e2c4: afa20028 */ sw $v0,0x28($sp) /* f05e2c8: 8e040424 */ lw $a0,0x424($s0) -/* f05e2cc: 0fc126d1 */ jal func0f049b44 +/* f05e2cc: 0fc126d1 */ jal chrFindById /* f05e2d0: 90650002 */ lbu $a1,0x2($v1) /* f05e2d4: 10400029 */ beqz $v0,.L0f05e37c /* f05e2d8: 00402825 */ or $a1,$v0,$zero @@ -108683,7 +108715,7 @@ glabel ai01b3 /* f05e6bc: 07000020 */ bltz $t8,.L0f05e740 /* f05e6c0: 01cf1021 */ addu $v0,$t6,$t7 /* f05e6c4: 8c640424 */ lw $a0,0x424($v1) -/* f05e6c8: 0fc126d1 */ jal func0f049b44 +/* f05e6c8: 0fc126d1 */ jal chrFindById /* f05e6cc: 90450002 */ lbu $a1,0x2($v0) /* f05e6d0: 3c03800a */ lui $v1,0x800a /* f05e6d4: 1040001a */ beqz $v0,.L0f05e740 @@ -108742,12 +108774,12 @@ glabel ai01b5 /* f05e780: 01cf1821 */ addu $v1,$t6,$t7 /* f05e784: 90650002 */ lbu $a1,0x2($v1) /* f05e788: afa3002c */ sw $v1,0x2c($sp) -/* f05e78c: 0fc126d1 */ jal func0f049b44 +/* f05e78c: 0fc126d1 */ jal chrFindById /* f05e790: 8e040424 */ lw $a0,0x424($s0) /* f05e794: 8fa3002c */ lw $v1,0x2c($sp) /* f05e798: 8e040424 */ lw $a0,0x424($s0) /* f05e79c: 90650003 */ lbu $a1,0x3($v1) -/* f05e7a0: 0fc126d1 */ jal func0f049b44 +/* f05e7a0: 0fc126d1 */ jal chrFindById /* f05e7a4: afa20028 */ sw $v0,0x28($sp) /* f05e7a8: 8fa60028 */ lw $a2,0x28($sp) /* f05e7ac: 50c00029 */ beqzl $a2,.L0f05e854 @@ -108818,7 +108850,7 @@ glabel ai01b7 /* f05e888: 01cf1821 */ addu $v1,$t6,$t7 /* f05e88c: 90650002 */ lbu $a1,0x2($v1) /* f05e890: afa3001c */ sw $v1,0x1c($sp) -/* f05e894: 0fc126d1 */ jal func0f049b44 +/* f05e894: 0fc126d1 */ jal chrFindById /* f05e898: 8c440424 */ lw $a0,0x424($v0) /* f05e89c: 8fa3001c */ lw $v1,0x1c($sp) /* f05e8a0: 10400013 */ beqz $v0,.L0f05e8f0 @@ -109084,7 +109116,7 @@ glabel ai01be /* f05ebd4: 8e040424 */ lw $a0,0x424($s0) /* f05ebd8: 01cf1021 */ addu $v0,$t6,$t7 /* f05ebdc: 90450002 */ lbu $a1,0x2($v0) -/* f05ebe0: 0fc126d1 */ jal func0f049b44 +/* f05ebe0: 0fc126d1 */ jal chrFindById /* f05ebe4: afa20034 */ sw $v0,0x34($sp) /* f05ebe8: 10400003 */ beqz $v0,.L0f05ebf8 /* f05ebec: 00002025 */ or $a0,$zero,$zero @@ -109159,7 +109191,7 @@ glabel ai01bf /* f05eccc: a7a9004a */ sh $t1,0x4a($sp) /* f05ecd0: e7a40044 */ swc1 $f4,0x44($sp) /* f05ecd4: 90450004 */ lbu $a1,0x4($v0) -/* f05ecd8: 0fc126d1 */ jal func0f049b44 +/* f05ecd8: 0fc126d1 */ jal chrFindById /* f05ecdc: 8e040424 */ lw $a0,0x424($s0) /* f05ece0: 8e0a028c */ lw $t2,0x28c($s0) /* f05ece4: 1040000c */ beqz $v0,.L0f05ed18 @@ -109257,7 +109289,7 @@ glabel ai01c0 /* f05ee24: 8e040424 */ lw $a0,0x424($s0) /* f05ee28: 01cf1021 */ addu $v0,$t6,$t7 /* f05ee2c: 90450003 */ lbu $a1,0x3($v0) -/* f05ee30: 0fc126d1 */ jal func0f049b44 +/* f05ee30: 0fc126d1 */ jal chrFindById /* f05ee34: afa20044 */ sw $v0,0x44($sp) /* f05ee38: 8e18028c */ lw $t8,0x28c($s0) /* f05ee3c: 1040000c */ beqz $v0,.L0f05ee70 @@ -109437,7 +109469,7 @@ glabel ai01ca /* f05f068: 01cf1021 */ addu $v0,$t6,$t7 /* f05f06c: 90450002 */ lbu $a1,0x2($v0) /* f05f070: afa20034 */ sw $v0,0x34($sp) -/* f05f074: 0fc126d1 */ jal func0f049b44 +/* f05f074: 0fc126d1 */ jal chrFindById /* f05f078: 8c640424 */ lw $a0,0x424($v1) /* f05f07c: 8fb80034 */ lw $t8,0x34($sp) /* f05f080: 00408025 */ or $s0,$v0,$zero @@ -109632,7 +109664,7 @@ glabel ai01cd /* f05f304: 01cf1821 */ addu $v1,$t6,$t7 /* f05f308: 90650002 */ lbu $a1,0x2($v1) /* f05f30c: afa3001c */ sw $v1,0x1c($sp) -/* f05f310: 0fc126d1 */ jal func0f049b44 +/* f05f310: 0fc126d1 */ jal chrFindById /* f05f314: 8cc40424 */ lw $a0,0x424($a2) /* f05f318: 3c06800a */ lui $a2,0x800a /* f05f31c: 24c69fc0 */ addiu $a2,$a2,-24640 @@ -109699,7 +109731,7 @@ glabel ai01cf /* f05f3d0: 01cf1821 */ addu $v1,$t6,$t7 /* f05f3d4: 90650002 */ lbu $a1,0x2($v1) /* f05f3d8: afa3003c */ sw $v1,0x3c($sp) -/* f05f3dc: 0fc126d1 */ jal func0f049b44 +/* f05f3dc: 0fc126d1 */ jal chrFindById /* f05f3e0: 8c440424 */ lw $a0,0x424($v0) /* f05f3e4: 3c198007 */ lui $t9,0x8007 /* f05f3e8: 27399868 */ addiu $t9,$t9,-26520 @@ -109839,7 +109871,7 @@ glabel ai01d2 /* f05f5a0: afbf0014 */ sw $ra,0x14($sp) /* f05f5a4: 01cf1021 */ addu $v0,$t6,$t7 /* f05f5a8: 90450002 */ lbu $a1,0x2($v0) -/* f05f5ac: 0fc126d1 */ jal func0f049b44 +/* f05f5ac: 0fc126d1 */ jal chrFindById /* f05f5b0: 8c640424 */ lw $a0,0x424($v1) /* f05f5b4: 3c03800a */ lui $v1,0x800a /* f05f5b8: 24639fc0 */ addiu $v1,$v1,-24640 @@ -109874,7 +109906,7 @@ glabel ai01d3 /* f05f60c: 8e040424 */ lw $a0,0x424($s0) /* f05f610: 01cf1021 */ addu $v0,$t6,$t7 /* f05f614: 90450002 */ lbu $a1,0x2($v0) -/* f05f618: 0fc126d1 */ jal func0f049b44 +/* f05f618: 0fc126d1 */ jal chrFindById /* f05f61c: afa20024 */ sw $v0,0x24($sp) /* f05f620: 1040005d */ beqz $v0,.L0f05f798 /* f05f624: 00401825 */ or $v1,$v0,$zero @@ -110525,7 +110557,7 @@ glabel ai01db /* f05fee8: afbf0014 */ sw $ra,0x14($sp) /* f05feec: 01cf1021 */ addu $v0,$t6,$t7 /* f05fef0: 90450002 */ lbu $a1,0x2($v0) -/* f05fef4: 0fc126d1 */ jal func0f049b44 +/* f05fef4: 0fc126d1 */ jal chrFindById /* f05fef8: 8c640424 */ lw $a0,0x424($v1) /* f05fefc: 3c03800a */ lui $v1,0x800a /* f05ff00: 1040000e */ beqz $v0,.L0f05ff3c @@ -141213,7 +141245,7 @@ glabel func0f07afd0 /* f07afe0: 10400011 */ beqz $v0,.L0f07b028 /* f07afe4: 00002025 */ or $a0,$zero,$zero /* f07afe8: 8fa50024 */ lw $a1,0x24($sp) -/* f07afec: 0fc126d1 */ jal func0f049b44 +/* f07afec: 0fc126d1 */ jal chrFindById /* f07aff0: afa2001c */ sw $v0,0x1c($sp) /* f07aff4: 1040000c */ beqz $v0,.L0f07b028 /* f07aff8: 8fa6001c */ lw $a2,0x1c($sp) diff --git a/src/include/game.h b/src/include/game.h index 16f9f395f..f65884272 100644 --- a/src/include/game.h +++ b/src/include/game.h @@ -8,7 +8,7 @@ /*0x0002*/ bool aiLabel(void); /*0x0003*/ bool aiYield(void); /*0x0004*/ bool aiEndList(void); -/*0x0005*/ bool ai0005(void); +/*0x0005*/ bool aiSetAilist(void); /*0x0006*/ bool ai0006(void); /*0x0007*/ bool ai0007(void); /*0x0008*/ bool ai0008(void); @@ -996,4 +996,6 @@ u32 menuhandler001a6a70(u32, u32, u32); u32 menuhandler001a6ea4(u32, u32, u32); u32 menuhandler001a6d4c(u32, u32, u32); +struct chrdata *chrFindById(struct chrdata *data, u8 chrnum); + #endif diff --git a/src/include/library.h b/src/include/library.h index 1c48158b1..1cb4cd828 100644 --- a/src/include/library.h +++ b/src/include/library.h @@ -2,6 +2,6 @@ #define _IN_LIBRARY_H #include -u32 random2(void); +u32 func000184d0(void); #endif diff --git a/src/library.c b/src/library.c index 530811baf..2662fb3ff 100644 --- a/src/library.c +++ b/src/library.c @@ -1,4 +1,5 @@ #include +#include "src/include/library.h" #include "src/include/setup.h" u32 var0004f3e0 = 0x70002d68; @@ -30656,6 +30657,10 @@ glabel func00018148 /* 184c4: 03e00008 */ jr $ra /* 184c8: 27bd00d0 */ addiu $sp,$sp,0xd0 /* 184cc: 00000000 */ sll $zero,$zero,0x0 +); + +GLOBAL_ASM( +glabel func000184d0 /* 184d0: 28810401 */ slti $at,$a0,0x401 /* 184d4: 14200020 */ bnez $at,.L00018558 /* 184d8: 3c058006 */ lui $a1,0x8006 diff --git a/src/setup.c b/src/setup.c index 3ac02a5bb..1452ce663 100644 --- a/src/setup.c +++ b/src/setup.c @@ -13952,7 +13952,7 @@ bool (*command_pointers[])(void) = { /*0x0002*/ aiLabel, /*0x0003*/ aiYield, /*0x0004*/ aiEndList, - /*0x0005*/ ai0005, + /*0x0005*/ aiSetAilist, /*0x0006*/ ai0006, /*0x0007*/ ai0007, /*0x0008*/ ai0008,