diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index e2fd4cda..633d653d 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -1,3 +1,34 @@ +.late_rodata +glabel D_800E62A8 +.double -2500.0 +glabel D_800E62B0 +.double 0.025 +glabel D_800E62B8 +.double 0.561 +glabel D_800E62C0 +.double 0.004 +glabel D_800E62C8 +.double 0.025 +glabel D_800E62D0 +.double 0.561 +glabel D_800E62D8 +.double 0.004 +glabel D_800E62E0 +.double 0.2 +glabel D_800E62E8 +.double 0.004 +glabel D_800E62F0 +.double 0.595 +glabel D_800E62F8 +.double 0.025 +glabel D_800E6300 +.double 500.0 +glabel D_800E6308 +.double 650.0 +glabel D_800E6310 +.double -0.3 + +.text glabel func_80042D20 /* 043920 80042D20 27BDFF68 */ addiu $sp, $sp, -0x98 /* 043924 80042D24 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 5c5112fe..92af9e13 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jpt_800E6318 +.word L800446AC, L80044A04, L80044A04, L80044A04, L80044A04, L80044F54, L80044A04 +glabel jpt_800E6334 +.word L80044A2C, L80044A44, L80044A60, L80044A94, L80044ADC, L80044AC8 +.word 0 # Padding +glabel D_800E6350 +.double 300.0 + +.text glabel func_8004447C /* 04507C 8004447C 3C018012 */ lui $at, %hi(D_8011D52C) # $at, 0x8012 /* 045080 80044480 AC20D52C */ sw $zero, %lo(D_8011D52C)($at) @@ -142,12 +152,13 @@ glabel func_8004447C /* 045288 80044688 10200245 */ beqz $at, .L80044FA0 /* 04528C 8004468C 24050001 */ li $a1, 1 /* 045290 80044690 000D6880 */ sll $t5, $t5, 2 -/* 045294 80044694 3C01800E */ lui $at, %hi(D_800E6318) # $at, 0x800e +/* 045294 80044694 3C01800E */ lui $at, %hi(jpt_800E6318) # $at, 0x800e /* 045298 80044698 002D0821 */ addu $at, $at, $t5 -/* 04529C 8004469C 8C2D6318 */ lw $t5, %lo(D_800E6318)($at) +/* 04529C 8004469C 8C2D6318 */ lw $t5, %lo(jpt_800E6318)($at) /* 0452A0 800446A0 00000000 */ nop /* 0452A4 800446A4 01A00008 */ jr $t5 /* 0452A8 800446A8 00000000 */ nop +glabel L800446AC /* 0452AC 800446AC 00002025 */ move $a0, $zero /* 0452B0 800446B0 0C01BE53 */ jal func_8006F94C /* 0452B4 800446B4 24050009 */ li $a1, 9 @@ -378,22 +389,25 @@ glabel func_8004447C /* 0455F8 800449F8 A21801CD */ sb $t8, 0x1cd($s0) /* 0455FC 800449FC 10000168 */ b .L80044FA0 /* 045600 80044A00 A60C01C6 */ sh $t4, 0x1c6($s0) +glabel L80044A04 /* 045604 80044A04 246DFFFE */ addiu $t5, $v1, -2 /* 045608 80044A08 2DA10006 */ sltiu $at, $t5, 6 /* 04560C 80044A0C 10200033 */ beqz $at, .L80044ADC /* 045610 80044A10 000D6880 */ sll $t5, $t5, 2 -/* 045614 80044A14 3C01800E */ lui $at, %hi(D_800E6334) # $at, 0x800e +/* 045614 80044A14 3C01800E */ lui $at, %hi(jpt_800E6334) # $at, 0x800e /* 045618 80044A18 002D0821 */ addu $at, $at, $t5 -/* 04561C 80044A1C 8C2D6334 */ lw $t5, %lo(D_800E6334)($at) +/* 04561C 80044A1C 8C2D6334 */ lw $t5, %lo(jpt_800E6334)($at) /* 045620 80044A20 00000000 */ nop /* 045624 80044A24 01A00008 */ jr $t5 /* 045628 80044A28 00000000 */ nop +glabel L80044A2C /* 04562C 80044A2C 860E01C6 */ lh $t6, 0x1c6($s0) /* 045630 80044A30 00000000 */ nop /* 045634 80044A34 15C00029 */ bnez $t6, .L80044ADC /* 045638 80044A38 00000000 */ nop /* 04563C 80044A3C 10000027 */ b .L80044ADC /* 045640 80044A40 A20501CD */ sb $a1, 0x1cd($s0) +glabel L80044A44 /* 045644 80044A44 820F0172 */ lb $t7, 0x172($s0) /* 045648 80044A48 24190002 */ li $t9, 2 /* 04564C 80044A4C 11E00023 */ beqz $t7, .L80044ADC @@ -401,6 +415,7 @@ glabel func_8004447C /* 045654 80044A54 A21901CD */ sb $t9, 0x1cd($s0) /* 045658 80044A58 10000020 */ b .L80044ADC /* 04565C 80044A5C A61801C6 */ sh $t8, 0x1c6($s0) +glabel L80044A60 /* 045660 80044A60 820C0173 */ lb $t4, 0x173($s0) /* 045664 80044A64 3C018012 */ lui $at, %hi(D_8011D58C) # $at, 0x8012 /* 045668 80044A68 11800005 */ beqz $t4, .L80044A80 @@ -415,6 +430,7 @@ glabel func_8004447C /* 045688 80044A88 002E0821 */ addu $at, $at, $t6 /* 04568C 80044A8C 10000013 */ b .L80044ADC /* 045690 80044A90 A020D58C */ sb $zero, %lo(D_8011D58C)($at) +glabel L80044A94 /* 045694 80044A94 820F0002 */ lb $t7, 2($s0) /* 045698 80044A98 3C198012 */ lui $t9, %hi(D_8011D58C) # $t9, 0x8012 /* 04569C 80044A9C 032FC821 */ addu $t9, $t9, $t7 @@ -429,12 +445,14 @@ glabel func_8004447C .L80044AC0: /* 0456C0 80044AC0 10000006 */ b .L80044ADC /* 0456C4 80044AC4 A20501CD */ sb $a1, 0x1cd($s0) +glabel L80044AC8 /* 0456C8 80044AC8 820C0185 */ lb $t4, 0x185($s0) /* 0456CC 80044ACC 00000000 */ nop /* 0456D0 80044AD0 15800002 */ bnez $t4, .L80044ADC /* 0456D4 80044AD4 00000000 */ nop /* 0456D8 80044AD8 A20501CD */ sb $a1, 0x1cd($s0) .L80044ADC: +glabel L80044ADC /* 0456DC 80044ADC 920401CE */ lbu $a0, 0x1ce($s0) /* 0456E0 80044AE0 240100FF */ li $at, 255 /* 0456E4 80044AE4 10810026 */ beq $a0, $at, .L80044B80 @@ -749,6 +767,7 @@ glabel func_8004447C .L80044F4C: /* 045B4C 80044F4C 10000014 */ b .L80044FA0 /* 045B50 80044F50 AE000158 */ sw $zero, 0x158($s0) +glabel L80044F54 /* 045B54 80044F54 8FAF0078 */ lw $t7, 0x78($sp) /* 045B58 80044F58 24070002 */ li $a3, 2 /* 045B5C 80044F5C C5EC000C */ lwc1 $f12, 0xc($t7) diff --git a/asm/non_matchings/unknown_043920/func_800452A0.s b/asm/non_matchings/unknown_043920/func_800452A0.s index b4e4d33a..d765453b 100644 --- a/asm/non_matchings/unknown_043920/func_800452A0.s +++ b/asm/non_matchings/unknown_043920/func_800452A0.s @@ -1,3 +1,15 @@ +.late_rodata +glabel jpt_800E6358 +.word L800456A0, L800456A8, L800456B0, L800456BC, L800456CC, L800456D4, L800456B0, L800456DC +glabel D_800E6378 +.float 1000000.0 +glabel jpt_800E637C +.word L80045ADC, L80045AF8, L80045B30, L80045B30, L80045B58, L80045B70, L80045BB8, L80045ADC +.word 0 # Padding +glabel D_800E63A0 +.double 500.0 + +.text glabel func_800452A0 /* 045EA0 800452A0 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 045EA4 800452A4 3C018012 */ lui $at, %hi(D_8011D52C) # $at, 0x8012 @@ -283,27 +295,34 @@ glabel func_800452A0 /* 04627C 8004567C 2F210008 */ sltiu $at, $t9, 8 /* 046280 80045680 10200018 */ beqz $at, .L800456E4 /* 046284 80045684 0019C880 */ sll $t9, $t9, 2 -/* 046288 80045688 3C01800E */ lui $at, %hi(D_800E6358) # $at, 0x800e +/* 046288 80045688 3C01800E */ lui $at, %hi(jpt_800E6358) # $at, 0x800e /* 04628C 8004568C 00390821 */ addu $at, $at, $t9 -/* 046290 80045690 8C396358 */ lw $t9, %lo(D_800E6358)($at) +/* 046290 80045690 8C396358 */ lw $t9, %lo(jpt_800E6358)($at) /* 046294 80045694 00000000 */ nop /* 046298 80045698 03200008 */ jr $t9 /* 04629C 8004569C 00000000 */ nop +glabel L800456A0 /* 0462A0 800456A0 10000010 */ b .L800456E4 /* 0462A4 800456A4 2413002D */ li $s3, 45 +glabel L800456A8 /* 0462A8 800456A8 1000000E */ b .L800456E4 /* 0462AC 800456AC 2413005C */ li $s3, 92 +glabel L800456B0 /* 0462B0 800456B0 2413005C */ li $s3, 92 /* 0462B4 800456B4 1000000B */ b .L800456E4 /* 0462B8 800456B8 24120002 */ li $s2, 2 +glabel L800456BC /* 0462BC 800456BC 82B10002 */ lb $s1, 2($s5) /* 0462C0 800456C0 2413005C */ li $s3, 92 /* 0462C4 800456C4 10000007 */ b .L800456E4 /* 0462C8 800456C8 24120002 */ li $s2, 2 +glabel L800456CC /* 0462CC 800456CC 10000005 */ b .L800456E4 /* 0462D0 800456D0 24130011 */ li $s3, 17 +glabel L800456D4 /* 0462D4 800456D4 10000003 */ b .L800456E4 /* 0462D8 800456D8 24130001 */ li $s3, 1 +glabel L800456DC /* 0462DC 800456DC 2413002D */ li $s3, 45 /* 0462E0 800456E0 24120001 */ li $s2, 1 .L800456E4: @@ -579,12 +598,13 @@ glabel func_800452A0 /* 0466B8 80045AB8 2D810008 */ sltiu $at, $t4, 8 /* 0466BC 80045ABC 10200050 */ beqz $at, .L80045C00 /* 0466C0 80045AC0 000C6080 */ sll $t4, $t4, 2 -/* 0466C4 80045AC4 3C01800E */ lui $at, %hi(D_800E637C) # $at, 0x800e +/* 0466C4 80045AC4 3C01800E */ lui $at, %hi(jpt_800E637C) # $at, 0x800e /* 0466C8 80045AC8 002C0821 */ addu $at, $at, $t4 -/* 0466CC 80045ACC 8C2C637C */ lw $t4, %lo(D_800E637C)($at) +/* 0466CC 80045ACC 8C2C637C */ lw $t4, %lo(jpt_800E637C)($at) /* 0466D0 80045AD0 00000000 */ nop /* 0466D4 80045AD4 01800008 */ jr $t4 /* 0466D8 80045AD8 00000000 */ nop +glabel L80045ADC /* 0466DC 80045ADC 8EAD0144 */ lw $t5, 0x144($s5) /* 0466E0 80045AE0 240E0004 */ li $t6, 4 /* 0466E4 80045AE4 11A00047 */ beqz $t5, .L80045C04 @@ -592,6 +612,7 @@ glabel func_800452A0 /* 0466EC 80045AEC A2A001CD */ sb $zero, 0x1cd($s5) /* 0466F0 80045AF0 10000043 */ b .L80045C00 /* 0466F4 80045AF4 A2AE01CE */ sb $t6, 0x1ce($s5) +glabel L80045AF8 /* 0466F8 80045AF8 3C014059 */ li $at, 0x40590000 # 3.390625 /* 0466FC 80045AFC 44818800 */ mtc1 $at, $f17 /* 046700 80045B00 44808000 */ mtc1 $zero, $f16 @@ -606,6 +627,7 @@ glabel func_800452A0 /* 046724 80045B24 35F82000 */ ori $t8, $t7, 0x2000 /* 046728 80045B28 10000035 */ b .L80045C00 /* 04672C 80045B2C AC580000 */ sw $t8, ($v0) +glabel L80045B30 /* 046730 80045B30 3C014069 */ li $at, 0x40690000 # 3.640625 /* 046734 80045B34 44812800 */ mtc1 $at, $f5 /* 046738 80045B38 44802000 */ mtc1 $zero, $f4 @@ -616,12 +638,14 @@ glabel func_800452A0 /* 04674C 80045B4C 8FBF0054 */ lw $ra, 0x54($sp) /* 046750 80045B50 1000002B */ b .L80045C00 /* 046754 80045B54 A2A001CD */ sb $zero, 0x1cd($s5) +glabel L80045B58 /* 046758 80045B58 82B90173 */ lb $t9, 0x173($s5) /* 04675C 80045B5C 00000000 */ nop /* 046760 80045B60 13200028 */ beqz $t9, .L80045C04 /* 046764 80045B64 8FBF0054 */ lw $ra, 0x54($sp) /* 046768 80045B68 10000025 */ b .L80045C00 /* 04676C 80045B6C A2A001CD */ sb $zero, 0x1cd($s5) +glabel L80045B70 /* 046770 80045B70 82A90173 */ lb $t1, 0x173($s5) /* 046774 80045B74 3C01800E */ lui $at, %hi(D_800E63A4) # $at, 0x800e /* 046778 80045B78 15200002 */ bnez $t1, .L80045B84 @@ -641,6 +665,7 @@ glabel func_800452A0 /* 0467AC 80045BAC AC4A0000 */ sw $t2, ($v0) /* 0467B0 80045BB0 10000013 */ b .L80045C00 /* 0467B4 80045BB4 A2A001CD */ sb $zero, 0x1cd($s5) +glabel L80045BB8 /* 0467B8 80045BB8 3C014069 */ li $at, 0x40690000 # 3.640625 /* 0467BC 80045BBC 44818800 */ mtc1 $at, $f17 /* 0467C0 80045BC0 44808000 */ mtc1 $zero, $f16 diff --git a/asm/non_matchings/unknown_043920/func_80046524.s b/asm/non_matchings/unknown_043920/func_80046524.s index d8aa6cf7..4128d38c 100644 --- a/asm/non_matchings/unknown_043920/func_80046524.s +++ b/asm/non_matchings/unknown_043920/func_80046524.s @@ -1,3 +1,59 @@ +.late_rodata +glabel D_800E63A8 +.double 1.15 +glabel D_800E63B0 +.double 0.016 +glabel D_800E63B8 +.double 0.016 +glabel D_800E63C0 +.double 1.2 +glabel D_800E63C8 +.double 0.046 +glabel D_800E63D0 +.double 1.2 +glabel D_800E63D8 +.float 1.2 +.word 0 # Padding +glabel D_800E63E0 +.double 0.046 +glabel D_800E63E8 +.double 0.3 +glabel D_800E63F0 +.float 0.004 +.word 0 # Padding +glabel D_800E63F8 +.double 0.025 +glabel D_800E6400 +.double 300.0 +glabel D_800E6408 +.double 0.02 +glabel D_800E6410 +.double 1.7 +glabel D_800E6418 +.double 0.35 +glabel D_800E6420 +.double 0.2 +glabel D_800E6428 +.double 0.07 +glabel D_800E6430 +.double 0.8 +glabel D_800E6438 +.double 0.65 +glabel D_800E6440 +.double 0.65 +glabel D_800E6448 +.double 35.0 +glabel D_800E6450 +.float -10000.0 +.word 0 # Padding +glabel D_800E6458 +.double 0.8 +glabel D_800E6460 +.double 0.05 +glabel D_800E6468 +.float 0.11 + +.text glabel func_80046524 /* 047124 80046524 27BDFED8 */ addiu $sp, $sp, -0x128 /* 047128 80046528 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_043920/func_80048C7C.s b/asm/non_matchings/unknown_043920/func_80048C7C.s index 23ff83bc..117b389f 100644 --- a/asm/non_matchings/unknown_043920/func_80048C7C.s +++ b/asm/non_matchings/unknown_043920/func_80048C7C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel jpt_800E646C +.word L80048D40, L80048D40, L80048E50, L80048DAC, L80048E18, L80048DB8 +.word 0 # Padding +glabel D_800E6488 +.double 0.7 +glabel D_800E6490 +.double 20.5 + +.text glabel func_80048C7C /* 04987C 80048C7C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 049880 80048C80 AFBF001C */ sw $ra, 0x1c($sp) @@ -47,12 +57,13 @@ glabel func_80048C7C /* 04991C 80048D1C 2F210006 */ sltiu $at, $t9, 6 /* 049920 80048D20 1020004B */ beqz $at, .L80048E50 /* 049924 80048D24 0019C880 */ sll $t9, $t9, 2 -/* 049928 80048D28 3C01800E */ lui $at, %hi(D_800E646C) # $at, 0x800e +/* 049928 80048D28 3C01800E */ lui $at, %hi(jpt_800E646C) # $at, 0x800e /* 04992C 80048D2C 00390821 */ addu $at, $at, $t9 -/* 049930 80048D30 8C39646C */ lw $t9, %lo(D_800E646C)($at) +/* 049930 80048D30 8C39646C */ lw $t9, %lo(jpt_800E646C)($at) /* 049934 80048D34 00000000 */ nop /* 049938 80048D38 03200008 */ jr $t9 /* 04993C 80048D3C 00000000 */ nop +glabel L80048D40 /* 049940 80048D40 24080001 */ li $t0, 1 /* 049944 80048D44 14600008 */ bnez $v1, .L80048D68 /* 049948 80048D48 A20801F1 */ sb $t0, 0x1f1($s0) @@ -81,9 +92,11 @@ glabel func_80048C7C /* 0499A0 80048DA0 46203220 */ cvt.s.d $f8, $f6 /* 0499A4 80048DA4 1000002A */ b .L80048E50 /* 0499A8 80048DA8 E4880024 */ swc1 $f8, 0x24($a0) +glabel L80048DAC /* 0499AC 80048DAC 2409003C */ li $t1, 60 /* 0499B0 80048DB0 10000027 */ b .L80048E50 /* 0499B4 80048DB4 A20901ED */ sb $t1, 0x1ed($s0) +glabel L80048DB8 /* 0499B8 80048DB8 3C01800E */ lui $at, %hi(D_800E648C) # $at, 0x800e /* 0499BC 80048DBC C4216488 */ lwc1 $f1, %lo(D_800E6488)($at) /* 0499C0 80048DC0 C420648C */ lwc1 $f0, %lo(D_800E648C)($at) @@ -109,6 +122,7 @@ glabel func_80048C7C /* 049A0C 80048E0C 46209120 */ cvt.s.d $f4, $f18 /* 049A10 80048E10 1000000F */ b .L80048E50 /* 049A14 80048E14 E4840024 */ swc1 $f4, 0x24($a0) +glabel L80048E18 /* 049A18 80048E18 44800000 */ mtc1 $zero, $f0 /* 049A1C 80048E1C 240B0001 */ li $t3, 1 /* 049A20 80048E20 A20B01F1 */ sb $t3, 0x1f1($s0) @@ -124,6 +138,7 @@ glabel func_80048C7C /* 049A48 80048E48 0C015C12 */ jal func_80057048 /* 049A4C 80048E4C E4920020 */ swc1 $f18, 0x20($a0) .L80048E50: +glabel L80048E50 /* 049A50 80048E50 A2000187 */ sb $zero, 0x187($s0) .L80048E54: /* 049A54 80048E54 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_043920/func_80048E64.s b/asm/non_matchings/unknown_043920/func_80048E64.s index f30e2590..3fbdec9e 100644 --- a/asm/non_matchings/unknown_043920/func_80048E64.s +++ b/asm/non_matchings/unknown_043920/func_80048E64.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E6498 +.double 65.0 + +.text glabel func_80048E64 /* 049A64 80048E64 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 049A68 80048E68 3C014325 */ li $at, 0x43250000 # 165.000000 diff --git a/asm/non_matchings/unknown_043920/func_800494E0.s b/asm/non_matchings/unknown_043920/func_800494E0.s index cd647457..4ebc8a01 100644 --- a/asm/non_matchings/unknown_043920/func_800494E0.s +++ b/asm/non_matchings/unknown_043920/func_800494E0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E64A0 +.double 0.16666666666666666 + +.text glabel func_800494E0 /* 04A0E0 800494E0 27BDFF78 */ addiu $sp, $sp, -0x88 /* 04A0E4 800494E4 8FB80098 */ lw $t8, 0x98($sp) diff --git a/asm/non_matchings/unknown_043920/func_80049794.s b/asm/non_matchings/unknown_043920/func_80049794.s index 4d82fb7d..dfd316ec 100644 --- a/asm/non_matchings/unknown_043920/func_80049794.s +++ b/asm/non_matchings/unknown_043920/func_80049794.s @@ -1,3 +1,55 @@ +.late_rodata +glabel D_800E64A8 +.double 1.09 +glabel D_800E64B0 +.double 0.4 +glabel D_800E64B8 +.double 0.01 +glabel D_800E64C0 +.double 0.01 +glabel D_800E64C8 +.double 0.016 +glabel D_800E64D0 +.double 1.2 +glabel D_800E64D8 +.float 1.2 +.word 0 # Padding +glabel D_800E64E0 +.double 0.016 +glabel D_800E64E8 +.float 1.4 +glabel D_800E64EC +.float 0.01 +glabel D_800E64F0 +.float 0.02 +glabel D_800E64F4 +.float 0.004 +glabel D_800E64F8 +.double 0.6 +glabel D_800E6500 +.double 0.3 +glabel D_800E6508 +.float 1.2 +.word 0 # Padding +glabel D_800E6510 +.double 0.00015 +glabel D_800E6518 +.double 1.8 +glabel D_800E6520 +.double 0.4 +glabel D_800E6528 +.float 0.4 +.word 0 # Padding +glabel D_800E6530 +.double 0.058823529411764705 +glabel D_800E6538 +.double 0.05 +glabel D_800E6540 +.double 0.65 +glabel D_800E6548 +.double 0.65 + +.text glabel func_80049794 /* 04A394 80049794 27BDFF08 */ addiu $sp, $sp, -0xf8 /* 04A398 80049798 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004C140.s b/asm/non_matchings/unknown_043920/func_8004C140.s index 4ad08d1d..327ce778 100644 --- a/asm/non_matchings/unknown_043920/func_8004C140.s +++ b/asm/non_matchings/unknown_043920/func_8004C140.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E6550 +.double 0.7 + +.text glabel func_8004C140 /* 04CD40 8004C140 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 04CD44 8004C144 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004C2B0.s b/asm/non_matchings/unknown_043920/func_8004C2B0.s index c7c14ba1..51c01f57 100644 --- a/asm/non_matchings/unknown_043920/func_8004C2B0.s +++ b/asm/non_matchings/unknown_043920/func_8004C2B0.s @@ -1,3 +1,17 @@ +.late_rodata +glabel D_800E6558 +.double 0.4 +glabel D_800E6560 +.double 0.005555555555555556 +glabel D_800E6568 +.float 0.4 +.word 0 # Padding +glabel D_800E6570 +.double 65.0 +glabel D_800E6578 +.double 0.2 + +.text glabel func_8004C2B0 /* 04CEB0 8004C2B0 3C014348 */ li $at, 0x43480000 # 200.000000 /* 04CEB4 8004C2B4 44810000 */ mtc1 $at, $f0 diff --git a/asm/non_matchings/unknown_043920/func_8004CC20.s b/asm/non_matchings/unknown_043920/func_8004CC20.s index a480de1f..0c254ae3 100644 --- a/asm/non_matchings/unknown_043920/func_8004CC20.s +++ b/asm/non_matchings/unknown_043920/func_8004CC20.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_800E6580 +.float 1.3 +glabel D_800E6584 +.float 0.1 +glabel D_800E6588 +.float 0.002 +glabel D_800E658C +.float 0.01 + +.text glabel func_8004CC20 /* 04D820 8004CC20 27BDFF28 */ addiu $sp, $sp, -0xd8 /* 04D824 8004CC24 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index 722bcafd..2326d11c 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -1,3 +1,30 @@ +.late_rodata +glabel D_800E6590 +.double 1.2 +glabel D_800E6598 +.double 0.45 +glabel D_800E65A0 +.float -0.02 +glabel D_800E65A4 +.float 0.87 +glabel D_800E65A8 +.float 0.9 +glabel D_800E65AC +.float -10000.0 +glabel jpt_800E65B0 +.word L8004EB84, L8004EBBC, L8004EBD8, L8004EBF4, L8004EBA0, L8004EC10, L8004EC50, L8004EC90, L8004EC90, L8004ED88, L8004EBF4, L8004ECD0, L8004ED10, L8004ED50 +glabel D_800E65E8 +.float 1.12 +glabel D_800E65EC +.float 0.02 +glabel D_800E65F0 +.float -0.02 +glabel D_800E65F4 +.float 265.0 +glabel D_800E65F8 +.double 1500.0 + +.text glabel func_8004DE38 /* 04EA38 8004DE38 27BDFF50 */ addiu $sp, $sp, -0xb0 /* 04EA3C 8004DE3C AFBF002C */ sw $ra, 0x2c($sp) @@ -911,12 +938,13 @@ glabel func_8004DE38 /* 04F760 8004EB60 2D21000E */ sltiu $at, $t1, 0xe /* 04F764 8004EB64 10200088 */ beqz $at, .L8004ED88 /* 04F768 8004EB68 00094880 */ sll $t1, $t1, 2 -/* 04F76C 8004EB6C 3C01800E */ lui $at, %hi(D_800E65B0) # $at, 0x800e +/* 04F76C 8004EB6C 3C01800E */ lui $at, %hi(jpt_800E65B0) # $at, 0x800e /* 04F770 8004EB70 00290821 */ addu $at, $at, $t1 -/* 04F774 8004EB74 8C2965B0 */ lw $t1, %lo(D_800E65B0)($at) +/* 04F774 8004EB74 8C2965B0 */ lw $t1, %lo(jpt_800E65B0)($at) /* 04F778 8004EB78 00000000 */ nop /* 04F77C 8004EB7C 01200008 */ jr $t1 /* 04F780 8004EB80 00000000 */ nop +glabel L8004EB84 /* 04F784 8004EB84 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F788 8004EB88 8FA5009C */ lw $a1, 0x9c($sp) /* 04F78C 8004EB8C 02203025 */ move $a2, $s1 @@ -924,6 +952,7 @@ glabel func_8004DE38 /* 04F794 8004EB94 02003825 */ move $a3, $s0 /* 04F798 8004EB98 1000007C */ b .L8004ED8C /* 04F79C 8004EB9C 820A0175 */ lb $t2, 0x175($s0) +glabel L8004EBA0 /* 04F7A0 8004EBA0 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F7A4 8004EBA4 8FA5009C */ lw $a1, 0x9c($sp) /* 04F7A8 8004EBA8 02203025 */ move $a2, $s1 @@ -931,6 +960,7 @@ glabel func_8004DE38 /* 04F7B0 8004EBB0 02003825 */ move $a3, $s0 /* 04F7B4 8004EBB4 10000075 */ b .L8004ED8C /* 04F7B8 8004EBB8 820A0175 */ lb $t2, 0x175($s0) +glabel L8004EBBC /* 04F7BC 8004EBBC 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F7C0 8004EBC0 8FA5009C */ lw $a1, 0x9c($sp) /* 04F7C4 8004EBC4 02203025 */ move $a2, $s1 @@ -938,6 +968,7 @@ glabel func_8004DE38 /* 04F7CC 8004EBCC 02003825 */ move $a3, $s0 /* 04F7D0 8004EBD0 1000006E */ b .L8004ED8C /* 04F7D4 8004EBD4 820A0175 */ lb $t2, 0x175($s0) +glabel L8004EBD8 /* 04F7D8 8004EBD8 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F7DC 8004EBDC 8FA5009C */ lw $a1, 0x9c($sp) /* 04F7E0 8004EBE0 02203025 */ move $a2, $s1 @@ -945,6 +976,7 @@ glabel func_8004DE38 /* 04F7E8 8004EBE8 02003825 */ move $a3, $s0 /* 04F7EC 8004EBEC 10000067 */ b .L8004ED8C /* 04F7F0 8004EBF0 820A0175 */ lb $t2, 0x175($s0) +glabel L8004EBF4 /* 04F7F4 8004EBF4 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F7F8 8004EBF8 8FA5009C */ lw $a1, 0x9c($sp) /* 04F7FC 8004EBFC 02203025 */ move $a2, $s1 @@ -952,6 +984,7 @@ glabel func_8004DE38 /* 04F804 8004EC04 02003825 */ move $a3, $s0 /* 04F808 8004EC08 10000060 */ b .L8004ED8C /* 04F80C 8004EC0C 820A0175 */ lb $t2, 0x175($s0) +glabel L8004EC10 /* 04F810 8004EC10 3C0B8012 */ lui $t3, %hi(D_8011D528) # $t3, 0x8012 /* 04F814 8004EC14 3C0D8012 */ lui $t5, %hi(D_8011D52C) # $t5, 0x8012 /* 04F818 8004EC18 3C0C8012 */ lui $t4, %hi(D_8011D540) # $t4, 0x8012 @@ -968,6 +1001,7 @@ glabel func_8004DE38 /* 04F844 8004EC44 02003825 */ move $a3, $s0 /* 04F848 8004EC48 10000050 */ b .L8004ED8C /* 04F84C 8004EC4C 820A0175 */ lb $t2, 0x175($s0) +glabel L8004EC50 /* 04F850 8004EC50 3C0E8012 */ lui $t6, %hi(D_8011D528) # $t6, 0x8012 /* 04F854 8004EC54 3C0F8012 */ lui $t7, %hi(D_8011D52C) # $t7, 0x8012 /* 04F858 8004EC58 3C088012 */ lui $t0, %hi(D_8011D540) # $t0, 0x8012 @@ -984,6 +1018,7 @@ glabel func_8004DE38 /* 04F884 8004EC84 02003825 */ move $a3, $s0 /* 04F888 8004EC88 10000040 */ b .L8004ED8C /* 04F88C 8004EC8C 820A0175 */ lb $t2, 0x175($s0) +glabel L8004EC90 /* 04F890 8004EC90 3C188012 */ lui $t8, %hi(D_8011D528) # $t8, 0x8012 /* 04F894 8004EC94 3C198012 */ lui $t9, %hi(D_8011D534) # $t9, 0x8012 /* 04F898 8004EC98 3C0A8012 */ lui $t2, %hi(D_8011D540) # $t2, 0x8012 @@ -1000,6 +1035,7 @@ glabel func_8004DE38 /* 04F8C4 8004ECC4 02003825 */ move $a3, $s0 /* 04F8C8 8004ECC8 10000030 */ b .L8004ED8C /* 04F8CC 8004ECCC 820A0175 */ lb $t2, 0x175($s0) +glabel L8004ECD0 /* 04F8D0 8004ECD0 3C098012 */ lui $t1, %hi(D_8011D528) # $t1, 0x8012 /* 04F8D4 8004ECD4 3C0B8012 */ lui $t3, %hi(D_8011D52C) # $t3, 0x8012 /* 04F8D8 8004ECD8 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012 @@ -1016,6 +1052,7 @@ glabel func_8004DE38 /* 04F904 8004ED04 02003825 */ move $a3, $s0 /* 04F908 8004ED08 10000020 */ b .L8004ED8C /* 04F90C 8004ED0C 820A0175 */ lb $t2, 0x175($s0) +glabel L8004ED10 /* 04F910 8004ED10 3C0C8012 */ lui $t4, %hi(D_8011D528) # $t4, 0x8012 /* 04F914 8004ED14 3C0E8012 */ lui $t6, %hi(D_8011D52C) # $t6, 0x8012 /* 04F918 8004ED18 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 @@ -1032,6 +1069,7 @@ glabel func_8004DE38 /* 04F944 8004ED44 02003825 */ move $a3, $s0 /* 04F948 8004ED48 10000010 */ b .L8004ED8C /* 04F94C 8004ED4C 820A0175 */ lb $t2, 0x175($s0) +glabel L8004ED50 /* 04F950 8004ED50 3C088012 */ lui $t0, %hi(D_8011D528) # $t0, 0x8012 /* 04F954 8004ED54 3C188012 */ lui $t8, %hi(D_8011D52C) # $t8, 0x8012 /* 04F958 8004ED58 3C198012 */ lui $t9, %hi(D_8011D540) # $t9, 0x8012 @@ -1047,6 +1085,7 @@ glabel func_8004DE38 /* 04F980 8004ED80 0C017CC4 */ jal func_8005F310 /* 04F984 8004ED84 02003825 */ move $a3, $s0 .L8004ED88: +glabel L8004ED88 /* 04F988 8004ED88 820A0175 */ lb $t2, 0x175($s0) .L8004ED8C: /* 04F98C 8004ED8C 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index 22c9006d..611b821d 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -1,3 +1,20 @@ +.late_rodata +glabel D_800E6600 +.double 0.065 +glabel D_800E6608 +.double 0.3 +glabel D_800E6610 +.double 0.1 +glabel D_800E6618 +.double 0.3 +glabel D_800E6620 +.double 0.1 +glabel D_800E6628 +.double 0.004 +glabel D_800E6630 +.double 0.65 + +.text glabel func_8004F7F4 /* 0503F4 8004F7F4 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 0503F8 8004F7F8 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index df7030a4..1938d2c6 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -1,3 +1,46 @@ +.late_rodata +glabel D_800E6638 +.double 0.024999999999999998 +glabel D_800E6640 +.double 0.4 +glabel D_800E6648 +.double 1.1 +glabel D_800E6650 +.double -0.3 +glabel D_800E6658 +.double 0.3 +glabel D_800E6660 +.float 0.02 +.word 0 # Padding +glabel D_800E6668 +.double 0.9 +glabel D_800E6670 +.double 0.7 +glabel D_800E6678 +.double 1.7 +glabel D_800E6680 +.double 0.15 +glabel D_800E6688 +.double 0.3 +glabel D_800E6690 +.double 0.32 +glabel D_800E6698 +.double -0.04 +glabel D_800E66A0 +.double 0.04 +glabel D_800E66A8 +.double 0.9 +glabel D_800E66B0 +.double 0.3 +glabel D_800E66B8 +.double 0.1 +glabel D_800E66C0 +.float 0.1 +.word 0 # Padding +glabel D_800E66C8 +.double 0.05 + +.text glabel func_80050A28 /* 051628 80050A28 27BDFF88 */ addiu $sp, $sp, -0x78 /* 05162C 80050A2C AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_043920/func_8005250C.s b/asm/non_matchings/unknown_043920/func_8005250C.s index 548a6596..d2d79256 100644 --- a/asm/non_matchings/unknown_043920/func_8005250C.s +++ b/asm/non_matchings/unknown_043920/func_8005250C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel jpt_800E66D0 +.word L80052678, L80052978, L80052978, L800527AC, L8005280C, L80052858, L800528A4, L80052910 + +.text glabel func_8005250C /* 05310C 8005250C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 053110 80052510 AFBF0024 */ sw $ra, 0x24($sp) @@ -92,12 +97,13 @@ glabel func_8005250C /* 053254 80052654 2D410008 */ sltiu $at, $t2, 8 /* 053258 80052658 102000C7 */ beqz $at, .L80052978 /* 05325C 8005265C 000A5080 */ sll $t2, $t2, 2 -/* 053260 80052660 3C01800E */ lui $at, %hi(D_800E66D0) # $at, 0x800e +/* 053260 80052660 3C01800E */ lui $at, %hi(jpt_800E66D0) # $at, 0x800e /* 053264 80052664 002A0821 */ addu $at, $at, $t2 -/* 053268 80052668 8C2A66D0 */ lw $t2, %lo(D_800E66D0)($at) +/* 053268 80052668 8C2A66D0 */ lw $t2, %lo(jpt_800E66D0)($at) /* 05326C 8005266C 00000000 */ nop /* 053270 80052670 01400008 */ jr $t2 /* 053274 80052674 00000000 */ nop +glabel L80052678 /* 053278 80052678 84AC01A2 */ lh $t4, 0x1a2($a1) /* 05327C 8005267C 3C018012 */ lui $at, %hi(D_8011D570) # $at, 0x8012 /* 053280 80052680 000C6823 */ negu $t5, $t4 @@ -180,6 +186,7 @@ glabel func_8005250C /* 0533A0 800527A0 8FBF0024 */ lw $ra, 0x24($sp) /* 0533A4 800527A4 10000074 */ b .L80052978 /* 0533A8 800527A8 A0AE01F2 */ sb $t6, 0x1f2($a1) +glabel L800527AC /* 0533AC 800527AC 90B801F3 */ lbu $t8, 0x1f3($a1) /* 0533B0 800527B0 8FA40028 */ lw $a0, 0x28($sp) /* 0533B4 800527B4 33080004 */ andi $t0, $t8, 4 @@ -205,6 +212,7 @@ glabel func_8005250C /* 053400 80052800 31ABFFFB */ andi $t3, $t5, 0xfffb /* 053404 80052804 1000005C */ b .L80052978 /* 053408 80052808 A0AB01F3 */ sb $t3, 0x1f3($a1) +glabel L8005280C /* 05340C 8005280C 8FAE0030 */ lw $t6, 0x30($sp) /* 053410 80052810 8FA40028 */ lw $a0, 0x28($sp) /* 053414 80052814 240F0020 */ li $t7, 32 @@ -224,6 +232,7 @@ glabel func_8005250C /* 05344C 8005284C 3308FFF7 */ andi $t0, $t8, 0xfff7 /* 053450 80052850 10000049 */ b .L80052978 /* 053454 80052854 A0A801F3 */ sb $t0, 0x1f3($a1) +glabel L80052858 /* 053458 80052858 3C098012 */ lui $t1, %hi(D_8011D528) # $t1, 0x8012 /* 05345C 8005285C 8D29D528 */ lw $t1, %lo(D_8011D528)($t1) /* 053460 80052860 8FA40028 */ lw $a0, 0x28($sp) @@ -244,6 +253,7 @@ glabel func_8005250C /* 053498 80052898 AFAB001C */ sw $t3, 0x1c($sp) /* 05349C 8005289C 10000037 */ b .L8005297C /* 0534A0 800528A0 8FBF0024 */ lw $ra, 0x24($sp) +glabel L800528A4 /* 0534A4 800528A4 C4AA002C */ lwc1 $f10, 0x2c($a1) /* 0534A8 800528A8 44804800 */ mtc1 $zero, $f9 /* 0534AC 800528AC 44804000 */ mtc1 $zero, $f8 @@ -273,6 +283,7 @@ glabel func_8005250C /* 053504 80052904 AFA8001C */ sw $t0, 0x1c($sp) /* 053508 80052908 1000001C */ b .L8005297C /* 05350C 8005290C 8FBF0024 */ lw $ra, 0x24($sp) +glabel L80052910 /* 053510 80052910 8FAC0030 */ lw $t4, 0x30($sp) /* 053514 80052914 8FA40028 */ lw $a0, 0x28($sp) /* 053518 80052918 24090060 */ li $t1, 96 @@ -300,6 +311,7 @@ glabel func_8005250C /* 053570 80052970 0C014A62 */ jal func_80052988 /* 053574 80052974 AFB9001C */ sw $t9, 0x1c($sp) .L80052978: +glabel L80052978 /* 053578 80052978 8FBF0024 */ lw $ra, 0x24($sp) .L8005297C: /* 05357C 8005297C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/unknown_043920/func_80052B64.s b/asm/non_matchings/unknown_043920/func_80052B64.s index bdc0050a..c4a3ea52 100644 --- a/asm/non_matchings/unknown_043920/func_80052B64.s +++ b/asm/non_matchings/unknown_043920/func_80052B64.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E66F0 +.double 0.97 + +.text glabel func_80052B64 /* 053764 80052B64 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 053768 80052B68 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_043920/func_80052D7C.s b/asm/non_matchings/unknown_043920/func_80052D7C.s index 3354655e..b8f90151 100644 --- a/asm/non_matchings/unknown_043920/func_80052D7C.s +++ b/asm/non_matchings/unknown_043920/func_80052D7C.s @@ -1,3 +1,29 @@ +.late_rodata +glabel D_800E66F8 +.double 0.87 +glabel D_800E6700 +.double 0.9 +glabel D_800E6708 +.double 0.3 +glabel D_800E6710 +.double 1.6 +glabel D_800E6718 +.double 0.025 +glabel D_800E6720 +.float 0.45 +.word 0 # Padding +glabel D_800E6728 +.double 0.97 +glabel D_800E6730 +.double 0.2 +glabel D_800E6738 +.double 0.2 +glabel D_800E6740 +.double 1.33 +glabel D_800E6748 +.double 0.53 + +.text glabel func_80052D7C /* 05397C 80052D7C 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 053980 80052D80 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_043920/func_80053478.s b/asm/non_matchings/unknown_043920/func_80053478.s index 21e2b4d3..17e71be2 100644 --- a/asm/non_matchings/unknown_043920/func_80053478.s +++ b/asm/non_matchings/unknown_043920/func_80053478.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_800E6750 +.double 1.8 +glabel D_800E6758 +.float 1.8 +.word 0 # Padding +glabel D_800E6760 +.double 0.2 + +.text glabel func_80053478 /* 054078 80053478 C480002C */ lwc1 $f0, 0x2c($a0) /* 05407C 8005347C 44806800 */ mtc1 $zero, $f13 diff --git a/asm/non_matchings/unknown_043920/func_80053750.s b/asm/non_matchings/unknown_043920/func_80053750.s index 285333b0..5d594aa1 100644 --- a/asm/non_matchings/unknown_043920/func_80053750.s +++ b/asm/non_matchings/unknown_043920/func_80053750.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_800E6788 +.double 0.4 +glabel D_800E6790 +.double 0.1 +glabel D_800E6798 +.double 1.4 + +.text glabel func_80053750 /* 054350 80053750 AFA50004 */ sw $a1, 4($sp) /* 054354 80053754 8C820060 */ lw $v0, 0x60($a0) diff --git a/asm/non_matchings/unknown_043920/func_80053E9C.s b/asm/non_matchings/unknown_043920/func_80053E9C.s index d7571a2f..f3468f6a 100644 --- a/asm/non_matchings/unknown_043920/func_80053E9C.s +++ b/asm/non_matchings/unknown_043920/func_80053E9C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_800E67A0 +.float 0.1 +glabel jpt_800E67A4 +.word L80053FF0, L8005406C, L800540FC, L8005408C, L800540C4, L80054098 +.word 0 # Padding +glabel D_800E67C0 +.double 20.5 + +.text glabel func_80053E9C /* 054A9C 80053E9C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 054AA0 80053EA0 AFBF001C */ sw $ra, 0x1c($sp) @@ -88,12 +98,13 @@ glabel func_80053E9C /* 054BCC 80053FCC 2DE10006 */ sltiu $at, $t7, 6 /* 054BD0 80053FD0 1020004A */ beqz $at, .L800540FC /* 054BD4 80053FD4 000F7880 */ sll $t7, $t7, 2 -/* 054BD8 80053FD8 3C01800E */ lui $at, %hi(D_800E67A4) # $at, 0x800e +/* 054BD8 80053FD8 3C01800E */ lui $at, %hi(jpt_800E67A4) # $at, 0x800e /* 054BDC 80053FDC 002F0821 */ addu $at, $at, $t7 -/* 054BE0 80053FE0 8C2F67A4 */ lw $t7, %lo(D_800E67A4)($at) +/* 054BE0 80053FE0 8C2F67A4 */ lw $t7, %lo(jpt_800E67A4)($at) /* 054BE4 80053FE4 00000000 */ nop /* 054BE8 80053FE8 01E00008 */ jr $t7 /* 054BEC 80053FEC 00000000 */ nop +glabel L80053FF0 /* 054BF0 80053FF0 24180001 */ li $t8, 1 /* 054BF4 80053FF4 A21801F1 */ sb $t8, 0x1f1($s0) /* 054BF8 80053FF8 83B90027 */ lb $t9, 0x27($sp) @@ -126,6 +137,7 @@ glabel func_80053E9C /* 054C60 80054060 462042A0 */ cvt.s.d $f10, $f8 /* 054C64 80054064 10000025 */ b .L800540FC /* 054C68 80054068 E48A0020 */ swc1 $f10, 0x20($a0) +glabel L8005406C /* 054C6C 8005406C 24080002 */ li $t0, 2 /* 054C70 80054070 24091002 */ li $t1, 4098 /* 054C74 80054074 A20801DB */ sb $t0, 0x1db($s0) @@ -134,9 +146,11 @@ glabel func_80053E9C /* 054C80 80054080 2405013B */ li $a1, 315 /* 054C84 80054084 1000001E */ b .L80054100 /* 054C88 80054088 A2000187 */ sb $zero, 0x187($s0) +glabel L8005408C /* 054C8C 8005408C 240A003C */ li $t2, 60 /* 054C90 80054090 1000001A */ b .L800540FC /* 054C94 80054094 A20A01ED */ sb $t2, 0x1ed($s0) +glabel L80054098 /* 054C98 80054098 C610002C */ lwc1 $f16, 0x2c($s0) /* 054C9C 8005409C 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 054CA0 800540A0 44812800 */ mtc1 $at, $f5 @@ -148,6 +162,7 @@ glabel func_80053E9C /* 054CB8 800540B8 46203220 */ cvt.s.d $f8, $f6 /* 054CBC 800540BC 1000000F */ b .L800540FC /* 054CC0 800540C0 E608002C */ swc1 $f8, 0x2c($s0) +glabel L800540C4 /* 054CC4 800540C4 44805000 */ mtc1 $zero, $f10 /* 054CC8 800540C8 240C0001 */ li $t4, 1 /* 054CCC 800540CC A20C01F1 */ sb $t4, 0x1f1($s0) @@ -163,6 +178,7 @@ glabel func_80053E9C /* 054CF4 800540F4 0C015C12 */ jal func_80057048 /* 054CF8 800540F8 E4880020 */ swc1 $f8, 0x20($a0) .L800540FC: +glabel L800540FC /* 054CFC 800540FC A2000187 */ sb $zero, 0x187($s0) .L80054100: /* 054D00 80054100 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_043920/func_80054110.s b/asm/non_matchings/unknown_043920/func_80054110.s index c96a31ce..00671236 100644 --- a/asm/non_matchings/unknown_043920/func_80054110.s +++ b/asm/non_matchings/unknown_043920/func_80054110.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_800E67C8 +.double 0.3 +glabel D_800E67D0 +.double 0.1 +glabel D_800E67D8 +.double 0.3 +glabel D_800E67E0 +.double 0.1 + +.text glabel func_80054110 /* 054D10 80054110 27BDFF50 */ addiu $sp, $sp, -0xb0 /* 054D14 80054114 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_043920/func_8005492C.s b/asm/non_matchings/unknown_043920/func_8005492C.s index f2be331d..f2e9087d 100644 --- a/asm/non_matchings/unknown_043920/func_8005492C.s +++ b/asm/non_matchings/unknown_043920/func_8005492C.s @@ -1,3 +1,27 @@ +.late_rodata +glabel D_800E67E8 +.double -0.3 +glabel D_800E67F0 +.double 0.3 +glabel D_800E67F8 +.double 0.9 +glabel D_800E6800 +.float 0.02 +.word 0 # Padding +glabel D_800E6808 +.double 1.7 +glabel D_800E6810 +.double 0.15 +glabel D_800E6818 +.double 0.32 +glabel D_800E6820 +.double -0.04 +glabel D_800E6828 +.double 0.04 +glabel D_800E6830 +.double 0.9 + +.text glabel func_8005492C /* 05552C 8005492C 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 055530 80054930 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_043920/func_80054FD0.s b/asm/non_matchings/unknown_043920/func_80054FD0.s index 46f6029f..6f457e33 100644 --- a/asm/non_matchings/unknown_043920/func_80054FD0.s +++ b/asm/non_matchings/unknown_043920/func_80054FD0.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E6838 +.double 1.075 +glabel D_800E6840 +.double 0.15 + +.text glabel func_80054FD0 /* 055BD0 80054FD0 27BDFE60 */ addiu $sp, $sp, -0x1a0 /* 055BD4 80054FD4 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_043920/func_80055EC0.s b/asm/non_matchings/unknown_043920/func_80055EC0.s index 3c6d41f9..f6c00f7d 100644 --- a/asm/non_matchings/unknown_043920/func_80055EC0.s +++ b/asm/non_matchings/unknown_043920/func_80055EC0.s @@ -1,3 +1,14 @@ +.late_rodata +glabel D_800E6848 +.double 0.7 +glabel D_800E6850 +.float 1500.0 +glabel jpt_800E6854 +.word L8005635C, L80056370, L80056380, L8005639C, L800563EC, L80056508, L8005655C, L80056508, L800563EC, L80056620, L800563CC, L80056380, L800565C0, L800565E0, L80056600, L800563EC +glabel jpt_800E6894 +.word L80056828, L80056834, L80056840, L8005684C, L80056884, L80056884, L80056884, L80056884, L80056884, L80056884, L80056874, L80056880 + +.text glabel func_80055EC0 /* 056AC0 80055EC0 27BDFF78 */ addiu $sp, $sp, -0x88 /* 056AC4 80055EC4 AFBF0024 */ sw $ra, 0x24($sp) @@ -308,21 +319,24 @@ glabel func_80055EC0 /* 056F38 80056338 102000B9 */ beqz $at, .L80056620 /* 056F3C 8005633C 0100C825 */ move $t9, $t0 /* 056F40 80056340 0019C880 */ sll $t9, $t9, 2 -/* 056F44 80056344 3C01800E */ lui $at, %hi(D_800E6854) # $at, 0x800e +/* 056F44 80056344 3C01800E */ lui $at, %hi(jpt_800E6854) # $at, 0x800e /* 056F48 80056348 00390821 */ addu $at, $at, $t9 -/* 056F4C 8005634C 8C396854 */ lw $t9, %lo(D_800E6854)($at) +/* 056F4C 8005634C 8C396854 */ lw $t9, %lo(jpt_800E6854)($at) /* 056F50 80056350 00000000 */ nop /* 056F54 80056354 03200008 */ jr $t9 /* 056F58 80056358 00000000 */ nop +glabel L8005635C /* 056F5C 8005635C 3C01C120 */ li $at, 0xC1200000 # -10.000000 /* 056F60 80056360 44815000 */ mtc1 $at, $f10 /* 056F64 80056364 240200E5 */ li $v0, 229 /* 056F68 80056368 100000B0 */ b .L8005662C /* 056F6C 8005636C E7AA0064 */ swc1 $f10, 0x64($sp) +glabel L80056370 /* 056F70 80056370 3C01C120 */ li $at, 0xC1200000 # -10.000000 /* 056F74 80056374 44819000 */ mtc1 $at, $f18 /* 056F78 80056378 100000AC */ b .L8005662C /* 056F7C 8005637C E7B20064 */ swc1 $f18, 0x64($sp) +glabel L80056380 /* 056F80 80056380 3C014120 */ li $at, 0x41200000 # 10.000000 /* 056F84 80056384 44818000 */ mtc1 $at, $f16 /* 056F88 80056388 3C01C000 */ li $at, 0xC0000000 # -2.000000 @@ -330,6 +344,7 @@ glabel func_80055EC0 /* 056F90 80056390 2402000E */ li $v0, 14 /* 056F94 80056394 100000A5 */ b .L8005662C /* 056F98 80056398 E7B00064 */ swc1 $f16, 0x64($sp) +glabel L8005639C /* 056F9C 8005639C 820B01D6 */ lb $t3, 0x1d6($s0) /* 056FA0 800563A0 24010002 */ li $at, 2 /* 056FA4 800563A4 11610003 */ beq $t3, $at, .L800563B4 @@ -343,6 +358,7 @@ glabel func_80055EC0 /* 056FC0 800563C0 44810000 */ mtc1 $at, $f0 /* 056FC4 800563C4 10000099 */ b .L8005662C /* 056FC8 800563C8 E7A40064 */ swc1 $f4, 0x64($sp) +glabel L800563CC /* 056FCC 800563CC 3C014120 */ li $at, 0x41200000 # 10.000000 /* 056FD0 800563D0 44814000 */ mtc1 $at, $f8 /* 056FD4 800563D4 3C01C000 */ li $at, 0xC0000000 # -2.000000 @@ -351,6 +367,7 @@ glabel func_80055EC0 /* 056FE0 800563E0 00005025 */ move $t2, $zero /* 056FE4 800563E4 10000091 */ b .L8005662C /* 056FE8 800563E8 E7A80064 */ swc1 $f8, 0x64($sp) +glabel L800563EC /* 056FEC 800563EC 24010008 */ li $at, 8 /* 056FF0 800563F0 11010009 */ beq $t0, $at, .L80056418 /* 056FF4 800563F4 2401000F */ li $at, 15 @@ -429,6 +446,7 @@ glabel func_80055EC0 /* 0570FC 800564FC 24050008 */ li $a1, 8 /* 057100 80056500 10000108 */ b .L80056924 /* 057104 80056504 8FBF0024 */ lw $ra, 0x24($sp) +glabel L80056508 /* 057108 80056508 820C0173 */ lb $t4, 0x173($s0) /* 05710C 8005650C 860B0000 */ lh $t3, ($s0) /* 057110 80056510 2401FFFF */ li $at, -1 @@ -451,6 +469,7 @@ glabel func_80055EC0 /* 057150 80056550 2405000F */ li $a1, 15 /* 057154 80056554 100000F3 */ b .L80056924 /* 057158 80056558 8FBF0024 */ lw $ra, 0x24($sp) +glabel L8005655C /* 05715C 8005655C 820C0173 */ lb $t4, 0x173($s0) /* 057160 80056560 860B0000 */ lh $t3, ($s0) /* 057164 80056564 2401FFFF */ li $at, -1 @@ -477,6 +496,7 @@ glabel func_80055EC0 /* 0571B4 800565B4 2405000F */ li $a1, 15 /* 0571B8 800565B8 100000DA */ b .L80056924 /* 0571BC 800565BC 8FBF0024 */ lw $ra, 0x24($sp) +glabel L800565C0 /* 0571C0 800565C0 820D0173 */ lb $t5, 0x173($s0) /* 0571C4 800565C4 24190001 */ li $t9, 1 /* 0571C8 800565C8 240B012C */ li $t3, 300 @@ -485,6 +505,7 @@ glabel func_80055EC0 /* 0571D4 800565D4 A60B018E */ sh $t3, 0x18e($s0) /* 0571D8 800565D8 100000D1 */ b .L80056920 /* 0571DC 800565DC A20E0173 */ sb $t6, 0x173($s0) +glabel L800565E0 /* 0571E0 800565E0 82180173 */ lb $t8, 0x173($s0) /* 0571E4 800565E4 240F0002 */ li $t7, 2 /* 0571E8 800565E8 24190258 */ li $t9, 600 @@ -493,6 +514,7 @@ glabel func_80055EC0 /* 0571F4 800565F4 A20C0173 */ sb $t4, 0x173($s0) /* 0571F8 800565F8 100000C9 */ b .L80056920 /* 0571FC 800565FC A619018E */ sh $t9, 0x18e($s0) +glabel L80056600 /* 057200 80056600 820E0173 */ lb $t6, 0x173($s0) /* 057204 80056604 240B0003 */ li $t3, 3 /* 057208 80056608 240D0384 */ li $t5, 900 @@ -502,6 +524,7 @@ glabel func_80055EC0 /* 057218 80056618 100000C1 */ b .L80056920 /* 05721C 8005661C A20F0173 */ sb $t7, 0x173($s0) .L80056620: +glabel L80056620 /* 057220 80056620 44803000 */ mtc1 $zero, $f6 /* 057224 80056624 00000000 */ nop /* 057228 80056628 E7A60064 */ swc1 $f6, 0x64($sp) @@ -628,21 +651,25 @@ glabel func_80055EC0 /* 057404 80056804 1020001F */ beqz $at, .L80056884 /* 057408 80056808 E46A0010 */ swc1 $f10, 0x10($v1) /* 05740C 8005680C 000E7080 */ sll $t6, $t6, 2 -/* 057410 80056810 3C01800E */ lui $at, %hi(D_800E6894) # $at, 0x800e +/* 057410 80056810 3C01800E */ lui $at, %hi(jpt_800E6894) # $at, 0x800e /* 057414 80056814 002E0821 */ addu $at, $at, $t6 -/* 057418 80056818 8C2E6894 */ lw $t6, %lo(D_800E6894)($at) +/* 057418 80056818 8C2E6894 */ lw $t6, %lo(jpt_800E6894)($at) /* 05741C 8005681C 00000000 */ nop /* 057420 80056820 01C00008 */ jr $t6 /* 057424 80056824 00000000 */ nop +glabel L80056828 /* 057428 80056828 240F0134 */ li $t7, 308 /* 05742C 8005682C 10000015 */ b .L80056884 /* 057430 80056830 A7AF003A */ sh $t7, 0x3a($sp) +glabel L80056834 /* 057434 80056834 24180135 */ li $t8, 309 /* 057438 80056838 10000012 */ b .L80056884 /* 05743C 8005683C A7B8003A */ sh $t8, 0x3a($sp) +glabel L80056840 /* 057440 80056840 240C000F */ li $t4, 15 /* 057444 80056844 1000000F */ b .L80056884 /* 057448 80056848 A7AC003A */ sh $t4, 0x3a($sp) +glabel L8005684C /* 05744C 8005684C 821901D6 */ lb $t9, 0x1d6($s0) /* 057450 80056850 24010002 */ li $at, 2 /* 057454 80056854 13210005 */ beq $t9, $at, .L8005686C @@ -654,11 +681,14 @@ glabel func_80055EC0 .L8005686C: /* 05746C 8005686C 10000005 */ b .L80056884 /* 057470 80056870 A7AD003A */ sh $t5, 0x3a($sp) +glabel L80056874 /* 057474 80056874 240E000F */ li $t6, 15 /* 057478 80056878 10000002 */ b .L80056884 /* 05747C 8005687C A7AE003A */ sh $t6, 0x3a($sp) +glabel L80056880 /* 057480 80056880 A4400018 */ sh $zero, 0x18($v0) .L80056884: +glabel L80056884 /* 057484 80056884 97AF003A */ lhu $t7, 0x3a($sp) /* 057488 80056888 00000000 */ nop /* 05748C 8005688C 11E0001D */ beqz $t7, .L80056904 diff --git a/asm/non_matchings/unknown_043920/func_8005698C.s b/asm/non_matchings/unknown_043920/func_8005698C.s index 40fc3e3e..2260531c 100644 --- a/asm/non_matchings/unknown_043920/func_8005698C.s +++ b/asm/non_matchings/unknown_043920/func_8005698C.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E68C4 +.float 10000.0 +glabel D_800E68C8 +.float 10000.0 + +.text glabel func_8005698C /* 05758C 8005698C 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 057590 80056990 AFBF004C */ sw $ra, 0x4c($sp) diff --git a/asm/non_matchings/unknown_043920/func_80057220.s b/asm/non_matchings/unknown_043920/func_80057220.s index 0f6f8af6..fe486e59 100644 --- a/asm/non_matchings/unknown_043920/func_80057220.s +++ b/asm/non_matchings/unknown_043920/func_80057220.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E68CC +.float 0.025 + +.text glabel func_80057220 /* 057E20 80057220 3C0E8012 */ lui $t6, %hi(D_8011D540) # $t6, 0x8012 /* 057E24 80057224 8DCED540 */ lw $t6, %lo(D_8011D540)($t6) diff --git a/asm/non_matchings/unknown_043920/func_80057A40.s b/asm/non_matchings/unknown_043920/func_80057A40.s index e434abbd..d7f55626 100644 --- a/asm/non_matchings/unknown_043920/func_80057A40.s +++ b/asm/non_matchings/unknown_043920/func_80057A40.s @@ -1,3 +1,16 @@ +.late_rodata +glabel jpt_800E68D0 +.word L80057BBC, L80057BE4, L80057CD0, L80057C0C, L80057C34, L80057C5C, L80057C84, L80057CAC +glabel D_800E68F0 +.double 91.75 +glabel D_800E68F8 +.double 90.0 +glabel D_800E6900 +.double 48.5 +glabel D_800E6908 +.double 0.95 + +.text glabel func_80057A40 /* 058640 80057A40 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 058644 80057A44 3C0E8012 */ lui $t6, %hi(D_8011D52C) # $t6, 0x8012 @@ -97,12 +110,13 @@ glabel func_80057A40 /* 058798 80057B98 2F010008 */ sltiu $at, $t8, 8 /* 05879C 80057B9C 1020004C */ beqz $at, .L80057CD0 /* 0587A0 80057BA0 0018C080 */ sll $t8, $t8, 2 -/* 0587A4 80057BA4 3C01800E */ lui $at, %hi(D_800E68D0) # $at, 0x800e +/* 0587A4 80057BA4 3C01800E */ lui $at, %hi(jpt_800E68D0) # $at, 0x800e /* 0587A8 80057BA8 00380821 */ addu $at, $at, $t8 -/* 0587AC 80057BAC 8C3868D0 */ lw $t8, %lo(D_800E68D0)($at) +/* 0587AC 80057BAC 8C3868D0 */ lw $t8, %lo(jpt_800E68D0)($at) /* 0587B0 80057BB0 00000000 */ nop /* 0587B4 80057BB4 03000008 */ jr $t8 /* 0587B8 80057BB8 00000000 */ nop +glabel L80057BBC /* 0587BC 80057BBC C7AC0040 */ lwc1 $f12, 0x40($sp) /* 0587C0 80057BC0 8FA50038 */ lw $a1, 0x38($sp) /* 0587C4 80057BC4 0C01607A */ jal func_800581E8 @@ -113,6 +127,7 @@ glabel func_80057A40 /* 0587D8 80057BD8 8FA6003C */ lw $a2, 0x3c($sp) /* 0587DC 80057BDC 1000003C */ b .L80057CD0 /* 0587E0 80057BE0 00000000 */ nop +glabel L80057BE4 /* 0587E4 80057BE4 C7AC0040 */ lwc1 $f12, 0x40($sp) /* 0587E8 80057BE8 8FA50038 */ lw $a1, 0x38($sp) /* 0587EC 80057BEC 0C0130AC */ jal func_8004C2B0 @@ -123,6 +138,7 @@ glabel func_80057A40 /* 058800 80057C00 8FA6003C */ lw $a2, 0x3c($sp) /* 058804 80057C04 10000032 */ b .L80057CD0 /* 058808 80057C08 00000000 */ nop +glabel L80057C0C /* 05880C 80057C0C C7AC0040 */ lwc1 $f12, 0x40($sp) /* 058810 80057C10 8FA50038 */ lw $a1, 0x38($sp) /* 058814 80057C14 0C0163D1 */ jal func_80058F44 @@ -133,6 +149,7 @@ glabel func_80057A40 /* 058828 80057C28 8FA6003C */ lw $a2, 0x3c($sp) /* 05882C 80057C2C 10000028 */ b .L80057CD0 /* 058830 80057C30 00000000 */ nop +glabel L80057C34 /* 058834 80057C34 C7AC0040 */ lwc1 $f12, 0x40($sp) /* 058838 80057C38 8FA50038 */ lw $a1, 0x38($sp) /* 05883C 80057C3C 0C012399 */ jal func_80048E64 @@ -143,6 +160,7 @@ glabel func_80057A40 /* 058850 80057C50 8FA6003C */ lw $a2, 0x3c($sp) /* 058854 80057C54 1000001E */ b .L80057CD0 /* 058858 80057C58 00000000 */ nop +glabel L80057C5C /* 05885C 80057C5C C7AC0040 */ lwc1 $f12, 0x40($sp) /* 058860 80057C60 8FA50038 */ lw $a1, 0x38($sp) /* 058864 80057C64 0C0162E1 */ jal func_80058B84 @@ -153,6 +171,7 @@ glabel func_80057A40 /* 058878 80057C78 8FA6003C */ lw $a2, 0x3c($sp) /* 05887C 80057C7C 10000014 */ b .L80057CD0 /* 058880 80057C80 00000000 */ nop +glabel L80057C84 /* 058884 80057C84 C7AC0040 */ lwc1 $f12, 0x40($sp) /* 058888 80057C88 8FA50038 */ lw $a1, 0x38($sp) /* 05888C 80057C8C 0C013564 */ jal func_8004D590 @@ -163,6 +182,7 @@ glabel func_80057A40 /* 0588A0 80057CA0 8FA6003C */ lw $a2, 0x3c($sp) /* 0588A4 80057CA4 1000000A */ b .L80057CD0 /* 0588A8 80057CA8 00000000 */ nop +glabel L80057CAC /* 0588AC 80057CAC C7AC0040 */ lwc1 $f12, 0x40($sp) /* 0588B0 80057CB0 8FA50038 */ lw $a1, 0x38($sp) /* 0588B4 80057CB4 0C016357 */ jal func_80058D5C @@ -173,6 +193,7 @@ glabel func_80057A40 /* 0588C8 80057CC8 8FA6003C */ lw $a2, 0x3c($sp) /* 0588CC 80057CCC 00000000 */ nop .L80057CD0: +glabel L80057CD0 /* 0588D0 80057CD0 3C038012 */ lui $v1, %hi(D_8011D586) # $v1, 0x8012 /* 0588D4 80057CD4 3C01800E */ lui $at, %hi(D_800E68F4) # $at, 0x800e /* 0588D8 80057CD8 2463D586 */ addiu $v1, %lo(D_8011D586) # addiu $v1, $v1, -0x2a7a diff --git a/asm/non_matchings/unknown_043920/func_800581E8.s b/asm/non_matchings/unknown_043920/func_800581E8.s index 978bbc33..286d056a 100644 --- a/asm/non_matchings/unknown_043920/func_800581E8.s +++ b/asm/non_matchings/unknown_043920/func_800581E8.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E6910 +.double 65.0 +glabel D_800E6918 +.double 1.3 + +.text glabel func_800581E8 /* 058DE8 800581E8 27BDFF98 */ addiu $sp, $sp, -0x68 /* 058DEC 800581EC 3C0142F0 */ li $at, 0x42F00000 # 120.000000 diff --git a/asm/non_matchings/unknown_043920/func_80059208.s b/asm/non_matchings/unknown_043920/func_80059208.s index 782e6bca..184399a2 100644 --- a/asm/non_matchings/unknown_043920/func_80059208.s +++ b/asm/non_matchings/unknown_043920/func_80059208.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E6920 +.double -0.2 + +.text glabel func_80059208 /* 059E08 80059208 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 059E0C 8005920C AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_043920/func_80059790.s b/asm/non_matchings/unknown_043920/func_80059790.s index 6b68366d..f24b3bc5 100644 --- a/asm/non_matchings/unknown_043920/func_80059790.s +++ b/asm/non_matchings/unknown_043920/func_80059790.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E6928 +.double 1.2 + +.text glabel func_80059790 /* 05A390 80059790 3C0E8012 */ lui $t6, %hi(D_80126170) # $t6, 0x8012 /* 05A394 80059794 8DCE6170 */ lw $t6, %lo(D_80126170)($t6) diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index 1b0be27a..708dbc1f 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E6930 +.double 1.2 +glabel D_800E6938 +.double 0.8 + +.text glabel func_80059E40 /* 05AA40 80059E40 3C058012 */ lui $a1, %hi(D_80120001) # $a1, 0x8012 /* 05AA44 80059E44 80A5D59C */ lb $a1, %lo(D_8011D59C)($a1) diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index 3b0c6d2d..af6c2bc8 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -1,3 +1,32 @@ +.late_rodata +glabel D_800E6940 +.double 0.45 +glabel D_800E6948 +.float -0.02 +glabel D_800E694C +.float 1000000.0 +glabel D_800E6950 +.double 160000.0 +glabel D_800E6958 +.float 0.8 +.word 0 # Padding +glabel D_800E6960 +.double 160000.0 +glabel jpt_800E6968 +.word L8005AF80, L8005AFD8, L8005B004, L8005B030, L8005AFAC, L8005B05C, L8005B094, L8005B0CC, L8005B0CC, L8005B1B0, L8005B030, L8005B10C, L8005B144, L8005B17C +glabel D_800E69A0 +.double 0.9 +glabel D_800E69A8 +.float 0.02 +glabel D_800E69AC +.float -0.02 +glabel D_800E69B0 +.float 265.0 +.word 0 # Padding +glabel D_800E69B8 +.double 1500.0 + +.text glabel func_8005A6F0 /* 05B2F0 8005A6F0 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 05B2F4 8005A6F4 AFBF002C */ sw $ra, 0x2c($sp) @@ -585,12 +614,13 @@ glabel func_8005A6F0 /* 05BB5C 8005AF5C 10200094 */ beqz $at, .L8005B1B0 /* 05BB60 8005AF60 2442D52C */ addiu $v0, %lo(D_8011D52C) # addiu $v0, $v0, -0x2ad4 /* 05BB64 8005AF64 0019C880 */ sll $t9, $t9, 2 -/* 05BB68 8005AF68 3C01800E */ lui $at, %hi(D_800E6968) # $at, 0x800e +/* 05BB68 8005AF68 3C01800E */ lui $at, %hi(jpt_800E6968) # $at, 0x800e /* 05BB6C 8005AF6C 00390821 */ addu $at, $at, $t9 -/* 05BB70 8005AF70 8C396968 */ lw $t9, %lo(D_800E6968)($at) +/* 05BB70 8005AF70 8C396968 */ lw $t9, %lo(jpt_800E6968)($at) /* 05BB74 8005AF74 00000000 */ nop /* 05BB78 8005AF78 03200008 */ jr $t9 /* 05BB7C 8005AF7C 00000000 */ nop +glabel L8005AF80 /* 05BB80 8005AF80 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BB84 8005AF84 8FA500AC */ lw $a1, 0xac($sp) /* 05BB88 8005AF88 8FA600A0 */ lw $a2, 0xa0($sp) @@ -602,6 +632,7 @@ glabel func_8005A6F0 /* 05BBA0 8005AFA0 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BBA4 8005AFA4 10000082 */ b .L8005B1B0 /* 05BBA8 8005AFA8 240B0001 */ li $t3, 1 +glabel L8005AFAC /* 05BBAC 8005AFAC 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BBB0 8005AFB0 8FA500AC */ lw $a1, 0xac($sp) /* 05BBB4 8005AFB4 8FA600A0 */ lw $a2, 0xa0($sp) @@ -613,6 +644,7 @@ glabel func_8005A6F0 /* 05BBCC 8005AFCC 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BBD0 8005AFD0 10000077 */ b .L8005B1B0 /* 05BBD4 8005AFD4 240B0001 */ li $t3, 1 +glabel L8005AFD8 /* 05BBD8 8005AFD8 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BBDC 8005AFDC 8FA500AC */ lw $a1, 0xac($sp) /* 05BBE0 8005AFE0 8FA600A0 */ lw $a2, 0xa0($sp) @@ -624,6 +656,7 @@ glabel func_8005A6F0 /* 05BBF8 8005AFF8 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BBFC 8005AFFC 1000006C */ b .L8005B1B0 /* 05BC00 8005B000 240B0001 */ li $t3, 1 +glabel L8005B004 /* 05BC04 8005B004 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BC08 8005B008 8FA500AC */ lw $a1, 0xac($sp) /* 05BC0C 8005B00C 8FA600A0 */ lw $a2, 0xa0($sp) @@ -635,6 +668,7 @@ glabel func_8005A6F0 /* 05BC24 8005B024 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BC28 8005B028 10000061 */ b .L8005B1B0 /* 05BC2C 8005B02C 240B0001 */ li $t3, 1 +glabel L8005B030 /* 05BC30 8005B030 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BC34 8005B034 8FA500AC */ lw $a1, 0xac($sp) /* 05BC38 8005B038 8FA600A0 */ lw $a2, 0xa0($sp) @@ -646,6 +680,7 @@ glabel func_8005A6F0 /* 05BC50 8005B050 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BC54 8005B054 10000056 */ b .L8005B1B0 /* 05BC58 8005B058 240B0001 */ li $t3, 1 +glabel L8005B05C /* 05BC5C 8005B05C 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BC60 8005B060 8FA500AC */ lw $a1, 0xac($sp) /* 05BC64 8005B064 8FA600A0 */ lw $a2, 0xa0($sp) @@ -660,6 +695,7 @@ glabel func_8005A6F0 /* 05BC88 8005B088 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BC8C 8005B08C 10000048 */ b .L8005B1B0 /* 05BC90 8005B090 240B0001 */ li $t3, 1 +glabel L8005B094 /* 05BC94 8005B094 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BC98 8005B098 8FA500AC */ lw $a1, 0xac($sp) /* 05BC9C 8005B09C 8FA600A0 */ lw $a2, 0xa0($sp) @@ -674,6 +710,7 @@ glabel func_8005A6F0 /* 05BCC0 8005B0C0 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BCC4 8005B0C4 1000003A */ b .L8005B1B0 /* 05BCC8 8005B0C8 240B0001 */ li $t3, 1 +glabel L8005B0CC /* 05BCCC 8005B0CC 3C0D8012 */ lui $t5, %hi(D_8011D534) # $t5, 0x8012 /* 05BCD0 8005B0D0 25ADD534 */ addiu $t5, %lo(D_8011D534) # addiu $t5, $t5, -0x2acc /* 05BCD4 8005B0D4 8FA400A8 */ lw $a0, 0xa8($sp) @@ -690,6 +727,7 @@ glabel func_8005A6F0 /* 05BD00 8005B100 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BD04 8005B104 1000002A */ b .L8005B1B0 /* 05BD08 8005B108 240B0001 */ li $t3, 1 +glabel L8005B10C /* 05BD0C 8005B10C 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BD10 8005B110 8FA500AC */ lw $a1, 0xac($sp) /* 05BD14 8005B114 8FA600A0 */ lw $a2, 0xa0($sp) @@ -704,6 +742,7 @@ glabel func_8005A6F0 /* 05BD38 8005B138 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BD3C 8005B13C 1000001C */ b .L8005B1B0 /* 05BD40 8005B140 240B0001 */ li $t3, 1 +glabel L8005B144 /* 05BD44 8005B144 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BD48 8005B148 8FA500AC */ lw $a1, 0xac($sp) /* 05BD4C 8005B14C 8FA600A0 */ lw $a2, 0xa0($sp) @@ -718,6 +757,7 @@ glabel func_8005A6F0 /* 05BD70 8005B170 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BD74 8005B174 1000000E */ b .L8005B1B0 /* 05BD78 8005B178 240B0001 */ li $t3, 1 +glabel L8005B17C /* 05BD7C 8005B17C 8FA400A8 */ lw $a0, 0xa8($sp) /* 05BD80 8005B180 8FA500AC */ lw $a1, 0xac($sp) /* 05BD84 8005B184 8FA600A0 */ lw $a2, 0xa0($sp) @@ -732,6 +772,7 @@ glabel func_8005A6F0 /* 05BDA8 8005B1A8 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 /* 05BDAC 8005B1AC 240B0001 */ li $t3, 1 .L8005B1B0: +glabel L8005B1B0 /* 05BDB0 8005B1B0 8FAE0094 */ lw $t6, 0x94($sp) /* 05BDB4 8005B1B4 8FA400A0 */ lw $a0, 0xa0($sp) /* 05BDB8 8005B1B8 11CB0006 */ beq $t6, $t3, .L8005B1D4 diff --git a/asm/non_matchings/unknown_043920/func_8005B818.s b/asm/non_matchings/unknown_043920/func_8005B818.s index 5940fc3a..12682972 100644 --- a/asm/non_matchings/unknown_043920/func_8005B818.s +++ b/asm/non_matchings/unknown_043920/func_8005B818.s @@ -1,3 +1,23 @@ +.late_rodata +glabel D_800E69C0 +.double 0.025 +glabel D_800E69C8 +.double 0.595 +glabel D_800E69D0 +.double 0.004 +glabel D_800E69D8 +.double 1.3 +glabel D_800E69E0 +.double 150.0 +glabel D_800E69E8 +.float 0.01 +.word 0 # Padding +glabel D_800E69F0 +.double 0.01 +glabel D_800E69F8 +.double 35.0 + +.text glabel func_8005B818 /* 05C418 8005B818 27BDFED8 */ addiu $sp, $sp, -0x128 /* 05C41C 8005B81C AFB30050 */ sw $s3, 0x50($sp) diff --git a/src/unknown_043920.c b/src/unknown_043920.c index b412ff4f..f7f6559e 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -120,288 +120,6 @@ const char D_800E6280[] = "%.1f,%.1f,%.1f\n"; const char D_800E6290[] = "Chk ovflow!!\n"; const char D_800E62A0[] = "Back\n"; -const DoubleLiteral D_800E62A8 = { -2500.0 }; -const DoubleLiteral D_800E62B0 = { 0.025 }; -const DoubleLiteral D_800E62B8 = { 0.561 }; -const DoubleLiteral D_800E62C0 = { 0.004 }; -const DoubleLiteral D_800E62C8 = { 0.025 }; -const DoubleLiteral D_800E62D0 = { 0.561 }; -const DoubleLiteral D_800E62D8 = { 0.004 }; -const DoubleLiteral D_800E62E0 = { 0.2 }; -const DoubleLiteral D_800E62E8 = { 0.004 }; -const DoubleLiteral D_800E62F0 = { 0.595 }; -const DoubleLiteral D_800E62F8 = { 0.025 }; -const DoubleLiteral D_800E6300 = { 500.0 }; -const DoubleLiteral D_800E6308 = { 650.0 }; -const DoubleLiteral D_800E6310 = { -0.3 }; - -// Jump table in func_8004447C -const u32 D_800E6318[] = { - 0x800446AC, 0x80044A04, 0x80044A04, 0x80044A04, - 0x80044A04, 0x80044F54, 0x80044A04 -}; - -// Jump table in func_8004447C -const u32 D_800E6334[] = { - 0x80044A2C, 0x80044A44, 0x80044A60, 0x80044A94, - 0x80044ADC, 0x80044AC8 -}; - -const DoubleLiteral D_800E6350 = { 300.0 }; - -// Jump table in func_800452A0 -const u32 D_800E6358[] = { - 0x800456A0, 0x800456A8, 0x800456B0, 0x800456BC, - 0x800456CC, 0x800456D4, 0x800456B0, 0x800456DC -}; - -const FloatLiteral D_800E6378 = { 1000000.0f }; - -// Jump table in -const u32 D_800E637C[] = { - 0x80045ADC, 0x80045AF8, 0x80045B30, 0x80045B30, - 0x80045B58, 0x80045B70, 0x80045BB8, 0x80045ADC -}; - -const DoubleLiteral D_800E63A0 = { 500.0 }; -const DoubleLiteral D_800E63A8 = { 1.15 }; -const DoubleLiteral D_800E63B0 = { 0.016 }; -const DoubleLiteral D_800E63B8 = { 0.016 }; -const DoubleLiteral D_800E63C0 = { 1.2 }; -const DoubleLiteral D_800E63C8 = { 0.046 }; -const DoubleLiteral D_800E63D0 = { 1.2 }; -const FloatLiteral D_800E63D8 = { 1.2f }; -const DoubleLiteral D_800E63E0 = { 0.046 }; -const DoubleLiteral D_800E63E8 = { 0.3 }; -const FloatLiteral D_800E63F0 = { 0.004f }; -const DoubleLiteral D_800E63F8 = { 0.025 }; -const DoubleLiteral D_800E6400 = { 300.0 }; -const DoubleLiteral D_800E6408 = { 0.02 }; -const DoubleLiteral D_800E6410 = { 1.7 }; -const DoubleLiteral D_800E6418 = { 0.35 }; -const DoubleLiteral D_800E6420 = { 0.2 }; -const DoubleLiteral D_800E6428 = { 0.07 }; -const DoubleLiteral D_800E6430 = { 0.8 }; -const DoubleLiteral D_800E6438 = { 0.65 }; -const DoubleLiteral D_800E6440 = { 0.65 }; -const DoubleLiteral D_800E6448 = { 35.0 }; -const FloatLiteral D_800E6450 = { -10000.0f }; -const DoubleLiteral D_800E6458 = { 0.8 }; -const DoubleLiteral D_800E6460 = { 0.05 }; -const FloatLiteral D_800E6468 = { 0.11f }; - -// Jump table in func_80048C7C -const u32 D_800E646C[] = { - 0x80048D40, 0x80048D40, 0x80048E50, 0x80048DAC, - 0x80048E18, 0x80048DB8 -}; - -const DoubleLiteral D_800E6488 = { 0.7 }; -const DoubleLiteral D_800E6490 = { 20.5 }; -const DoubleLiteral D_800E6498 = { 65.0 }; -const DoubleLiteral D_800E64A0 = { 0.16666666666666666 }; -const DoubleLiteral D_800E64A8 = { 1.09 }; -const DoubleLiteral D_800E64B0 = { 0.4 }; -const DoubleLiteral D_800E64B8 = { 0.01 }; -const DoubleLiteral D_800E64C0 = { 0.01 }; -const DoubleLiteral D_800E64C8 = { 0.016 }; -const DoubleLiteral D_800E64D0 = { 1.2 }; -const FloatLiteral D_800E64D8 = { 1.2f }; -const DoubleLiteral D_800E64E0 = { 0.016 }; -const FloatLiteral D_800E64E8 = { 1.4f }; -const FloatLiteral D_800E64EC = { 0.01f }; -const FloatLiteral D_800E64F0 = { 0.02f }; -const FloatLiteral D_800E64F4 = { 0.004f }; -const DoubleLiteral D_800E64F8 = { 0.6 }; -const DoubleLiteral D_800E6500 = { 0.3 }; -const FloatLiteral D_800E6508 = { 1.2f }; -const DoubleLiteral D_800E6510 = { 0.00015 }; -const DoubleLiteral D_800E6518 = { 1.8 }; -const DoubleLiteral D_800E6520 = { 0.4 }; -const FloatLiteral D_800E6528 = { 0.4f }; -const DoubleLiteral D_800E6530 = { 0.058823529411764705 }; -const DoubleLiteral D_800E6538 = { 0.05 }; -const DoubleLiteral D_800E6540 = { 0.65 }; -const DoubleLiteral D_800E6548 = { 0.65 }; -const DoubleLiteral D_800E6550 = { 0.7 }; -const DoubleLiteral D_800E6558 = { 0.4 }; -const DoubleLiteral D_800E6560 = { 0.005555555555555556 }; -const FloatLiteral D_800E6568 = { 0.4f }; -const DoubleLiteral D_800E6570 = { 65.0 }; -const DoubleLiteral D_800E6578 = { 0.2 }; -const FloatLiteral D_800E6580 = { 1.3f }; -const FloatLiteral D_800E6584 = { 0.1f }; -const FloatLiteral D_800E6588 = { 0.002f }; -const FloatLiteral D_800E658C = { 0.01f }; -const DoubleLiteral D_800E6590 = { 1.2 }; -const DoubleLiteral D_800E6598 = { 0.45 }; -const FloatLiteral D_800E65A0 = { -0.02f }; -const FloatLiteral D_800E65A4 = { 0.87f }; -const FloatLiteral D_800E65A8 = { 0.9f }; -const FloatLiteral D_800E65AC = { -10000.0f }; - -// Jump table in func_8004DE38 -const u32 D_800E65B0[] = { - 0x8004EB84, 0x8004EBBC, 0x8004EBD8, 0x8004EBF4, - 0x8004EBA0, 0x8004EC10, 0x8004EC50, 0x8004EC90, - 0x8004EC90, 0x8004ED88, 0x8004EBF4, 0x8004ECD0, - 0x8004ED10, 0x8004ED50 -}; - -const FloatLiteral D_800E65E8 = { 1.12f }; -const FloatLiteral D_800E65EC = { 0.02f }; -const FloatLiteral D_800E65F0 = { -0.02f }; -const FloatLiteral D_800E65F4 = { 265.0f }; -const DoubleLiteral D_800E65F8 = { 1500.0 }; -const DoubleLiteral D_800E6600 = { 0.065 }; -const DoubleLiteral D_800E6608 = { 0.3 }; -const DoubleLiteral D_800E6610 = { 0.1 }; -const DoubleLiteral D_800E6618 = { 0.3 }; -const DoubleLiteral D_800E6620 = { 0.1 }; -const DoubleLiteral D_800E6628 = { 0.004 }; -const DoubleLiteral D_800E6630 = { 0.65 }; -const DoubleLiteral D_800E6638 = { 0.024999999999999998 }; -const DoubleLiteral D_800E6640 = { 0.4 }; -const DoubleLiteral D_800E6648 = { 1.1 }; -const DoubleLiteral D_800E6650 = { -0.3 }; -const DoubleLiteral D_800E6658 = { 0.3 }; -const FloatLiteral D_800E6660 = { 0.02f }; -const DoubleLiteral D_800E6668 = { 0.9 }; -const DoubleLiteral D_800E6670 = { 0.7 }; -const DoubleLiteral D_800E6678 = { 1.7 }; -const DoubleLiteral D_800E6680 = { 0.15 }; -const DoubleLiteral D_800E6688 = { 0.3 }; -const DoubleLiteral D_800E6690 = { 0.32 }; -const DoubleLiteral D_800E6698 = { -0.04 }; -const DoubleLiteral D_800E66A0 = { 0.04 }; -const DoubleLiteral D_800E66A8 = { 0.9 }; -const DoubleLiteral D_800E66B0 = { 0.3 }; -const DoubleLiteral D_800E66B8 = { 0.1 }; -const FloatLiteral D_800E66C0 = { 0.1f }; -const DoubleLiteral D_800E66C8 = { 0.05 }; - -// Jump table in func_8005250C -const u32 D_800E66D0[] = { - 0x80052678, 0x80052978, 0x80052978, 0x800527AC, - 0x8005280C, 0x80052858, 0x800528A4, 0x80052910 -}; - -const DoubleLiteral D_800E66F0 = { 0.97 }; -const DoubleLiteral D_800E66F8 = { 0.87 }; -const DoubleLiteral D_800E6700 = { 0.9 }; -const DoubleLiteral D_800E6708 = { 0.3 }; -const DoubleLiteral D_800E6710 = { 1.6 }; -const DoubleLiteral D_800E6718 = { 0.025 }; -const FloatLiteral D_800E6720 = { 0.45f }; -const DoubleLiteral D_800E6728 = { 0.97 }; -const DoubleLiteral D_800E6730 = { 0.2 }; -const DoubleLiteral D_800E6738 = { 0.2 }; -const DoubleLiteral D_800E6740 = { 1.33 }; -const DoubleLiteral D_800E6748 = { 0.53 }; -const DoubleLiteral D_800E6750 = { 1.8 }; -const FloatLiteral D_800E6758 = { 1.8f }; -const DoubleLiteral D_800E6760 = { 0.2 }; -const DoubleLiteral D_800E6768 = { 0.1 }; -const DoubleLiteral D_800E6770 = { 0.2 }; -const DoubleLiteral D_800E6778 = { 0.05 }; -const DoubleLiteral D_800E6780 = { 0.1 }; -const DoubleLiteral D_800E6788 = { 0.4 }; -const DoubleLiteral D_800E6790 = { 0.1 }; -const DoubleLiteral D_800E6798 = { 1.4 }; -const FloatLiteral D_800E67A0 = { 0.1f }; - -// Jump table in func_80053E9C -const u32 D_800E67A4[] = { - 0x80053FF0, 0x8005406C, 0x800540FC, 0x8005408C, - 0x800540C4, 0x80054098 -}; - -const DoubleLiteral D_800E67C0 = { 20.5 }; -const DoubleLiteral D_800E67C8 = { 0.3 }; -const DoubleLiteral D_800E67D0 = { 0.1 }; -const DoubleLiteral D_800E67D8 = { 0.3 }; -const DoubleLiteral D_800E67E0 = { 0.1 }; -const DoubleLiteral D_800E67E8 = { -0.3 }; -const DoubleLiteral D_800E67F0 = { 0.3 }; -const DoubleLiteral D_800E67F8 = { 0.9 }; -const FloatLiteral D_800E6800 = { 0.02f }; -const DoubleLiteral D_800E6808 = { 1.7 }; -const DoubleLiteral D_800E6810 = { 0.15 }; -const DoubleLiteral D_800E6818 = { 0.32 }; -const DoubleLiteral D_800E6820 = { -0.04 }; -const DoubleLiteral D_800E6828 = { 0.04 }; -const DoubleLiteral D_800E6830 = { 0.9 }; -const DoubleLiteral D_800E6838 = { 1.075 }; -const DoubleLiteral D_800E6840 = { 0.15 }; -const DoubleLiteral D_800E6848 = { 0.7 }; -const FloatLiteral D_800E6850 = { 1500.0f }; - -// Jump table in func_80055EC0 -const u32 D_800E6854[] = { - 0x8005635C, 0x80056370, 0x80056380, 0x8005639C, - 0x800563EC, 0x80056508, 0x8005655C, 0x80056508, - 0x800563EC, 0x80056620, 0x800563CC, 0x80056380, - 0x800565C0, 0x800565E0, 0x80056600, 0x800563EC, - 0x80056828 -}; - -// Jump table in func_80055EC0 -const u32 D_800E6894[] = { - 0x80056834, 0x80056840, 0x8005684C, 0x80056884, - 0x80056884, 0x80056884, 0x80056884, 0x80056884, - 0x80056884, 0x80056874, 0x80056880 -}; - -const FloatLiteral D_800E68C4 = { 10000.0f }; -const FloatLiteral D_800E68C8 = { 10000.0f }; -const FloatLiteral D_800E68CC = { 0.025f }; - -// Jump table in func_80057A40 -const u32 D_800E68D0[] = { - 0x80057BBC, 0x80057BE4, 0x80057CD0, 0x80057C0C, - 0x80057C34, 0x80057C5C, 0x80057C84, 0x80057CAC -}; - -const DoubleLiteral D_800E68F0 = { 91.75 }; -const DoubleLiteral D_800E68F8 = { 90.0 }; -const DoubleLiteral D_800E6900 = { 48.5 }; -const DoubleLiteral D_800E6908 = { 0.95 }; -const DoubleLiteral D_800E6910 = { 65.0 }; -const DoubleLiteral D_800E6918 = { 1.3 }; -const DoubleLiteral D_800E6920 = { -0.2 }; -const DoubleLiteral D_800E6928 = { 1.2 }; -const DoubleLiteral D_800E6930 = { 1.2 }; -const DoubleLiteral D_800E6938 = { 0.8 }; -const DoubleLiteral D_800E6940 = { 0.45 }; -const FloatLiteral D_800E6948 = { -0.02f }; -const FloatLiteral D_800E694C = { 1000000.0f }; -const DoubleLiteral D_800E6950 = { 160000.0 }; -const FloatLiteral D_800E6958 = { 0.8f }; -const DoubleLiteral D_800E6960 = { 160000.0 }; - -// Jump table in func_8005A6F0 -const u32 D_800E6968[] = { - 0x8005AF80, 0x8005AFD8, 0x8005B004, 0x8005B030, - 0x8005AFAC, 0x8005B05C, 0x8005B094, 0x8005B0CC, - 0x8005B0CC, 0x8005B1B0, 0x8005B030, 0x8005B10C, - 0x8005B144, 0x8005B17C -}; - -const DoubleLiteral D_800E69A0 = { 0.9 }; -const FloatLiteral D_800E69A8 = { 0.02f }; -const FloatLiteral D_800E69AC = { -0.02f }; -const FloatLiteral D_800E69B0 = { 265.0f }; -const DoubleLiteral D_800E69B8 = { 1500.0 }; -const DoubleLiteral D_800E69C0 = { 0.025 }; -const DoubleLiteral D_800E69C8 = { 0.595 }; -const DoubleLiteral D_800E69D0 = { 0.004 }; -const DoubleLiteral D_800E69D8 = { 1.3 }; -const DoubleLiteral D_800E69E0 = { 150.0 }; -const FloatLiteral D_800E69E8 = { 0.01f }; -const DoubleLiteral D_800E69F0 = { 0.01 }; -const DoubleLiteral D_800E69F8 = { 35.0 }; -const FloatLiteral D_800E6A00 = { 0.05f }; - /*********************************/ /************ .bss ************/ @@ -630,7 +348,7 @@ void func_800535C4(unk800535C4 *arg0, unk800535C4_2 *arg1) { void func_80053664(Player_64 *arg0) { if (arg0->throttle > 0.0) { - arg0->throttle -= D_800E6768.doubleLiteral; + arg0->throttle -= 0.1; } if (D_8011D528 & 0x8000) { @@ -639,12 +357,12 @@ void func_80053664(Player_64 *arg0) { if (D_8011D528 & 0x4000) { if (arg0->brake < 1.0) { - arg0->brake += D_800E6770.doubleLiteral; + arg0->brake += 0.2; } } else { //! @bug Will cause a negative brake value resulting in higher velocity - if (arg0->brake > D_800E6778.doubleLiteral) { - arg0->brake -= D_800E6780.doubleLiteral; + if (arg0->brake > 0.05) { + arg0->brake -= 0.1; } } } @@ -849,7 +567,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005A6F0.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005B818.s") void func_8005C25C(void) { - D_800DCB9C[0] = D_800E6A00.floatLiteral; + D_800DCB9C[0] = 0.05f; } /* Unknown Size */