diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c index f5f2adb9e..30f6b7888 100644 --- a/src/game/chraicommands.c +++ b/src/game/chraicommands.c @@ -6854,7 +6854,7 @@ s16 g_MaianQuipBank[][4] = { * @cmd 0130 */ #if MATCHING -#if VERSION == VERSION_PAL_FINAL +#if PAL GLOBAL_ASM( glabel aiSayQuip .late_rodata @@ -7517,669 +7517,6 @@ glabel var7f1a9d64 /* f05add8: 03e00008 */ jr $ra /* f05addc: 00000000 */ nop ); -#elif VERSION == VERSION_PAL_BETA -GLOBAL_ASM( -glabel aiSayQuip -.late_rodata -glabel var7f1a9d64 -.word 0x45dac000 -.text -/* f05a3a8: 27bdff58 */ addiu $sp,$sp,-168 -/* f05a3ac: afb00048 */ sw $s0,0x48($sp) -/* f05a3b0: 3c10800a */ lui $s0,%hi(g_Vars) -/* f05a3b4: 2610e4d0 */ addiu $s0,$s0,%lo(g_Vars) -/* f05a3b8: 8e0e0434 */ lw $t6,0x434($s0) -/* f05a3bc: 8e0f0438 */ lw $t7,0x438($s0) -/* f05a3c0: afbf004c */ sw $ra,0x4c($sp) -/* f05a3c4: 8e040424 */ lw $a0,0x424($s0) -/* f05a3c8: 01cf1021 */ addu $v0,$t6,$t7 -/* f05a3cc: 90450002 */ lbu $a1,0x2($v0) -/* f05a3d0: 0fc1271a */ jal chrFindById -/* f05a3d4: afa2009c */ sw $v0,0x9c($sp) -/* f05a3d8: 8e18028c */ lw $t8,0x28c($s0) -/* f05a3dc: 8e070424 */ lw $a3,0x424($s0) -/* f05a3e0: 8fa8009c */ lw $t0,0x9c($sp) -/* f05a3e4: afb80078 */ sw $t8,0x78($sp) -/* f05a3e8: 94f90192 */ lhu $t9,0x192($a3) -/* f05a3ec: 91060003 */ lbu $a2,0x3($t0) -/* f05a3f0: 00402825 */ move $a1,$v0 -/* f05a3f4: 33291000 */ andi $t1,$t9,0x1000 -/* f05a3f8: 10e00003 */ beqz $a3,.PB0f05a408 -/* f05a3fc: a3a9006b */ sb $t1,0x6b($sp) -/* f05a400: 10000002 */ b .PB0f05a40c -/* f05a404: 90e302fe */ lbu $v1,0x2fe($a3) -.PB0f05a408: -/* f05a408: 00001825 */ move $v1,$zero -.PB0f05a40c: -/* f05a40c: 24010001 */ li $at,0x1 -/* f05a410: 14610007 */ bne $v1,$at,.PB0f05a430 -/* f05a414: 3c0a8007 */ lui $t2,%hi(g_SkedarQuipBank) -/* f05a418: 254aada8 */ addiu $t2,$t2,%lo(g_SkedarQuipBank) -/* f05a41c: 28c10006 */ slti $at,$a2,0x6 -/* f05a420: 1420002a */ bnez $at,.PB0f05a4cc -/* f05a424: afaa0084 */ sw $t2,0x84($sp) -/* f05a428: 10000028 */ b .PB0f05a4cc -/* f05a42c: 00003025 */ move $a2,$zero -.PB0f05a430: -/* f05a430: 80eb0006 */ lb $t3,0x6($a3) -/* f05a434: 24030029 */ li $v1,0x29 -/* f05a438: 3c0c8007 */ lui $t4,%hi(g_MaianQuipBank) -/* f05a43c: 146b000d */ bne $v1,$t3,.PB0f05a474 -/* f05a440: 258cade0 */ addiu $t4,$t4,%lo(g_MaianQuipBank) -/* f05a444: 28c10003 */ slti $at,$a2,0x3 -/* f05a448: 14200020 */ bnez $at,.PB0f05a4cc -/* f05a44c: afac0084 */ sw $t4,0x84($sp) -/* f05a450: afa60070 */ sw $a2,0x70($sp) -/* f05a454: 0c004be0 */ jal random -/* f05a458: afa5007c */ sw $a1,0x7c($sp) -/* f05a45c: 30460001 */ andi $a2,$v0,0x1 -/* f05a460: afa60070 */ sw $a2,0x70($sp) -/* f05a464: 8fa5007c */ lw $a1,0x7c($sp) -/* f05a468: 8e070424 */ lw $a3,0x424($s0) -/* f05a46c: 10000017 */ b .PB0f05a4cc -/* f05a470: 8fa8009c */ lw $t0,0x9c($sp) -.PB0f05a474: -/* f05a474: 910e0007 */ lbu $t6,0x7($t0) -/* f05a478: 3c0b8007 */ lui $t3,%hi(g_SpecialQuipBank) -/* f05a47c: 256babe8 */ addiu $t3,$t3,%lo(g_SpecialQuipBank) -/* f05a480: 55c00012 */ bnezl $t6,.PB0f05a4cc -/* f05a484: afab0084 */ sw $t3,0x84($sp) -/* f05a488: 90e202b1 */ lbu $v0,0x2b1($a3) -/* f05a48c: 240f0003 */ li $t7,0x3 -/* f05a490: 28410004 */ slti $at,$v0,0x4 -/* f05a494: 14200004 */ bnez $at,.PB0f05a4a8 -/* f05a498: 00000000 */ nop -/* f05a49c: a0ef02b1 */ sb $t7,0x2b1($a3) -/* f05a4a0: 8e070424 */ lw $a3,0x424($s0) -/* f05a4a4: 90e202b1 */ lbu $v0,0x2b1($a3) -.PB0f05a4a8: -/* f05a4a8: 00430019 */ multu $v0,$v1 -/* f05a4ac: 3c098007 */ lui $t1,%hi(g_GuardQuipBank) -/* f05a4b0: 2529a6c8 */ addiu $t1,$t1,%lo(g_GuardQuipBank) -/* f05a4b4: 0000c012 */ mflo $t8 -/* f05a4b8: 0018c8c0 */ sll $t9,$t8,0x3 -/* f05a4bc: 03295021 */ addu $t2,$t9,$t1 -/* f05a4c0: 10000002 */ b .PB0f05a4cc -/* f05a4c4: afaa0084 */ sw $t2,0x84($sp) -/* f05a4c8: afab0084 */ sw $t3,0x84($sp) -.PB0f05a4cc: -/* f05a4cc: 54c0000e */ bnezl $a2,.PB0f05a508 -/* f05a4d0: 90e40125 */ lbu $a0,0x125($a3) -/* f05a4d4: 910c0004 */ lbu $t4,0x4($t0) -/* f05a4d8: 5580000b */ bnezl $t4,.PB0f05a508 -/* f05a4dc: 90e40125 */ lbu $a0,0x125($a3) -/* f05a4e0: 910d0006 */ lbu $t5,0x6($t0) -/* f05a4e4: 55a00008 */ bnezl $t5,.PB0f05a508 -/* f05a4e8: 90e40125 */ lbu $a0,0x125($a3) -/* f05a4ec: ace00120 */ sw $zero,0x120($a3) -/* f05a4f0: 8e0e0438 */ lw $t6,0x438($s0) -/* f05a4f4: 00001025 */ move $v0,$zero -/* f05a4f8: 25cf000a */ addiu $t7,$t6,0xa -/* f05a4fc: 10000208 */ b .PB0f05ad20 -/* f05a500: ae0f0438 */ sw $t7,0x438($s0) -/* f05a504: 90e40125 */ lbu $a0,0x125($a3) -.PB0f05a508: -/* f05a508: afa60070 */ sw $a2,0x70($sp) -/* f05a50c: 0fc133c9 */ jal teamGetChrIds -/* f05a510: afa5007c */ sw $a1,0x7c($sp) -/* f05a514: 8fb8009c */ lw $t8,0x9c($sp) -/* f05a518: afa20088 */ sw $v0,0x88($sp) -/* f05a51c: afa00098 */ sw $zero,0x98($sp) -/* f05a520: afa00094 */ sw $zero,0x94($sp) -/* f05a524: 93190004 */ lbu $t9,0x4($t8) -/* f05a528: 8e070424 */ lw $a3,0x424($s0) -/* f05a52c: 24010005 */ li $at,0x5 -/* f05a530: afb90090 */ sw $t9,0x90($sp) -/* f05a534: 80e30006 */ lb $v1,0x6($a3) -/* f05a538: 8fa5007c */ lw $a1,0x7c($sp) -/* f05a53c: 8fa90084 */ lw $t1,0x84($sp) -/* f05a540: 10610007 */ beq $v1,$at,.PB0f05a560 -/* f05a544: 3c0a8007 */ lui $t2,%hi(g_SpecialQuipBank) -/* f05a548: 2401000f */ li $at,0xf -/* f05a54c: 10610004 */ beq $v1,$at,.PB0f05a560 -/* f05a550: 2401003a */ li $at,0x3a -/* f05a554: 10610002 */ beq $v1,$at,.PB0f05a560 -/* f05a558: 24010028 */ li $at,0x28 -/* f05a55c: 14610004 */ bne $v1,$at,.PB0f05a570 -.PB0f05a560: -/* f05a560: 254aabe8 */ addiu $t2,$t2,%lo(g_SpecialQuipBank) -/* f05a564: 112a0002 */ beq $t1,$t2,.PB0f05a570 -/* f05a568: 00000000 */ nop -/* f05a56c: afa00090 */ sw $zero,0x90($sp) -.PB0f05a570: -/* f05a570: 50a0001c */ beqzl $a1,.PB0f05a5e4 -/* f05a574: 90e20126 */ lbu $v0,0x126($a3) -/* f05a578: 8ca4001c */ lw $a0,0x1c($a1) -/* f05a57c: 50800019 */ beqzl $a0,.PB0f05a5e4 -/* f05a580: 90e20126 */ lbu $v0,0x126($a3) -/* f05a584: 908b0000 */ lbu $t3,0x0($a0) -/* f05a588: 24010006 */ li $at,0x6 -/* f05a58c: 55610015 */ bnel $t3,$at,.PB0f05a5e4 -/* f05a590: 90e20126 */ lbu $v0,0x126($a3) -/* f05a594: 0fc4a797 */ jal playermgrGetPlayerNumByProp -/* f05a598: 00000000 */ nop -/* f05a59c: 8e030298 */ lw $v1,0x298($s0) -/* f05a5a0: 00026080 */ sll $t4,$v0,0x2 -/* f05a5a4: 00402025 */ move $a0,$v0 -/* f05a5a8: 0460000a */ bltz $v1,.PB0f05a5d4 -/* f05a5ac: 020c6821 */ addu $t5,$s0,$t4 -/* f05a5b0: 8dae0064 */ lw $t6,0x64($t5) -/* f05a5b4: 8dcf00d8 */ lw $t7,0xd8($t6) -/* f05a5b8: 11e00006 */ beqz $t7,.PB0f05a5d4 -/* f05a5bc: 00000000 */ nop -/* f05a5c0: 8e050294 */ lw $a1,0x294($s0) -/* f05a5c4: 14450003 */ bne $v0,$a1,.PB0f05a5d4 -/* f05a5c8: 00a02025 */ move $a0,$a1 -/* f05a5cc: 10000001 */ b .PB0f05a5d4 -/* f05a5d0: 00602025 */ move $a0,$v1 -.PB0f05a5d4: -/* f05a5d4: 0fc4a783 */ jal setCurrentPlayerNum -/* f05a5d8: 00000000 */ nop -/* f05a5dc: 8e070424 */ lw $a3,0x424($s0) -/* f05a5e0: 90e20126 */ lbu $v0,0x126($a3) -.PB0f05a5e4: -/* f05a5e4: 10400009 */ beqz $v0,.PB0f05a60c -/* f05a5e8: 0002c080 */ sll $t8,$v0,0x2 -/* f05a5ec: 0302c023 */ subu $t8,$t8,$v0 -/* f05a5f0: 8cf90120 */ lw $t9,0x120($a3) -/* f05a5f4: 0018c0c0 */ sll $t8,$t8,0x3 -/* f05a5f8: 0302c021 */ addu $t8,$t8,$v0 -/* f05a5fc: 0018c040 */ sll $t8,$t8,0x1 -/* f05a600: 0319082a */ slt $at,$t8,$t9 -/* f05a604: 102001c0 */ beqz $at,.PB0f05ad08 -/* f05a608: 00000000 */ nop -.PB0f05a60c: -/* f05a60c: 0c004be0 */ jal random -/* f05a610: 00000000 */ nop -/* f05a614: 8faa0090 */ lw $t2,0x90($sp) -/* f05a618: 304900ff */ andi $t1,$v0,0xff -/* f05a61c: 8fab0088 */ lw $t3,0x88($sp) -/* f05a620: 012a082a */ slt $at,$t1,$t2 -/* f05a624: 102001b8 */ beqz $at,.PB0f05ad08 -/* f05a628: 00000000 */ nop -/* f05a62c: 85640000 */ lh $a0,0x0($t3) -/* f05a630: 2401fffe */ li $at,-2 -/* f05a634: 5081003e */ beql $a0,$at,.PB0f05a730 -/* f05a638: 8fae0094 */ lw $t6,0x94($sp) -.PB0f05a63c: -/* f05a63c: 0fc0a211 */ jal chrFindByLiteralId -/* f05a640: 00000000 */ nop -/* f05a644: 50400033 */ beqzl $v0,.PB0f05a714 -/* f05a648: 8fa20088 */ lw $v0,0x88($sp) -/* f05a64c: 8c4c0020 */ lw $t4,0x20($v0) -/* f05a650: 00402025 */ move $a0,$v0 -/* f05a654: 5180002f */ beqzl $t4,.PB0f05a714 -/* f05a658: 8fa20088 */ lw $v0,0x88($sp) -/* f05a65c: 0fc0e6e9 */ jal chrIsDead -/* f05a660: afa20064 */ sw $v0,0x64($sp) -/* f05a664: 1440002a */ bnez $v0,.PB0f05a710 -/* f05a668: 8fa60064 */ lw $a2,0x64($sp) -/* f05a66c: 80cd0007 */ lb $t5,0x7($a2) -/* f05a670: 24010005 */ li $at,0x5 -/* f05a674: 51a10027 */ beql $t5,$at,.PB0f05a714 -/* f05a678: 8fa20088 */ lw $v0,0x88($sp) -/* f05a67c: 8e070424 */ lw $a3,0x424($s0) -/* f05a680: 90ce02a2 */ lbu $t6,0x2a2($a2) -/* f05a684: 90ef02a2 */ lbu $t7,0x2a2($a3) -/* f05a688: 55cf0022 */ bnel $t6,$t7,.PB0f05a714 -/* f05a68c: 8fa20088 */ lw $v0,0x88($sp) -/* f05a690: 90d80113 */ lbu $t8,0x113($a2) -/* f05a694: 2b010064 */ slti $at,$t8,0x64 -/* f05a698: 5420001e */ bnezl $at,.PB0f05a714 -/* f05a69c: 8fa20088 */ lw $v0,0x88($sp) -/* f05a6a0: 84c50000 */ lh $a1,0x0($a2) -/* f05a6a4: 84f90000 */ lh $t9,0x0($a3) -/* f05a6a8: 00e02025 */ move $a0,$a3 -/* f05a6ac: 50b90019 */ beql $a1,$t9,.PB0f05a714 -/* f05a6b0: 8fa20088 */ lw $v0,0x88($sp) -/* f05a6b4: 0fc12775 */ jal chrGetDistanceToChr -/* f05a6b8: afa60064 */ sw $a2,0x64($sp) -/* f05a6bc: 3c017f1b */ lui $at,%hi(var7f1a9d64) -/* f05a6c0: c424ba54 */ lwc1 $f4,%lo(var7f1a9d64)($at) -/* f05a6c4: 8fa90098 */ lw $t1,0x98($sp) -/* f05a6c8: 8fa60064 */ lw $a2,0x64($sp) -/* f05a6cc: 4604003c */ c.lt.s $f0,$f4 -/* f05a6d0: 252a0001 */ addiu $t2,$t1,0x1 -/* f05a6d4: 4502000f */ bc1fl .PB0f05a714 -/* f05a6d8: 8fa20088 */ lw $v0,0x88($sp) -/* f05a6dc: afaa0098 */ sw $t2,0x98($sp) -/* f05a6e0: 8ccb0120 */ lw $t3,0x120($a2) -/* f05a6e4: 8fac009c */ lw $t4,0x9c($sp) -/* f05a6e8: 29610032 */ slti $at,$t3,0x32 -/* f05a6ec: 50200009 */ beqzl $at,.PB0f05a714 -/* f05a6f0: 8fa20088 */ lw $v0,0x88($sp) -/* f05a6f4: 91820006 */ lbu $v0,0x6($t4) -/* f05a6f8: 240100ff */ li $at,0xff -/* f05a6fc: 50400005 */ beqzl $v0,.PB0f05a714 -/* f05a700: 8fa20088 */ lw $v0,0x88($sp) -/* f05a704: 10410002 */ beq $v0,$at,.PB0f05a710 -/* f05a708: 240d0001 */ li $t5,0x1 -/* f05a70c: afad0094 */ sw $t5,0x94($sp) -.PB0f05a710: -/* f05a710: 8fa20088 */ lw $v0,0x88($sp) -.PB0f05a714: -/* f05a714: 2401fffe */ li $at,-2 -/* f05a718: 84440002 */ lh $a0,0x2($v0) -/* f05a71c: 24420002 */ addiu $v0,$v0,0x2 -/* f05a720: afa20088 */ sw $v0,0x88($sp) -/* f05a724: 1481ffc5 */ bne $a0,$at,.PB0f05a63c -/* f05a728: 00000000 */ nop -/* f05a72c: 8fae0094 */ lw $t6,0x94($sp) -.PB0f05a730: -/* f05a730: 8faf0098 */ lw $t7,0x98($sp) -/* f05a734: 15c00174 */ bnez $t6,.PB0f05ad08 -/* f05a738: 00000000 */ nop -/* f05a73c: 15e00007 */ bnez $t7,.PB0f05a75c -/* f05a740: 8fb8009c */ lw $t8,0x9c($sp) -/* f05a744: 93020006 */ lbu $v0,0x6($t8) -/* f05a748: 240100ff */ li $at,0xff -/* f05a74c: 1040000a */ beqz $v0,.PB0f05a778 -/* f05a750: 00000000 */ nop -/* f05a754: 10410008 */ beq $v0,$at,.PB0f05a778 -/* f05a758: 00000000 */ nop -.PB0f05a75c: -/* f05a75c: 8fb90098 */ lw $t9,0x98($sp) -/* f05a760: 8fa9009c */ lw $t1,0x9c($sp) -/* f05a764: 1b200168 */ blez $t9,.PB0f05ad08 -/* f05a768: 00000000 */ nop -/* f05a76c: 912a0006 */ lbu $t2,0x6($t1) -/* f05a770: 19400165 */ blez $t2,.PB0f05ad08 -/* f05a774: 00000000 */ nop -.PB0f05a778: -/* f05a778: 0c004be0 */ jal random -/* f05a77c: 00000000 */ nop -/* f05a780: 24010003 */ li $at,0x3 -/* f05a784: 0041001b */ divu $zero,$v0,$at -/* f05a788: 8fab009c */ lw $t3,0x9c($sp) -/* f05a78c: 00001810 */ mfhi $v1 -/* f05a790: a3a300a7 */ sb $v1,0xa7($sp) -/* f05a794: 916c0007 */ lbu $t4,0x7($t3) -/* f05a798: 8fb80070 */ lw $t8,0x70($sp) -/* f05a79c: 8fae0084 */ lw $t6,0x84($sp) -/* f05a7a0: 318d0080 */ andi $t5,$t4,0x80 -/* f05a7a4: 15a00009 */ bnez $t5,.PB0f05a7cc -/* f05a7a8: 0018c8c0 */ sll $t9,$t8,0x3 -/* f05a7ac: 01d94821 */ addu $t1,$t6,$t9 -/* f05a7b0: 306a00ff */ andi $t2,$v1,0xff -/* f05a7b4: 000a5840 */ sll $t3,$t2,0x1 -/* f05a7b8: 012b6021 */ addu $t4,$t1,$t3 -/* f05a7bc: afa90058 */ sw $t1,0x58($sp) -/* f05a7c0: 858d0002 */ lh $t5,0x2($t4) -/* f05a7c4: 1000000c */ b .PB0f05a7f8 -/* f05a7c8: a7ad00a4 */ sh $t5,0xa4($sp) -.PB0f05a7cc: -/* f05a7cc: 8e0a0424 */ lw $t2,0x424($s0) -/* f05a7d0: 8fae0070 */ lw $t6,0x70($sp) -/* f05a7d4: 8faf0084 */ lw $t7,0x84($sp) -/* f05a7d8: 914902b0 */ lbu $t1,0x2b0($t2) -/* f05a7dc: 000ec8c0 */ sll $t9,$t6,0x3 -/* f05a7e0: 01f91021 */ addu $v0,$t7,$t9 -/* f05a7e4: 00095840 */ sll $t3,$t1,0x1 -/* f05a7e8: 004b6021 */ addu $t4,$v0,$t3 -/* f05a7ec: 858d0002 */ lh $t5,0x2($t4) -/* f05a7f0: afa20058 */ sw $v0,0x58($sp) -/* f05a7f4: a7ad00a4 */ sh $t5,0xa4($sp) -.PB0f05a7f8: -/* f05a7f8: 0fc13416 */ jal audioWasNotPlayedRecently -/* f05a7fc: 87a400a4 */ lh $a0,0xa4($sp) -/* f05a800: 1440000a */ bnez $v0,.PB0f05a82c -/* f05a804: 24010001 */ li $at,0x1 -/* f05a808: 8e070424 */ lw $a3,0x424($s0) -/* f05a80c: 00001825 */ move $v1,$zero -/* f05a810: 24080001 */ li $t0,0x1 -/* f05a814: 10e00003 */ beqz $a3,.PB0f05a824 -/* f05a818: 3c0e8007 */ lui $t6,%hi(g_GuardQuipBank) -/* f05a81c: 10000001 */ b .PB0f05a824 -/* f05a820: 90e302fe */ lbu $v1,0x2fe($a3) -.PB0f05a824: -/* f05a824: 54610092 */ bnel $v1,$at,.PB0f05aa70 -/* f05a828: 8fad0070 */ lw $t5,0x70($sp) -.PB0f05a82c: -/* f05a82c: 0fc13404 */ jal audioMarkAsRecentlyPlayed -/* f05a830: 87a400a4 */ lh $a0,0xa4($sp) -/* f05a834: 87b800a4 */ lh $t8,0xa4($sp) -/* f05a838: 2401034e */ li $at,0x34e -/* f05a83c: 93ae006b */ lbu $t6,0x6b($sp) -/* f05a840: 57010005 */ bnel $t8,$at,.PB0f05a858 -/* f05a844: 8e190424 */ lw $t9,0x424($s0) -/* f05a848: 15c00002 */ bnez $t6,.PB0f05a854 -/* f05a84c: 240f034d */ li $t7,0x34d -/* f05a850: a7af00a4 */ sh $t7,0xa4($sp) -.PB0f05a854: -/* f05a854: 8e190424 */ lw $t9,0x424($s0) -.PB0f05a858: -/* f05a858: 240103f7 */ li $at,0x3f7 -/* f05a85c: af200120 */ sw $zero,0x120($t9) -/* f05a860: 8faa009c */ lw $t2,0x9c($sp) -/* f05a864: 8e0b0424 */ lw $t3,0x424($s0) -/* f05a868: 91490005 */ lbu $t1,0x5($t2) -/* f05a86c: a1690126 */ sb $t1,0x126($t3) -/* f05a870: 8e070424 */ lw $a3,0x424($s0) -/* f05a874: 90ec0332 */ lbu $t4,0x332($a3) -/* f05a878: 258d0001 */ addiu $t5,$t4,0x1 -/* f05a87c: a0ed0332 */ sb $t5,0x332($a3) -/* f05a880: 87b800a4 */ lh $t8,0xa4($sp) -/* f05a884: 13010022 */ beq $t8,$at,.PB0f05a910 -/* f05a888: 24010331 */ li $at,0x331 -/* f05a88c: 13010020 */ beq $t8,$at,.PB0f05a910 -/* f05a890: 240103a1 */ li $at,0x3a1 -/* f05a894: 1301001e */ beq $t8,$at,.PB0f05a910 -/* f05a898: 24050009 */ li $a1,0x9 -/* f05a89c: 8e0e0424 */ lw $t6,0x424($s0) -/* f05a8a0: 3406ffff */ li $a2,0xffff -/* f05a8a4: 0fc24943 */ jal func0f0926bc -/* f05a8a8: 8dc4001c */ lw $a0,%lo(invpartvisibility_crossbow)($t6) -/* f05a8ac: 8e0f0424 */ lw $t7,0x424($s0) -/* f05a8b0: 3c01bf80 */ lui $at,0xbf80 -/* f05a8b4: 44810000 */ mtc1 $at,$f0 -/* f05a8b8: 8de5001c */ lw $a1,0x1c($t7) -/* f05a8bc: 2419ffff */ li $t9,-1 -/* f05a8c0: 240a0008 */ li $t2,0x8 -/* f05a8c4: 24090009 */ li $t1,0x9 -/* f05a8c8: 240bffff */ li $t3,-1 -/* f05a8cc: afab002c */ sw $t3,0x2c($sp) -/* f05a8d0: afa9001c */ sw $t1,0x1c($sp) -/* f05a8d4: afaa0014 */ sw $t2,0x14($sp) -/* f05a8d8: afb90010 */ sw $t9,0x10($sp) -/* f05a8dc: afa00028 */ sw $zero,0x28($sp) -/* f05a8e0: afa00020 */ sw $zero,0x20($sp) -/* f05a8e4: afa00018 */ sw $zero,0x18($sp) -/* f05a8e8: 00002025 */ move $a0,$zero -/* f05a8ec: 87a600a4 */ lh $a2,0xa4($sp) -/* f05a8f0: 2407ffff */ li $a3,-1 -/* f05a8f4: e7a00038 */ swc1 $f0,0x38($sp) -/* f05a8f8: e7a00034 */ swc1 $f0,0x34($sp) -/* f05a8fc: e7a00030 */ swc1 $f0,0x30($sp) -/* f05a900: 0fc24e0e */ jal propsnd0f0939f8 -/* f05a904: e7a00024 */ swc1 $f0,0x24($sp) -/* f05a908: 10000026 */ b .PB0f05a9a4 -/* f05a90c: 8faa009c */ lw $t2,0x9c($sp) -.PB0f05a910: -/* f05a910: 0fc131a9 */ jal chrGetDistanceLostToTargetInLastSecond -/* f05a914: 8e040424 */ lw $a0,0x424($s0) -/* f05a918: 18400003 */ blez $v0,.PB0f05a928 -/* f05a91c: 00021823 */ negu $v1,$v0 -/* f05a920: 10000001 */ b .PB0f05a928 -/* f05a924: 00401825 */ move $v1,$v0 -.PB0f05a928: -/* f05a928: 28610033 */ slti $at,$v1,0x33 -/* f05a92c: 1420001c */ bnez $at,.PB0f05a9a0 -/* f05a930: 24050009 */ li $a1,0x9 -/* f05a934: 8e0c0424 */ lw $t4,0x424($s0) -/* f05a938: 3406ffff */ li $a2,0xffff -/* f05a93c: 0fc24943 */ jal func0f0926bc -/* f05a940: 8d84001c */ lw $a0,0x1c($t4) -/* f05a944: 8e0d0424 */ lw $t5,0x424($s0) -/* f05a948: 3c01bf80 */ lui $at,0xbf80 -/* f05a94c: 44810000 */ mtc1 $at,$f0 -/* f05a950: 8da5001c */ lw $a1,0x1c($t5) -/* f05a954: 2418ffff */ li $t8,-1 -/* f05a958: 240e0008 */ li $t6,0x8 -/* f05a95c: 240f0009 */ li $t7,0x9 -/* f05a960: 2419ffff */ li $t9,-1 -/* f05a964: afb9002c */ sw $t9,0x2c($sp) -/* f05a968: afaf001c */ sw $t7,0x1c($sp) -/* f05a96c: afae0014 */ sw $t6,0x14($sp) -/* f05a970: afb80010 */ sw $t8,0x10($sp) -/* f05a974: afa00028 */ sw $zero,0x28($sp) -/* f05a978: afa00020 */ sw $zero,0x20($sp) -/* f05a97c: afa00018 */ sw $zero,0x18($sp) -/* f05a980: 00002025 */ move $a0,$zero -/* f05a984: 87a600a4 */ lh $a2,0xa4($sp) -/* f05a988: 2407ffff */ li $a3,-1 -/* f05a98c: e7a00038 */ swc1 $f0,0x38($sp) -/* f05a990: e7a00034 */ swc1 $f0,0x34($sp) -/* f05a994: e7a00030 */ swc1 $f0,0x30($sp) -/* f05a998: 0fc24e0e */ jal propsnd0f0939f8 -/* f05a99c: e7a00024 */ swc1 $f0,0x24($sp) -.PB0f05a9a0: -/* f05a9a0: 8faa009c */ lw $t2,0x9c($sp) -.PB0f05a9a4: -/* f05a9a4: 91420008 */ lbu $v0,0x8($t2) -/* f05a9a8: 1040001a */ beqz $v0,.PB0f05aa14 -/* f05a9ac: 00000000 */ nop -/* f05a9b0: 91490007 */ lbu $t1,0x7($t2) -/* f05a9b4: 93a300a7 */ lbu $v1,0xa7($sp) -/* f05a9b8: 000260c0 */ sll $t4,$v0,0x3 -/* f05a9bc: 312b0080 */ andi $t3,$t1,0x80 -/* f05a9c0: 15600014 */ bnez $t3,.PB0f05aa14 -/* f05a9c4: 28610003 */ slti $at,$v1,0x3 -/* f05a9c8: 14200002 */ bnez $at,.PB0f05a9d4 -/* f05a9cc: 3c048007 */ lui $a0,%hi(g_SpecialQuipBank+0x16a) -/* f05a9d0: 24030002 */ li $v1,0x2 -.PB0f05a9d4: -/* f05a9d4: 00036840 */ sll $t5,$v1,0x1 -/* f05a9d8: 018dc021 */ addu $t8,$t4,$t5 -/* f05a9dc: 00982021 */ addu $a0,$a0,$t8 -/* f05a9e0: 0fc5c06a */ jal langGet -/* f05a9e4: 8484ad52 */ lh $a0,%lo(g_SpecialQuipBank+0x16a)($a0) -/* f05a9e8: afa20080 */ sw $v0,0x80($sp) -/* f05a9ec: 0c004116 */ jal sndIsFiltered -/* f05a9f0: 87a400a4 */ lh $a0,0xa4($sp) -/* f05a9f4: 144000c4 */ bnez $v0,.PB0f05ad08 -/* f05a9f8: 8fa40080 */ lw $a0,0x80($sp) -/* f05a9fc: 8fae009c */ lw $t6,0x9c($sp) -/* f05aa00: 24050006 */ li $a1,0x6 -/* f05aa04: 0fc37931 */ jal hudmsgCreateWithColour -/* f05aa08: 91c60009 */ lbu $a2,0x9($t6) -/* f05aa0c: 100000be */ b .PB0f05ad08 -/* f05aa10: 00000000 */ nop -.PB0f05aa14: -/* f05aa14: 104000bc */ beqz $v0,.PB0f05ad08 -/* f05aa18: 00000000 */ nop -/* f05aa1c: 8e190424 */ lw $t9,0x424($s0) -/* f05aa20: 000278c0 */ sll $t7,$v0,0x3 -/* f05aa24: 3c048007 */ lui $a0,%hi(g_SpecialQuipBank+0x16a) -/* f05aa28: 932a02b0 */ lbu $t2,0x2b0($t9) -/* f05aa2c: 000a4840 */ sll $t1,$t2,0x1 -/* f05aa30: 01e95821 */ addu $t3,$t7,$t1 -/* f05aa34: 008b2021 */ addu $a0,$a0,$t3 -/* f05aa38: 0fc5c06a */ jal langGet -/* f05aa3c: 8484ad52 */ lh $a0,%lo(g_SpecialQuipBank+0x16a)($a0) -/* f05aa40: afa20080 */ sw $v0,0x80($sp) -/* f05aa44: 0c004116 */ jal sndIsFiltered -/* f05aa48: 87a400a4 */ lh $a0,0xa4($sp) -/* f05aa4c: 144000ae */ bnez $v0,.PB0f05ad08 -/* f05aa50: 8fa40080 */ lw $a0,0x80($sp) -/* f05aa54: 8fac009c */ lw $t4,0x9c($sp) -/* f05aa58: 24050006 */ li $a1,0x6 -/* f05aa5c: 0fc37931 */ jal hudmsgCreateWithColour -/* f05aa60: 91860009 */ lbu $a2,0x9($t4) -/* f05aa64: 100000a8 */ b .PB0f05ad08 -/* f05aa68: 00000000 */ nop -/* f05aa6c: 8fad0070 */ lw $t5,0x70($sp) -.PB0f05aa70: -/* f05aa70: 25cea6c8 */ addiu $t6,$t6,%lo(g_GuardQuipBank) -/* f05aa74: a7a000a4 */ sh $zero,0xa4($sp) -/* f05aa78: 000dc0c0 */ sll $t8,$t5,0x3 -/* f05aa7c: 030e1021 */ addu $v0,$t8,$t6 -/* f05aa80: afa2005c */ sw $v0,0x5c($sp) -.PB0f05aa84: -/* f05aa84: 8fa2005c */ lw $v0,0x5c($sp) -/* f05aa88: 00081840 */ sll $v1,$t0,0x1 -/* f05aa8c: 0043c821 */ addu $t9,$v0,$v1 -/* f05aa90: 87240000 */ lh $a0,0x0($t9) -/* f05aa94: a3a800a3 */ sb $t0,0xa3($sp) -/* f05aa98: 0fc13416 */ jal audioWasNotPlayedRecently -/* f05aa9c: afa30054 */ sw $v1,0x54($sp) -/* f05aaa0: 8fa30054 */ lw $v1,0x54($sp) -/* f05aaa4: 1040000d */ beqz $v0,.PB0f05aadc -/* f05aaa8: 93a800a3 */ lbu $t0,0xa3($sp) -/* f05aaac: 8faa0058 */ lw $t2,0x58($sp) -/* f05aab0: 01432821 */ addu $a1,$t2,$v1 -/* f05aab4: 84a40000 */ lh $a0,0x0($a1) -/* f05aab8: a3a800a3 */ sb $t0,0xa3($sp) -/* f05aabc: 0fc13416 */ jal audioWasNotPlayedRecently -/* f05aac0: afa50050 */ sw $a1,0x50($sp) -/* f05aac4: 8fa50050 */ lw $a1,0x50($sp) -/* f05aac8: 10400004 */ beqz $v0,.PB0f05aadc -/* f05aacc: 93a800a3 */ lbu $t0,0xa3($sp) -/* f05aad0: 84af0000 */ lh $t7,0x0($a1) -/* f05aad4: 10000006 */ b .PB0f05aaf0 -/* f05aad8: a7af00a4 */ sh $t7,0xa4($sp) -.PB0f05aadc: -/* f05aadc: 25080001 */ addiu $t0,$t0,0x1 -/* f05aae0: 310900ff */ andi $t1,$t0,0xff -/* f05aae4: 29210004 */ slti $at,$t1,0x4 -/* f05aae8: 1420ffe6 */ bnez $at,.PB0f05aa84 -/* f05aaec: 01204025 */ move $t0,$t1 -.PB0f05aaf0: -/* f05aaf0: 87ab00a4 */ lh $t3,0xa4($sp) -/* f05aaf4: 1160007a */ beqz $t3,.PB0f05ace0 -/* f05aaf8: 01602025 */ move $a0,$t3 -/* f05aafc: 0fc13404 */ jal audioMarkAsRecentlyPlayed -/* f05ab00: a3a800a3 */ sb $t0,0xa3($sp) -/* f05ab04: 87ac00a4 */ lh $t4,0xa4($sp) -/* f05ab08: 2401034e */ li $at,0x34e -/* f05ab0c: 93a800a3 */ lbu $t0,0xa3($sp) -/* f05ab10: 15810004 */ bne $t4,$at,.PB0f05ab24 -/* f05ab14: 93ad006b */ lbu $t5,0x6b($sp) -/* f05ab18: 15a00002 */ bnez $t5,.PB0f05ab24 -/* f05ab1c: 2418034d */ li $t8,0x34d -/* f05ab20: a7b800a4 */ sh $t8,0xa4($sp) -.PB0f05ab24: -/* f05ab24: 8e0e0424 */ lw $t6,0x424($s0) -/* f05ab28: 240103f7 */ li $at,0x3f7 -/* f05ab2c: adc00120 */ sw $zero,0x120($t6) -/* f05ab30: 8fb9009c */ lw $t9,0x9c($sp) -/* f05ab34: 8e0f0424 */ lw $t7,0x424($s0) -/* f05ab38: 932a0005 */ lbu $t2,0x5($t9) -/* f05ab3c: a1ea0126 */ sb $t2,0x126($t7) -/* f05ab40: 8e070424 */ lw $a3,0x424($s0) -/* f05ab44: 90e90332 */ lbu $t1,0x332($a3) -/* f05ab48: 252b0001 */ addiu $t3,$t1,0x1 -/* f05ab4c: a0eb0332 */ sb $t3,0x332($a3) -/* f05ab50: 87ac00a4 */ lh $t4,0xa4($sp) -/* f05ab54: 11810024 */ beq $t4,$at,.PB0f05abe8 -/* f05ab58: 24010331 */ li $at,0x331 -/* f05ab5c: 11810022 */ beq $t4,$at,.PB0f05abe8 -/* f05ab60: 240103a1 */ li $at,0x3a1 -/* f05ab64: 51810021 */ beql $t4,$at,.PB0f05abec -/* f05ab68: 8e040424 */ lw $a0,0x424($s0) -/* f05ab6c: 8e0d0424 */ lw $t5,0x424($s0) -/* f05ab70: 24050009 */ li $a1,0x9 -/* f05ab74: 3406ffff */ li $a2,0xffff -/* f05ab78: 8da4001c */ lw $a0,0x1c($t5) -/* f05ab7c: 0fc24943 */ jal func0f0926bc -/* f05ab80: a3a800a3 */ sb $t0,0xa3($sp) -/* f05ab84: 8e180424 */ lw $t8,0x424($s0) -/* f05ab88: 3c01bf80 */ lui $at,0xbf80 -/* f05ab8c: 44810000 */ mtc1 $at,$f0 -/* f05ab90: 8f05001c */ lw $a1,0x1c($t8) -/* f05ab94: 240effff */ li $t6,-1 -/* f05ab98: 24190008 */ li $t9,0x8 -/* f05ab9c: 240a0009 */ li $t2,0x9 -/* f05aba0: 240fffff */ li $t7,-1 -/* f05aba4: afaf002c */ sw $t7,0x2c($sp) -/* f05aba8: afaa001c */ sw $t2,0x1c($sp) -/* f05abac: afb90014 */ sw $t9,0x14($sp) -/* f05abb0: afae0010 */ sw $t6,0x10($sp) -/* f05abb4: afa00028 */ sw $zero,0x28($sp) -/* f05abb8: afa00020 */ sw $zero,0x20($sp) -/* f05abbc: afa00018 */ sw $zero,0x18($sp) -/* f05abc0: 00002025 */ move $a0,$zero -/* f05abc4: 87a600a4 */ lh $a2,0xa4($sp) -/* f05abc8: 2407ffff */ li $a3,-1 -/* f05abcc: e7a00038 */ swc1 $f0,0x38($sp) -/* f05abd0: e7a00034 */ swc1 $f0,0x34($sp) -/* f05abd4: e7a00030 */ swc1 $f0,0x30($sp) -/* f05abd8: 0fc24e0e */ jal propsnd0f0939f8 -/* f05abdc: e7a00024 */ swc1 $f0,0x24($sp) -/* f05abe0: 1000002a */ b .PB0f05ac8c -/* f05abe4: 93a800a3 */ lbu $t0,0xa3($sp) -.PB0f05abe8: -/* f05abe8: 8e040424 */ lw $a0,0x424($s0) -.PB0f05abec: -/* f05abec: 0fc131a9 */ jal chrGetDistanceLostToTargetInLastSecond -/* f05abf0: a3a800a3 */ sb $t0,0xa3($sp) -/* f05abf4: 18400003 */ blez $v0,.PB0f05ac04 -/* f05abf8: 93a800a3 */ lbu $t0,0xa3($sp) -/* f05abfc: 10000002 */ b .PB0f05ac08 -/* f05ac00: 00401825 */ move $v1,$v0 -.PB0f05ac04: -/* f05ac04: 00021823 */ negu $v1,$v0 -.PB0f05ac08: -/* f05ac08: 28610033 */ slti $at,$v1,0x33 -/* f05ac0c: 54200020 */ bnezl $at,.PB0f05ac90 -/* f05ac10: 8fb9009c */ lw $t9,0x9c($sp) -/* f05ac14: 8e090424 */ lw $t1,0x424($s0) -/* f05ac18: 24050009 */ li $a1,0x9 -/* f05ac1c: 3406ffff */ li $a2,0xffff -/* f05ac20: 8d24001c */ lw $a0,0x1c($t1) -/* f05ac24: 0fc24943 */ jal func0f0926bc -/* f05ac28: a3a800a3 */ sb $t0,0xa3($sp) -/* f05ac2c: 8e0b0424 */ lw $t3,0x424($s0) -/* f05ac30: 3c01bf80 */ lui $at,0xbf80 -/* f05ac34: 44810000 */ mtc1 $at,$f0 -/* f05ac38: 8d65001c */ lw $a1,0x1c($t3) -/* f05ac3c: 240cffff */ li $t4,-1 -/* f05ac40: 240d0008 */ li $t5,0x8 -/* f05ac44: 24180009 */ li $t8,0x9 -/* f05ac48: 240effff */ li $t6,-1 -/* f05ac4c: afae002c */ sw $t6,0x2c($sp) -/* f05ac50: afb8001c */ sw $t8,0x1c($sp) -/* f05ac54: afad0014 */ sw $t5,0x14($sp) -/* f05ac58: afac0010 */ sw $t4,0x10($sp) -/* f05ac5c: afa00028 */ sw $zero,0x28($sp) -/* f05ac60: afa00020 */ sw $zero,0x20($sp) -/* f05ac64: afa00018 */ sw $zero,0x18($sp) -/* f05ac68: 00002025 */ move $a0,$zero -/* f05ac6c: 87a600a4 */ lh $a2,0xa4($sp) -/* f05ac70: 2407ffff */ li $a3,-1 -/* f05ac74: e7a00038 */ swc1 $f0,0x38($sp) -/* f05ac78: e7a00034 */ swc1 $f0,0x34($sp) -/* f05ac7c: e7a00030 */ swc1 $f0,0x30($sp) -/* f05ac80: 0fc24e0e */ jal propsnd0f0939f8 -/* f05ac84: e7a00024 */ swc1 $f0,0x24($sp) -/* f05ac88: 93a800a3 */ lbu $t0,0xa3($sp) -.PB0f05ac8c: -/* f05ac8c: 8fb9009c */ lw $t9,0x9c($sp) -.PB0f05ac90: -/* f05ac90: 00087840 */ sll $t7,$t0,0x1 -/* f05ac94: 3c048007 */ lui $a0,%hi(g_SpecialQuipBank+0x168) -/* f05ac98: 93220008 */ lbu $v0,0x8($t9) -/* f05ac9c: 1040001a */ beqz $v0,.PB0f05ad08 -/* f05aca0: 000250c0 */ sll $t2,$v0,0x3 -/* f05aca4: 014f4821 */ addu $t1,$t2,$t7 -/* f05aca8: 00892021 */ addu $a0,$a0,$t1 -/* f05acac: 0fc5c06a */ jal langGet -/* f05acb0: 8484ad50 */ lh $a0,%lo(g_SpecialQuipBank+0x168)($a0) -/* f05acb4: afa20080 */ sw $v0,0x80($sp) -/* f05acb8: 0c004116 */ jal sndIsFiltered -/* f05acbc: 87a400a4 */ lh $a0,0xa4($sp) -/* f05acc0: 14400011 */ bnez $v0,.PB0f05ad08 -/* f05acc4: 8fa40080 */ lw $a0,0x80($sp) -/* f05acc8: 8fab009c */ lw $t3,0x9c($sp) -/* f05accc: 24050006 */ li $a1,0x6 -/* f05acd0: 0fc37931 */ jal hudmsgCreateWithColour -/* f05acd4: 91660009 */ lbu $a2,0x9($t3) -/* f05acd8: 1000000b */ b .PB0f05ad08 -/* f05acdc: 00000000 */ nop -.PB0f05ace0: -/* f05ace0: 8e0c0424 */ lw $t4,0x424($s0) -/* f05ace4: 3c050800 */ lui $a1,0x800 -/* f05ace8: 24060001 */ li $a2,0x1 -/* f05acec: ad800120 */ sw $zero,0x120($t4) -/* f05acf0: 8fad009c */ lw $t5,0x9c($sp) -/* f05acf4: 8e0e0424 */ lw $t6,0x424($s0) -/* f05acf8: 91b80005 */ lbu $t8,0x5($t5) -/* f05acfc: a1d80126 */ sb $t8,0x126($t6) -/* f05ad00: 0fc127cb */ jal chrUnsetFlags -/* f05ad04: 8e040424 */ lw $a0,0x424($s0) -.PB0f05ad08: -/* f05ad08: 0fc4a783 */ jal setCurrentPlayerNum -/* f05ad0c: 8fa40078 */ lw $a0,0x78($sp) -/* f05ad10: 8e190438 */ lw $t9,0x438($s0) -/* f05ad14: 00001025 */ move $v0,$zero -/* f05ad18: 272a000a */ addiu $t2,$t9,0xa -/* f05ad1c: ae0a0438 */ sw $t2,0x438($s0) -.PB0f05ad20: -/* f05ad20: 8fbf004c */ lw $ra,0x4c($sp) -/* f05ad24: 8fb00048 */ lw $s0,0x48($sp) -/* f05ad28: 27bd00a8 */ addiu $sp,$sp,0xa8 -/* f05ad2c: 03e00008 */ jr $ra -/* f05ad30: 00000000 */ nop -); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( glabel aiSayQuip diff --git a/src/game/title.c b/src/game/title.c index a12cb3be6..14519301c 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -1268,7 +1268,7 @@ glabel var7f1a8f88jf /* f018270: 2508a630 */ addiu $t0,$t0,%lo(g_Vars) /* f018274: 8d0e0038 */ lw $t6,0x38($t0) /* f018278: 24190050 */ li $t9,0x50 -/* f01827c: 3c018006 */ lui $at,0x8006 +/* f01827c: 3c018006 */ lui $at,%hi(g_PdLogoFrac) /* f018280: 004ec021 */ addu $t8,$v0,$t6 /* f018284: ac780000 */ sw $t8,0x0($v1) /* f018288: 1b000009 */ blez $t8,.JF0f0182b0 @@ -1282,7 +1282,7 @@ glabel var7f1a8f88jf /* f0182a8: 10000002 */ b .JF0f0182b4 /* f0182ac: e42a2700 */ swc1 $f10,%lo(g_PdLogoFrac)($at) .JF0f0182b0: -/* f0182b0: e42e2700 */ swc1 $f14,0x2700($at) +/* f0182b0: e42e2700 */ swc1 $f14,%lo(g_PdLogoFrac)($at) .JF0f0182b4: /* f0182b4: 28410051 */ slti $at,$v0,0x51 /* f0182b8: 14200008 */ bnez $at,.JF0f0182dc @@ -3286,7 +3286,7 @@ glabel var7f1a8468 /* f017f90: 2508a510 */ addiu $t0,$t0,%lo(g_Vars) /* f017f94: 8d180038 */ lw $t8,0x38($t0) /* f017f98: 240f0042 */ li $t7,0x42 -/* f017f9c: 3c018006 */ lui $at,0x8006 +/* f017f9c: 3c018006 */ lui $at,%hi(g_PdLogoFrac) /* f017fa0: 0058c821 */ addu $t9,$v0,$t8 /* f017fa4: ad390000 */ sw $t9,0x0($t1) /* f017fa8: 1b200009 */ blez $t9,.PF0f017fd0 @@ -3300,7 +3300,7 @@ glabel var7f1a8468 /* f017fc8: 10000002 */ b .PF0f017fd4 /* f017fcc: e42a248c */ swc1 $f10,%lo(g_PdLogoFrac)($at) .PF0f017fd0: -/* f017fd0: e432248c */ swc1 $f18,0x248c($at) +/* f017fd0: e432248c */ swc1 $f18,%lo(g_PdLogoFrac)($at) .PF0f017fd4: /* f017fd4: 28410043 */ slti $at,$v0,0x43 /* f017fd8: 54200008 */ bnezl $at,.PF0f017ffc @@ -3537,7 +3537,7 @@ glabel var7f1a8468 /* f018338: e42824c4 */ swc1 $f8,%lo(g_PdLogoTitleStepFrac)($at) .PF0f01833c: /* f01833c: 14820009 */ bne $a0,$v0,.PF0f018364 -/* f018340: 3c018006 */ lui $at,0x8006 +/* f018340: 3c018006 */ lui $at,%hi(g_PdLogoTitleStepFrac) /* f018344: 3c018006 */ lui $at,%hi(g_PdLogoTitleStepFrac) /* f018348: c42424c4 */ lwc1 $f4,%lo(g_PdLogoTitleStepFrac)($at) /* f01834c: 3c017f1b */ lui $at,%hi(var7f1a8450) @@ -3547,7 +3547,7 @@ glabel var7f1a8468 /* f01835c: 10000007 */ b .PF0f01837c /* f018360: e42a24c4 */ swc1 $f10,%lo(g_PdLogoTitleStepFrac)($at) .PF0f018364: -/* f018364: c42824c4 */ lwc1 $f8,0x24c4($at) +/* f018364: c42824c4 */ lwc1 $f8,%lo(g_PdLogoTitleStepFrac)($at) /* f018368: 3c017f1b */ lui $at,%hi(var7f1a8454) /* f01836c: c4249664 */ lwc1 $f4,%lo(var7f1a8454)($at) /* f018370: 3c018006 */ lui $at,%hi(g_PdLogoTitleStepFrac) @@ -4224,7 +4224,7 @@ glabel var7f1a8468 .PF0f018d90: /* f018d90: 24010003 */ li $at,0x3 /* f018d94: 14410022 */ bne $v0,$at,.PF0f018e20 -/* f018d98: 3c058006 */ lui $a1,0x8006 +/* f018d98: 3c058006 */ lui $a1,%hi(g_TitleModelPdTwo) /* f018d9c: 3c018006 */ lui $at,%hi(g_PdLogoTitleStepFrac) /* f018da0: c42024c4 */ lwc1 $f0,%lo(g_PdLogoTitleStepFrac)($at) /* f018da4: 3c013f00 */ lui $at,0x3f00 @@ -4272,7 +4272,7 @@ glabel var7f1a8468 /* f018e44: 8dced210 */ lw $t6,%lo(var8009ccb0)($t6) /* f018e48: 8f39d208 */ lw $t9,%lo(var8009cca8)($t9) /* f018e4c: 241800ff */ li $t8,0xff -/* f018e50: 8ca521d8 */ lw $a1,0x21d8($a1) +/* f018e50: 8ca521d8 */ lw $a1,%lo(g_TitleModelPdTwo)($a1) /* f018e54: afb80010 */ sw $t8,0x10($sp) /* f018e58: 01e01025 */ move $v0,$t7 /* f018e5c: 8fa40330 */ lw $a0,0x330($sp) @@ -4617,7 +4617,7 @@ glabel var7f1a8468 /* f017f38: 2508e4d0 */ addiu $t0,$t0,%lo(g_Vars) /* f017f3c: 8d0e0038 */ lw $t6,0x38($t0) /* f017f40: 24190042 */ li $t9,0x42 -/* f017f44: 3c018006 */ lui $at,0x8006 +/* f017f44: 3c018006 */ lui $at,%hi(g_PdLogoFrac) /* f017f48: 004ec021 */ addu $t8,$v0,$t6 /* f017f4c: ad380000 */ sw $t8,0x0($t1) /* f017f50: 1b000009 */ blez $t8,.PB0f017f78 @@ -4631,7 +4631,7 @@ glabel var7f1a8468 /* f017f70: 10000002 */ b .PB0f017f7c /* f017f74: e4283e7c */ swc1 $f8,%lo(g_PdLogoFrac)($at) .PB0f017f78: -/* f017f78: e4323e7c */ swc1 $f18,0x3e7c($at) +/* f017f78: e4323e7c */ swc1 $f18,%lo(g_PdLogoFrac)($at) .PB0f017f7c: /* f017f7c: 28410043 */ slti $at,$v0,0x43 /* f017f80: 54200008 */ bnezl $at,.PB0f017fa4 @@ -4653,7 +4653,7 @@ glabel var7f1a8468 /* f017fb8: c4283e7c */ lwc1 $f8,%lo(g_PdLogoFrac)($at) /* f017fbc: 46043282 */ mul.s $f10,$f6,$f4 /* f017fc0: 460a4000 */ add.s $f0,$f8,$f10 -/* f017fc4: e4203e7c */ swc1 $f0,0x3e7c($at) +/* f017fc4: e4203e7c */ swc1 $f0,%lo(g_PdLogoFrac)($at) /* f017fc8: 3c017f1b */ lui $at,%hi(var7f1a8438) /* f017fcc: c424a0f8 */ lwc1 $f4,%lo(var7f1a8438)($at) /* f017fd0: 3c018006 */ lui $at,%hi(g_PdLogoFrac) @@ -4868,7 +4868,7 @@ glabel var7f1a8468 /* f0182e0: e4263eb4 */ swc1 $f6,%lo(g_PdLogoTitleStepFrac)($at) .PB0f0182e4: /* f0182e4: 14820009 */ bne $a0,$v0,.PB0f01830c -/* f0182e8: 3c018006 */ lui $at,0x8006 +/* f0182e8: 3c018006 */ lui $at,%hi(g_PdLogoTitleStepFrac) /* f0182ec: 3c018006 */ lui $at,%hi(g_PdLogoTitleStepFrac) /* f0182f0: c4243eb4 */ lwc1 $f4,%lo(g_PdLogoTitleStepFrac)($at) /* f0182f4: 3c017f1b */ lui $at,%hi(var7f1a8450) @@ -4878,7 +4878,7 @@ glabel var7f1a8468 /* f018304: 10000007 */ b .PB0f018324 /* f018308: e4283eb4 */ swc1 $f8,%lo(g_PdLogoTitleStepFrac)($at) .PB0f01830c: -/* f01830c: c4263eb4 */ lwc1 $f6,0x3eb4($at) +/* f01830c: c4263eb4 */ lwc1 $f6,%lo(g_PdLogoTitleStepFrac)($at) /* f018310: 3c017f1b */ lui $at,%hi(var7f1a8454) /* f018314: c424a114 */ lwc1 $f4,%lo(var7f1a8454)($at) /* f018318: 3c018006 */ lui $at,%hi(g_PdLogoTitleStepFrac) @@ -5555,7 +5555,7 @@ glabel var7f1a8468 .PB0f018d38: /* f018d38: 24010003 */ li $at,0x3 /* f018d3c: 14410022 */ bne $v0,$at,.PB0f018dc8 -/* f018d40: 3c058006 */ lui $a1,0x8006 +/* f018d40: 3c058006 */ lui $a1,%hi(g_TitleModelPdTwo) /* f018d44: 3c018006 */ lui $at,%hi(g_PdLogoTitleStepFrac) /* f018d48: c4203eb4 */ lwc1 $f0,%lo(g_PdLogoTitleStepFrac)($at) /* f018d4c: 3c013f00 */ lui $at,0x3f00 @@ -5603,7 +5603,7 @@ glabel var7f1a8468 /* f018dec: 8def11d0 */ lw $t7,%lo(var8009ccb0)($t7) /* f018df0: 8f1811c8 */ lw $t8,%lo(var8009cca8)($t8) /* f018df4: 240e00ff */ li $t6,0xff -/* f018df8: 8ca53bc8 */ lw $a1,0x3bc8($a1) +/* f018df8: 8ca53bc8 */ lw $a1,%lo(g_TitleModelPdTwo)($a1) /* f018dfc: afae0010 */ sw $t6,0x10($sp) /* f018e00: 03201025 */ move $v0,$t9 /* f018e04: 8fa40330 */ lw $a0,0x330($sp)