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

almost

This commit is contained in:
Ethan Roseman 2021-01-13 01:52:12 +09:00
parent 52240a310e
commit 1c620c3c6c
20 changed files with 132 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/data/code_16A3E0.data.s
View File

@ -236,7 +236,7 @@ glabel jtbl_8024C018_16C878
glabel jtbl_8024C030_16C890
.word L80247AC4_168324, L80247AC4_168324, L80247ADC_16833C, L80247AC4_168324, L80247AF8_168358, 0
glabel pause_partners_draw_movelist_title
glabel jtbl_8024C048_16C8A8
.word L80247C08_168468, L80247C08_168468, L80247C20_168480, L80247C08_168468, L80247C3C_16849C, 0
glabel jtbl_8024C060_16C8C0

2
asm/data/code_3239B0.data.s
View File

@ -2,7 +2,7 @@
.section .data
glabel D_802BFE60
glabel D_802BFE60_2
.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD2, 0x9C, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
glabel D_802BFE7C

4
asm/nonmatchings/code_1000_len_60/entry_point.s
View File

@ -15,8 +15,8 @@ glabel entry_point
/* 1024 80025C24 00000000 */ nop
/* 1028 80025C28 3C1D800B */ lui $sp, %hi(D_800B6590)
/* 102C 80025C2C 27BD6590 */ addiu $sp, $sp, %lo(D_800B6590)
/* 1030 80025C30 3C0A8006 */ lui $t2, %hi(jtbl_8005E8B0_39CB0)
/* 1034 80025C34 254AE8B0 */ addiu $t2, $t2, %lo(jtbl_8005E8B0_39CB0)
/* 1030 80025C30 3C0A8006 */ lui $t2, %hi(nuBoot)
/* 1034 80025C34 254AE8B0 */ addiu $t2, $t2, %lo(nuBoot)
/* 1038 80025C38 01400008 */ jr $t2
/* 103C 80025C3C 00000000 */ nop
/* 1040 80025C40 00000000 */ nop

6
asm/nonmatchings/code_303c0_len_3e10/func_80055EB4.s
View File

@ -6,11 +6,11 @@ glabel func_80055EB4
/* 312B8 80055EB8 10400025 */ beqz $v0, .L80055F50
/* 312BC 80055EBC 0000182D */ daddu $v1, $zero, $zero
/* 312C0 80055EC0 00041080 */ sll $v0, $a0, 2
/* 312C4 80055EC4 3C01800A */ lui $at, %hi(D_80098908)
/* 312C4 80055EC4 3C01800A */ lui $at, %hi(jtbl_80098908_73D08)
/* 312C8 80055EC8 00220821 */ addu $at, $at, $v0
/* 312CC 80055ECC 8C228908 */ lw $v0, %lo(D_80098908)($at)
/* 312CC 80055ECC 8C228908 */ lw $v0, %lo(jtbl_80098908_73D08)($at)
/* 312D0 80055ED0 00400008 */ jr $v0
/* 312D4 80055ED4 00000000 */ nop
/* 312D4 80055ED4 00000000 */ nop
/* 312D8 80055ED8 3C038008 */ lui $v1, %hi(D_80078DB8)
/* 312DC 80055EDC 24638DB8 */ addiu $v1, $v1, %lo(D_80078DB8)
/* 312E0 80055EE0 03E00008 */ jr $ra

2
asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s
View File

@ -66,7 +66,7 @@ glabel func_800DFAAC
/* 79040 800DFB90 30420002 */ andi $v0, $v0, 2
/* 79044 800DFB94 10400003 */ beqz $v0, .L800DFBA4
/* 79048 800DFB98 00000000 */ nop
/* 7904C 800DFB9C 0C0AF81C */ jal func_802BE070
/* 7904C 800DFB9C 0C0AF81C */ jal func_802BE070_31DBE0
/* 79050 800DFBA0 00000000 */ nop
.L800DFBA4:
/* 79054 800DFBA4 8E020000 */ lw $v0, ($s0)

4
asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s
View File

@ -31,8 +31,8 @@ glabel osInitialize
/* 45B68 8006A768 34A50008 */ ori $a1, $a1, 8
/* 45B6C 8006A76C 1440FFFA */ bnez $v0, .L8006A758
/* 45B70 8006A770 00000000 */ nop
/* 45B74 8006A774 3C028007 */ lui $v0, %hi(D_8006A9F0)
/* 45B78 8006A778 2442A9F0 */ addiu $v0, $v0, %lo(D_8006A9F0)
/* 45B74 8006A774 3C028007 */ lui $v0, %hi(func_8006A9F0)
/* 45B78 8006A778 2442A9F0 */ addiu $v0, $v0, %lo(func_8006A9F0)
/* 45B7C 8006A77C 3C068000 */ lui $a2, 0x8000
/* 45B80 8006A780 8C430000 */ lw $v1, ($v0)
/* 45B84 8006A784 8C440004 */ lw $a0, 4($v0)

10
asm/nonmatchings/world/partner/watt/func_802BD180_31CC70.s → asm/nonmatchings/world/partner/watt/func_802BD180_31CCF0.s
View File

@ -1,16 +1,16 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD180_31CC70
/* 31CCF0 802BD180 3C03802C */ lui $v1, 0x802c
/* 31CCF4 802BD184 2463E310 */ addiu $v1, $v1, -0x1cf0
glabel func_802BD180_31CCF0
/* 31CCF0 802BD180 3C03802C */ lui $v1, %hi(D_802BE310)
/* 31CCF4 802BD184 2463E310 */ addiu $v1, $v1, %lo(D_802BE310)
/* 31CCF8 802BD188 8C620000 */ lw $v0, ($v1)
/* 31CCFC 802BD18C 10400005 */ beqz $v0, .L802BD1A4
/* 31CD00 802BD190 00000000 */ nop
/* 31CD00 802BD190 00000000 */ nop
/* 31CD04 802BD194 AC600000 */ sw $zero, ($v1)
/* 31CD08 802BD198 8C43000C */ lw $v1, 0xc($v0)
/* 31CD0C 802BD19C 24020001 */ addiu $v0, $zero, 1
/* 31CD10 802BD1A0 AC620028 */ sw $v0, 0x28($v1)
.L802BD1A4:
/* 31CD14 802BD1A4 03E00008 */ jr $ra
/* 31CD18 802BD1A8 00000000 */ nop
/* 31CD18 802BD1A8 00000000 */ nop

10
asm/nonmatchings/world/partner/watt/func_802BD1AC.s → asm/nonmatchings/world/partner/watt/func_802BD1AC_31CD1C.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD1AC
glabel func_802BD1AC_31CD1C
/* 31CD1C 802BD1AC 3C02802C */ lui $v0, %hi(D_802BE310)
/* 31CD20 802BD1B0 8C42E310 */ lw $v0, %lo(D_802BE310)($v0)
/* 31CD24 802BD1B4 3C013F00 */ lui $at, 0x3f00
@ -16,7 +16,7 @@ glabel func_802BD1AC
/* 31CD48 802BD1D8 468010A0 */ cvt.s.w $f2, $f2
/* 31CD4C 802BD1DC 8C420008 */ lw $v0, 8($v0)
/* 31CD50 802BD1E0 46001082 */ mul.s $f2, $f2, $f0
/* 31CD54 802BD1E4 00000000 */ nop
/* 31CD54 802BD1E4 00000000 */ nop
/* 31CD58 802BD1E8 2444FFFF */ addiu $a0, $v0, -1
/* 31CD5C 802BD1EC 0064102A */ slt $v0, $v1, $a0
/* 31CD60 802BD1F0 10400010 */ beqz $v0, .L802BD234
@ -26,10 +26,10 @@ glabel func_802BD1AC
.L802BD200:
/* 31CD70 802BD200 30620001 */ andi $v0, $v1, 1
/* 31CD74 802BD204 44820000 */ mtc1 $v0, $f0
/* 31CD78 802BD208 00000000 */ nop
/* 31CD78 802BD208 00000000 */ nop
/* 31CD7C 802BD20C 46800020 */ cvt.s.w $f0, $f0
/* 31CD80 802BD210 46001002 */ mul.s $f0, $f2, $f0
/* 31CD84 802BD214 00000000 */ nop
/* 31CD84 802BD214 00000000 */ nop
/* 31CD88 802BD218 46002001 */ sub.s $f0, $f4, $f0
/* 31CD8C 802BD21C 24630001 */ addiu $v1, $v1, 1
/* 31CD90 802BD220 0064102A */ slt $v0, $v1, $a0
@ -39,4 +39,4 @@ glabel func_802BD1AC
/* 31CDA0 802BD230 24A50038 */ addiu $a1, $a1, 0x38
.L802BD234:
/* 31CDA4 802BD234 03E00008 */ jr $ra
/* 31CDA8 802BD238 00000000 */ nop
/* 31CDA8 802BD238 00000000 */ nop

4
asm/nonmatchings/world/partner/watt/func_802BD23C.s → asm/nonmatchings/world/partner/watt/func_802BD23C_31CDAC.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD23C
glabel func_802BD23C_31CDAC
/* 31CDAC 802BD23C 24020018 */ addiu $v0, $zero, 0x18
/* 31CDB0 802BD240 A48200A8 */ sh $v0, 0xa8($a0)
/* 31CDB4 802BD244 A48200A6 */ sh $v0, 0xa6($a0)
@ -17,4 +17,4 @@ glabel func_802BD23C
/* 31CDDC 802BD26C 3C01802C */ lui $at, %hi(D_802BE310)
/* 31CDE0 802BD270 AC20E310 */ sw $zero, %lo(D_802BE310)($at)
/* 31CDE4 802BD274 03E00008 */ jr $ra
/* 31CDE8 802BD278 00000000 */ nop
/* 31CDE8 802BD278 00000000 */ nop

2
asm/nonmatchings/world/partner/watt/func_802BD27C.s → asm/nonmatchings/world/partner/watt/func_802BD27C_31CDEC.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD27C
glabel func_802BD27C_31CDEC
/* 31CDEC 802BD27C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 31CDF0 802BD280 AFBF0014 */ sw $ra, 0x14($sp)
/* 31CDF4 802BD284 AFB00010 */ sw $s0, 0x10($sp)

48
asm/nonmatchings/world/partner/watt/func_802BD2B4.s → asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD2B4
glabel func_802BD2B4_31CE24
/* 31CE24 802BD2B4 3C028011 */ lui $v0, %hi(D_8010EBB1)
/* 31CE28 802BD2B8 8042EBB1 */ lb $v0, %lo(D_8010EBB1)($v0)
/* 31CE2C 802BD2BC 27BDFFC8 */ addiu $sp, $sp, -0x38
@ -34,7 +34,7 @@ glabel func_802BD2B4
/* 31CE94 802BD324 24420001 */ addiu $v0, $v0, 1
/* 31CE98 802BD328 16400026 */ bnez $s2, .L802BD3C4
/* 31CE9C 802BD32C AE02030C */ sw $v0, 0x30c($s0)
/* 31CEA0 802BD330 0C0AF440 */ jal func_802BD100
/* 31CEA0 802BD330 0C0AF440 */ jal func_802BD100_31CC70
/* 31CEA4 802BD334 0220202D */ daddu $a0, $s1, $zero
/* 31CEA8 802BD338 0C03B52E */ jal update_player_move_history
/* 31CEAC 802BD33C 0220202D */ daddu $a0, $s1, $zero
@ -42,19 +42,19 @@ glabel func_802BD2B4
/* 31CEB4 802BD344 0220202D */ daddu $a0, $s1, $zero
/* 31CEB8 802BD348 C6220018 */ lwc1 $f2, 0x18($s1)
/* 31CEBC 802BD34C 44800000 */ mtc1 $zero, $f0
/* 31CEC0 802BD350 00000000 */ nop
/* 31CEC0 802BD350 00000000 */ nop
/* 31CEC4 802BD354 46001032 */ c.eq.s $f2, $f0
/* 31CEC8 802BD358 00000000 */ nop
/* 31CEC8 802BD358 00000000 */ nop
/* 31CECC 802BD35C 4501000D */ bc1t .L802BD394
/* 31CED0 802BD360 00000000 */ nop
/* 31CED0 802BD360 00000000 */ nop
/* 31CED4 802BD364 3C03802C */ lui $v1, %hi(D_802BE278)
/* 31CED8 802BD368 2463E278 */ addiu $v1, $v1, %lo(D_802BE278)
/* 31CEDC 802BD36C 8C620000 */ lw $v0, ($v1)
/* 31CEE0 802BD370 144000CE */ bnez $v0, .L802BD6AC
/* 31CEE4 802BD374 00000000 */ nop
/* 31CEE4 802BD374 00000000 */ nop
/* 31CEE8 802BD378 24040001 */ addiu $a0, $zero, 1
/* 31CEEC 802BD37C 0080102D */ daddu $v0, $a0, $zero
/* 31CEF0 802BD380 0C0AF46B */ jal func_802BD1AC
/* 31CEF0 802BD380 0C0AF46B */ jal func_802BD1AC_31CD1C
/* 31CEF4 802BD384 AC620000 */ sw $v0, ($v1)
/* 31CEF8 802BD388 3C020006 */ lui $v0, 6
/* 31CEFC 802BD38C 080AF4EF */ j .L802BD3BC
@ -64,9 +64,9 @@ glabel func_802BD2B4
/* 31CF08 802BD398 2463E278 */ addiu $v1, $v1, %lo(D_802BE278)
/* 31CF0C 802BD39C 8C620000 */ lw $v0, ($v1)
/* 31CF10 802BD3A0 104000C2 */ beqz $v0, .L802BD6AC
/* 31CF14 802BD3A4 00000000 */ nop
/* 31CF14 802BD3A4 00000000 */ nop
/* 31CF18 802BD3A8 0000202D */ daddu $a0, $zero, $zero
/* 31CF1C 802BD3AC 0C0AF46B */ jal func_802BD1AC
/* 31CF1C 802BD3AC 0C0AF46B */ jal func_802BD1AC_31CD1C
/* 31CF20 802BD3B0 AC600000 */ sw $zero, ($v1)
/* 31CF24 802BD3B4 3C020006 */ lui $v0, 6
/* 31CF28 802BD3B8 34420001 */ ori $v0, $v0, 1
@ -86,14 +86,14 @@ glabel func_802BD2B4
/* 31CF58 802BD3E8 50600009 */ beql $v1, $zero, .L802BD410
/* 31CF5C 802BD3EC AC850004 */ sw $a1, 4($a0)
/* 31CF60 802BD3F0 080AF5AB */ j .L802BD6AC
/* 31CF64 802BD3F4 00000000 */ nop
/* 31CF64 802BD3F4 00000000 */ nop
.L802BD3F8:
/* 31CF68 802BD3F8 10620099 */ beq $v1, $v0, .L802BD660
/* 31CF6C 802BD3FC 24020003 */ addiu $v0, $zero, 3
/* 31CF70 802BD400 1062009F */ beq $v1, $v0, .L802BD680
/* 31CF74 802BD404 00000000 */ nop
/* 31CF74 802BD404 00000000 */ nop
/* 31CF78 802BD408 080AF5AB */ j .L802BD6AC
/* 31CF7C 802BD40C 00000000 */ nop
/* 31CF7C 802BD40C 00000000 */ nop
.L802BD410:
/* 31CF80 802BD410 8E220000 */ lw $v0, ($s1)
/* 31CF84 802BD414 AC820008 */ sw $v0, 8($a0)
@ -136,7 +136,7 @@ glabel func_802BD2B4
/* 31D014 802BD4A4 44810000 */ mtc1 $at, $f0
/* 31D018 802BD4A8 C44C0010 */ lwc1 $f12, 0x10($v0)
/* 31D01C 802BD4AC 46006302 */ mul.s $f12, $f12, $f0
/* 31D020 802BD4B0 00000000 */ nop
/* 31D020 802BD4B0 00000000 */ nop
/* 31D024 802BD4B4 27A50010 */ addiu $a1, $sp, 0x10
/* 31D028 802BD4B8 3C0143B4 */ lui $at, 0x43b4
/* 31D02C 802BD4BC 44810000 */ mtc1 $at, $f0
@ -147,14 +147,14 @@ glabel func_802BD2B4
/* 31D040 802BD4D0 C7A20010 */ lwc1 $f2, 0x10($sp)
/* 31D044 802BD4D4 C440000C */ lwc1 $f0, 0xc($v0)
/* 31D048 802BD4D8 46001082 */ mul.s $f2, $f2, $f0
/* 31D04C 802BD4DC 00000000 */ nop
/* 31D04C 802BD4DC 00000000 */ nop
/* 31D050 802BD4E0 C6400048 */ lwc1 $f0, 0x48($s2)
/* 31D054 802BD4E4 46020000 */ add.s $f0, $f0, $f2
/* 31D058 802BD4E8 E6200038 */ swc1 $f0, 0x38($s1)
/* 31D05C 802BD4EC C7A20014 */ lwc1 $f2, 0x14($sp)
/* 31D060 802BD4F0 C440000C */ lwc1 $f0, 0xc($v0)
/* 31D064 802BD4F4 46001082 */ mul.s $f2, $f2, $f0
/* 31D068 802BD4F8 00000000 */ nop
/* 31D068 802BD4F8 00000000 */ nop
/* 31D06C 802BD4FC C6400050 */ lwc1 $f0, 0x50($s2)
/* 31D070 802BD500 46020001 */ sub.s $f0, $f0, $f2
/* 31D074 802BD504 E6200040 */ swc1 $f0, 0x40($s1)
@ -167,7 +167,7 @@ glabel func_802BD2B4
/* 31D090 802BD520 44811000 */ mtc1 $at, $f2
/* 31D094 802BD524 C604000C */ lwc1 $f4, 0xc($s0)
/* 31D098 802BD528 4604103C */ c.lt.s $f2, $f4
/* 31D09C 802BD52C 00000000 */ nop
/* 31D09C 802BD52C 00000000 */ nop
/* 31D0A0 802BD530 45000005 */ bc1f .L802BD548
/* 31D0A4 802BD534 E6000010 */ swc1 $f0, 0x10($s0)
/* 31D0A8 802BD538 3C013F80 */ lui $at, 0x3f80
@ -177,14 +177,14 @@ glabel func_802BD2B4
.L802BD548:
/* 31D0B8 802BD548 3C014198 */ lui $at, 0x4198
/* 31D0BC 802BD54C 44810000 */ mtc1 $at, $f0
/* 31D0C0 802BD550 00000000 */ nop
/* 31D0C0 802BD550 00000000 */ nop
/* 31D0C4 802BD554 4600203C */ c.lt.s $f4, $f0
/* 31D0C8 802BD558 00000000 */ nop
/* 31D0C8 802BD558 00000000 */ nop
/* 31D0CC 802BD55C 45000006 */ bc1f .L802BD578
/* 31D0D0 802BD560 00000000 */ nop
/* 31D0D0 802BD560 00000000 */ nop
/* 31D0D4 802BD564 3C013F80 */ lui $at, 0x3f80
/* 31D0D8 802BD568 44810000 */ mtc1 $at, $f0
/* 31D0DC 802BD56C 00000000 */ nop
/* 31D0DC 802BD56C 00000000 */ nop
/* 31D0E0 802BD570 46002000 */ add.s $f0, $f4, $f0
.L802BD574:
/* 31D0E4 802BD574 E600000C */ swc1 $f0, 0xc($s0)
@ -197,7 +197,7 @@ glabel func_802BD2B4
/* 31D0FC 802BD58C 44810000 */ mtc1 $at, $f0
/* 31D100 802BD590 C44C0018 */ lwc1 $f12, 0x18($v0)
/* 31D104 802BD594 46006302 */ mul.s $f12, $f12, $f0
/* 31D108 802BD598 00000000 */ nop
/* 31D108 802BD598 00000000 */ nop
/* 31D10C 802BD59C 3C0143B4 */ lui $at, 0x43b4
/* 31D110 802BD5A0 4481A000 */ mtc1 $at, $f20
/* 31D114 802BD5A4 0C00A85B */ jal sin_rad
@ -209,11 +209,11 @@ glabel func_802BD2B4
/* 31D12C 802BD5BC 46041080 */ add.s $f2, $f2, $f4
/* 31D130 802BD5C0 3C014316 */ lui $at, 0x4316
/* 31D134 802BD5C4 44813000 */ mtc1 $at, $f6
/* 31D138 802BD5C8 00000000 */ nop
/* 31D138 802BD5C8 00000000 */ nop
/* 31D13C 802BD5CC 4602303C */ c.lt.s $f6, $f2
/* 31D140 802BD5D0 E4420018 */ swc1 $f2, 0x18($v0)
/* 31D144 802BD5D4 46040082 */ mul.s $f2, $f0, $f4
/* 31D148 802BD5D8 00000000 */ nop
/* 31D148 802BD5D8 00000000 */ nop
/* 31D14C 802BD5DC 45030001 */ bc1tl .L802BD5E4
/* 31D150 802BD5E0 E4460018 */ swc1 $f6, 0x18($v0)
.L802BD5E4:
@ -235,7 +235,7 @@ glabel func_802BD2B4
/* 31D190 802BD620 44811000 */ mtc1 $at, $f2
/* 31D194 802BD624 46200020 */ cvt.s.d $f0, $f0
/* 31D198 802BD628 4600103C */ c.lt.s $f2, $f0
/* 31D19C 802BD62C 00000000 */ nop
/* 31D19C 802BD62C 00000000 */ nop
/* 31D1A0 802BD630 45000002 */ bc1f .L802BD63C
/* 31D1A4 802BD634 E4400014 */ swc1 $f0, 0x14($v0)
/* 31D1A8 802BD638 E4420014 */ swc1 $f2, 0x14($v0)

4
asm/nonmatchings/world/partner/watt/func_802BD710.s → asm/nonmatchings/world/partner/watt/func_802BD710_31D280.s
View File

@ -1,14 +1,14 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD710
glabel func_802BD710_31D280
/* 31D280 802BD710 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 31D284 802BD714 3C058011 */ lui $a1, %hi(D_8010C954)
/* 31D288 802BD718 24A5C954 */ addiu $a1, $a1, %lo(D_8010C954)
/* 31D28C 802BD71C AFBF0010 */ sw $ra, 0x10($sp)
/* 31D290 802BD720 8CA20000 */ lw $v0, ($a1)
/* 31D294 802BD724 10400008 */ beqz $v0, .L802BD748
/* 31D298 802BD728 00000000 */ nop
/* 31D298 802BD728 00000000 */ nop
/* 31D29C 802BD72C 3C03802C */ lui $v1, %hi(D_802BE274)
/* 31D2A0 802BD730 8C63E274 */ lw $v1, %lo(D_802BE274)($v1)
/* 31D2A4 802BD734 8C620008 */ lw $v0, 8($v1)

50
asm/nonmatchings/world/partner/watt/func_802BD754.s → asm/nonmatchings/world/partner/watt/func_802BD754_31D2C4.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD754
glabel func_802BD754_31D2C4
/* 31D2C4 802BD754 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 31D2C8 802BD758 AFB3001C */ sw $s3, 0x1c($sp)
/* 31D2CC 802BD75C 0080982D */ daddu $s3, $a0, $zero
@ -17,7 +17,7 @@ glabel func_802BD754
/* 31D2F4 802BD784 AFB00010 */ sw $s0, 0x10($sp)
/* 31D2F8 802BD788 10A0003B */ beqz $a1, .L802BD878
/* 31D2FC 802BD78C 8E71014C */ lw $s1, 0x14c($s3)
/* 31D300 802BD790 0C0AF5C4 */ jal func_802BD710
/* 31D300 802BD790 0C0AF5C4 */ jal func_802BD710_31D280
/* 31D304 802BD794 0220202D */ daddu $a0, $s1, $zero
/* 31D308 802BD798 8E430004 */ lw $v1, 4($s2)
/* 31D30C 802BD79C 3C020010 */ lui $v0, 0x10
@ -29,13 +29,13 @@ glabel func_802BD754
/* 31D324 802BD7B4 34620003 */ ori $v0, $v1, 3
/* 31D328 802BD7B8 82A20000 */ lb $v0, ($s5)
/* 31D32C 802BD7BC 14400009 */ bnez $v0, .L802BD7E4
/* 31D330 802BD7C0 00000000 */ nop
/* 31D330 802BD7C0 00000000 */ nop
/* 31D334 802BD7C4 0C03A94B */ jal func_800EA52C
/* 31D338 802BD7C8 24040006 */ addiu $a0, $zero, 6
/* 31D33C 802BD7CC 10400146 */ beqz $v0, .L802BDCE8
/* 31D340 802BD7D0 24020002 */ addiu $v0, $zero, 2
/* 31D344 802BD7D4 0C011052 */ jal func_80044148
/* 31D348 802BD7D8 00000000 */ nop
/* 31D348 802BD7D8 00000000 */ nop
/* 31D34C 802BD7DC 14400142 */ bnez $v0, .L802BDCE8
/* 31D350 802BD7E0 24020002 */ addiu $v0, $zero, 2
.L802BD7E4:
@ -43,7 +43,7 @@ glabel func_802BD754
/* 31D358 802BD7E8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0)
/* 31D35C 802BD7EC 8042007D */ lb $v0, 0x7d($v0)
/* 31D360 802BD7F0 10400009 */ beqz $v0, .L802BD818
/* 31D364 802BD7F4 00000000 */ nop
/* 31D364 802BD7F4 00000000 */ nop
/* 31D368 802BD7F8 8E420004 */ lw $v0, 4($s2)
/* 31D36C 802BD7FC 30420003 */ andi $v0, $v0, 3
/* 31D370 802BD800 1040000D */ beqz $v0, .L802BD838
@ -51,7 +51,7 @@ glabel func_802BD754
/* 31D378 802BD808 3C01802C */ lui $at, %hi(D_802BE304)
/* 31D37C 802BD80C AC22E304 */ sw $v0, %lo(D_802BE304)($at)
/* 31D380 802BD810 080AF61E */ j .L802BD878
/* 31D384 802BD814 00000000 */ nop
/* 31D384 802BD814 00000000 */ nop
.L802BD818:
/* 31D388 802BD818 8E420004 */ lw $v0, 4($s2)
/* 31D38C 802BD81C 30420001 */ andi $v0, $v0, 1
@ -60,16 +60,16 @@ glabel func_802BD754
/* 31D398 802BD828 3C01802C */ lui $at, %hi(D_802BE304)
/* 31D39C 802BD82C AC22E304 */ sw $v0, %lo(D_802BE304)($at)
/* 31D3A0 802BD830 080AF61E */ j .L802BD878
/* 31D3A4 802BD834 00000000 */ nop
/* 31D3A4 802BD834 00000000 */ nop
.L802BD838:
/* 31D3A8 802BD838 24020028 */ addiu $v0, $zero, 0x28
/* 31D3AC 802BD83C 3C01802C */ lui $at, %hi(D_802BE304)
/* 31D3B0 802BD840 AC22E304 */ sw $v0, %lo(D_802BE304)($at)
/* 31D3B4 802BD844 080AF61E */ j .L802BD878
/* 31D3B8 802BD848 00000000 */ nop
/* 31D3B8 802BD848 00000000 */ nop
.L802BD84C:
/* 31D3BC 802BD84C A2A00001 */ sb $zero, 1($s5)
/* 31D3C0 802BD850 0C0AF805 */ jal func_802BE014
/* 31D3C0 802BD850 0C0AF805 */ jal func_802BE014_31DB84
/* 31D3C4 802BD854 AE420004 */ sw $v0, 4($s2)
/* 31D3C8 802BD858 3C020006 */ lui $v0, 6
/* 31D3CC 802BD85C 34420001 */ ori $v0, $v0, 1
@ -87,9 +87,9 @@ glabel func_802BD754
/* 31D3F8 802BD888 10620005 */ beq $v1, $v0, .L802BD8A0
/* 31D3FC 802BD88C 24020029 */ addiu $v0, $zero, 0x29
/* 31D400 802BD890 1062000E */ beq $v1, $v0, .L802BD8CC
/* 31D404 802BD894 00000000 */ nop
/* 31D404 802BD894 00000000 */ nop
/* 31D408 802BD898 080AF64C */ j .L802BD930
/* 31D40C 802BD89C 00000000 */ nop
/* 31D40C 802BD89C 00000000 */ nop
.L802BD8A0:
/* 31D410 802BD8A0 82420015 */ lb $v0, 0x15($s2)
/* 31D414 802BD8A4 10400003 */ beqz $v0, .L802BD8B4
@ -122,7 +122,7 @@ glabel func_802BD754
/* 31D478 802BD908 104000F7 */ beqz $v0, .L802BDCE8
/* 31D47C 802BD90C 24020002 */ addiu $v0, $zero, 2
/* 31D480 802BD910 0C011052 */ jal func_80044148
/* 31D484 802BD914 00000000 */ nop
/* 31D484 802BD914 00000000 */ nop
/* 31D488 802BD918 144000F3 */ bnez $v0, .L802BDCE8
/* 31D48C 802BD91C 24020002 */ addiu $v0, $zero, 2
/* 31D490 802BD920 24020014 */ addiu $v0, $zero, 0x14
@ -140,15 +140,15 @@ glabel func_802BD754
/* 31D4B8 802BD948 10400005 */ beqz $v0, .L802BD960
/* 31D4BC 802BD94C 24020001 */ addiu $v0, $zero, 1
/* 31D4C0 802BD950 10620099 */ beq $v1, $v0, .L802BDBB8
/* 31D4C4 802BD954 00000000 */ nop
/* 31D4C4 802BD954 00000000 */ nop
/* 31D4C8 802BD958 080AF707 */ j .L802BDC1C
/* 31D4CC 802BD95C 00000000 */ nop
/* 31D4CC 802BD95C 00000000 */ nop
.L802BD960:
/* 31D4D0 802BD960 24020015 */ addiu $v0, $zero, 0x15
/* 31D4D4 802BD964 10620062 */ beq $v1, $v0, .L802BDAF0
/* 31D4D8 802BD968 00000000 */ nop
/* 31D4D8 802BD968 00000000 */ nop
/* 31D4DC 802BD96C 080AF707 */ j .L802BDC1C
/* 31D4E0 802BD970 00000000 */ nop
/* 31D4E0 802BD970 00000000 */ nop
.L802BD974:
/* 31D4E4 802BD974 3C058007 */ lui $a1, %hi(gGameStatusPtr)
/* 31D4E8 802BD978 8CA5419C */ lw $a1, %lo(gGameStatusPtr)($a1)
@ -193,7 +193,7 @@ glabel func_802BD754
/* 31D584 802BDA14 E620000C */ swc1 $f0, 0xc($s1)
/* 31D588 802BDA18 8E420004 */ lw $v0, 4($s2)
/* 31D58C 802BDA1C 34420002 */ ori $v0, $v0, 2
/* 31D590 802BDA20 0C0AF805 */ jal func_802BE014
/* 31D590 802BDA20 0C0AF805 */ jal func_802BE014_31DB84
/* 31D594 802BDA24 AE420004 */ sw $v0, 4($s2)
/* 31D598 802BDA28 0220202D */ daddu $a0, $s1, $zero
/* 31D59C 802BDA2C 0C00ECF4 */ jal func_8003B3D0
@ -254,7 +254,7 @@ glabel func_802BD754
/* 31D670 802BDB00 C628003C */ lwc1 $f8, 0x3c($s1)
/* 31D674 802BDB04 C6260040 */ lwc1 $f6, 0x40($s1)
/* 31D678 802BDB08 44821000 */ mtc1 $v0, $f2
/* 31D67C 802BDB0C 00000000 */ nop
/* 31D67C 802BDB0C 00000000 */ nop
/* 31D680 802BDB10 468010A0 */ cvt.s.w $f2, $f2
/* 31D684 802BDB14 0040202D */ daddu $a0, $v0, $zero
/* 31D688 802BDB18 460A0001 */ sub.s $f0, $f0, $f10
@ -269,12 +269,12 @@ glabel func_802BD754
/* 31D6AC 802BDB3C 00021400 */ sll $v0, $v0, 0x10
/* 31D6B0 802BDB40 46061081 */ sub.s $f2, $f2, $f6
/* 31D6B4 802BDB44 44840000 */ mtc1 $a0, $f0
/* 31D6B8 802BDB48 00000000 */ nop
/* 31D6B8 802BDB48 00000000 */ nop
/* 31D6BC 802BDB4C 46800020 */ cvt.s.w $f0, $f0
/* 31D6C0 802BDB50 46002103 */ div.s $f4, $f4, $f0
/* 31D6C4 802BDB54 46044200 */ add.s $f8, $f8, $f4
/* 31D6C8 802BDB58 44830000 */ mtc1 $v1, $f0
/* 31D6CC 802BDB5C 00000000 */ nop
/* 31D6CC 802BDB5C 00000000 */ nop
/* 31D6D0 802BDB60 46800020 */ cvt.s.w $f0, $f0
/* 31D6D4 802BDB64 46001083 */ div.s $f2, $f2, $f0
/* 31D6D8 802BDB68 46023180 */ add.s $f6, $f6, $f2
@ -291,15 +291,15 @@ glabel func_802BD754
/* 31D704 802BDB94 24030006 */ addiu $v1, $zero, 6
/* 31D708 802BDB98 A2A30003 */ sb $v1, 3($s5)
/* 31D70C 802BDB9C 34420002 */ ori $v0, $v0, 2
/* 31D710 802BDBA0 0C0AF805 */ jal func_802BE014
/* 31D710 802BDBA0 0C0AF805 */ jal func_802BE014_31DB84
/* 31D714 802BDBA4 AE420004 */ sw $v0, 4($s2)
/* 31D718 802BDBA8 24020002 */ addiu $v0, $zero, 2
/* 31D71C 802BDBAC AE620074 */ sw $v0, 0x74($s3)
/* 31D720 802BDBB0 080AF706 */ j .L802BDC18
/* 31D724 802BDBB4 24020001 */ addiu $v0, $zero, 1
.L802BDBB8:
/* 31D728 802BDBB8 0C0AF81C */ jal func_802BE070
/* 31D72C 802BDBBC 00000000 */ nop
/* 31D728 802BDBB8 0C0AF81C */ jal func_802BE070_31DBE0
/* 31D72C 802BDBBC 00000000 */ nop
/* 31D730 802BDBC0 8E420000 */ lw $v0, ($s2)
/* 31D734 802BDBC4 30420800 */ andi $v0, $v0, 0x800
/* 31D738 802BDBC8 14400013 */ bnez $v0, .L802BDC18
@ -307,7 +307,7 @@ glabel func_802BD754
/* 31D740 802BDBD0 824300B4 */ lb $v1, 0xb4($s2)
/* 31D744 802BDBD4 2402001D */ addiu $v0, $zero, 0x1d
/* 31D748 802BDBD8 10620010 */ beq $v1, $v0, .L802BDC1C
/* 31D74C 802BDBDC 00000000 */ nop
/* 31D74C 802BDBDC 00000000 */ nop
/* 31D750 802BDBE0 8E620074 */ lw $v0, 0x74($s3)
/* 31D754 802BDBE4 10400003 */ beqz $v0, .L802BDBF4
/* 31D758 802BDBE8 2442FFFF */ addiu $v0, $v0, -1
@ -318,7 +318,7 @@ glabel func_802BD754
/* 31D768 802BDBF8 14400003 */ bnez $v0, .L802BDC08
/* 31D76C 802BDBFC 2402000A */ addiu $v0, $zero, 0xa
/* 31D770 802BDC00 14620006 */ bne $v1, $v0, .L802BDC1C
/* 31D774 802BDC04 00000000 */ nop
/* 31D774 802BDC04 00000000 */ nop
.L802BDC08:
/* 31D778 802BDC08 8EA2000C */ lw $v0, 0xc($s5)
/* 31D77C 802BDC0C 30424000 */ andi $v0, $v0, 0x4000

6
asm/nonmatchings/world/partner/watt/func_802BDD0C.s → asm/nonmatchings/world/partner/watt/func_802BDD0C_31D87C.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BDD0C
glabel func_802BDD0C_31D87C
/* 31D87C 802BDD0C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 31D880 802BDD10 AFB20018 */ sw $s2, 0x18($sp)
/* 31D884 802BDD14 3C128011 */ lui $s2, %hi(gPlayerStatus)
@ -13,8 +13,8 @@ glabel func_802BDD0C
/* 31D89C 802BDD2C AFB00010 */ sw $s0, 0x10($sp)
/* 31D8A0 802BDD30 10A00011 */ beqz $a1, .L802BDD78
/* 31D8A4 802BDD34 8C90014C */ lw $s0, 0x14c($a0)
/* 31D8A8 802BDD38 0C0AF460 */ jal func_802BD180
/* 31D8AC 802BDD3C 00000000 */ nop
/* 31D8A8 802BDD38 0C0AF460 */ jal func_802BD180_31CCF0
/* 31D8AC 802BDD3C 00000000 */ nop
/* 31D8B0 802BDD40 0C03BA65 */ jal func_800EE994
/* 31D8B4 802BDD44 0200202D */ daddu $a0, $s0, $zero
/* 31D8B8 802BDD48 3C040001 */ lui $a0, 1

6
asm/nonmatchings/world/partner/watt/func_802BDD9C.s → asm/nonmatchings/world/partner/watt/func_802BDD9C_31D90C.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BDD9C
glabel func_802BDD9C_31D90C
/* 31D90C 802BDD9C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 31D910 802BDDA0 3C02802C */ lui $v0, %hi(D_802BE30C)
/* 31D914 802BDDA4 8C42E30C */ lw $v0, %lo(D_802BE30C)($v0)
@ -28,8 +28,8 @@ glabel func_802BDD9C
/* 31D964 802BDDF4 0C03BD17 */ jal clear_partner_move_history
/* 31D968 802BDDF8 A0C20001 */ sb $v0, 1($a2)
.L802BDDFC:
/* 31D96C 802BDDFC 0C0AF460 */ jal func_802BD180
/* 31D970 802BDE00 00000000 */ nop
/* 31D96C 802BDDFC 0C0AF460 */ jal func_802BD180_31CCF0
/* 31D970 802BDE00 00000000 */ nop
/* 31D974 802BDE04 8FBF0010 */ lw $ra, 0x10($sp)
/* 31D978 802BDE08 03E00008 */ jr $ra
/* 31D97C 802BDE0C 27BD0018 */ addiu $sp, $sp, 0x18

6
asm/nonmatchings/world/partner/watt/func_802BDE10.s → asm/nonmatchings/world/partner/watt/func_802BDE10_31D980.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BDE10
glabel func_802BDE10_31D980
/* 31D980 802BDE10 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 31D984 802BDE14 AFB00010 */ sw $s0, 0x10($sp)
/* 31D988 802BDE18 0080802D */ daddu $s0, $a0, $zero
@ -26,8 +26,8 @@ glabel func_802BDE10
/* 31D9D0 802BDE60 1444FFF6 */ bne $v0, $a0, .L802BDE3C
/* 31D9D4 802BDE64 24630010 */ addiu $v1, $v1, 0x10
/* 31D9D8 802BDE68 0C03ACC5 */ jal partner_use_ability
/* 31D9DC 802BDE6C 00000000 */ nop
/* 31D9E0 802BDE70 0C0AF440 */ jal func_802BD100
/* 31D9DC 802BDE6C 00000000 */ nop
/* 31D9E0 802BDE70 0C0AF440 */ jal func_802BD100_31CC70
/* 31D9E4 802BDE74 0200202D */ daddu $a0, $s0, $zero
.L802BDE78:
/* 31D9E8 802BDE78 8FBF0014 */ lw $ra, 0x14($sp)

28
asm/nonmatchings/world/partner/watt/func_802BDE88.s → asm/nonmatchings/world/partner/watt/func_802BDE88_31D9F8.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BDE88
glabel func_802BDE88_31D9F8
/* 31D9F8 802BDE88 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 31D9FC 802BDE8C AFB10014 */ sw $s1, 0x14($sp)
/* 31DA00 802BDE90 0080882D */ daddu $s1, $a0, $zero
@ -27,19 +27,19 @@ glabel func_802BDE88
/* 31DA4C 802BDEDC 10620037 */ beq $v1, $v0, .L802BDFBC
/* 31DA50 802BDEE0 0000102D */ daddu $v0, $zero, $zero
/* 31DA54 802BDEE4 080AF7FD */ j .L802BDFF4
/* 31DA58 802BDEE8 00000000 */ nop
/* 31DA58 802BDEE8 00000000 */ nop
.L802BDEEC:
/* 31DA5C 802BDEEC 8E2200B4 */ lw $v0, 0xb4($s1)
/* 31DA60 802BDEF0 14400007 */ bnez $v0, .L802BDF10
/* 31DA64 802BDEF4 00000000 */ nop
/* 31DA64 802BDEF4 00000000 */ nop
/* 31DA68 802BDEF8 0C03ADF3 */ jal partner_kill_ability_script
/* 31DA6C 802BDEFC 00000000 */ nop
/* 31DA70 802BDF00 0C0AF460 */ jal func_802BD180
/* 31DA74 802BDF04 00000000 */ nop
/* 31DA6C 802BDEFC 00000000 */ nop
/* 31DA70 802BDF00 0C0AF460 */ jal func_802BD180_31CCF0
/* 31DA74 802BDF04 00000000 */ nop
/* 31DA78 802BDF08 080AF7C6 */ j .L802BDF18
/* 31DA7C 802BDF0C 00000000 */ nop
/* 31DA7C 802BDF0C 00000000 */ nop
.L802BDF10:
/* 31DA80 802BDF10 0C0AF440 */ jal func_802BD100
/* 31DA80 802BDF10 0C0AF440 */ jal func_802BD100_31CC70
/* 31DA84 802BDF14 0240202D */ daddu $a0, $s2, $zero
.L802BDF18:
/* 31DA88 802BDF18 C6220088 */ lwc1 $f2, 0x88($s1)
@ -59,9 +59,9 @@ glabel func_802BDE88
/* 31DAC0 802BDF50 8E260098 */ lw $a2, 0x98($s1)
/* 31DAC4 802BDF54 44050000 */ mfc1 $a1, $f0
/* 31DAC8 802BDF58 0C0389DE */ jal move_player
/* 31DACC 802BDF5C 00000000 */ nop
/* 31DAD0 802BDF60 0C0AF81C */ jal func_802BE070
/* 31DAD4 802BDF64 00000000 */ nop
/* 31DACC 802BDF5C 00000000 */ nop
/* 31DAD0 802BDF60 0C0AF81C */ jal func_802BE070_31DBE0
/* 31DAD4 802BDF64 00000000 */ nop
/* 31DAD8 802BDF68 8E420000 */ lw $v0, ($s2)
/* 31DADC 802BDF6C 2403FDFF */ addiu $v1, $zero, -0x201
/* 31DAE0 802BDF70 00431024 */ and $v0, $v0, $v1
@ -84,8 +84,8 @@ glabel func_802BDE88
/* 31DB24 802BDFB4 080AF7FC */ j .L802BDFF0
/* 31DB28 802BDFB8 AE220070 */ sw $v0, 0x70($s1)
.L802BDFBC:
/* 31DB2C 802BDFBC 0C0AF81C */ jal func_802BE070
/* 31DB30 802BDFC0 00000000 */ nop
/* 31DB2C 802BDFBC 0C0AF81C */ jal func_802BE070_31DBE0
/* 31DB30 802BDFC0 00000000 */ nop
/* 31DB34 802BDFC4 8E220074 */ lw $v0, 0x74($s1)
/* 31DB38 802BDFC8 2442FFFF */ addiu $v0, $v0, -1
/* 31DB3C 802BDFCC 14400008 */ bnez $v0, .L802BDFF0
@ -94,7 +94,7 @@ glabel func_802BDE88
/* 31DB48 802BDFD8 10400006 */ beqz $v0, .L802BDFF4
/* 31DB4C 802BDFDC 24020002 */ addiu $v0, $zero, 2
/* 31DB50 802BDFE0 0C03ACC5 */ jal partner_use_ability
/* 31DB54 802BDFE4 00000000 */ nop
/* 31DB54 802BDFE4 00000000 */ nop
/* 31DB58 802BDFE8 080AF7FD */ j .L802BDFF4
/* 31DB5C 802BDFEC 24020002 */ addiu $v0, $zero, 2
.L802BDFF0:

8
asm/nonmatchings/world/partner/watt/func_802BE014.s → asm/nonmatchings/world/partner/watt/func_802BE014_31DB84.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BE014
glabel func_802BE014_31DB84
/* 31DB84 802BE014 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 31DB88 802BE018 3C028011 */ lui $v0, %hi(gPlayerStatus)
/* 31DB8C 802BE01C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus)
@ -9,7 +9,7 @@ glabel func_802BE014
/* 31DB94 802BE024 C4420054 */ lwc1 $f2, 0x54($v0)
/* 31DB98 802BE028 C440005C */ lwc1 $f0, 0x5c($v0)
/* 31DB9C 802BE02C 4602003E */ c.le.s $f0, $f2
/* 31DBA0 802BE030 00000000 */ nop
/* 31DBA0 802BE030 00000000 */ nop
/* 31DBA4 802BE034 45000003 */ bc1f .L802BE044
/* 31DBA8 802BE038 3C040006 */ lui $a0, 6
/* 31DBAC 802BE03C 080AF817 */ j .L802BE05C
@ -17,13 +17,13 @@ glabel func_802BE014
.L802BE044:
/* 31DBB4 802BE044 C4400058 */ lwc1 $f0, 0x58($v0)
/* 31DBB8 802BE048 4602003E */ c.le.s $f0, $f2
/* 31DBBC 802BE04C 00000000 */ nop
/* 31DBBC 802BE04C 00000000 */ nop
/* 31DBC0 802BE050 45000002 */ bc1f .L802BE05C
/* 31DBC4 802BE054 34840007 */ ori $a0, $a0, 7
/* 31DBC8 802BE058 3C040006 */ lui $a0, 6
.L802BE05C:
/* 31DBCC 802BE05C 0C037FBF */ jal func_800DFEFC
/* 31DBD0 802BE060 00000000 */ nop
/* 31DBD0 802BE060 00000000 */ nop
/* 31DBD4 802BE064 8FBF0010 */ lw $ra, 0x10($sp)
/* 31DBD8 802BE068 03E00008 */ jr $ra
/* 31DBDC 802BE06C 27BD0018 */ addiu $sp, $sp, 0x18

36
asm/nonmatchings/world/partner/watt/func_802BE070.s → asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BE070
glabel func_802BE070_31DBE0
/* 31DBE0 802BE070 3C028011 */ lui $v0, %hi(D_8010EBB0)
/* 31DBE4 802BE074 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0)
/* 31DBE8 802BE078 27BDFFC8 */ addiu $sp, $sp, -0x38
@ -20,14 +20,14 @@ glabel func_802BE070
/* 31DC1C 802BE0AC 44810000 */ mtc1 $at, $f0
/* 31DC20 802BE0B0 C44200A8 */ lwc1 $f2, 0xa8($v0)
/* 31DC24 802BE0B4 4600103C */ c.lt.s $f2, $f0
/* 31DC28 802BE0B8 00000000 */ nop
/* 31DC28 802BE0B8 00000000 */ nop
/* 31DC2C 802BE0BC 45010008 */ bc1t .L802BE0E0
/* 31DC30 802BE0C0 00000000 */ nop
/* 31DC30 802BE0C0 00000000 */ nop
/* 31DC34 802BE0C4 3C014387 */ lui $at, 0x4387
/* 31DC38 802BE0C8 44810000 */ mtc1 $at, $f0
/* 31DC3C 802BE0CC 00000000 */ nop
/* 31DC3C 802BE0CC 00000000 */ nop
/* 31DC40 802BE0D0 4602003C */ c.lt.s $f0, $f2
/* 31DC44 802BE0D4 00000000 */ nop
/* 31DC44 802BE0D4 00000000 */ nop
/* 31DC48 802BE0D8 45000008 */ bc1f .L802BE0FC
/* 31DC4C 802BE0DC 3C030100 */ lui $v1, 0x100
.L802BE0E0:
@ -37,7 +37,7 @@ glabel func_802BE070
/* 31DC5C 802BE0EC 10400007 */ beqz $v0, .L802BE10C
/* 31DC60 802BE0F0 24030005 */ addiu $v1, $zero, 5
/* 31DC64 802BE0F4 080AF844 */ j .L802BE110
/* 31DC68 802BE0F8 00000000 */ nop
/* 31DC68 802BE0F8 00000000 */ nop
.L802BE0FC:
/* 31DC6C 802BE0FC 8C4200A4 */ lw $v0, 0xa4($v0)
/* 31DC70 802BE100 00431024 */ and $v0, $v0, $v1
@ -61,15 +61,15 @@ glabel func_802BE070
/* 31DCB0 802BE140 C68000A8 */ lwc1 $f0, 0xa8($s4)
/* 31DCB4 802BE144 4600A501 */ sub.s $f20, $f20, $f0
/* 31DCB8 802BE148 44830000 */ mtc1 $v1, $f0
/* 31DCBC 802BE14C 00000000 */ nop
/* 31DCBC 802BE14C 00000000 */ nop
/* 31DCC0 802BE150 46800020 */ cvt.s.w $f0, $f0
/* 31DCC4 802BE154 4600A500 */ add.s $f20, $f20, $f0
/* 31DCC8 802BE158 3C0140C9 */ lui $at, 0x40c9
/* 31DCCC 802BE15C 34210FD0 */ ori $at, $at, 0xfd0
/* 31DCD0 802BE160 44810000 */ mtc1 $at, $f0
/* 31DCD4 802BE164 00000000 */ nop
/* 31DCD4 802BE164 00000000 */ nop
/* 31DCD8 802BE168 4600A502 */ mul.s $f20, $f20, $f0
/* 31DCDC 802BE16C 00000000 */ nop
/* 31DCDC 802BE16C 00000000 */ nop
/* 31DCE0 802BE170 3C108011 */ lui $s0, %hi(D_8010C930)
/* 31DCE4 802BE174 2610C930 */ addiu $s0, $s0, %lo(D_8010C930)
/* 31DCE8 802BE178 3C0143B4 */ lui $at, 0x43b4
@ -81,12 +81,12 @@ glabel func_802BE070
/* 31DD00 802BE190 8E330000 */ lw $s3, ($s1)
/* 31DD04 802BE194 866200B2 */ lh $v0, 0xb2($s3)
/* 31DD08 802BE198 44821000 */ mtc1 $v0, $f2
/* 31DD0C 802BE19C 00000000 */ nop
/* 31DD0C 802BE19C 00000000 */ nop
/* 31DD10 802BE1A0 468010A0 */ cvt.s.w $f2, $f2
/* 31DD14 802BE1A4 46020002 */ mul.s $f0, $f0, $f2
/* 31DD18 802BE1A8 00000000 */ nop
/* 31DD18 802BE1A8 00000000 */ nop
/* 31DD1C 802BE1AC 46160002 */ mul.s $f0, $f0, $f22
/* 31DD20 802BE1B0 00000000 */ nop
/* 31DD20 802BE1B0 00000000 */ nop
/* 31DD24 802BE1B4 C6820028 */ lwc1 $f2, 0x28($s4)
/* 31DD28 802BE1B8 46001080 */ add.s $f2, $f2, $f0
/* 31DD2C 802BE1BC E6420038 */ swc1 $f2, 0x38($s2)
@ -96,12 +96,12 @@ glabel func_802BE070
/* 31DD3C 802BE1CC 8E230000 */ lw $v1, ($s1)
/* 31DD40 802BE1D0 846200B2 */ lh $v0, 0xb2($v1)
/* 31DD44 802BE1D4 44821000 */ mtc1 $v0, $f2
/* 31DD48 802BE1D8 00000000 */ nop
/* 31DD48 802BE1D8 00000000 */ nop
/* 31DD4C 802BE1DC 468010A0 */ cvt.s.w $f2, $f2
/* 31DD50 802BE1E0 46020002 */ mul.s $f0, $f0, $f2
/* 31DD54 802BE1E4 00000000 */ nop
/* 31DD54 802BE1E4 00000000 */ nop
/* 31DD58 802BE1E8 46160002 */ mul.s $f0, $f0, $f22
/* 31DD5C 802BE1EC 00000000 */ nop
/* 31DD5C 802BE1EC 00000000 */ nop
/* 31DD60 802BE1F0 C6620030 */ lwc1 $f2, 0x30($s3)
/* 31DD64 802BE1F4 46001081 */ sub.s $f2, $f2, $f0
/* 31DD68 802BE1F8 E6420040 */ swc1 $f2, 0x40($s2)
@ -124,6 +124,6 @@ glabel func_802BE070
/* 31DDA8 802BE238 D7B40028 */ ldc1 $f20, 0x28($sp)
/* 31DDAC 802BE23C 03E00008 */ jr $ra
/* 31DDB0 802BE240 27BD0038 */ addiu $sp, $sp, 0x38
/* 31DDB4 802BE244 00000000 */ nop
/* 31DDB8 802BE248 00000000 */ nop
/* 31DDBC 802BE24C 00000000 */ nop
/* 31DDB4 802BE244 00000000 */ nop
/* 31DDB8 802BE248 00000000 */ nop
/* 31DDBC 802BE24C 00000000 */ nop

26
src/world/partner/watt.c
View File

@ -2,28 +2,28 @@
INCLUDE_ASM(s32, "world/partner/watt", func_802BD100_31CC70);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD180_31CC70);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD180_31CCF0);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD1AC);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD1AC_31CD1C);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD23C);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD23C_31CDAC);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD27C);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD27C_31CDEC);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD2B4);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD2B4_31CE24);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD710);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD710_31D280);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD754);
INCLUDE_ASM(s32, "world/partner/watt", func_802BD754_31D2C4);
INCLUDE_ASM(s32, "world/partner/watt", func_802BDD0C);
INCLUDE_ASM(s32, "world/partner/watt", func_802BDD0C_31D87C);
INCLUDE_ASM(s32, "world/partner/watt", func_802BDD9C);
INCLUDE_ASM(s32, "world/partner/watt", func_802BDD9C_31D90C);
INCLUDE_ASM(s32, "world/partner/watt", func_802BDE10);
INCLUDE_ASM(s32, "world/partner/watt", func_802BDE10_31D980);
INCLUDE_ASM(s32, "world/partner/watt", func_802BDE88);
INCLUDE_ASM(s32, "world/partner/watt", func_802BDE88_31D9F8);
INCLUDE_ASM(s32, "world/partner/watt", func_802BE014);
INCLUDE_ASM(s32, "world/partner/watt", func_802BE014_31DB84);
INCLUDE_ASM(s32, "world/partner/watt", func_802BE070);
INCLUDE_ASM(s32, "world/partner/watt", func_802BE070_31DBE0);