diff --git a/asm/non_matchings/unknown_00BC20/func_8000B750.s b/asm/non_matchings/unknown_00BC20/func_8000B750.s index 4a52d8d4..88e3a5ca 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B750.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B750.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E5130 +.float 1.09 +glabel D_800E5134 +.float 1.18 + +.text glabel func_8000B750 /* 00C350 8000B750 27BDFF80 */ addiu $sp, $sp, -0x80 /* 00C354 8000B754 AFB00028 */ sw $s0, 0x28($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000BADC.s b/asm/non_matchings/unknown_00BC20/func_8000BADC.s index 1678da01..f0b093f7 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000BADC.s +++ b/asm/non_matchings/unknown_00BC20/func_8000BADC.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_800E5138 +.float 1.2 +glabel D_800E513C +.float 2.4 +glabel D_800E5140 +.float 4.8 +glabel D_800E5144 +.float 0.05 +glabel D_800E5148 +.float 0.1 + +.text glabel func_8000BADC /* 00C6DC 8000BADC 3C028012 */ lui $v0, %hi(D_8011B008) # $v0, 0x8012 /* 00C6E0 8000BAE0 2442B008 */ addiu $v0, %lo(D_8011B008) # addiu $v0, $v0, -0x4ff8 diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 7d3023f0..c9a79bab 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -1,3 +1,16 @@ +.late_rodata +glabel jpt_800E5154 +.word L8000D974, L8000D974, L8000D974, L8000D974, L8000D974, L8000D98C, L8000D974, L8000D974, L8000D974 +glabel D_800E5178 +.float 0.0099999999 +glabel D_800E517C +.float 0.0099999999 +glabel D_800E5180 +.float 1.4 +glabel D_800E5184 +.float 0.714 + +.text glabel func_8000CC7C /* 00D87C 8000CC7C 27BDFEB0 */ addiu $sp, $sp, -0x150 /* 00D880 8000CC80 3C018012 */ lui $at, %hi(D_8011AD20) # $at, 0x8012 @@ -915,12 +928,13 @@ glabel func_8000CC7C /* 00E550 8000D950 2DE10009 */ sltiu $at, $t7, 9 /* 00E554 8000D954 1020000D */ beqz $at, .L8000D98C /* 00E558 8000D958 000F7880 */ sll $t7, $t7, 2 -/* 00E55C 8000D95C 3C01800E */ lui $at, %hi(D_800E5154) # $at, 0x800e +/* 00E55C 8000D95C 3C01800E */ lui $at, %hi(jpt_800E5154) # $at, 0x800e /* 00E560 8000D960 002F0821 */ addu $at, $at, $t7 -/* 00E564 8000D964 8C2F5154 */ lw $t7, %lo(D_800E5154)($at) +/* 00E564 8000D964 8C2F5154 */ lw $t7, %lo(jpt_800E5154)($at) /* 00E568 8000D968 00000000 */ nop /* 00E56C 8000D96C 01E00008 */ jr $t7 /* 00E570 8000D970 00000000 */ nop +glabel L8000D974 /* 00E574 8000D974 02202025 */ move $a0, $s1 /* 00E578 8000D978 0C0170BC */ jal func_8005C2F0 /* 00E57C 8000D97C 02602825 */ move $a1, $s3 @@ -928,6 +942,7 @@ glabel func_8000CC7C /* 00E584 8000D984 10000003 */ b .L8000D994 /* 00E588 8000D988 24020005 */ li $v0, 5 .L8000D98C: +glabel L8000D98C /* 00E58C 8000D98C 8FA40068 */ lw $a0, 0x68($sp) /* 00E590 8000D990 24020005 */ li $v0, 5 .L8000D994: diff --git a/asm/non_matchings/unknown_00BC20/func_8000E0B0.s b/asm/non_matchings/unknown_00BC20/func_8000E0B0.s index 2833f662..717c2a54 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E0B0.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E0B0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel jpt_800E5188 +.word L8000E104, L8000E0E4, L8000E0F4, L8000E0F4, L8000E0FC, L8000E104, L8000E0FC, L8000E0EC, L8000E104 + +.text glabel func_8000E0B0 /* 00ECB0 8000E0B0 3C0E8012 */ lui $t6, %hi(D_8011AD38) # $t6, 0x8012 /* 00ECB4 8000E0B4 8DCEAD38 */ lw $t6, %lo(D_8011AD38)($t6) @@ -6,20 +11,25 @@ glabel func_8000E0B0 /* 00ECC0 8000E0C0 10200014 */ beqz $at, .L8000E114 /* 00ECC4 8000E0C4 AFBF0014 */ sw $ra, 0x14($sp) /* 00ECC8 8000E0C8 000E7080 */ sll $t6, $t6, 2 -/* 00ECCC 8000E0CC 3C01800E */ lui $at, %hi(D_800E5188) # $at, 0x800e +/* 00ECCC 8000E0CC 3C01800E */ lui $at, %hi(jpt_800E5188) # $at, 0x800e /* 00ECD0 8000E0D0 002E0821 */ addu $at, $at, $t6 -/* 00ECD4 8000E0D4 8C2E5188 */ lw $t6, %lo(D_800E5188)($at) +/* 00ECD4 8000E0D4 8C2E5188 */ lw $t6, %lo(jpt_800E5188)($at) /* 00ECD8 8000E0D8 00000000 */ nop /* 00ECDC 8000E0DC 01C00008 */ jr $t6 /* 00ECE0 8000E0E0 00000000 */ nop +glabel L8000E0E4 /* 00ECE4 8000E0E4 1000000C */ b .L8000E118 /* 00ECE8 8000E0E8 2402FFFF */ li $v0, -1 +glabel L8000E0EC /* 00ECEC 8000E0EC 1000000A */ b .L8000E118 /* 00ECF0 8000E0F0 00001025 */ move $v0, $zero +glabel L8000E0F4 /* 00ECF4 8000E0F4 10000008 */ b .L8000E118 /* 00ECF8 8000E0F8 24020003 */ li $v0, 3 +glabel L8000E0FC /* 00ECFC 8000E0FC 10000006 */ b .L8000E118 /* 00ED00 8000E100 24020002 */ li $v0, 2 +glabel L8000E104 /* 00ED04 8000E104 0C016788 */ jal func_80059E20 /* 00ED08 8000E108 00000000 */ nop /* 00ED0C 8000E10C 10000003 */ b .L8000E11C diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index f8db715a..ac164001 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E51AC +.float 1.4 +glabel D_800E51B0 +.float 0.714 + +.text glabel func_8000E2B4 /* 00EEB4 8000E2B4 3C038012 */ lui $v1, %hi(D_8011AD44) # $v1, 0x8012 /* 00EEB8 8000E2B8 2463AD44 */ addiu $v1, %lo(D_8011AD44) # addiu $v1, $v1, -0x52bc diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index bf1bd880..380ac789 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -1,3 +1,8 @@ +.late_rodata +glabel jpt_800E51B4 +.word L8000ECD8, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000ED98, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000ECF4, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000ED10, L8000EDE0, L8000EDE0, L8000EDE0, L8000ED40, L8000EDE0, L8000EDE0, L8000EDE0, L8000EDE0, L8000ED54 + +.text glabel func_8000EA54 /* 00F654 8000EA54 27BDFF98 */ addiu $sp, $sp, -0x68 /* 00F658 8000EA58 AFBF0024 */ sw $ra, 0x24($sp) @@ -162,12 +167,13 @@ glabel func_8000EA54 /* 00F8B4 8000ECB4 2D410027 */ sltiu $at, $t2, 0x27 /* 00F8B8 8000ECB8 10200049 */ beqz $at, .L8000EDE0 /* 00F8BC 8000ECBC 000A5080 */ sll $t2, $t2, 2 -/* 00F8C0 8000ECC0 3C01800E */ lui $at, %hi(D_800E51B4) # $at, 0x800e +/* 00F8C0 8000ECC0 3C01800E */ lui $at, %hi(jpt_800E51B4) # $at, 0x800e /* 00F8C4 8000ECC4 002A0821 */ addu $at, $at, $t2 -/* 00F8C8 8000ECC8 8C2A51B4 */ lw $t2, %lo(D_800E51B4)($at) +/* 00F8C8 8000ECC8 8C2A51B4 */ lw $t2, %lo(jpt_800E51B4)($at) /* 00F8CC 8000ECCC 00000000 */ nop /* 00F8D0 8000ECD0 01400008 */ jr $t2 /* 00F8D4 8000ECD4 00000000 */ nop +glabel L8000ECD8 /* 00F8D8 8000ECD8 24040007 */ li $a0, 7 /* 00F8DC 8000ECDC 0C01867D */ jal func_800619F4 /* 00F8E0 8000ECE0 AFA6005C */ sw $a2, 0x5c($sp) @@ -175,6 +181,7 @@ glabel func_8000EA54 /* 00F8E8 8000ECE8 8FA7006C */ lw $a3, 0x6c($sp) /* 00F8EC 8000ECEC 1000003D */ b .L8000EDE4 /* 00F8F0 8000ECF0 8FAF002C */ lw $t7, 0x2c($sp) +glabel L8000ECF4 /* 00F8F4 8000ECF4 0C02708A */ jal func_8009C228 /* 00F8F8 8000ECF8 00002025 */ move $a0, $zero /* 00F8FC 8000ECFC A242003A */ sb $v0, 0x3a($s2) @@ -182,6 +189,7 @@ glabel func_8000EA54 /* 00F904 8000ED04 00403025 */ move $a2, $v0 /* 00F908 8000ED08 10000035 */ b .L8000EDE0 /* 00F90C 8000ED0C 24530001 */ addiu $s3, $v0, 1 +glabel L8000ED10 /* 00F910 8000ED10 922B0048 */ lbu $t3, 0x48($s1) /* 00F914 8000ED14 9629000E */ lhu $t1, 0xe($s1) /* 00F918 8000ED18 256CFFFF */ addiu $t4, $t3, -1 @@ -194,11 +202,13 @@ glabel func_8000EA54 /* 00F934 8000ED34 24D30001 */ addiu $s3, $a2, 1 /* 00F938 8000ED38 10000029 */ b .L8000EDE0 /* 00F93C 8000ED3C A246003A */ sb $a2, 0x3a($s2) +glabel L8000ED40 /* 00F940 8000ED40 92260017 */ lbu $a2, 0x17($s1) /* 00F944 8000ED44 00000000 */ nop /* 00F948 8000ED48 24D30001 */ addiu $s3, $a2, 1 /* 00F94C 8000ED4C 10000024 */ b .L8000EDE0 /* 00F950 8000ED50 A246003A */ sb $a2, 0x3a($s2) +glabel L8000ED54 /* 00F954 8000ED54 9638000E */ lhu $t8, 0xe($s1) /* 00F958 8000ED58 00009825 */ move $s3, $zero /* 00F95C 8000ED5C 24020003 */ li $v0, 3 @@ -218,6 +228,7 @@ glabel func_8000EA54 /* 00F98C 8000ED8C A246003A */ sb $a2, 0x3a($s2) /* 00F990 8000ED90 10000013 */ b .L8000EDE0 /* 00F994 8000ED94 24D30001 */ addiu $s3, $a2, 1 +glabel L8000ED98 /* 00F998 8000ED98 24130001 */ li $s3, 1 /* 00F99C 8000ED9C 0C027B1C */ jal is_in_adventure_two /* 00F9A0 8000EDA0 AFA6005C */ sw $a2, 0x5c($sp) @@ -238,6 +249,7 @@ glabel func_8000EA54 /* 00F9D8 8000EDD8 8FA7006C */ lw $a3, 0x6c($sp) /* 00F9DC 8000EDDC 00000000 */ nop .L8000EDE0: +glabel L8000EDE0 /* 00F9E0 8000EDE0 8FAF002C */ lw $t7, 0x2c($sp) .L8000EDE4: /* 00F9E4 8000EDE4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_800101AC.s b/asm/non_matchings/unknown_00BC20/func_800101AC.s index 72ab0216..11c0f4c4 100644 --- a/asm/non_matchings/unknown_00BC20/func_800101AC.s +++ b/asm/non_matchings/unknown_00BC20/func_800101AC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel jpt_800E5250 +.word L80010374, L800105F8, L800105F8, L800105F8, L80010400, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L80010400, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800104C0, L800105F8, L800105F8, L800105A8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105D0, L800105E4, L800105F8, L800105F8, L800105F8, L800105F8, L800104D8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800104AC, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105A8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L80010508, L800105F8, L80010374, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L8001047C, L8001047C, L800105F8, L800105F8, L800105F8, L8001047C, L8001047C, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L800105F8, L8001044C +glabel jpt_800E5420 +.word L8001063C, L8001063C, L80010664, L8001063C, L8001063C, L80010664, L8001063C, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L8001063C, L80010664, L8001063C, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L8001063C, L8001063C, L80010664, L80010664, L8001063C, L8001063C, L8001063C, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L8001063C, L8001063C, L80010664, L80010664, L80010664, L8001063C, L8001063C, L8001063C, L8001063C, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L80010664, L8001063C, L80010664, L8001063C, L80010664, L80010664, L80010664, L8001063C + +.text glabel func_800101AC /* 010DAC 800101AC 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 010DB0 800101B0 AFBF0034 */ sw $ra, 0x34($sp) @@ -117,12 +124,13 @@ glabel func_800101AC /* 010F50 80010350 2D810074 */ sltiu $at, $t4, 0x74 /* 010F54 80010354 102000A8 */ beqz $at, .L800105F8 /* 010F58 80010358 000C6080 */ sll $t4, $t4, 2 -/* 010F5C 8001035C 3C01800E */ lui $at, %hi(D_800E5250) # $at, 0x800e +/* 010F5C 8001035C 3C01800E */ lui $at, %hi(jpt_800E5250) # $at, 0x800e /* 010F60 80010360 002C0821 */ addu $at, $at, $t4 -/* 010F64 80010364 8C2C5250 */ lw $t4, %lo(D_800E5250)($at) +/* 010F64 80010364 8C2C5250 */ lw $t4, %lo(jpt_800E5250)($at) /* 010F68 80010368 00000000 */ nop /* 010F6C 8001036C 01800008 */ jr $t4 /* 010F70 80010370 00000000 */ nop +glabel L80010374 /* 010F74 80010374 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012 /* 010F78 80010378 8C63AE5C */ lw $v1, %lo(objCount)($v1) /* 010F7C 8001037C 0000A825 */ move $s5, $zero @@ -161,6 +169,7 @@ glabel func_800101AC .L800103F8: /* 010FF8 800103F8 10000080 */ b .L800105FC /* 010FFC 800103FC 24140012 */ li $s4, 18 +glabel L80010400 /* 011000 80010400 8ED00064 */ lw $s0, 0x64($s6) /* 011004 80010404 00000000 */ nop /* 011008 80010408 8E04001C */ lw $a0, 0x1c($s0) @@ -181,6 +190,7 @@ glabel func_800101AC .L80010444: /* 011044 80010444 1000006D */ b .L800105FC /* 011048 80010448 24140012 */ li $s4, 18 +glabel L8001044C /* 01104C 8001044C 8ED00064 */ lw $s0, 0x64($s6) /* 011050 80010450 00000000 */ nop /* 011054 80010454 8E04001C */ lw $a0, 0x1c($s0) @@ -194,6 +204,7 @@ glabel func_800101AC .L80010474: /* 011074 80010474 10000061 */ b .L800105FC /* 011078 80010478 24140012 */ li $s4, 18 +glabel L8001047C /* 01107C 8001047C 8EC20064 */ lw $v0, 0x64($s6) /* 011080 80010480 00000000 */ nop /* 011084 80010484 8C430020 */ lw $v1, 0x20($v0) @@ -207,17 +218,20 @@ glabel func_800101AC .L800104A4: /* 0110A4 800104A4 10000055 */ b .L800105FC /* 0110A8 800104A8 24140012 */ li $s4, 18 +glabel L800104AC /* 0110AC 800104AC 0C02FCF9 */ jal func_800BF3E4 /* 0110B0 800104B0 02C02025 */ move $a0, $s6 /* 0110B4 800104B4 86C50048 */ lh $a1, 0x48($s6) /* 0110B8 800104B8 10000050 */ b .L800105FC /* 0110BC 800104BC 24140012 */ li $s4, 18 +glabel L800104C0 /* 0110C0 800104C0 8EC40064 */ lw $a0, 0x64($s6) /* 0110C4 800104C4 0C00CAEB */ jal func_80032BAC /* 0110C8 800104C8 00000000 */ nop /* 0110CC 800104CC 86C50048 */ lh $a1, 0x48($s6) /* 0110D0 800104D0 1000004A */ b .L800105FC /* 0110D4 800104D4 24140012 */ li $s4, 18 +glabel L800104D8 /* 0110D8 800104D8 8EC40064 */ lw $a0, 0x64($s6) /* 0110DC 800104DC 8FB9003C */ lw $t9, 0x3c($sp) /* 0110E0 800104E0 10800007 */ beqz $a0, .L80010500 @@ -231,6 +245,7 @@ glabel func_800101AC .L80010500: /* 011100 80010500 1000003E */ b .L800105FC /* 011104 80010504 24140012 */ li $s4, 18 +glabel L80010508 /* 011108 80010508 3C048012 */ lui $a0, %hi(D_8011AE00) # $a0, 0x8012 /* 01110C 8001050C 2484AE00 */ addiu $a0, %lo(D_8011AE00) # addiu $a0, $a0, -0x5200 /* 011110 80010510 80830000 */ lb $v1, ($a0) @@ -275,6 +290,7 @@ glabel func_800101AC /* 01119C 8001059C 86C50048 */ lh $a1, 0x48($s6) /* 0111A0 800105A0 10000016 */ b .L800105FC /* 0111A4 800105A4 00009825 */ move $s3, $zero +glabel L800105A8 /* 0111A8 800105A8 8EC40064 */ lw $a0, 0x64($s6) /* 0111AC 800105AC 00000000 */ nop /* 0111B0 800105B0 10800005 */ beqz $a0, .L800105C8 @@ -286,17 +302,20 @@ glabel func_800101AC .L800105C8: /* 0111C8 800105C8 1000000C */ b .L800105FC /* 0111CC 800105CC 24140012 */ li $s4, 18 +glabel L800105D0 /* 0111D0 800105D0 0C02B220 */ jal func_800AC880 /* 0111D4 800105D4 02C02025 */ move $a0, $s6 /* 0111D8 800105D8 86C50048 */ lh $a1, 0x48($s6) /* 0111DC 800105DC 10000007 */ b .L800105FC /* 0111E0 800105E0 24140012 */ li $s4, 18 +glabel L800105E4 /* 0111E4 800105E4 0C02B3E6 */ jal func_800ACF98 /* 0111E8 800105E8 02C02025 */ move $a0, $s6 /* 0111EC 800105EC 86C50048 */ lh $a1, 0x48($s6) /* 0111F0 800105F0 10000002 */ b .L800105FC /* 0111F4 800105F4 24140012 */ li $s4, 18 .L800105F8: +glabel L800105F8 /* 0111F8 800105F8 24140012 */ li $s4, 18 .L800105FC: /* 0111FC 800105FC 28A1000D */ slti $at, $a1, 0xd @@ -306,9 +325,9 @@ glabel func_800101AC /* 01120C 8001060C 2F210046 */ sltiu $at, $t9, 0x46 /* 011210 80010610 10200014 */ beqz $at, .L80010664 /* 011214 80010614 0019C880 */ sll $t9, $t9, 2 -/* 011218 80010618 3C01800E */ lui $at, %hi(D_800E5420) # $at, 0x800e +/* 011218 80010618 3C01800E */ lui $at, %hi(jpt_800E5420) # $at, 0x800e /* 01121C 8001061C 00390821 */ addu $at, $at, $t9 -/* 011220 80010620 8C395420 */ lw $t9, %lo(D_800E5420)($at) +/* 011220 80010620 8C395420 */ lw $t9, %lo(jpt_800E5420)($at) /* 011224 80010624 00000000 */ nop /* 011228 80010628 03200008 */ jr $t9 /* 01122C 8001062C 00000000 */ nop @@ -316,6 +335,7 @@ glabel func_800101AC /* 011230 80010630 2401000C */ li $at, 12 /* 011234 80010634 1441000C */ bne $v0, $at, .L80010668 /* 011238 80010638 24010001 */ li $at, 1 +glabel L8001063C /* 01123C 8001063C 8EC20064 */ lw $v0, 0x64($s6) /* 011240 80010640 00000000 */ nop /* 011244 80010644 8C440018 */ lw $a0, 0x18($v0) @@ -327,6 +347,7 @@ glabel func_800101AC /* 01125C 8001065C 86C50048 */ lh $a1, 0x48($s6) /* 011260 80010660 00000000 */ nop .L80010664: +glabel L80010664 /* 011264 80010664 24010001 */ li $at, 1 .L80010668: /* 011268 80010668 14A10061 */ bne $a1, $at, .L800107F0 diff --git a/asm/non_matchings/unknown_00BC20/func_80011570.s b/asm/non_matchings/unknown_00BC20/func_80011570.s index d7a3b9c3..bb5a8071 100644 --- a/asm/non_matchings/unknown_00BC20/func_80011570.s +++ b/asm/non_matchings/unknown_00BC20/func_80011570.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_800E5538 +.double 1000.0 +glabel D_800E5540 +.double 3000.0 +glabel D_800E5548 +.double 500.0 + +.text glabel func_80011570 /* 012170 80011570 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 012174 80011574 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80011AD0.s b/asm/non_matchings/unknown_00BC20/func_80011AD0.s index edf6f216..d99bcbb1 100644 --- a/asm/non_matchings/unknown_00BC20/func_80011AD0.s +++ b/asm/non_matchings/unknown_00BC20/func_80011AD0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E5550 +.float 0.01 + +.text glabel func_80011AD0 /* 0126D0 80011AD0 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0126D4 80011AD4 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80012F94.s b/asm/non_matchings/unknown_00BC20/func_80012F94.s index b1a64273..fb1d4872 100644 --- a/asm/non_matchings/unknown_00BC20/func_80012F94.s +++ b/asm/non_matchings/unknown_00BC20/func_80012F94.s @@ -1,3 +1,16 @@ +.late_rodata +glabel D_800E5554 +.float 0.2 +glabel D_800E5558 +.float 0.05 +glabel D_800E555C +.float 3500.0 +glabel D_800E5560 +.float 2700.0 +glabel D_800E5564 +.float 0.6 + +.text glabel func_80012F94 /* 013B94 80012F94 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 013B98 80012F98 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_800135B8.s b/asm/non_matchings/unknown_00BC20/func_800135B8.s index 7a8e2b3e..fa2f4bbc 100644 --- a/asm/non_matchings/unknown_00BC20/func_800135B8.s +++ b/asm/non_matchings/unknown_00BC20/func_800135B8.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E5568 +.float 1.15 + +.text glabel func_800135B8 /* 0141B8 800135B8 27BDFF88 */ addiu $sp, $sp, -0x78 /* 0141BC 800135BC AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80013A0C.s b/asm/non_matchings/unknown_00BC20/func_80013A0C.s index f08385f9..de3e1e6c 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013A0C.s +++ b/asm/non_matchings/unknown_00BC20/func_80013A0C.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_800E556C +.float 0.05 +glabel D_800E5570 +.float 0.95 +.word 0 # Padding +glabel D_800E5578 +.double 0.1 + +.text glabel func_80013A0C /* 01460C 80013A0C 27BDFF98 */ addiu $sp, $sp, -0x68 /* 014610 80013A10 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80013DCC.s b/asm/non_matchings/unknown_00BC20/func_80013DCC.s index 1becf18d..8f9b02cd 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013DCC.s +++ b/asm/non_matchings/unknown_00BC20/func_80013DCC.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E5580 +.float 0.02 +glabel D_800E5584 +.float 0.98 + +.text glabel func_80013DCC /* 0149CC 80013DCC 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 0149D0 80013DD0 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80014B50.s b/asm/non_matchings/unknown_00BC20/func_80014B50.s index 6bebda90..0269af6a 100644 --- a/asm/non_matchings/unknown_00BC20/func_80014B50.s +++ b/asm/non_matchings/unknown_00BC20/func_80014B50.s @@ -1,3 +1,8 @@ +.late_rodata +glabel jpt_800E5588 +.word L80014B80, L80014CCC, L80014E18, L80015340, L80015340, L80015340, L80015340, L80015340, L80014F64, L800150B0, L800151FC + +.text glabel func_80014B50 /* 015750 80014B50 44866000 */ mtc1 $a2, $f12 /* 015754 80014B54 2CE1000B */ sltiu $at, $a3, 0xb @@ -5,12 +10,13 @@ glabel func_80014B50 /* 01575C 80014B5C 102001F8 */ beqz $at, .L80015340 /* 015760 80014B60 00A01825 */ move $v1, $a1 /* 015764 80014B64 00077080 */ sll $t6, $a3, 2 -/* 015768 80014B68 3C01800E */ lui $at, %hi(D_800E5588) # $at, 0x800e +/* 015768 80014B68 3C01800E */ lui $at, %hi(jpt_800E5588) # $at, 0x800e /* 01576C 80014B6C 002E0821 */ addu $at, $at, $t6 -/* 015770 80014B70 8C2E5588 */ lw $t6, %lo(D_800E5588)($at) +/* 015770 80014B70 8C2E5588 */ lw $t6, %lo(jpt_800E5588)($at) /* 015774 80014B74 00000000 */ nop /* 015778 80014B78 01C00008 */ jr $t6 /* 01577C 80014B7C 00000000 */ nop +glabel L80014B80 /* 015780 80014B80 00A4082A */ slt $at, $a1, $a0 /* 015784 80014B84 142001EE */ bnez $at, .L80015340 /* 015788 80014B88 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 @@ -103,6 +109,7 @@ glabel func_80014B50 /* 0158C4 80014CC4 03E00008 */ jr $ra /* 0158C8 80014CC8 00801025 */ move $v0, $a0 +glabel L80014CCC /* 0158CC 80014CCC 00A4082A */ slt $at, $a1, $a0 /* 0158D0 80014CD0 1420019B */ bnez $at, .L80015340 /* 0158D4 80014CD4 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 @@ -195,6 +202,7 @@ glabel func_80014B50 /* 015A10 80014E10 03E00008 */ jr $ra /* 015A14 80014E14 00801025 */ move $v0, $a0 +glabel L80014E18 /* 015A18 80014E18 00A4082A */ slt $at, $a1, $a0 /* 015A1C 80014E1C 14200148 */ bnez $at, .L80015340 /* 015A20 80014E20 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 @@ -287,6 +295,7 @@ glabel func_80014B50 /* 015B5C 80014F5C 03E00008 */ jr $ra /* 015B60 80014F60 00801025 */ move $v0, $a0 +glabel L80014F64 /* 015B64 80014F64 00A4082A */ slt $at, $a1, $a0 /* 015B68 80014F68 142000F5 */ bnez $at, .L80015340 /* 015B6C 80014F6C 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 @@ -379,6 +388,7 @@ glabel func_80014B50 /* 015CA8 800150A8 03E00008 */ jr $ra /* 015CAC 800150AC 00801025 */ move $v0, $a0 +glabel L800150B0 /* 015CB0 800150B0 00A4082A */ slt $at, $a1, $a0 /* 015CB4 800150B4 142000A2 */ bnez $at, .L80015340 /* 015CB8 800150B8 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 @@ -471,6 +481,7 @@ glabel func_80014B50 /* 015DF4 800151F4 03E00008 */ jr $ra /* 015DF8 800151F8 00801025 */ move $v0, $a0 +glabel L800151FC /* 015DFC 800151FC 00A4082A */ slt $at, $a1, $a0 /* 015E00 80015200 1420004F */ bnez $at, .L80015340 /* 015E04 80015204 3C0A8012 */ lui $t2, %hi(objPtrList) # $t2, 0x8012 @@ -561,6 +572,7 @@ glabel func_80014B50 /* 015F38 80015338 1020FFB5 */ beqz $at, .L80015210 /* 015F3C 8001533C 0064082A */ slt $at, $v1, $a0 .L80015340: +glabel L80015340 /* 015F40 80015340 03E00008 */ jr $ra /* 015F44 80015344 00801025 */ move $v0, $a0 diff --git a/asm/non_matchings/unknown_00BC20/func_800159C8.s b/asm/non_matchings/unknown_00BC20/func_800159C8.s index c98d89e1..d674ce00 100644 --- a/asm/non_matchings/unknown_00BC20/func_800159C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800159C8.s @@ -1,3 +1,22 @@ +.late_rodata +glabel D_800E55B8 +.double 0.3 +glabel D_800E55C0 +.double 0.3 +glabel D_800E55C8 +.double 0.8 +glabel D_800E55D0 +.double 0.1 +glabel D_800E55D8 +.double 0.1 +glabel D_800E55E0 +.double 0.3 +glabel D_800E55E8 +.double 0.3 +glabel D_800E55F0 +.double 0.1 + +.text glabel func_800159C8 /* 0165C8 800159C8 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 0165CC 800159CC AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80016748.s b/asm/non_matchings/unknown_00BC20/func_80016748.s index 735e8599..a31b8785 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016748.s +++ b/asm/non_matchings/unknown_00BC20/func_80016748.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E55F8 +.double 0.3 +glabel D_800E5600 +.double 0.1 + +.text glabel func_80016748 /* 017348 80016748 27BDFF10 */ addiu $sp, $sp, -0xf0 /* 01734C 8001674C AFBF007C */ sw $ra, 0x7c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80017A18.s b/asm/non_matchings/unknown_00BC20/func_80017A18.s index fe772f57..e9d175c5 100644 --- a/asm/non_matchings/unknown_00BC20/func_80017A18.s +++ b/asm/non_matchings/unknown_00BC20/func_80017A18.s @@ -1,3 +1,12 @@ +.late_rodata +glabel D_800E5608 +.double -0.1 +glabel D_800E5610 +.double -0.1 +glabel D_800E5618 +.double 0.707 + +.text glabel func_80017A18 /* 018618 80017A18 27BDFEE0 */ addiu $sp, $sp, -0x120 /* 01861C 80017A1C AFBF005C */ sw $ra, 0x5c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_800185E4.s b/asm/non_matchings/unknown_00BC20/func_800185E4.s index 91c53a4d..c14c05b7 100644 --- a/asm/non_matchings/unknown_00BC20/func_800185E4.s +++ b/asm/non_matchings/unknown_00BC20/func_800185E4.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E5620 +.double -0.3 +glabel D_800E5628 +.double 1.3 + +.text glabel func_800185E4 /* 0191E4 800185E4 27BDFF88 */ addiu $sp, $sp, -0x78 /* 0191E8 800185E8 3C028012 */ lui $v0, %hi(D_8011AED0) # $v0, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_8001955C.s b/asm/non_matchings/unknown_00BC20/func_8001955C.s index c840d476..f2b5cef5 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001955C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001955C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E5630 +.double 500.0 + +.text glabel func_8001955C /* 01A15C 8001955C 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 01A160 80019560 AFB60040 */ sw $s6, 0x40($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8001BF20.s b/asm/non_matchings/unknown_00BC20/func_8001BF20.s index 7695645c..aec05458 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001BF20.s +++ b/asm/non_matchings/unknown_00BC20/func_8001BF20.s @@ -1,3 +1,10 @@ +.late_rodata +glabel D_800E5638 +.float -20000.0 +glabel D_800E563C +.float -10000.0 + +.text glabel func_8001BF20 /* 01CB20 8001BF20 27BDFE70 */ addiu $sp, $sp, -0x190 /* 01CB24 8001BF24 3C028012 */ lui $v0, %hi(D_8011AF10) # $v0, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_8001C418.s b/asm/non_matchings/unknown_00BC20/func_8001C418.s index f1559d48..414d020e 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001C418.s +++ b/asm/non_matchings/unknown_00BC20/func_8001C418.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E5640 +.float -20000.0 + +.text glabel func_8001C418 /* 01D018 8001C418 3C01800E */ lui $at, %hi(D_800E5640) # $at, 0x800e /* 01D01C 8001C41C 3C048012 */ lui $a0, %hi(D_8011AF18) # $a0, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_8001C6C4.s b/asm/non_matchings/unknown_00BC20/func_8001C6C4.s index b2430e4b..ed14d98e 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001C6C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001C6C4.s @@ -1,3 +1,15 @@ +.late_rodata +glabel D_800E5644 +.float 50000.0 +glabel D_800E5648 +.double 1.2 +glabel D_800E5650 +.float 0.01 +.word 0 # Padding +glabel D_800E5658 +.double 255.0 + +.text glabel func_8001C6C4 /* 01D2C4 8001C6C4 27BDFF18 */ addiu $sp, $sp, -0xe8 /* 01D2C8 8001C6C8 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 diff --git a/asm/non_matchings/unknown_00BC20/func_8001D2A0.s b/asm/non_matchings/unknown_00BC20/func_8001D2A0.s index 1d051d0c..d8898f21 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001D2A0.s +++ b/asm/non_matchings/unknown_00BC20/func_8001D2A0.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E5660 +.float 1.99 + +.text glabel func_8001D2A0 /* 01DEA0 8001D2A0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 01DEA4 8001D2A4 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8001EFA4.s b/asm/non_matchings/unknown_00BC20/func_8001EFA4.s index b33b84c9..e4176f0b 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001EFA4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001EFA4.s @@ -1,3 +1,8 @@ +.late_rodata +glabel D_800E5668 +.double 0.1 + +.text glabel func_8001EFA4 /* 01FBA4 8001EFA4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 01FBA8 8001EFA8 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8001F460.s b/asm/non_matchings/unknown_00BC20/func_8001F460.s index 83c340d0..3895b23e 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F460.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F460.s @@ -1,3 +1,13 @@ +.late_rodata +glabel D_800E5670 +.double 1.2 +glabel D_800E5678 +.float 0.01 +.word 0 # Padding +glabel D_800E5680 +.double 0.1 + +.text glabel func_8001F460 /* 020060 8001F460 27BDFE68 */ addiu $sp, $sp, -0x198 /* 020064 8001F464 3C0E8012 */ lui $t6, %hi(D_8011AE7A) # $t6, 0x8012 diff --git a/asm/non_matchings/unknown_00BC20/func_800235DC.s b/asm/non_matchings/unknown_00BC20/func_800235DC.s index 793525af..aab10d33 100644 --- a/asm/non_matchings/unknown_00BC20/func_800235DC.s +++ b/asm/non_matchings/unknown_00BC20/func_800235DC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel jpt_800E5688 +.word L80023614, L800238A8, L80023808, L80023650, L800236DC, L800238A8, L8002363C, L80023664, L80023678, L800238A8, L800238A8, L80023790, L800238A8, L80023628, L800238A8, L8002368C, L800236F0, L800236DC, L80023678, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800236B4, L800238A8, L800236C8, L800236A0, L80023754, L80023704, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L80023718, L800238A8, L8002372C, L800236A0, L800238A8, L800238A8, L800238A8, L80023740, L800238A8, L80023830, L800238A8, L800238A8, L80023790, L80023790, L800238A8, L80023790, L80023790, L800236A0, L80023790, L800238A8, L800238A8, L800238A8, L800238A8, L800237E0, L80023754, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L80023790, L800237A4, L80023790, L800238A8, L8002386C, L800238A8, L800238A8, L80023754, L800238A8, L80023768, L80023790, L80023790, L800238A8, L8002377C, L80023790, L80023790, L80023790, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L80023858, L800238A8, L80023790, L80023790, L800238A8, L800238A8, L800238A8, L80023790, L80023790, L80023790, L80023790, L800238A8, L800238A8, L800238A8, L800238A8, L80023880, L800238A8, L80023628, L800237B8, L80023790, L800238A8, L80023790, L80023894, L800238A8, L800237CC, L80023790 + +.text glabel func_800235DC /* 0241DC 800235DC 8C8E0040 */ lw $t6, 0x40($a0) /* 0241E0 800235E0 AC850064 */ sw $a1, 0x64($a0) @@ -7,150 +12,174 @@ glabel func_800235DC /* 0241F0 800235F0 2F010077 */ sltiu $at, $t8, 0x77 /* 0241F4 800235F4 102000AC */ beqz $at, .L800238A8 /* 0241F8 800235F8 0018C080 */ sll $t8, $t8, 2 -/* 0241FC 800235FC 3C01800E */ lui $at, %hi(D_800E5688) # $at, 0x800e +/* 0241FC 800235FC 3C01800E */ lui $at, %hi(jpt_800E5688) # $at, 0x800e /* 024200 80023600 00380821 */ addu $at, $at, $t8 -/* 024204 80023604 8C385688 */ lw $t8, %lo(D_800E5688)($at) +/* 024204 80023604 8C385688 */ lw $t8, %lo(jpt_800E5688)($at) /* 024208 80023608 00000000 */ nop /* 02420C 8002360C 03000008 */ jr $t8 /* 024210 80023610 00000000 */ nop +glabel L80023614 /* 024214 80023614 24030224 */ li $v1, 548 /* 024218 80023618 2401FFFC */ li $at, -4 /* 02421C 8002361C 00611024 */ and $v0, $v1, $at /* 024220 80023620 03E00008 */ jr $ra /* 024224 80023624 24420004 */ addiu $v0, $v0, 4 +glabel L80023628 /* 024228 80023628 24030018 */ li $v1, 24 /* 02422C 8002362C 2401FFFC */ li $at, -4 /* 024230 80023630 00611024 */ and $v0, $v1, $at /* 024234 80023634 03E00008 */ jr $ra /* 024238 80023638 24420004 */ addiu $v0, $v0, 4 +glabel L8002363C /* 02423C 8002363C 24030018 */ li $v1, 24 /* 024240 80023640 2401FFFC */ li $at, -4 /* 024244 80023644 00611024 */ and $v0, $v1, $at /* 024248 80023648 03E00008 */ jr $ra /* 02424C 8002364C 24420004 */ addiu $v0, $v0, 4 +glabel L80023650 /* 024250 80023650 2403000C */ li $v1, 12 /* 024254 80023654 2401FFFC */ li $at, -4 /* 024258 80023658 00611024 */ and $v0, $v1, $at /* 02425C 8002365C 03E00008 */ jr $ra /* 024260 80023660 24420004 */ addiu $v0, $v0, 4 +glabel L80023664 /* 024264 80023664 24030010 */ li $v1, 16 /* 024268 80023668 2401FFFC */ li $at, -4 /* 02426C 8002366C 00611024 */ and $v0, $v1, $at /* 024270 80023670 03E00008 */ jr $ra /* 024274 80023674 24420004 */ addiu $v0, $v0, 4 +glabel L80023678 /* 024278 80023678 24030014 */ li $v1, 20 /* 02427C 8002367C 2401FFFC */ li $at, -4 /* 024280 80023680 00611024 */ and $v0, $v1, $at /* 024284 80023684 03E00008 */ jr $ra /* 024288 80023688 24420004 */ addiu $v0, $v0, 4 +glabel L8002368C /* 02428C 8002368C 2403001C */ li $v1, 28 /* 024290 80023690 2401FFFC */ li $at, -4 /* 024294 80023694 00611024 */ and $v0, $v1, $at /* 024298 80023698 03E00008 */ jr $ra /* 02429C 8002369C 24420004 */ addiu $v0, $v0, 4 +glabel L800236A0 /* 0242A0 800236A0 24030018 */ li $v1, 24 /* 0242A4 800236A4 2401FFFC */ li $at, -4 /* 0242A8 800236A8 00611024 */ and $v0, $v1, $at /* 0242AC 800236AC 03E00008 */ jr $ra /* 0242B0 800236B0 24420004 */ addiu $v0, $v0, 4 +glabel L800236B4 /* 0242B4 800236B4 24030006 */ li $v1, 6 /* 0242B8 800236B8 2401FFFC */ li $at, -4 /* 0242BC 800236BC 00611024 */ and $v0, $v1, $at /* 0242C0 800236C0 03E00008 */ jr $ra /* 0242C4 800236C4 24420004 */ addiu $v0, $v0, 4 +glabel L800236C8 /* 0242C8 800236C8 2403000C */ li $v1, 12 /* 0242CC 800236CC 2401FFFC */ li $at, -4 /* 0242D0 800236D0 00611024 */ and $v0, $v1, $at /* 0242D4 800236D4 03E00008 */ jr $ra /* 0242D8 800236D8 24420004 */ addiu $v0, $v0, 4 +glabel L800236DC /* 0242DC 800236DC 24030020 */ li $v1, 32 /* 0242E0 800236E0 2401FFFC */ li $at, -4 /* 0242E4 800236E4 00611024 */ and $v0, $v1, $at /* 0242E8 800236E8 03E00008 */ jr $ra /* 0242EC 800236EC 24420004 */ addiu $v0, $v0, 4 +glabel L800236F0 /* 0242F0 800236F0 24030008 */ li $v1, 8 /* 0242F4 800236F4 2401FFFC */ li $at, -4 /* 0242F8 800236F8 00611024 */ and $v0, $v1, $at /* 0242FC 800236FC 03E00008 */ jr $ra /* 024300 80023700 24420004 */ addiu $v0, $v0, 4 +glabel L80023704 /* 024304 80023704 2403000C */ li $v1, 12 /* 024308 80023708 2401FFFC */ li $at, -4 /* 02430C 8002370C 00611024 */ and $v0, $v1, $at /* 024310 80023710 03E00008 */ jr $ra /* 024314 80023714 24420004 */ addiu $v0, $v0, 4 +glabel L80023718 /* 024318 80023718 24030008 */ li $v1, 8 /* 02431C 8002371C 2401FFFC */ li $at, -4 /* 024320 80023720 00611024 */ and $v0, $v1, $at /* 024324 80023724 03E00008 */ jr $ra /* 024328 80023728 24420004 */ addiu $v0, $v0, 4 +glabel L8002372C /* 02432C 8002372C 24030018 */ li $v1, 24 /* 024330 80023730 2401FFFC */ li $at, -4 /* 024334 80023734 00611024 */ and $v0, $v1, $at /* 024338 80023738 03E00008 */ jr $ra /* 02433C 8002373C 24420004 */ addiu $v0, $v0, 4 +glabel L80023740 /* 024340 80023740 2403000C */ li $v1, 12 /* 024344 80023744 2401FFFC */ li $at, -4 /* 024348 80023748 00611024 */ and $v0, $v1, $at /* 02434C 8002374C 03E00008 */ jr $ra /* 024350 80023750 24420004 */ addiu $v0, $v0, 4 +glabel L80023754 /* 024354 80023754 24030038 */ li $v1, 56 /* 024358 80023758 2401FFFC */ li $at, -4 /* 02435C 8002375C 00611024 */ and $v0, $v1, $at /* 024360 80023760 03E00008 */ jr $ra /* 024364 80023764 24420004 */ addiu $v0, $v0, 4 +glabel L80023768 /* 024368 80023768 24030014 */ li $v1, 20 /* 02436C 8002376C 2401FFFC */ li $at, -4 /* 024370 80023770 00611024 */ and $v0, $v1, $at /* 024374 80023774 03E00008 */ jr $ra /* 024378 80023778 24420004 */ addiu $v0, $v0, 4 +glabel L8002377C /* 02437C 8002377C 24030010 */ li $v1, 16 /* 024380 80023780 2401FFFC */ li $at, -4 /* 024384 80023784 00611024 */ and $v0, $v1, $at /* 024388 80023788 03E00008 */ jr $ra /* 02438C 8002378C 24420004 */ addiu $v0, $v0, 4 +glabel L80023790 /* 024390 80023790 24030048 */ li $v1, 72 /* 024394 80023794 2401FFFC */ li $at, -4 /* 024398 80023798 00611024 */ and $v0, $v1, $at /* 02439C 8002379C 03E00008 */ jr $ra /* 0243A0 800237A0 24420004 */ addiu $v0, $v0, 4 +glabel L800237A4 /* 0243A4 800237A4 24030044 */ li $v1, 68 /* 0243A8 800237A8 2401FFFC */ li $at, -4 /* 0243AC 800237AC 00611024 */ and $v0, $v1, $at /* 0243B0 800237B0 03E00008 */ jr $ra /* 0243B4 800237B4 24420004 */ addiu $v0, $v0, 4 +glabel L800237B8 /* 0243B8 800237B8 24030020 */ li $v1, 32 /* 0243BC 800237BC 2401FFFC */ li $at, -4 /* 0243C0 800237C0 00611024 */ and $v0, $v1, $at /* 0243C4 800237C4 03E00008 */ jr $ra /* 0243C8 800237C8 24420004 */ addiu $v0, $v0, 4 +glabel L800237CC /* 0243CC 800237CC 24030004 */ li $v1, 4 /* 0243D0 800237D0 2401FFFC */ li $at, -4 /* 0243D4 800237D4 00611024 */ and $v0, $v1, $at /* 0243D8 800237D8 03E00008 */ jr $ra /* 0243DC 800237DC 24420004 */ addiu $v0, $v0, 4 +glabel L800237E0 /* 0243E0 800237E0 30B9000F */ andi $t9, $a1, 0xf /* 0243E4 800237E4 24080010 */ li $t0, 16 /* 0243E8 800237E8 01191023 */ subu $v0, $t0, $t9 @@ -162,6 +191,7 @@ glabel func_800235DC /* 024400 80023800 03E00008 */ jr $ra /* 024404 80023804 24420004 */ addiu $v0, $v0, 4 +glabel L80023808 /* 024408 80023808 30AA000F */ andi $t2, $a1, 0xf /* 02440C 8002380C 240B0010 */ li $t3, 16 /* 024410 80023810 016A1023 */ subu $v0, $t3, $t2 @@ -173,6 +203,7 @@ glabel func_800235DC /* 024428 80023828 03E00008 */ jr $ra /* 02442C 8002382C 24420004 */ addiu $v0, $v0, 4 +glabel L80023830 /* 024430 80023830 30AD000F */ andi $t5, $a1, 0xf /* 024434 80023834 240E0010 */ li $t6, 16 /* 024438 80023838 01CD1023 */ subu $v0, $t6, $t5 @@ -184,24 +215,28 @@ glabel func_800235DC /* 024450 80023850 03E00008 */ jr $ra /* 024454 80023854 24420004 */ addiu $v0, $v0, 4 +glabel L80023858 /* 024458 80023858 24030060 */ li $v1, 96 /* 02445C 8002385C 2401FFFC */ li $at, -4 /* 024460 80023860 00611024 */ and $v0, $v1, $at /* 024464 80023864 03E00008 */ jr $ra /* 024468 80023868 24420004 */ addiu $v0, $v0, 4 +glabel L8002386C /* 02446C 8002386C 24030008 */ li $v1, 8 /* 024470 80023870 2401FFFC */ li $at, -4 /* 024474 80023874 00611024 */ and $v0, $v1, $at /* 024478 80023878 03E00008 */ jr $ra /* 02447C 8002387C 24420004 */ addiu $v0, $v0, 4 +glabel L80023880 /* 024480 80023880 24030034 */ li $v1, 52 /* 024484 80023884 2401FFFC */ li $at, -4 /* 024488 80023888 00611024 */ and $v0, $v1, $at /* 02448C 8002388C 03E00008 */ jr $ra /* 024490 80023890 24420004 */ addiu $v0, $v0, 4 +glabel L80023894 /* 024494 80023894 24030020 */ li $v1, 32 /* 024498 80023898 2401FFFC */ li $at, -4 /* 02449C 8002389C 00611024 */ and $v0, $v1, $at @@ -209,6 +244,7 @@ glabel func_800235DC /* 0244A4 800238A4 24420004 */ addiu $v0, $v0, 4 .L800238A8: +glabel L800238A8 /* 0244A8 800238A8 AC800064 */ sw $zero, 0x64($a0) /* 0244AC 800238AC 2401FFFC */ li $at, -4 /* 0244B0 800238B0 00611024 */ and $v0, $v1, $at diff --git a/asm/non_matchings/unknown_00BC20/func_800238BC.s b/asm/non_matchings/unknown_00BC20/func_800238BC.s index 6d5dc28d..bbafa168 100644 --- a/asm/non_matchings/unknown_00BC20/func_800238BC.s +++ b/asm/non_matchings/unknown_00BC20/func_800238BC.s @@ -1,3 +1,8 @@ +.late_rodata +glabel jpt_800E5864 +.word L80023908, L80023918, L80023928, L80023938, L80023A78, L80023948, L80023978, L80023988, L80023998, L800239B8, L800239C8, L800239D8, L800239E8, L80023A18, L80023A38, L80023A48, L80023A58, L80023A78, L80023998, L80023E20, L80023E20, L80023968, L80023A68, L80023E20, L80023958, L80023A88, L800239A8, L80023A98, L80023AA8, L800239F8, L80023AB8, L80023AC8, L80023AD8, L80023E20, L80023E20, L80023AE8, L80023B08, L80023B18, L80023B28, L80023B38, L80023A08, L80023E20, L80023B48, L80023B58, L80023B68, L80023B78, L80023B88, L80023E20, L80023B98, L80023E20, L80023E20, L80023BA8, L80023E20, L80023E20, L80023BB8, L80023E20, L80023BC8, L80023BD8, L80023BE8, L80023E20, L80023BF8, L80023C08, L80023E20, L80023C18, L80023C28, L80023C38, L80023AF8, L80023C48, L80023C58, L80023C68, L80023CA8, L80023C78, L80023CD8, L80023CE8, L80023CF8, L80023D08, L80023D18, L80023D28, L80023D38, L80023E20, L80023E20, L80023D48, L80023D58, L80023D68, L80023E20, L80023E20, L80023E20, L80023D88, L80023D78, L80023D98, L80023E20, L80023E20, L80023BC8, L80023DA8, L80023C78, L80023C88, L80023C98, L80023DB8, L80023DC8, L80023DC8, L80023C88, L80023C98, L80023C68, L80023C78, L80023DD8, L80023E20, L80023E20, L80023DE8, L80023DF8, L80023E08, L80023A28, L80023CB8, L80023E20, L80023E20, L80023E20, L80023DE8, L80023E18, L80023CC8 + +.text glabel func_800238BC /* 0244BC 800238BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0244C0 800238C0 AFBF0014 */ sw $ra, 0x14($sp) @@ -12,339 +17,422 @@ glabel func_800238BC /* 0244E4 800238E4 2F210076 */ sltiu $at, $t9, 0x76 /* 0244E8 800238E8 1020014D */ beqz $at, .L80023E20 /* 0244EC 800238EC 0019C880 */ sll $t9, $t9, 2 -/* 0244F0 800238F0 3C01800E */ lui $at, %hi(D_800E5864) # $at, 0x800e +/* 0244F0 800238F0 3C01800E */ lui $at, %hi(jpt_800E5864) # $at, 0x800e /* 0244F4 800238F4 00390821 */ addu $at, $at, $t9 -/* 0244F8 800238F8 8C395864 */ lw $t9, %lo(D_800E5864)($at) +/* 0244F8 800238F8 8C395864 */ lw $t9, %lo(jpt_800E5864)($at) /* 0244FC 800238FC 00000000 */ nop /* 024500 80023900 03200008 */ jr $t9 /* 024504 80023904 00000000 */ nop +glabel L80023908 /* 024508 80023908 0C0136AC */ jal func_8004DAB0 /* 02450C 8002390C 00000000 */ nop /* 024510 80023910 10000144 */ b .L80023E24 /* 024514 80023914 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023918 /* 024518 80023918 0C00CF30 */ jal func_80033CC0 /* 02451C 8002391C 00000000 */ nop /* 024520 80023920 10000140 */ b .L80023E24 /* 024524 80023924 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023928 /* 024528 80023928 0C00DB0C */ jal func_80036C30 /* 02452C 8002392C 00000000 */ nop /* 024530 80023930 1000013C */ b .L80023E24 /* 024534 80023934 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023938 /* 024538 80023938 0C00DDB8 */ jal func_800376E0 /* 02453C 8002393C 00000000 */ nop /* 024540 80023940 10000138 */ b .L80023E24 /* 024544 80023944 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023948 /* 024548 80023948 0C00E26B */ jal func_800389AC /* 02454C 8002394C 00000000 */ nop /* 024550 80023950 10000134 */ b .L80023E24 /* 024554 80023954 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023958 /* 024558 80023958 0C00E29B */ jal func_80038A6C /* 02455C 8002395C 00000000 */ nop /* 024560 80023960 10000130 */ b .L80023E24 /* 024564 80023964 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023968 /* 024568 80023968 0C00E2DD */ jal func_80038B74 /* 02456C 8002396C 00000000 */ nop /* 024570 80023970 1000012C */ b .L80023E24 /* 024574 80023974 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023978 /* 024578 80023978 0C00E38F */ jal func_80038E3C /* 02457C 8002397C 00000000 */ nop /* 024580 80023980 10000128 */ b .L80023E24 /* 024584 80023984 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023988 /* 024588 80023988 0C00FF5A */ jal func_8003FD68 /* 02458C 8002398C 00000000 */ nop /* 024590 80023990 10000124 */ b .L80023E24 /* 024594 80023994 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023998 /* 024598 80023998 0C00FFBD */ jal func_8003FEF4 /* 02459C 8002399C 00000000 */ nop /* 0245A0 800239A0 10000120 */ b .L80023E24 /* 0245A4 800239A4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L800239A8 /* 0245A8 800239A8 0C010007 */ jal func_8004001C /* 0245AC 800239AC 00000000 */ nop /* 0245B0 800239B0 1000011C */ b .L80023E24 /* 0245B4 800239B4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L800239B8 /* 0245B8 800239B8 0C00E458 */ jal func_80039160 /* 0245BC 800239BC 00000000 */ nop /* 0245C0 800239C0 10000118 */ b .L80023E24 /* 0245C4 800239C4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L800239C8 /* 0245C8 800239C8 0C00E464 */ jal func_80039190 /* 0245CC 800239CC 00000000 */ nop /* 0245D0 800239D0 10000114 */ b .L80023E24 /* 0245D4 800239D4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L800239D8 /* 0245D8 800239D8 0C00E472 */ jal func_800391C8 /* 0245DC 800239DC 00000000 */ nop /* 0245E0 800239E0 10000110 */ b .L80023E24 /* 0245E4 800239E4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L800239E8 /* 0245E8 800239E8 0C00EB2F */ jal func_8003ACBC /* 0245EC 800239EC 00000000 */ nop /* 0245F0 800239F0 1000010C */ b .L80023E24 /* 0245F4 800239F4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L800239F8 /* 0245F8 800239F8 0C00EB4D */ jal func_8003AD34 /* 0245FC 800239FC 00000000 */ nop /* 024600 80023A00 10000108 */ b .L80023E24 /* 024604 80023A04 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A08 /* 024608 80023A08 0C00EC16 */ jal func_8003B058 /* 02460C 80023A0C 00000000 */ nop /* 024610 80023A10 10000104 */ b .L80023E24 /* 024614 80023A14 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A18 /* 024618 80023A18 0C00EDF3 */ jal func_8003B7CC /* 02461C 80023A1C 00000000 */ nop /* 024620 80023A20 10000100 */ b .L80023E24 /* 024624 80023A24 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A28 /* 024628 80023A28 0C00F078 */ jal func_8003C1E0 /* 02462C 80023A2C 00000000 */ nop /* 024630 80023A30 100000FC */ b .L80023E24 /* 024634 80023A34 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A38 /* 024638 80023A38 0C00F3C6 */ jal func_8003CF18 /* 02463C 80023A3C 00000000 */ nop /* 024640 80023A40 100000F8 */ b .L80023E24 /* 024644 80023A44 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A48 /* 024648 80023A48 0C00F3F8 */ jal func_8003CFE0 /* 02464C 80023A4C 00000000 */ nop /* 024650 80023A50 100000F4 */ b .L80023E24 /* 024654 80023A54 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A58 /* 024658 80023A58 0C00F7F3 */ jal func_8003DFCC /* 02465C 80023A5C 00000000 */ nop /* 024660 80023A60 100000F0 */ b .L80023E24 /* 024664 80023A64 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A68 /* 024668 80023A68 0C00F96C */ jal func_8003E5B0 /* 02466C 80023A6C 00000000 */ nop /* 024670 80023A70 100000EC */ b .L80023E24 /* 024674 80023A74 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A78 /* 024678 80023A78 0C00F972 */ jal func_8003E5C8 /* 02467C 80023A7C 00000000 */ nop /* 024680 80023A80 100000E8 */ b .L80023E24 /* 024684 80023A84 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A88 /* 024688 80023A88 0C00F3D6 */ jal func_8003CF58 /* 02468C 80023A8C 00000000 */ nop /* 024690 80023A90 100000E4 */ b .L80023E24 /* 024694 80023A94 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023A98 /* 024698 80023A98 0C00D2BC */ jal func_80034AF0 /* 02469C 80023A9C 00000000 */ nop /* 0246A0 80023AA0 100000E0 */ b .L80023E24 /* 0246A4 80023AA4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023AA8 /* 0246A8 80023AA8 0C010029 */ jal func_800400A4 /* 0246AC 80023AAC 00000000 */ nop /* 0246B0 80023AB0 100000DC */ b .L80023E24 /* 0246B4 80023AB4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023AB8 /* 0246B8 80023AB8 0C00D865 */ jal func_80036194 /* 0246BC 80023ABC 00000000 */ nop /* 0246C0 80023AC0 100000D8 */ b .L80023E24 /* 0246C4 80023AC4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023AC8 /* 0246C8 80023AC8 0C00F54D */ jal func_8003D534 /* 0246CC 80023ACC 00000000 */ nop /* 0246D0 80023AD0 100000D4 */ b .L80023E24 /* 0246D4 80023AD4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023AD8 /* 0246D8 80023AD8 0C0100EA */ jal func_800403A8 /* 0246DC 80023ADC 00000000 */ nop /* 0246E0 80023AE0 100000D0 */ b .L80023E24 /* 0246E4 80023AE4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023AE8 /* 0246E8 80023AE8 0C0100F6 */ jal func_800403D8 /* 0246EC 80023AEC 00000000 */ nop /* 0246F0 80023AF0 100000CC */ b .L80023E24 /* 0246F4 80023AF4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023AF8 /* 0246F8 80023AF8 0C010127 */ jal func_8004049C /* 0246FC 80023AFC 00000000 */ nop /* 024700 80023B00 100000C8 */ b .L80023E24 /* 024704 80023B04 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B08 /* 024708 80023B08 0C010200 */ jal func_80040800 /* 02470C 80023B0C 00000000 */ nop /* 024710 80023B10 100000C4 */ b .L80023E24 /* 024714 80023B14 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B18 /* 024718 80023B18 0C00F27B */ jal func_8003C9EC /* 02471C 80023B1C 00000000 */ nop /* 024720 80023B20 100000C0 */ b .L80023E24 /* 024724 80023B24 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B28 /* 024728 80023B28 0C00F399 */ jal func_8003CE64 /* 02472C 80023B2C 00000000 */ nop /* 024730 80023B30 100000BC */ b .L80023E24 /* 024734 80023B34 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B38 /* 024738 80023B38 0C00F3C0 */ jal func_8003CF00 /* 02473C 80023B3C 00000000 */ nop /* 024740 80023B40 100000B8 */ b .L80023E24 /* 024744 80023B44 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B48 /* 024748 80023B48 0C01024B */ jal func_8004092C /* 02474C 80023B4C 00000000 */ nop /* 024750 80023B50 100000B4 */ b .L80023E24 /* 024754 80023B54 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B58 /* 024758 80023B58 0C010253 */ jal func_8004094C /* 02475C 80023B5C 00000000 */ nop /* 024760 80023B60 100000B0 */ b .L80023E24 /* 024764 80023B64 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B68 /* 024768 80023B68 0C00D48B */ jal func_8003522C /* 02476C 80023B6C 00000000 */ nop /* 024770 80023B70 100000AC */ b .L80023E24 /* 024774 80023B74 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B78 /* 024778 80023B78 0C00D590 */ jal func_80035640 /* 02477C 80023B7C 00000000 */ nop /* 024780 80023B80 100000A8 */ b .L80023E24 /* 024784 80023B84 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B88 /* 024788 80023B88 0C00D7BE */ jal func_80035EF8 /* 02478C 80023B8C 00000000 */ nop /* 024790 80023B90 100000A4 */ b .L80023E24 /* 024794 80023B94 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023B98 /* 024798 80023B98 0C00DE86 */ jal func_80037A18 /* 02479C 80023B9C 00000000 */ nop /* 0247A0 80023BA0 100000A0 */ b .L80023E24 /* 0247A4 80023BA4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023BA8 /* 0247A8 80023BA8 0C00E215 */ jal func_80038854 /* 0247AC 80023BAC 00000000 */ nop /* 0247B0 80023BB0 1000009C */ b .L80023E24 /* 0247B4 80023BB4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023BB8 /* 0247B8 80023BB8 0C00F191 */ jal func_8003C644 /* 0247BC 80023BBC 00000000 */ nop /* 0247C0 80023BC0 10000098 */ b .L80023E24 /* 0247C4 80023BC4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023BC8 /* 0247C8 80023BC8 0C00D623 */ jal func_8003588C /* 0247CC 80023BCC 00000000 */ nop /* 0247D0 80023BD0 10000094 */ b .L80023E24 /* 0247D4 80023BD4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023BD8 /* 0247D8 80023BD8 0C00D788 */ jal func_80035E20 /* 0247DC 80023BDC 00000000 */ nop /* 0247E0 80023BE0 10000090 */ b .L80023E24 /* 0247E4 80023BE4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023BE8 /* 0247E8 80023BE8 0C010269 */ jal func_800409A4 /* 0247EC 80023BEC 00000000 */ nop /* 0247F0 80023BF0 1000008C */ b .L80023E24 /* 0247F4 80023BF4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023BF8 /* 0247F8 80023BF8 0C010272 */ jal func_800409C8 /* 0247FC 80023BFC 00000000 */ nop /* 024800 80023C00 10000088 */ b .L80023E24 /* 024804 80023C04 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C08 /* 024808 80023C08 0C00E4AE */ jal func_800392B8 /* 02480C 80023C0C 00000000 */ nop /* 024810 80023C10 10000084 */ b .L80023E24 /* 024814 80023C14 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C18 /* 024818 80023C18 0C00F79D */ jal func_8003DE74 /* 02481C 80023C1C 00000000 */ nop /* 024820 80023C20 10000080 */ b .L80023E24 /* 024824 80023C24 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C28 /* 024828 80023C28 0C00F4FB */ jal func_8003D3EC /* 02482C 80023C2C 00000000 */ nop /* 024830 80023C30 1000007C */ b .L80023E24 /* 024834 80023C34 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C38 /* 024838 80023C38 0C00F40E */ jal func_8003D038 /* 02483C 80023C3C 00000000 */ nop /* 024840 80023C40 10000078 */ b .L80023E24 /* 024844 80023C44 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C48 /* 024848 80023C48 0C00DD5E */ jal func_80037578 /* 02484C 80023C4C 00000000 */ nop /* 024850 80023C50 10000074 */ b .L80023E24 /* 024854 80023C54 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C58 /* 024858 80023C58 0C00DD89 */ jal func_80037624 /* 02485C 80023C5C 00000000 */ nop /* 024860 80023C60 10000070 */ b .L80023E24 /* 024864 80023C64 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C68 /* 024868 80023C68 0C00E063 */ jal func_8003818C /* 02486C 80023C6C 00000000 */ nop /* 024870 80023C70 1000006C */ b .L80023E24 /* 024874 80023C74 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C78 /* 024878 80023C78 0C00E078 */ jal func_800381E0 /* 02487C 80023C7C 00000000 */ nop /* 024880 80023C80 10000068 */ b .L80023E24 /* 024884 80023C84 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C88 /* 024888 80023C88 0C00E085 */ jal func_80038214 /* 02488C 80023C8C 00000000 */ nop /* 024890 80023C90 10000064 */ b .L80023E24 /* 024894 80023C94 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023C98 /* 024898 80023C98 0C00E092 */ jal func_80038248 /* 02489C 80023C9C 00000000 */ nop /* 0248A0 80023CA0 10000060 */ b .L80023E24 /* 0248A4 80023CA4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023CA8 /* 0248A8 80023CA8 0C0106A4 */ jal func_80041A90 /* 0248AC 80023CAC 00000000 */ nop /* 0248B0 80023CB0 1000005C */ b .L80023E24 /* 0248B4 80023CB4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023CB8 /* 0248B8 80023CB8 0C0107A0 */ jal func_80041E80 /* 0248BC 80023CBC 00000000 */ nop /* 0248C0 80023CC0 10000058 */ b .L80023E24 /* 0248C4 80023CC4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023CC8 /* 0248C8 80023CC8 0C010805 */ jal func_80042014 /* 0248CC 80023CCC 00000000 */ nop /* 0248D0 80023CD0 10000054 */ b .L80023E24 /* 0248D4 80023CD4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023CD8 /* 0248D8 80023CD8 0C00D2DA */ jal func_80034B68 /* 0248DC 80023CDC 00000000 */ nop /* 0248E0 80023CE0 10000050 */ b .L80023E24 /* 0248E4 80023CE4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023CE8 /* 0248E8 80023CE8 0C00D39C */ jal func_80034E70 /* 0248EC 80023CEC 00000000 */ nop /* 0248F0 80023CF0 1000004C */ b .L80023E24 /* 0248F4 80023CF4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023CF8 /* 0248F8 80023CF8 0C01080F */ jal func_8004203C /* 0248FC 80023CFC 00000000 */ nop /* 024900 80023D00 10000048 */ b .L80023E24 /* 024904 80023D04 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D08 /* 024908 80023D08 0C00F4AB */ jal func_8003D2AC /* 02490C 80023D0C 00000000 */ nop /* 024910 80023D10 10000044 */ b .L80023E24 /* 024914 80023D14 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D18 /* 024918 80023D18 0C00ECDA */ jal func_8003B368 /* 02491C 80023D1C 00000000 */ nop /* 024920 80023D20 10000040 */ b .L80023E24 /* 024924 80023D24 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D28 /* 024928 80023D28 0C00D211 */ jal func_80034844 /* 02492C 80023D2C 00000000 */ nop /* 024930 80023D30 1000003C */ b .L80023E24 /* 024934 80023D34 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D38 /* 024938 80023D38 0C00D14C */ jal func_80034530 /* 02493C 80023D3C 00000000 */ nop /* 024940 80023D40 10000038 */ b .L80023E24 /* 024944 80023D44 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D48 /* 024948 80023D48 0C00D6BA */ jal func_80035AE8 /* 02494C 80023D4C 00000000 */ nop /* 024950 80023D50 10000034 */ b .L80023E24 /* 024954 80023D54 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D58 /* 024958 80023D58 0C00DF55 */ jal func_80037D54 /* 02495C 80023D5C 00000000 */ nop /* 024960 80023D60 10000030 */ b .L80023E24 /* 024964 80023D64 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D68 /* 024968 80023D68 0C00DF5B */ jal func_80037D6C /* 02496C 80023D6C 00000000 */ nop /* 024970 80023D70 1000002C */ b .L80023E24 /* 024974 80023D74 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D78 /* 024978 80023D78 0C010843 */ jal func_8004210C /* 02497C 80023D7C 00000000 */ nop /* 024980 80023D80 10000028 */ b .L80023E24 /* 024984 80023D84 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D88 /* 024988 80023D88 0C00F717 */ jal func_8003DC5C /* 02498C 80023D8C 00000000 */ nop /* 024990 80023D90 10000024 */ b .L80023E24 /* 024994 80023D94 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023D98 /* 024998 80023D98 0C00E2B2 */ jal func_80038AC8 /* 02499C 80023D9C 00000000 */ nop /* 0249A0 80023DA0 10000020 */ b .L80023E24 /* 0249A4 80023DA4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023DA8 /* 0249A8 80023DA8 0C010854 */ jal func_80042150 /* 0249AC 80023DAC 00000000 */ nop /* 0249B0 80023DB0 1000001C */ b .L80023E24 /* 0249B4 80023DB4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023DB8 /* 0249B8 80023DB8 0C00E356 */ jal func_80038D58 /* 0249BC 80023DBC 00000000 */ nop /* 0249C0 80023DC0 10000018 */ b .L80023E24 /* 0249C4 80023DC4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023DC8 /* 0249C8 80023DC8 0C00D5CB */ jal func_8003572C /* 0249CC 80023DCC 00000000 */ nop /* 0249D0 80023DD0 10000014 */ b .L80023E24 /* 0249D4 80023DD4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023DD8 /* 0249D8 80023DD8 0C01085B */ jal func_8004216C /* 0249DC 80023DDC 00000000 */ nop /* 0249E0 80023DE0 10000010 */ b .L80023E24 /* 0249E4 80023DE4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023DE8 /* 0249E8 80023DE8 0C00CFD1 */ jal func_80033F44 /* 0249EC 80023DEC 00000000 */ nop /* 0249F0 80023DF0 1000000C */ b .L80023E24 /* 0249F4 80023DF4 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023DF8 /* 0249F8 80023DF8 0C010884 */ jal func_80042210 /* 0249FC 80023DFC 00000000 */ nop /* 024A00 80023E00 10000008 */ b .L80023E24 /* 024A04 80023E04 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023E08 /* 024A08 80023E08 0C00F6E8 */ jal func_8003DBA0 /* 024A0C 80023E0C 00000000 */ nop /* 024A10 80023E10 10000004 */ b .L80023E24 /* 024A14 80023E14 8FBF0014 */ lw $ra, 0x14($sp) +glabel L80023E18 /* 024A18 80023E18 0C010A87 */ jal func_80042A1C /* 024A1C 80023E1C 00000000 */ nop .L80023E20: +glabel L80023E20 /* 024A20 80023E20 8FBF0014 */ lw $ra, 0x14($sp) .L80023E24: /* 024A24 80023E24 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/unknown_00BC20/func_80023E30.s b/asm/non_matchings/unknown_00BC20/func_80023E30.s index 33ee5bdd..0a33dd34 100644 --- a/asm/non_matchings/unknown_00BC20/func_80023E30.s +++ b/asm/non_matchings/unknown_00BC20/func_80023E30.s @@ -1,101 +1,136 @@ +.late_rodata +glabel jpt_800E5A3C +.word L80023E5C, L80023E64, L80023F40, L80023F40, L80023E6C, L80023F40, L80023F14, L80023F40, L80023F40, L80023F40, L80023F40, L80023E74, L80023F14, L80023E7C, L80023F40, L80023F40, L80023E84, L80023F14, L80023F40, L80023F40, L80023F40, L80023F40, L80023F40, L80023E9C, L80023F40, L80023F14, L80023F40, L80023F40, L80023F40, L80023F14, L80023EA4, L80023EAC, L80023F40, L80023F40, L80023F40, L80023F14, L80023F40, L80023EBC, L80023EC4, L80023ECC, L80023F14, L80023F40, L80023F40, L80023F40, L80023ED4, L80023F40, L80023F40, L80023EDC, L80023F24, L80023EEC, L80023F24, L80023F14, L80023F40, L80023EF4, L80023F14, L80023EEC, L80023F14, L80023F40, L80023F40, L80023F40, L80023F24, L80023F2C, L80023EE4, L80023EAC, L80023F40, L80023F40, L80023EB4, L80023F14, L80023F40, L80023E8C, L80023F40, L80023E8C, L80023F40, L80023EFC, L80023F40, L80023F40, L80023E84, L80023F14, L80023F14, L80023EEC, L80023F0C, L80023F1C, L80023F40, L80023EEC, L80023F40, L80023EEC, L80023F40, L80023EAC, L80023F40, L80023F40, L80023F04, L80023F40, L80023F14, L80023F40, L80023EFC, L80023E8C, L80023E8C, L80023F14, L80023EFC, L80023EFC, L80023E94, L80023E94, L80023E94, L80023E94, L80023F40, L80023F40, L80023F40, L80023F14, L80023F34, L80023EAC, L80023E7C, L80023F40, L80023F40, L80023F3C, L80023EEC, L80023F14 + +.text glabel func_80023E30 /* 024A30 80023E30 248EFFFF */ addiu $t6, $a0, -1 /* 024A34 80023E34 2DC10074 */ sltiu $at, $t6, 0x74 /* 024A38 80023E38 10200041 */ beqz $at, .L80023F40 /* 024A3C 80023E3C 00001825 */ move $v1, $zero /* 024A40 80023E40 000E7080 */ sll $t6, $t6, 2 -/* 024A44 80023E44 3C01800E */ lui $at, %hi(D_800E5A3C) # $at, 0x800e +/* 024A44 80023E44 3C01800E */ lui $at, %hi(jpt_800E5A3C) # $at, 0x800e /* 024A48 80023E48 002E0821 */ addu $at, $at, $t6 -/* 024A4C 80023E4C 8C2E5A3C */ lw $t6, %lo(D_800E5A3C)($at) +/* 024A4C 80023E4C 8C2E5A3C */ lw $t6, %lo(jpt_800E5A3C)($at) /* 024A50 80023E50 00000000 */ nop /* 024A54 80023E54 01C00008 */ jr $t6 /* 024A58 80023E58 00000000 */ nop +glabel L80023E5C /* 024A5C 80023E5C 03E00008 */ jr $ra /* 024A60 80023E60 2402001F */ li $v0, 31 +glabel L80023E64 /* 024A64 80023E64 03E00008 */ jr $ra /* 024A68 80023E68 24020013 */ li $v0, 19 +glabel L80023E6C /* 024A6C 80023E6C 03E00008 */ jr $ra /* 024A70 80023E70 24020016 */ li $v0, 22 +glabel L80023E74 /* 024A74 80023E74 03E00008 */ jr $ra /* 024A78 80023E78 2402001B */ li $v0, 27 +glabel L80023E7C /* 024A7C 80023E7C 03E00008 */ jr $ra /* 024A80 80023E80 24020030 */ li $v0, 48 +glabel L80023E84 /* 024A84 80023E84 03E00008 */ jr $ra /* 024A88 80023E88 24020012 */ li $v0, 18 +glabel L80023E8C /* 024A8C 80023E8C 03E00008 */ jr $ra /* 024A90 80023E90 2402003B */ li $v0, 59 +glabel L80023E94 /* 024A94 80023E94 03E00008 */ jr $ra /* 024A98 80023E98 2402003A */ li $v0, 58 +glabel L80023E9C /* 024A9C 80023E9C 03E00008 */ jr $ra /* 024AA0 80023EA0 24020004 */ li $v0, 4 +glabel L80023EA4 /* 024AA4 80023EA4 03E00008 */ jr $ra /* 024AA8 80023EA8 2402001B */ li $v0, 27 +glabel L80023EAC /* 024AAC 80023EAC 03E00008 */ jr $ra /* 024AB0 80023EB0 24020012 */ li $v0, 18 +glabel L80023EB4 /* 024AB4 80023EB4 03E00008 */ jr $ra /* 024AB8 80023EB8 24020030 */ li $v0, 48 +glabel L80023EBC /* 024ABC 80023EBC 03E00008 */ jr $ra /* 024AC0 80023EC0 24020039 */ li $v0, 57 +glabel L80023EC4 /* 024AC4 80023EC4 03E00008 */ jr $ra /* 024AC8 80023EC8 24020012 */ li $v0, 18 +glabel L80023ECC /* 024ACC 80023ECC 03E00008 */ jr $ra /* 024AD0 80023ED0 24020009 */ li $v0, 9 +glabel L80023ED4 /* 024AD4 80023ED4 03E00008 */ jr $ra /* 024AD8 80023ED8 24020012 */ li $v0, 18 +glabel L80023EDC /* 024ADC 80023EDC 03E00008 */ jr $ra /* 024AE0 80023EE0 24020009 */ li $v0, 9 +glabel L80023EE4 /* 024AE4 80023EE4 03E00008 */ jr $ra /* 024AE8 80023EE8 24020009 */ li $v0, 9 +glabel L80023EEC /* 024AEC 80023EEC 03E00008 */ jr $ra /* 024AF0 80023EF0 2402000B */ li $v0, 11 +glabel L80023EF4 /* 024AF4 80023EF4 03E00008 */ jr $ra /* 024AF8 80023EF8 2402000B */ li $v0, 11 +glabel L80023EFC /* 024AFC 80023EFC 03E00008 */ jr $ra /* 024B00 80023F00 24020031 */ li $v0, 49 +glabel L80023F04 /* 024B04 80023F04 03E00008 */ jr $ra /* 024B08 80023F08 24020001 */ li $v0, 1 +glabel L80023F0C /* 024B0C 80023F0C 03E00008 */ jr $ra /* 024B10 80023F10 2402000A */ li $v0, 10 +glabel L80023F14 /* 024B14 80023F14 03E00008 */ jr $ra /* 024B18 80023F18 24020010 */ li $v0, 16 +glabel L80023F1C /* 024B1C 80023F1C 03E00008 */ jr $ra /* 024B20 80023F20 24020012 */ li $v0, 18 +glabel L80023F24 /* 024B24 80023F24 03E00008 */ jr $ra /* 024B28 80023F28 24020002 */ li $v0, 2 +glabel L80023F2C /* 024B2C 80023F2C 03E00008 */ jr $ra /* 024B30 80023F30 2402001B */ li $v0, 27 +glabel L80023F34 /* 024B34 80023F34 03E00008 */ jr $ra /* 024B38 80023F38 2402000B */ li $v0, 11 +glabel L80023F3C /* 024B3C 80023F3C 24030001 */ li $v1, 1 .L80023F40: +glabel L80023F40 /* 024B40 80023F40 03E00008 */ jr $ra /* 024B44 80023F44 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/unknown_00BC20/func_80023F48.s b/asm/non_matchings/unknown_00BC20/func_80023F48.s index fe6cc235..b4c19696 100644 --- a/asm/non_matchings/unknown_00BC20/func_80023F48.s +++ b/asm/non_matchings/unknown_00BC20/func_80023F48.s @@ -1,3 +1,8 @@ +.late_rodata +glabel jpt_800E5C0C +.word L80023FA4, L80023FB8, L80023FCC, L80024108, L80023FE0, L8002401C, L80024570, L80024570, L80024030, L80024044, L80024058, L8002406C, L800240A8, L800240BC, L800240CC, L800240E0, L80024108, L80024570, L80024570, L80024570, L80024008, L800240F4, L80024570, L80023FF4, L8002411C, L80024570, L80024130, L80024144, L80024080, L80024158, L8002416C, L80024570, L80024570, L80024570, L80024180, L800241A8, L800241BC, L800241D0, L800241E4, L80024094, L80024570, L80024570, L80024570, L800241F8, L8002420C, L80024220, L80024570, L80024570, L80024234, L8002425C, L80024270, L80024284, L80024298, L800242AC, L800242C0, L800242D4, L800242E8, L80024570, L800242FC, L8002430C, L80024320, L80024570, L80024334, L80024348, L8002435C, L80024194, L80024370, L80024384, L80024398, L80024570, L80024398, L800243C0, L800243D4, L800243E8, L800243FC, L80024410, L80024424, L80024438, L8002444C, L80024234, L80024460, L80024570, L80024474, L80024234, L80024234, L80024570, L80024488, L80024570, L8002449C, L80024570, L80024570, L800242D4, L800244B0, L80024570, L800243AC, L800243AC, L800244C4, L80024570, L800244EC, L800243AC, L800243AC, L80024398, L80024398, L800244D8, L80024570, L80024570, L80024500, L80024514, L80024488, L80024528, L80024570, L8002453C, L80024570, L80024550, L80024500, L80024564, L80024570, L80024248 + +.text glabel func_80023F48 /* 024B48 80023F48 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 024B4C 80023F4C AFBF0014 */ sw $ra, 0x14($sp) @@ -16,384 +21,460 @@ glabel func_80023F48 /* 024B80 80023F80 2DE10076 */ sltiu $at, $t7, 0x76 /* 024B84 80023F84 1020017A */ beqz $at, .L80024570 /* 024B88 80023F88 000F7880 */ sll $t7, $t7, 2 -/* 024B8C 80023F8C 3C01800E */ lui $at, %hi(D_800E5C0C) # $at, 0x800e +/* 024B8C 80023F8C 3C01800E */ lui $at, %hi(jpt_800E5C0C) # $at, 0x800e /* 024B90 80023F90 002F0821 */ addu $at, $at, $t7 -/* 024B94 80023F94 8C2F5C0C */ lw $t7, %lo(D_800E5C0C)($at) +/* 024B94 80023F94 8C2F5C0C */ lw $t7, %lo(jpt_800E5C0C)($at) /* 024B98 80023F98 00000000 */ nop /* 024B9C 80023F9C 01E00008 */ jr $t7 /* 024BA0 80023FA0 00000000 */ nop +glabel L80023FA4 /* 024BA4 80023FA4 00C02025 */ move $a0, $a2 /* 024BA8 80023FA8 0C00CF74 */ jal func_80033DD0 /* 024BAC 80023FAC 00E02825 */ move $a1, $a3 /* 024BB0 80023FB0 10000170 */ b .L80024574 /* 024BB4 80023FB4 24040001 */ li $a0, 1 +glabel L80023FB8 /* 024BB8 80023FB8 00C02025 */ move $a0, $a2 /* 024BBC 80023FBC 0C00DC35 */ jal func_800370D4 /* 024BC0 80023FC0 00E02825 */ move $a1, $a3 /* 024BC4 80023FC4 1000016B */ b .L80024574 /* 024BC8 80023FC8 24040001 */ li $a0, 1 +glabel L80023FCC /* 024BCC 80023FCC 00C02025 */ move $a0, $a2 /* 024BD0 80023FD0 0C00DDF9 */ jal func_800377E4 /* 024BD4 80023FD4 00E02825 */ move $a1, $a3 /* 024BD8 80023FD8 10000166 */ b .L80024574 /* 024BDC 80023FDC 24040001 */ li $a0, 1 +glabel L80023FE0 /* 024BE0 80023FE0 00C02025 */ move $a0, $a2 /* 024BE4 80023FE4 0C00E26E */ jal func_800389B8 /* 024BE8 80023FE8 00E02825 */ move $a1, $a3 /* 024BEC 80023FEC 10000161 */ b .L80024574 /* 024BF0 80023FF0 24040001 */ li $a0, 1 +glabel L80023FF4 /* 024BF4 80023FF4 00C02025 */ move $a0, $a2 /* 024BF8 80023FF8 0C00E29E */ jal func_80038A78 /* 024BFC 80023FFC 00E02825 */ move $a1, $a3 /* 024C00 80024000 1000015C */ b .L80024574 /* 024C04 80024004 24040001 */ li $a0, 1 +glabel L80024008 /* 024C08 80024008 00C02025 */ move $a0, $a2 /* 024C0C 8002400C 0C00E2FD */ jal func_80038BF4 /* 024C10 80024010 00E02825 */ move $a1, $a3 /* 024C14 80024014 10000157 */ b .L80024574 /* 024C18 80024018 24040001 */ li $a0, 1 +glabel L8002401C /* 024C1C 8002401C 00C02025 */ move $a0, $a2 /* 024C20 80024020 0C00E3D6 */ jal func_80038F58 /* 024C24 80024024 00E02825 */ move $a1, $a3 /* 024C28 80024028 10000152 */ b .L80024574 /* 024C2C 8002402C 24040001 */ li $a0, 1 +glabel L80024030 /* 024C30 80024030 00C02025 */ move $a0, $a2 /* 024C34 80024034 0C00E461 */ jal func_80039184 /* 024C38 80024038 00E02825 */ move $a1, $a3 /* 024C3C 8002403C 1000014D */ b .L80024574 /* 024C40 80024040 24040001 */ li $a0, 1 +glabel L80024044 /* 024C44 80024044 00C02025 */ move $a0, $a2 /* 024C48 80024048 0C00E46F */ jal func_800391BC /* 024C4C 8002404C 00E02825 */ move $a1, $a3 /* 024C50 80024050 10000148 */ b .L80024574 /* 024C54 80024054 24040001 */ li $a0, 1 +glabel L80024058 /* 024C58 80024058 00C02025 */ move $a0, $a2 /* 024C5C 8002405C 0C00E47F */ jal func_800391FC /* 024C60 80024060 00E02825 */ move $a1, $a3 /* 024C64 80024064 10000143 */ b .L80024574 /* 024C68 80024068 24040001 */ li $a0, 1 +glabel L8002406C /* 024C6C 8002406C 00C02025 */ move $a0, $a2 /* 024C70 80024070 0C00EB4A */ jal func_8003AD28 /* 024C74 80024074 00E02825 */ move $a1, $a3 /* 024C78 80024078 1000013E */ b .L80024574 /* 024C7C 8002407C 24040001 */ li $a0, 1 +glabel L80024080 /* 024C80 80024080 00C02025 */ move $a0, $a2 /* 024C84 80024084 0C00EB94 */ jal func_8003AE50 /* 024C88 80024088 00E02825 */ move $a1, $a3 /* 024C8C 8002408C 10000139 */ b .L80024574 /* 024C90 80024090 24040001 */ li $a0, 1 +glabel L80024094 /* 024C94 80024094 00C02025 */ move $a0, $a2 /* 024C98 80024098 0C00EC5D */ jal func_8003B174 /* 024C9C 8002409C 00E02825 */ move $a1, $a3 /* 024CA0 800240A0 10000134 */ b .L80024574 /* 024CA4 800240A4 24040001 */ li $a0, 1 +glabel L800240A8 /* 024CA8 800240A8 00C02025 */ move $a0, $a2 /* 024CAC 800240AC 0C00EE62 */ jal func_8003B988 /* 024CB0 800240B0 00E02825 */ move $a1, $a3 /* 024CB4 800240B4 1000012F */ b .L80024574 /* 024CB8 800240B8 24040001 */ li $a0, 1 +glabel L800240BC /* 024CBC 800240BC 0C00C29D */ jal func_80030A74 /* 024CC0 800240C0 00C02025 */ move $a0, $a2 /* 024CC4 800240C4 1000012B */ b .L80024574 /* 024CC8 800240C8 24040001 */ li $a0, 1 +glabel L800240CC /* 024CCC 800240CC 00C02025 */ move $a0, $a2 /* 024CD0 800240D0 0C00F40B */ jal func_8003D02C /* 024CD4 800240D4 00E02825 */ move $a1, $a3 /* 024CD8 800240D8 10000126 */ b .L80024574 /* 024CDC 800240DC 24040001 */ li $a0, 1 +glabel L800240E0 /* 024CE0 800240E0 00C02025 */ move $a0, $a2 /* 024CE4 800240E4 0C00F850 */ jal func_8003E140 /* 024CE8 800240E8 00E02825 */ move $a1, $a3 /* 024CEC 800240EC 10000121 */ b .L80024574 /* 024CF0 800240F0 24040001 */ li $a0, 1 +glabel L800240F4 /* 024CF4 800240F4 00C02025 */ move $a0, $a2 /* 024CF8 800240F8 0C00F96F */ jal func_8003E5BC /* 024CFC 800240FC 00E02825 */ move $a1, $a3 /* 024D00 80024100 1000011C */ b .L80024574 /* 024D04 80024104 24040001 */ li $a0, 1 +glabel L80024108 /* 024D08 80024108 00C02025 */ move $a0, $a2 /* 024D0C 8002410C 0C00F98C */ jal func_8003E630 /* 024D10 80024110 00E02825 */ move $a1, $a3 /* 024D14 80024114 10000117 */ b .L80024574 /* 024D18 80024118 24040001 */ li $a0, 1 +glabel L8002411C /* 024D1C 8002411C 00C02025 */ move $a0, $a2 /* 024D20 80024120 0C00F3E6 */ jal func_8003CF98 /* 024D24 80024124 00E02825 */ move $a1, $a3 /* 024D28 80024128 10000112 */ b .L80024574 /* 024D2C 8002412C 24040001 */ li $a0, 1 +glabel L80024130 /* 024D30 80024130 00C02025 */ move $a0, $a2 /* 024D34 80024134 0C00D2D3 */ jal func_80034B4C /* 024D38 80024138 00E02825 */ move $a1, $a3 /* 024D3C 8002413C 1000010D */ b .L80024574 /* 024D40 80024140 24040001 */ li $a0, 1 +glabel L80024144 /* 024D44 80024144 00C02025 */ move $a0, $a2 /* 024D48 80024148 0C010052 */ jal func_80040148 /* 024D4C 8002414C 00E02825 */ move $a1, $a3 /* 024D50 80024150 10000108 */ b .L80024574 /* 024D54 80024154 24040001 */ li $a0, 1 +glabel L80024158 /* 024D58 80024158 00C02025 */ move $a0, $a2 /* 024D5C 8002415C 0C00D878 */ jal func_800361E0 /* 024D60 80024160 00E02825 */ move $a1, $a3 /* 024D64 80024164 10000103 */ b .L80024574 /* 024D68 80024168 24040001 */ li $a0, 1 +glabel L8002416C /* 024D6C 8002416C 00C02025 */ move $a0, $a2 /* 024D70 80024170 0C00F568 */ jal func_8003D5A0 /* 024D74 80024174 00E02825 */ move $a1, $a3 /* 024D78 80024178 100000FE */ b .L80024574 /* 024D7C 8002417C 24040001 */ li $a0, 1 +glabel L80024180 /* 024D80 80024180 00C02025 */ move $a0, $a2 /* 024D84 80024184 0C010112 */ jal func_80040448 /* 024D88 80024188 00E02825 */ move $a1, $a3 /* 024D8C 8002418C 100000F9 */ b .L80024574 /* 024D90 80024190 24040001 */ li $a0, 1 +glabel L80024194 /* 024D94 80024194 00C02025 */ move $a0, $a2 /* 024D98 80024198 0C01015C */ jal func_80040570 /* 024D9C 8002419C 00E02825 */ move $a1, $a3 /* 024DA0 800241A0 100000F4 */ b .L80024574 /* 024DA4 800241A4 24040001 */ li $a0, 1 +glabel L800241A8 /* 024DA8 800241A8 00C02025 */ move $a0, $a2 /* 024DAC 800241AC 0C010208 */ jal func_80040820 /* 024DB0 800241B0 00E02825 */ move $a1, $a3 /* 024DB4 800241B4 100000EF */ b .L80024574 /* 024DB8 800241B8 24040001 */ li $a0, 1 +glabel L800241BC /* 024DBC 800241BC 00C02025 */ move $a0, $a2 /* 024DC0 800241C0 0C00F29A */ jal func_8003CA68 /* 024DC4 800241C4 00E02825 */ move $a1, $a3 /* 024DC8 800241C8 100000EA */ b .L80024574 /* 024DCC 800241CC 24040001 */ li $a0, 1 +glabel L800241D0 /* 024DD0 800241D0 00C02025 */ move $a0, $a2 /* 024DD4 800241D4 0C00F3A8 */ jal func_8003CEA0 /* 024DD8 800241D8 00E02825 */ move $a1, $a3 /* 024DDC 800241DC 100000E5 */ b .L80024574 /* 024DE0 800241E0 24040001 */ li $a0, 1 +glabel L800241E4 /* 024DE4 800241E4 00C02025 */ move $a0, $a2 /* 024DE8 800241E8 0C00F3C3 */ jal func_8003CF0C /* 024DEC 800241EC 00E02825 */ move $a1, $a3 /* 024DF0 800241F0 100000E0 */ b .L80024574 /* 024DF4 800241F4 24040001 */ li $a0, 1 +glabel L800241F8 /* 024DF8 800241F8 00C02025 */ move $a0, $a2 /* 024DFC 800241FC 0C00D498 */ jal func_80035260 /* 024E00 80024200 00E02825 */ move $a1, $a3 /* 024E04 80024204 100000DB */ b .L80024574 /* 024E08 80024208 24040001 */ li $a0, 1 +glabel L8002420C /* 024E0C 8002420C 00C02025 */ move $a0, $a2 /* 024E10 80024210 0C00D593 */ jal func_8003564C /* 024E14 80024214 00E02825 */ move $a1, $a3 /* 024E18 80024218 100000D6 */ b .L80024574 /* 024E1C 8002421C 24040001 */ li $a0, 1 +glabel L80024220 /* 024E20 80024220 00C02025 */ move $a0, $a2 /* 024E24 80024224 0C00D7DB */ jal func_80035F6C /* 024E28 80024228 00E02825 */ move $a1, $a3 /* 024E2C 8002422C 100000D1 */ b .L80024574 /* 024E30 80024230 24040001 */ li $a0, 1 +glabel L80024234 /* 024E34 80024234 00C02025 */ move $a0, $a2 /* 024E38 80024238 0C00DF3A */ jal func_80037CE8 /* 024E3C 8002423C 00E02825 */ move $a1, $a3 /* 024E40 80024240 100000CC */ b .L80024574 /* 024E44 80024244 24040001 */ li $a0, 1 +glabel L80024248 /* 024E48 80024248 00C02025 */ move $a0, $a2 /* 024E4C 8002424C 0C010B34 */ jal func_80042CD0 /* 024E50 80024250 00E02825 */ move $a1, $a3 /* 024E54 80024254 100000C7 */ b .L80024574 /* 024E58 80024258 24040001 */ li $a0, 1 +glabel L8002425C /* 024E5C 8002425C 00C02025 */ move $a0, $a2 /* 024E60 80024260 0C00E1C4 */ jal func_80038710 /* 024E64 80024264 00E02825 */ move $a1, $a3 /* 024E68 80024268 100000C2 */ b .L80024574 /* 024E6C 8002426C 24040001 */ li $a0, 1 +glabel L80024270 /* 024E70 80024270 00C02025 */ move $a0, $a2 /* 024E74 80024274 0C00E235 */ jal func_800388D4 /* 024E78 80024278 00E02825 */ move $a1, $a3 /* 024E7C 8002427C 100000BD */ b .L80024574 /* 024E80 80024280 24040001 */ li $a0, 1 +glabel L80024284 /* 024E84 80024284 00C02025 */ move $a0, $a2 /* 024E88 80024288 0C00E1F3 */ jal func_800387CC /* 024E8C 8002428C 00E02825 */ move $a1, $a3 /* 024E90 80024290 100000B8 */ b .L80024574 /* 024E94 80024294 24040001 */ li $a0, 1 +glabel L80024298 /* 024E98 80024298 00C02025 */ move $a0, $a2 /* 024E9C 8002429C 0C00E0CF */ jal func_8003833C /* 024EA0 800242A0 00E02825 */ move $a1, $a3 /* 024EA4 800242A4 100000B3 */ b .L80024574 /* 024EA8 800242A8 24040001 */ li $a0, 1 +glabel L800242AC /* 024EAC 800242AC 00C02025 */ move $a0, $a2 /* 024EB0 800242B0 0C00F1E9 */ jal func_8003C7A4 /* 024EB4 800242B4 00E02825 */ move $a1, $a3 /* 024EB8 800242B8 100000AE */ b .L80024574 /* 024EBC 800242BC 24040001 */ li $a0, 1 +glabel L800242C0 /* 024EC0 800242C0 00C02025 */ move $a0, $a2 /* 024EC4 800242C4 0C00E03E */ jal func_800380F8 /* 024EC8 800242C8 00E02825 */ move $a1, $a3 /* 024ECC 800242CC 100000A9 */ b .L80024574 /* 024ED0 800242D0 24040001 */ li $a0, 1 +glabel L800242D4 /* 024ED4 800242D4 00C02025 */ move $a0, $a2 /* 024ED8 800242D8 0C00D65B */ jal func_8003596C /* 024EDC 800242DC 00E02825 */ move $a1, $a3 /* 024EE0 800242E0 100000A4 */ b .L80024574 /* 024EE4 800242E4 24040001 */ li $a0, 1 +glabel L800242E8 /* 024EE8 800242E8 00C02025 */ move $a0, $a2 /* 024EEC 800242EC 0C00D78D */ jal func_80035E34 /* 024EF0 800242F0 00E02825 */ move $a1, $a3 /* 024EF4 800242F4 1000009F */ b .L80024574 /* 024EF8 800242F8 24040001 */ li $a0, 1 +glabel L800242FC /* 024EFC 800242FC 0C02FFF7 */ jal func_800BFFDC /* 024F00 80024300 00C02025 */ move $a0, $a2 /* 024F04 80024304 1000009B */ b .L80024574 /* 024F08 80024308 24040001 */ li $a0, 1 +glabel L8002430C /* 024F0C 8002430C 00C02025 */ move $a0, $a2 /* 024F10 80024310 0C010315 */ jal func_80040C54 /* 024F14 80024314 00E02825 */ move $a1, $a3 /* 024F18 80024318 10000096 */ b .L80024574 /* 024F1C 8002431C 24040001 */ li $a0, 1 +glabel L80024320 /* 024F20 80024320 00C02025 */ move $a0, $a2 /* 024F24 80024324 0C00E4CC */ jal func_80039330 /* 024F28 80024328 00E02825 */ move $a1, $a3 /* 024F2C 8002432C 10000091 */ b .L80024574 /* 024F30 80024330 24040001 */ li $a0, 1 +glabel L80024334 /* 024F34 80024334 00C02025 */ move $a0, $a2 /* 024F38 80024338 0C00F7C2 */ jal func_8003DF08 /* 024F3C 8002433C 00E02825 */ move $a1, $a3 /* 024F40 80024340 1000008C */ b .L80024574 /* 024F44 80024344 24040001 */ li $a0, 1 +glabel L80024348 /* 024F48 80024348 00C02025 */ move $a0, $a2 /* 024F4C 8002434C 0C00F4FF */ jal func_8003D3FC /* 024F50 80024350 00E02825 */ move $a1, $a3 /* 024F54 80024354 10000087 */ b .L80024574 /* 024F58 80024358 24040001 */ li $a0, 1 +glabel L8002435C /* 024F5C 8002435C 00C02025 */ move $a0, $a2 /* 024F60 80024360 0C00F416 */ jal func_8003D058 /* 024F64 80024364 00E02825 */ move $a1, $a3 /* 024F68 80024368 10000082 */ b .L80024574 /* 024F6C 8002436C 24040001 */ li $a0, 1 +glabel L80024370 /* 024F70 80024370 00C02025 */ move $a0, $a2 /* 024F74 80024374 0C00DD65 */ jal func_80037594 /* 024F78 80024378 00E02825 */ move $a1, $a3 /* 024F7C 8002437C 1000007D */ b .L80024574 /* 024F80 80024380 24040001 */ li $a0, 1 +glabel L80024384 /* 024F84 80024384 00C02025 */ move $a0, $a2 /* 024F88 80024388 0C00DD8F */ jal func_8003763C /* 024F8C 8002438C 00E02825 */ move $a1, $a3 /* 024F90 80024390 10000078 */ b .L80024574 /* 024F94 80024394 24040001 */ li $a0, 1 +glabel L80024398 /* 024F98 80024398 00C02025 */ move $a0, $a2 /* 024F9C 8002439C 0C00E070 */ jal func_800381C0 /* 024FA0 800243A0 00E02825 */ move $a1, $a3 /* 024FA4 800243A4 10000073 */ b .L80024574 /* 024FA8 800243A8 24040001 */ li $a0, 1 +glabel L800243AC /* 024FAC 800243AC 00C02025 */ move $a0, $a2 /* 024FB0 800243B0 0C00E09F */ jal func_8003827C /* 024FB4 800243B4 00E02825 */ move $a1, $a3 /* 024FB8 800243B8 1000006E */ b .L80024574 /* 024FBC 800243BC 24040001 */ li $a0, 1 +glabel L800243C0 /* 024FC0 800243C0 00C02025 */ move $a0, $a2 /* 024FC4 800243C4 0C00D2DD */ jal func_80034B74 /* 024FC8 800243C8 00E02825 */ move $a1, $a3 /* 024FCC 800243CC 10000069 */ b .L80024574 /* 024FD0 800243D0 24040001 */ li $a0, 1 +glabel L800243D4 /* 024FD4 800243D4 00C02025 */ move $a0, $a2 /* 024FD8 800243D8 0C00D3A7 */ jal func_80034E9C /* 024FDC 800243DC 00E02825 */ move $a1, $a3 /* 024FE0 800243E0 10000064 */ b .L80024574 /* 024FE4 800243E4 24040001 */ li $a0, 1 +glabel L800243E8 /* 024FE8 800243E8 00C02025 */ move $a0, $a2 /* 024FEC 800243EC 0C010824 */ jal func_80042090 /* 024FF0 800243F0 00E02825 */ move $a1, $a3 /* 024FF4 800243F4 1000005F */ b .L80024574 /* 024FF8 800243F8 24040001 */ li $a0, 1 +glabel L800243FC /* 024FFC 800243FC 00C02025 */ move $a0, $a2 /* 025000 80024400 0C00F4AE */ jal func_8003D2B8 /* 025004 80024404 00E02825 */ move $a1, $a3 /* 025008 80024408 1000005A */ b .L80024574 /* 02500C 8002440C 24040001 */ li $a0, 1 +glabel L80024410 /* 025010 80024410 00C02025 */ move $a0, $a2 /* 025014 80024414 0C00ED2F */ jal func_8003B4BC /* 025018 80024418 00E02825 */ move $a1, $a3 /* 02501C 8002441C 10000055 */ b .L80024574 /* 025020 80024420 24040001 */ li $a0, 1 +glabel L80024424 /* 025024 80024424 00C02025 */ move $a0, $a2 /* 025028 80024428 0C00D218 */ jal func_80034860 /* 02502C 8002442C 00E02825 */ move $a1, $a3 /* 025030 80024430 10000050 */ b .L80024574 /* 025034 80024434 24040001 */ li $a0, 1 +glabel L80024438 /* 025038 80024438 00C02025 */ move $a0, $a2 /* 02503C 8002443C 0C00D168 */ jal func_800345A0 /* 025040 80024440 00E02825 */ move $a1, $a3 /* 025044 80024444 1000004B */ b .L80024574 /* 025048 80024448 24040001 */ li $a0, 1 +glabel L8002444C /* 02504C 8002444C 00C02025 */ move $a0, $a2 /* 025050 80024450 0C00EB28 */ jal func_8003ACA0 /* 025054 80024454 00E02825 */ move $a1, $a3 /* 025058 80024458 10000046 */ b .L80024574 /* 02505C 8002445C 24040001 */ li $a0, 1 +glabel L80024460 /* 025060 80024460 00C02025 */ move $a0, $a2 /* 025064 80024464 0C00D714 */ jal func_80035C50 /* 025068 80024468 00E02825 */ move $a1, $a3 /* 02506C 8002446C 10000041 */ b .L80024574 /* 025070 80024470 24040001 */ li $a0, 1 +glabel L80024474 /* 025074 80024474 00C02025 */ move $a0, $a2 /* 025078 80024478 0C00DF5E */ jal func_80037D78 /* 02507C 8002447C 00E02825 */ move $a1, $a3 /* 025080 80024480 1000003C */ b .L80024574 /* 025084 80024484 24040001 */ li $a0, 1 +glabel L80024488 /* 025088 80024488 00C02025 */ move $a0, $a2 /* 02508C 8002448C 0C00F745 */ jal func_8003DD14 /* 025090 80024490 00E02825 */ move $a1, $a3 /* 025094 80024494 10000037 */ b .L80024574 /* 025098 80024498 24040001 */ li $a0, 1 +glabel L8002449C /* 02509C 8002449C 00C02025 */ move $a0, $a2 /* 0250A0 800244A0 0C00E2B5 */ jal func_80038AD4 /* 0250A4 800244A4 00E02825 */ move $a1, $a3 /* 0250A8 800244A8 10000032 */ b .L80024574 /* 0250AC 800244AC 24040001 */ li $a0, 1 +glabel L800244B0 /* 0250B0 800244B0 00C02025 */ move $a0, $a2 /* 0250B4 800244B4 0C010858 */ jal func_80042160 /* 0250B8 800244B8 00E02825 */ move $a1, $a3 /* 0250BC 800244BC 1000002D */ b .L80024574 /* 0250C0 800244C0 24040001 */ li $a0, 1 +glabel L800244C4 /* 0250C4 800244C4 00C02025 */ move $a0, $a2 /* 0250C8 800244C8 0C00E371 */ jal func_80038DC4 /* 0250CC 800244CC 00E02825 */ move $a1, $a3 /* 0250D0 800244D0 10000028 */ b .L80024574 /* 0250D4 800244D4 24040001 */ li $a0, 1 +glabel L800244D8 /* 0250D8 800244D8 00C02025 */ move $a0, $a2 /* 0250DC 800244DC 0C01085E */ jal func_80042178 /* 0250E0 800244E0 00E02825 */ move $a1, $a3 /* 0250E4 800244E4 10000023 */ b .L80024574 /* 0250E8 800244E8 24040001 */ li $a0, 1 +glabel L800244EC /* 0250EC 800244EC 00C02025 */ move $a0, $a2 /* 0250F0 800244F0 0C00D5F5 */ jal func_800357D4 /* 0250F4 800244F4 00E02825 */ move $a1, $a3 /* 0250F8 800244F8 1000001E */ b .L80024574 /* 0250FC 800244FC 24040001 */ li $a0, 1 +glabel L80024500 /* 025100 80024500 00C02025 */ move $a0, $a2 /* 025104 80024504 0C00CFD8 */ jal func_80033F60 /* 025108 80024508 00E02825 */ move $a1, $a3 /* 02510C 8002450C 10000019 */ b .L80024574 /* 025110 80024510 24040001 */ li $a0, 1 +glabel L80024514 /* 025114 80024514 00C02025 */ move $a0, $a2 /* 025118 80024518 0C0108BC */ jal func_800422F0 /* 02511C 8002451C 00E02825 */ move $a1, $a3 /* 025120 80024520 10000014 */ b .L80024574 /* 025124 80024524 24040001 */ li $a0, 1 +glabel L80024528 /* 025128 80024528 00C02025 */ move $a0, $a2 /* 02512C 8002452C 0C00F0B9 */ jal func_8003C2E4 /* 025130 80024530 00E02825 */ move $a1, $a3 /* 025134 80024534 1000000F */ b .L80024574 /* 025138 80024538 24040001 */ li $a0, 1 +glabel L8002453C /* 02513C 8002453C 00C02025 */ move $a0, $a2 /* 025140 80024540 0C00DF42 */ jal func_80037D08 /* 025144 80024544 00E02825 */ move $a1, $a3 /* 025148 80024548 1000000A */ b .L80024574 /* 02514C 8002454C 24040001 */ li $a0, 1 +glabel L80024550 /* 025150 80024550 00C02025 */ move $a0, $a2 /* 025154 80024554 0C010A66 */ jal func_80042998 /* 025158 80024558 00E02825 */ move $a1, $a3 /* 02515C 8002455C 10000005 */ b .L80024574 /* 025160 80024560 24040001 */ li $a0, 1 +glabel L80024564 /* 025164 80024564 00C02025 */ move $a0, $a2 /* 025168 80024568 0C010AA4 */ jal func_80042A90 /* 02516C 8002456C 00E02825 */ move $a1, $a3 .L80024570: +glabel L80024570 /* 025170 80024570 24040001 */ li $a0, 1 .L80024574: /* 025174 80024574 0C02DDAE */ jal func_800B76B8 diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 4322bf11..8546900e 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -117,294 +117,6 @@ const char D_800E50FC[] = "ERROR Channel %d\n"; const char D_800E5110[] = "RO error %d!!\n"; const char D_800E5120[] = "ARGHHHHHHHHH\n"; -const FloatLiteral D_800E5130 = { 1.09f }; -const FloatLiteral D_800E5134 = { 1.18f }; -const FloatLiteral D_800E5138 = { 1.2f }; -const FloatLiteral D_800E513C = { 2.4f }; -const FloatLiteral D_800E5140 = { 4.8f }; -const FloatLiteral D_800E5144 = { 0.05f }; -const FloatLiteral D_800E5148 = { 0.1f }; -const FloatLiteral D_800E514C = { 0.67f }; -const FloatLiteral D_800E5150 = { 0.33f }; - -// Jump table in func_8000CC7C -const u32 D_800E5154[] = { - 0x8000D974, 0x8000D974, 0x8000D974, 0x8000D974, - 0x8000D974, 0x8000D98C, 0x8000D974, 0x8000D974, - 0x8000D974 -}; - -const FloatLiteral D_800E5178 = { 0.0099999999f }; -const FloatLiteral D_800E517C = { 0.0099999999f }; -const FloatLiteral D_800E5180 = { 1.4f }; -const FloatLiteral D_800E5184 = { 0.714f }; - -// Jump table in func_8000E0B0 -const u32 D_800E5188[] = { - 0x8000E104, 0x8000E0E4, 0x8000E0F4, 0x8000E0F4, - 0x8000E0FC, 0x8000E104, 0x8000E0FC, 0x8000E0EC, - 0x8000E104 -}; - -const FloatLiteral D_800E51AC = { 1.4f }; -const FloatLiteral D_800E51B0 = { 0.714f }; - -// Jump table in func_8000EA54 -const u32 D_800E51B4[] = { - 0x8000ECD8, 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, - 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, - 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, - 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, 0x8000ED98, - 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, - 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, - 0x8000ECF4, 0x8000EDE0, 0x8000EDE0, 0x8000EDE0, - 0x8000EDE0, 0x8000ED10, 0x8000EDE0, 0x8000EDE0, - 0x8000EDE0, 0x8000ED40, 0x8000EDE0, 0x8000EDE0, - 0x8000EDE0, 0x8000EDE0, 0x8000ED54 -}; - -// Jump table in func_800101AC -const u32 D_800E5250[] = { - 0x80010374, 0x800105F8, 0x800105F8, 0x800105F8, - 0x80010400, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x80010400, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800104C0, 0x800105F8, 0x800105F8, 0x800105A8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105D0, 0x800105E4, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800104D8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800104AC, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105A8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x80010508, 0x800105F8, - 0x80010374, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x8001047C, - 0x8001047C, 0x800105F8, 0x800105F8, 0x800105F8, - 0x8001047C, 0x8001047C, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x800105F8, - 0x800105F8, 0x800105F8, 0x800105F8, 0x8001044C -}; - -// Jump table in func_800101AC -const u32 D_800E5420[] = { - 0x8001063C, 0x8001063C, 0x80010664, 0x8001063C, - 0x8001063C, 0x80010664, 0x8001063C, 0x80010664, - 0x80010664, 0x80010664, 0x80010664, 0x80010664, - 0x80010664, 0x80010664, 0x80010664, 0x80010664, - 0x80010664, 0x80010664, 0x80010664, 0x80010664, - 0x8001063C, 0x80010664, 0x8001063C, 0x80010664, - 0x80010664, 0x80010664, 0x80010664, 0x80010664, - 0x80010664, 0x80010664, 0x8001063C, 0x8001063C, - 0x80010664, 0x80010664, 0x8001063C, 0x8001063C, - 0x8001063C, 0x80010664, 0x80010664, 0x80010664, - 0x80010664, 0x80010664, 0x80010664, 0x80010664, - 0x80010664, 0x80010664, 0x8001063C, 0x8001063C, - 0x80010664, 0x80010664, 0x80010664, 0x8001063C, - 0x8001063C, 0x8001063C, 0x8001063C, 0x80010664, - 0x80010664, 0x80010664, 0x80010664, 0x80010664, - 0x80010664, 0x80010664, 0x80010664, 0x8001063C, - 0x80010664, 0x8001063C, 0x80010664, 0x80010664, - 0x80010664, 0x8001063C -}; - -const DoubleLiteral D_800E5538 = { 1000.0 }; -const DoubleLiteral D_800E5540 = { 3000.0 }; -const DoubleLiteral D_800E5548 = { 500.0 }; -const FloatLiteral D_800E5550 = { 0.01f }; -const FloatLiteral D_800E5554 = { 0.2f }; -const FloatLiteral D_800E5558 = { 0.05f }; -const FloatLiteral D_800E555C = { 3500.0f }; -const FloatLiteral D_800E5560 = { 2700.0f }; -const FloatLiteral D_800E5564 = { 0.6f }; -const FloatLiteral D_800E5568 = { 1.15f }; -const FloatLiteral D_800E556C = { 0.05f }; -const FloatLiteral D_800E5570 = { 0.95f }; -const DoubleLiteral D_800E5578 = { 0.1 }; -const FloatLiteral D_800E5580 = { 0.02f }; -const FloatLiteral D_800E5584 = { 0.98f }; - -// Jump table in func_80014B50 -const u32 D_800E5588[] = { - 0x80014B80, 0x80014CCC, 0x80014E18, 0x80015340, - 0x80015340, 0x80015340, 0x80015340, 0x80015340, - 0x80014F64, 0x800150B0, 0x800151FC -}; - -const DoubleLiteral D_800E55B8 = { 0.3 }; -const DoubleLiteral D_800E55C0 = { 0.3 }; -const DoubleLiteral D_800E55C8 = { 0.8 }; -const DoubleLiteral D_800E55D0 = { 0.1 }; -const DoubleLiteral D_800E55D8 = { 0.1 }; -const DoubleLiteral D_800E55E0 = { 0.3 }; -const DoubleLiteral D_800E55E8 = { 0.3 }; -const DoubleLiteral D_800E55F0 = { 0.1 }; -const DoubleLiteral D_800E55F8 = { 0.3 }; -const DoubleLiteral D_800E5600 = { 0.1 }; -const DoubleLiteral D_800E5608 = { -0.1 }; -const DoubleLiteral D_800E5610 = { -0.1 }; -const DoubleLiteral D_800E5618 = { 0.707 }; -const DoubleLiteral D_800E5620 = { -0.3 }; -const DoubleLiteral D_800E5628 = { 1.3 }; -const DoubleLiteral D_800E5630 = { 500.0 }; -const FloatLiteral D_800E5638 = { -20000.0f }; -const FloatLiteral D_800E563C = { -10000.0f }; -const FloatLiteral D_800E5644 = { -20000.0f }; -const FloatLiteral D_800E5648 = { 50000.0f }; -const DoubleLiteral D_800E564C = { 1.2 }; -const FloatLiteral D_800E5650 = { 0.01f }; -const DoubleLiteral D_800E5658 = { 255.0 }; -const FloatLiteral D_800E5660 = { 1.99f }; -const DoubleLiteral D_800E5668 = { 0.1 }; -const DoubleLiteral D_800E5670 = { 1.2 }; -const FloatLiteral D_800E5678 = { 0.01f }; -const DoubleLiteral D_800E5680 = { 0.1 }; - -// Jump table in func_800235DC -const u32 D_800E5688[] = { - 0x80023614, 0x800238A8, 0x80023808, 0x80023650, - 0x800236DC, 0x800238A8, 0x8002363C, 0x80023664, - 0x80023678, 0x800238A8, 0x800238A8, 0x80023790, - 0x800238A8, 0x80023628, 0x800238A8, 0x8002368C, - 0x800236F0, 0x800236DC, 0x80023678, 0x800238A8, - 0x800238A8, 0x800238A8, 0x800238A8, 0x800238A8, - 0x800238A8, 0x800238A8, 0x800236B4, 0x800238A8, - 0x800236C8, 0x800236A0, 0x80023754, 0x80023704, - 0x800238A8, 0x800238A8, 0x800238A8, 0x800238A8, - 0x800238A8, 0x80023718, 0x800238A8, 0x8002372C, - 0x800236A0, 0x800238A8, 0x800238A8, 0x800238A8, - 0x80023740, 0x800238A8, 0x80023830, 0x800238A8, - 0x800238A8, 0x80023790, 0x80023790, 0x800238A8, - 0x80023790, 0x80023790, 0x800236A0, 0x80023790, - 0x800238A8, 0x800238A8, 0x800238A8, 0x800238A8, - 0x800237E0, 0x80023754, 0x800238A8, 0x800238A8, - 0x800238A8, 0x800238A8, 0x800238A8, 0x800238A8, - 0x800238A8, 0x80023790, 0x800237A4, 0x80023790, - 0x800238A8, 0x8002386C, 0x800238A8, 0x800238A8, - 0x80023754, 0x800238A8, 0x80023768, 0x80023790, - 0x80023790, 0x800238A8, 0x8002377C, 0x80023790, - 0x80023790, 0x80023790, 0x800238A8, 0x800238A8, - 0x800238A8, 0x800238A8, 0x800238A8, 0x800238A8, - 0x800238A8, 0x80023858, 0x800238A8, 0x80023790, - 0x80023790, 0x800238A8, 0x800238A8, 0x800238A8, - 0x80023790, 0x80023790, 0x80023790, 0x80023790, - 0x800238A8, 0x800238A8, 0x800238A8, 0x800238A8, - 0x80023880, 0x800238A8, 0x80023628, 0x800237B8, - 0x80023790, 0x800238A8, 0x80023790, 0x80023894, - 0x800238A8, 0x800237CC, 0x80023790 -}; - -// Jump table in func_800238BC -const u32 D_800E5864[] = { - 0x80023908, 0x80023918, 0x80023928, 0x80023938, - 0x80023A78, 0x80023948, 0x80023978, 0x80023988, - 0x80023998, 0x800239B8, 0x800239C8, 0x800239D8, - 0x800239E8, 0x80023A18, 0x80023A38, 0x80023A48, - 0x80023A58, 0x80023A78, 0x80023998, 0x80023E20, - 0x80023E20, 0x80023968, 0x80023A68, 0x80023E20, - 0x80023958, 0x80023A88, 0x800239A8, 0x80023A98, - 0x80023AA8, 0x800239F8, 0x80023AB8, 0x80023AC8, - 0x80023AD8, 0x80023E20, 0x80023E20, 0x80023AE8, - 0x80023B08, 0x80023B18, 0x80023B28, 0x80023B38, - 0x80023A08, 0x80023E20, 0x80023B48, 0x80023B58, - 0x80023B68, 0x80023B78, 0x80023B88, 0x80023E20, - 0x80023B98, 0x80023E20, 0x80023E20, 0x80023BA8, - 0x80023E20, 0x80023E20, 0x80023BB8, 0x80023E20, - 0x80023BC8, 0x80023BD8, 0x80023BE8, 0x80023E20, - 0x80023BF8, 0x80023C08, 0x80023E20, 0x80023C18, - 0x80023C28, 0x80023C38, 0x80023AF8, 0x80023C48, - 0x80023C58, 0x80023C68, 0x80023CA8, 0x80023C78, - 0x80023CD8, 0x80023CE8, 0x80023CF8, 0x80023D08, - 0x80023D18, 0x80023D28, 0x80023D38, 0x80023E20, - 0x80023E20, 0x80023D48, 0x80023D58, 0x80023D68, - 0x80023E20, 0x80023E20, 0x80023E20, 0x80023D88, - 0x80023D78, 0x80023D98, 0x80023E20, 0x80023E20, - 0x80023BC8, 0x80023DA8, 0x80023C78, 0x80023C88, - 0x80023C98, 0x80023DB8, 0x80023DC8, 0x80023DC8, - 0x80023C88, 0x80023C98, 0x80023C68, 0x80023C78, - 0x80023DD8, 0x80023E20, 0x80023E20, 0x80023DE8, - 0x80023DF8, 0x80023E08, 0x80023A28, 0x80023CB8, - 0x80023E20, 0x80023E20, 0x80023E20, 0x80023DE8, - 0x80023E18, 0x80023CC8 -}; - -// Jump table in func_80023E30 -const u32 D_800E5A3C[] = { - 0x80023E5C, 0x80023E64, 0x80023F40, 0x80023F40, - 0x80023E6C, 0x80023F40, 0x80023F14, 0x80023F40, - 0x80023F40, 0x80023F40, 0x80023F40, 0x80023E74, - 0x80023F14, 0x80023E7C, 0x80023F40, 0x80023F40, - 0x80023E84, 0x80023F14, 0x80023F40, 0x80023F40, - 0x80023F40, 0x80023F40, 0x80023F40, 0x80023E9C, - 0x80023F40, 0x80023F14, 0x80023F40, 0x80023F40, - 0x80023F40, 0x80023F14, 0x80023EA4, 0x80023EAC, - 0x80023F40, 0x80023F40, 0x80023F40, 0x80023F14, - 0x80023F40, 0x80023EBC, 0x80023EC4, 0x80023ECC, - 0x80023F14, 0x80023F40, 0x80023F40, 0x80023F40, - 0x80023ED4, 0x80023F40, 0x80023F40, 0x80023EDC, - 0x80023F24, 0x80023EEC, 0x80023F24, 0x80023F14, - 0x80023F40, 0x80023EF4, 0x80023F14, 0x80023EEC, - 0x80023F14, 0x80023F40, 0x80023F40, 0x80023F40, - 0x80023F24, 0x80023F2C, 0x80023EE4, 0x80023EAC, - 0x80023F40, 0x80023F40, 0x80023EB4, 0x80023F14, - 0x80023F40, 0x80023E8C, 0x80023F40, 0x80023E8C, - 0x80023F40, 0x80023EFC, 0x80023F40, 0x80023F40, - 0x80023E84, 0x80023F14, 0x80023F14, 0x80023EEC, - 0x80023F0C, 0x80023F1C, 0x80023F40, 0x80023EEC, - 0x80023F40, 0x80023EEC, 0x80023F40, 0x80023EAC, - 0x80023F40, 0x80023F40, 0x80023F04, 0x80023F40, - 0x80023F14, 0x80023F40, 0x80023EFC, 0x80023E8C, - 0x80023E8C, 0x80023F14, 0x80023EFC, 0x80023EFC, - 0x80023E94, 0x80023E94, 0x80023E94, 0x80023E94, - 0x80023F40, 0x80023F40, 0x80023F40, 0x80023F14, - 0x80023F34, 0x80023EAC, 0x80023E7C, 0x80023F40, - 0x80023F40, 0x80023F3C, 0x80023EEC, 0x80023F14 -}; - -// Jump table in func_80023F48 -const u32 D_800E5C0C[] = { - 0x80023FA4, 0x80023FB8, 0x80023FCC, 0x80024108, - 0x80023FE0, 0x8002401C, 0x80024570, 0x80024570, - 0x80024030, 0x80024044, 0x80024058, 0x8002406C, - 0x800240A8, 0x800240BC, 0x800240CC, 0x800240E0, - 0x80024108, 0x80024570, 0x80024570, 0x80024570, - 0x80024008, 0x800240F4, 0x80024570, 0x80023FF4, - 0x8002411C, 0x80024570, 0x80024130, 0x80024144, - 0x80024080, 0x80024158, 0x8002416C, 0x80024570, - 0x80024570, 0x80024570, 0x80024180, 0x800241A8, - 0x800241BC, 0x800241D0, 0x800241E4, 0x80024094, - 0x80024570, 0x80024570, 0x80024570, 0x800241F8, - 0x8002420C, 0x80024220, 0x80024570, 0x80024570, - 0x80024234, 0x8002425C, 0x80024270, 0x80024284, - 0x80024298, 0x800242AC, 0x800242C0, 0x800242D4, - 0x800242E8, 0x80024570, 0x800242FC, 0x8002430C, - 0x80024320, 0x80024570, 0x80024334, 0x80024348, - 0x8002435C, 0x80024194, 0x80024370, 0x80024384, - 0x80024398, 0x80024570, 0x80024398, 0x800243C0, - 0x800243D4, 0x800243E8, 0x800243FC, 0x80024410, - 0x80024424, 0x80024438, 0x8002444C, 0x80024234, - 0x80024460, 0x80024570, 0x80024474, 0x80024234, - 0x80024234, 0x80024570, 0x80024488, 0x80024570, - 0x8002449C, 0x80024570, 0x80024570, 0x800242D4, - 0x800244B0, 0x80024570, 0x800243AC, 0x800243AC, - 0x800244C4, 0x80024570, 0x800244EC, 0x800243AC, - 0x800243AC, 0x80024398, 0x80024398, 0x800244D8, - 0x80024570, 0x80024570, 0x80024500, 0x80024514, - 0x80024488, 0x80024528, 0x80024570, 0x8002453C, - 0x80024570, 0x80024550, 0x80024500, 0x80024564, - 0x80024570, 0x80024248 -}; - /*********************************/ /************ .bss ************/ @@ -605,7 +317,7 @@ void func_8000C2D8(u8 *arg0, s32 length); void func_8000BF8C(void) { s32 i; - func_8001D258(D_800E514C.floatLiteral, D_800E5150.floatLiteral, 0, -0x2000, 0); + func_8001D258(0.67f, 0.33f, 0, -0x2000, 0); D_8011AE68 = (s32*)func_80070B78(0x15800, 0x200); particlePtrList = (Player **)func_80070C9C(0x320, 0xFFFF); D_8011AE6C = (s32*)func_80070C9C(0x50, 0xFFFF); diff --git a/tools/python/rodata_move.py b/tools/python/rodata_move.py index e141fb52..a2dfb749 100755 --- a/tools/python/rodata_move.py +++ b/tools/python/rodata_move.py @@ -135,7 +135,7 @@ def convertFile(cFilepath): # # Check if the string has a reference somewhere # getAsmFileReferenceForLabel(filename, strLabel) # hasProcessed = True - # bottomLine = curLine - 1 + # bottomLine = curLine # asmData.insert(0, ('asciz', strLabel, strValue, bottomLine)) # except: print('Currently cannot process literal string: ') @@ -151,7 +151,7 @@ def convertFile(cFilepath): stoppedPremature = True break hasProcessed = True - bottomLine = curLine - 1 + bottomLine = curLine asmData.insert(0, ('float', floatLabel, floatValue, bottomLine)) elif lineType == 3: # Literal double floatMatch = getMatches(line, C_FLOAT_REGEX)[0] @@ -162,7 +162,7 @@ def convertFile(cFilepath): stoppedPremature = True break hasProcessed = True - bottomLine = curLine - 1 + bottomLine = curLine asmData.insert(0, ('double', floatLabel, floatValue, bottomLine)) elif lineType == 4: # Jump table bottom tableBottom = curLine @@ -173,7 +173,7 @@ def convertFile(cFilepath): for val in range(1, len(tblMatch)): tblValues.append(tblMatch[val][0][2:]) hasProcessed = True - bottomLine = curLine - 1 + bottomLine = curLine asmData.insert(0, ('table', tblLabel, tblValues, bottomLine)) tableBottom = -1 else: @@ -181,22 +181,25 @@ def convertFile(cFilepath): curLine -= 1 asmRefs = {} asmBottomLine = 999999 - for i in range(0, len(asmData)): + for i in reversed(range(0, len(asmData))): data = asmData[i] try: ref = getAsmFileReferenceForLabel(filename, data[1]) if ref not in asmRefs: asmRefs[ref] = [] asmRefs[ref].append(data) - asmBottomLine = min(asmBottomLine, asmRefs[ref][3]) + asmBottomLine = min(asmBottomLine, data[3]) except Exception as e: + # raise e print(e) if asmBottomLine != 999999: + print(bottomLine, asmBottomLine) bottomLine = asmBottomLine stoppedPremature = True break - for asmFilepath in reversed(asmRefs): + for asmFilepath in asmRefs: print('Processing: ' + asmFilepath) + asmRefs[asmFilepath].reverse() asmBottomLine = 999999 adjustAsmFile(asmFilepath, asmRefs[asmFilepath]) for ref in asmRefs[asmFilepath]: @@ -218,8 +221,12 @@ def convertFile(cFilepath): parser = argparse.ArgumentParser(description="") parser.add_argument("file", help=".c file that contains rodata to move.") +parser.add_argument("-s", "--single", help="Only do one ASM function in the file", action='store_true') args = parser.parse_args() +if args.single is not None and args.single: + ONLY_THE_FIRST_ASM_FILE = True + if args.file.endswith('.c'): convertFile(args.file) else: