From cf33e2ea5f6d45b690572bd3eb38880efa185653 Mon Sep 17 00:00:00 2001 From: Tyler McGavran Date: Tue, 11 Jul 2023 13:58:02 -0400 Subject: [PATCH] Migrate rodata for code_80005FD0 into asm files (#332) Signed-off-by: Taggerung --- .../code_80005FD0/func_80006018.s | 66 - .../code_80005FD0/func_80007FA4.s | 22 + .../code_80005FD0/func_80008424.s | 10 + .../code_80005FD0/func_8000929C.s | 10 + .../code_80005FD0/func_80009B60.s | 25 + .../code_80005FD0/func_8000B140.s | 13 + .../code_80005FD0/func_8000B874.s | 61 - .../code_80005FD0/func_8000BA14.s | 7 + .../code_80005FD0/func_8000C0BC.s | 525 ------ .../code_80005FD0/func_8000C884.s | 93 -- .../code_80005FD0/func_8000C9DC.s | 124 -- .../code_80005FD0/func_8000D100.s | 7 + .../code_80005FD0/func_8000D6D0.s | 7 + .../code_80005FD0/func_8000D940.s | 7 + .../code_80005FD0/func_8000DBAC.s | 7 + .../code_80005FD0/func_8000DF8C.s | 32 + .../code_80005FD0/func_8000EF20.s | 121 -- .../code_80005FD0/func_8000F628.s | 8 + .../code_80005FD0/func_800107C4.s | 361 ---- .../code_80005FD0/func_80011014.s | 10 + .../code_80005FD0/func_8001168C.s | 7 + .../code_80005FD0/func_80011B14.s | 15 + .../code_80005FD0/func_80011D48.s | 9 + .../code_80005FD0/func_80011EC0.s | 10 + .../code_80005FD0/func_80012AC0.s | 11 + .../code_80005FD0/func_80013054.s | 21 + .../code_80005FD0/func_800132F4.s | 8 + .../code_80005FD0/func_800133C4.s | 19 + .../code_80005FD0/func_80013854.s | 105 -- .../code_80005FD0/func_800139E4.s | 7 + .../code_80005FD0/func_80013C74.s | 55 - .../code_80005FD0/func_80013D20.s | 158 -- .../code_80005FD0/func_80013F7C.s | 16 + .../code_80005FD0/func_800145A8.s | 84 - .../code_80005FD0/func_800146B8.s | 7 + .../code_80005FD0/func_800147E0.s | 13 + .../code_80005FD0/func_80014934.s | 13 + .../code_80005FD0/func_80014A88.s | 13 + .../code_80005FD0/func_80014BDC.s | 13 + .../code_80005FD0/func_80015544.s | 7 + .../code_80005FD0/func_8001577C.s | 10 + .../code_80005FD0/func_80015C94.s | 7 + .../code_80005FD0/func_80016494.s | 19 + .../code_80005FD0/func_80016C3C.s | 14 + .../code_80005FD0/func_80017054.s | 10 + .../code_80005FD0/func_800178F4.s | 14 + .../code_80005FD0/func_800180F0.s | 10 + .../code_80005FD0/func_800188F4.s | 45 + .../code_80005FD0/func_80019118.s | 7 + .../code_80005FD0/func_8001933C.s | 10 + .../code_80005FD0/func_80019890.s | 11 + .../code_80005FD0/func_8001A220.s | 8 + .../code_80005FD0/func_8001A588.s | 11 + .../code_80005FD0/func_8001AB74.s | 10 + .../code_80005FD0/func_8001AC10.s | 23 + .../code_80005FD0/func_8001C05C.s | 31 + data/data_0DD0A0_3.s | 1456 ----------------- mk64.ld | 2 +- src/code_80005FD0.c | 429 ++++- src/code_80005FD0.h | 2 - 60 files changed, 938 insertions(+), 3298 deletions(-) delete mode 100644 asm/non_matchings/code_80005FD0/func_80006018.s delete mode 100644 asm/non_matchings/code_80005FD0/func_8000B874.s delete mode 100644 asm/non_matchings/code_80005FD0/func_8000C0BC.s delete mode 100644 asm/non_matchings/code_80005FD0/func_8000C884.s delete mode 100644 asm/non_matchings/code_80005FD0/func_8000C9DC.s delete mode 100644 asm/non_matchings/code_80005FD0/func_8000EF20.s delete mode 100644 asm/non_matchings/code_80005FD0/func_800107C4.s delete mode 100644 asm/non_matchings/code_80005FD0/func_80013854.s delete mode 100644 asm/non_matchings/code_80005FD0/func_80013C74.s delete mode 100644 asm/non_matchings/code_80005FD0/func_80013D20.s delete mode 100644 asm/non_matchings/code_80005FD0/func_800145A8.s delete mode 100644 data/data_0DD0A0_3.s diff --git a/asm/non_matchings/code_80005FD0/func_80006018.s b/asm/non_matchings/code_80005FD0/func_80006018.s deleted file mode 100644 index f93a8a8ab..000000000 --- a/asm/non_matchings/code_80005FD0/func_80006018.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80006018 -/* 006C18 80006018 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 006C1C 8000601C AFA60020 */ sw $a2, 0x20($sp) -/* 006C20 80006020 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 006C24 80006024 AFA70024 */ sw $a3, 0x24($sp) -/* 006C28 80006028 C7A80024 */ lwc1 $f8, 0x24($sp) -/* 006C2C 8000602C 46042182 */ mul.s $f6, $f4, $f4 -/* 006C30 80006030 AFBF0014 */ sw $ra, 0x14($sp) -/* 006C34 80006034 E7AC0018 */ swc1 $f12, 0x18($sp) -/* 006C38 80006038 46084282 */ mul.s $f10, $f8, $f8 -/* 006C3C 8000603C E7AE001C */ swc1 $f14, 0x1c($sp) -/* 006C40 80006040 0C033850 */ jal sqrtf -/* 006C44 80006044 460A3300 */ add.s $f12, $f6, $f10 -/* 006C48 80006048 3C01800F */ lui $at, %hi(D_800ECF74) # $at, 0x800f -/* 006C4C 8000604C C424CF74 */ lwc1 $f4, %lo(D_800ECF74)($at) -/* 006C50 80006050 C7A80020 */ lwc1 $f8, 0x20($sp) -/* 006C54 80006054 8FBF0014 */ lw $ra, 0x14($sp) -/* 006C58 80006058 4604003C */ c.lt.s $f0, $f4 -/* 006C5C 8000605C 00000000 */ nop -/* 006C60 80006060 45020004 */ bc1fl .L80006074 -/* 006C64 80006064 46004403 */ div.s $f16, $f8, $f0 -/* 006C68 80006068 10000028 */ b .L8000610C -/* 006C6C 8000606C 00001025 */ move $v0, $zero -/* 006C70 80006070 46004403 */ div.s $f16, $f8, $f0 -.L80006074: -/* 006C74 80006074 C7A40024 */ lwc1 $f4, 0x24($sp) -/* 006C78 80006078 C7A60030 */ lwc1 $f6, 0x30($sp) -/* 006C7C 8000607C C7AA0018 */ lwc1 $f10, 0x18($sp) -/* 006C80 80006080 C7A80034 */ lwc1 $f8, 0x34($sp) -/* 006C84 80006084 00001025 */ move $v0, $zero -/* 006C88 80006088 460A3081 */ sub.s $f2, $f6, $f10 -/* 006C8C 8000608C C7A6001C */ lwc1 $f6, 0x1c($sp) -/* 006C90 80006090 46002383 */ div.s $f14, $f4, $f0 -/* 006C94 80006094 46064301 */ sub.s $f12, $f8, $f6 -/* 006C98 80006098 46028282 */ mul.s $f10, $f16, $f2 -/* 006C9C 8000609C C7A80028 */ lwc1 $f8, 0x28($sp) -/* 006CA0 800060A0 46004187 */ neg.s $f6, $f8 -/* 006CA4 800060A4 460C7102 */ mul.s $f4, $f14, $f12 -/* 006CA8 800060A8 46045480 */ add.s $f18, $f10, $f4 -/* 006CAC 800060AC 4612303C */ c.lt.s $f6, $f18 -/* 006CB0 800060B0 00000000 */ nop -/* 006CB4 800060B4 45000015 */ bc1f .L8000610C -/* 006CB8 800060B8 00000000 */ nop -/* 006CBC 800060BC 4608903C */ c.lt.s $f18, $f8 -/* 006CC0 800060C0 00000000 */ nop -/* 006CC4 800060C4 45000011 */ bc1f .L8000610C -/* 006CC8 800060C8 00000000 */ nop -/* 006CCC 800060CC 46027282 */ mul.s $f10, $f14, $f2 -/* 006CD0 800060D0 46008107 */ neg.s $f4, $f16 -/* 006CD4 800060D4 C7A8002C */ lwc1 $f8, 0x2c($sp) -/* 006CD8 800060D8 460C2182 */ mul.s $f6, $f4, $f12 -/* 006CDC 800060DC 46004107 */ neg.s $f4, $f8 -/* 006CE0 800060E0 46065480 */ add.s $f18, $f10, $f6 -/* 006CE4 800060E4 4612203C */ c.lt.s $f4, $f18 -/* 006CE8 800060E8 00000000 */ nop -/* 006CEC 800060EC 45000007 */ bc1f .L8000610C -/* 006CF0 800060F0 00000000 */ nop -/* 006CF4 800060F4 4608903C */ c.lt.s $f18, $f8 -/* 006CF8 800060F8 00000000 */ nop -/* 006CFC 800060FC 45000003 */ bc1f .L8000610C -/* 006D00 80006100 00000000 */ nop -/* 006D04 80006104 10000001 */ b .L8000610C -/* 006D08 80006108 24020001 */ li $v0, 1 -.L8000610C: -/* 006D0C 8000610C 03E00008 */ jr $ra -/* 006D10 80006110 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_80005FD0/func_80007FA4.s b/asm/non_matchings/code_80005FD0/func_80007FA4.s index 871959809..4e4f134a8 100644 --- a/asm/non_matchings/code_80005FD0/func_80007FA4.s +++ b/asm/non_matchings/code_80005FD0/func_80007FA4.s @@ -1,3 +1,25 @@ +.section .late_rodata + +glabel D_800ECF78 +.double 0.16666666666666666 + +glabel D_800ECF80 +.double 0.41666666666666669 + +glabel D_800ECF88 +.double 1.6666666666666667 + +glabel D_800ECF90 +.float 4900.0 + +glabel D_800ECF94 +.float 22500.0 + +glabel D_800ECF98 +.float 90000.0 + +.section .text + glabel func_80007FA4 /* 008BA4 80007FA4 00041080 */ sll $v0, $a0, 2 /* 008BA8 80007FA8 3C018016 */ lui $at, %hi(D_80163418) diff --git a/asm/non_matchings/code_80005FD0/func_80008424.s b/asm/non_matchings/code_80005FD0/func_80008424.s index 5841a424e..d6f4cba47 100644 --- a/asm/non_matchings/code_80005FD0/func_80008424.s +++ b/asm/non_matchings/code_80005FD0/func_80008424.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ECF9C +.float 3.3333333 + +glabel D_800ECFA0 +.float 1.6666666 + +.section .text + glabel func_80008424 /* 009024 80008424 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 009028 80008428 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8000929C.s b/asm/non_matchings/code_80005FD0/func_8000929C.s index a2ca2f112..9c9e50c80 100644 --- a/asm/non_matchings/code_80005FD0/func_8000929C.s +++ b/asm/non_matchings/code_80005FD0/func_8000929C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ECFA8 +.float 1300.0 + +glabel D_800ECFAC +.float -1300.0 + +.section .text + glabel func_8000929C /* 009E9C 8000929C 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 009EA0 800092A0 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80009B60.s b/asm/non_matchings/code_80005FD0/func_80009B60.s index 887deae2e..6cbd0a680 100644 --- a/asm/non_matchings/code_80005FD0/func_80009B60.s +++ b/asm/non_matchings/code_80005FD0/func_80009B60.s @@ -1,3 +1,28 @@ +.section .late_rodata + +glabel D_800ECFB0 +.float 4.3 + +glabel D_800ECFB4 +.float 8.33333333 + +glabel D_800ECFB8 +.float 0.9 + +glabel D_800ECFBC +.float -0.9 + +glabel D_800ECFC0 +.float 0.9 + +glabel D_800ECFC4 +.float -0.9 + +glabel D_800ECFC8 +.float 3.33333333 + +.section .text + glabel func_80009B60 /* 00A760 80009B60 3C0E800E */ lui $t6, %hi(gCurrentCourseId) /* 00A764 80009B64 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) diff --git a/asm/non_matchings/code_80005FD0/func_8000B140.s b/asm/non_matchings/code_80005FD0/func_8000B140.s index 0468b8a0e..9089758eb 100644 --- a/asm/non_matchings/code_80005FD0/func_8000B140.s +++ b/asm/non_matchings/code_80005FD0/func_8000B140.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel D_800ECFCC +.float 0.2 + +glabel D_800ECFD0 +.float 0.2 + +glabel D_800ECFD4 +.float 0.2 + +.section .text + glabel func_8000B140 /* 00BD40 8000B140 000478C0 */ sll $t7, $a0, 3 /* 00BD44 8000B144 01E47823 */ subu $t7, $t7, $a0 diff --git a/asm/non_matchings/code_80005FD0/func_8000B874.s b/asm/non_matchings/code_80005FD0/func_8000B874.s deleted file mode 100644 index c87638251..000000000 --- a/asm/non_matchings/code_80005FD0/func_8000B874.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_8000B874 -/* 00C474 8000B874 00071880 */ sll $v1, $a3, 2 -/* 00C478 8000B878 3C0F8016 */ lui $t7, %hi(D_80164560) # 0x8016 -/* 00C47C 8000B87C 3C188016 */ lui $t8, %hi(D_80164570) # 0x8016 -/* 00C480 8000B880 01E37821 */ addu $t7, $t7, $v1 -/* 00C484 8000B884 0303C021 */ addu $t8, $t8, $v1 -/* 00C488 8000B888 8DEF4560 */ lw $t7, %lo(D_80164560)($t7) # 0x4560($t7) -/* 00C48C 8000B88C 8F184570 */ lw $t8, %lo(D_80164570)($t8) # 0x4570($t8) -/* 00C490 8000B890 30CEFFFF */ andi $t6, $a2, 0xffff -/* 00C494 8000B894 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 00C498 8000B898 000E20C0 */ sll $a0, $t6, 3 -/* 00C49C 8000B89C AFA60038 */ sw $a2, 0x38($sp) -/* 00C4A0 8000B8A0 01E41021 */ addu $v0, $t7, $a0 -/* 00C4A4 8000B8A4 03042821 */ addu $a1, $t8, $a0 -/* 00C4A8 8000B8A8 84590000 */ lh $t9, ($v0) -/* 00C4AC 8000B8AC 84A90000 */ lh $t1, ($a1) -/* 00C4B0 8000B8B0 84480004 */ lh $t0, 4($v0) -/* 00C4B4 8000B8B4 84AA0004 */ lh $t2, 4($a1) -/* 00C4B8 8000B8B8 44992000 */ mtc1 $t9, $f4 -/* 00C4BC 8000B8BC 44894000 */ mtc1 $t1, $f8 -/* 00C4C0 8000B8C0 44883000 */ mtc1 $t0, $f6 -/* 00C4C4 8000B8C4 468020A0 */ cvt.s.w $f2, $f4 -/* 00C4C8 8000B8C8 448A5000 */ mtc1 $t2, $f10 -/* 00C4CC 8000B8CC 3C01800F */ lui $at, %hi(D_800ECFE0) # $at, 0x800f -/* 00C4D0 8000B8D0 46804020 */ cvt.s.w $f0, $f8 -/* 00C4D4 8000B8D4 46803420 */ cvt.s.w $f16, $f6 -/* 00C4D8 8000B8D8 468054A0 */ cvt.s.w $f18, $f10 -/* 00C4DC 8000B8DC 46020101 */ sub.s $f4, $f0, $f2 -/* 00C4E0 8000B8E0 46109181 */ sub.s $f6, $f18, $f16 -/* 00C4E4 8000B8E4 E7A4000C */ swc1 $f4, 0xc($sp) -/* 00C4E8 8000B8E8 C7A8000C */ lwc1 $f8, 0xc($sp) -/* 00C4EC 8000B8EC E7A60008 */ swc1 $f6, 8($sp) -/* 00C4F0 8000B8F0 46084282 */ mul.s $f10, $f8, $f8 -/* 00C4F4 8000B8F4 C7A40008 */ lwc1 $f4, 8($sp) -/* 00C4F8 8000B8F8 46042182 */ mul.s $f6, $f4, $f4 -/* 00C4FC 8000B8FC C424CFE0 */ lwc1 $f4, %lo(D_800ECFE0)($at) -/* 00C500 8000B900 46065200 */ add.s $f8, $f10, $f6 -/* 00C504 8000B904 4604403C */ c.lt.s $f8, $f4 -/* 00C508 8000B908 E7A80004 */ swc1 $f8, 4($sp) -/* 00C50C 8000B90C 45020005 */ bc1fl .L8000B924 -/* 00C510 8000B910 46026181 */ sub.s $f6, $f12, $f2 -/* 00C514 8000B914 44800000 */ mtc1 $zero, $f0 -/* 00C518 8000B918 1000000E */ b .L8000B954 -/* 00C51C 8000B91C 00000000 */ nop -/* 00C520 8000B920 46026181 */ sub.s $f6, $f12, $f2 -.L8000B924: -/* 00C524 8000B924 C7AA000C */ lwc1 $f10, 0xc($sp) -/* 00C528 8000B928 C7A40008 */ lwc1 $f4, 8($sp) -/* 00C52C 8000B92C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 00C530 8000B930 46065202 */ mul.s $f8, $f10, $f6 -/* 00C534 8000B934 46107281 */ sub.s $f10, $f14, $f16 -/* 00C538 8000B938 460A2182 */ mul.s $f6, $f4, $f10 -/* 00C53C 8000B93C C7AA0004 */ lwc1 $f10, 4($sp) -/* 00C540 8000B940 46064480 */ add.s $f18, $f8, $f6 -/* 00C544 8000B944 44813000 */ mtc1 $at, $f6 -/* 00C548 8000B948 46129100 */ add.s $f4, $f18, $f18 -/* 00C54C 8000B94C 460A2203 */ div.s $f8, $f4, $f10 -/* 00C550 8000B950 46064001 */ sub.s $f0, $f8, $f6 -.L8000B954: -/* 00C554 8000B954 03E00008 */ jr $ra -/* 00C558 8000B958 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80005FD0/func_8000BA14.s b/asm/non_matchings/code_80005FD0/func_8000BA14.s index 15656e4b3..078b8c76f 100644 --- a/asm/non_matchings/code_80005FD0/func_8000BA14.s +++ b/asm/non_matchings/code_80005FD0/func_8000BA14.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ECFE4 +.float 0.01 + +.section .text + glabel func_8000BA14 /* 00C614 8000BA14 3C0C8016 */ lui $t4, %hi(D_80164430) # $t4, 0x8016 /* 00C618 8000BA18 958C4430 */ lhu $t4, %lo(D_80164430)($t4) diff --git a/asm/non_matchings/code_80005FD0/func_8000C0BC.s b/asm/non_matchings/code_80005FD0/func_8000C0BC.s deleted file mode 100644 index 44968d6f6..000000000 --- a/asm/non_matchings/code_80005FD0/func_8000C0BC.s +++ /dev/null @@ -1,525 +0,0 @@ -glabel func_8000C0BC -/* 00CCBC 8000C0BC 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 00CCC0 8000C0C0 8FAF0070 */ lw $t7, 0x70($sp) -/* 00CCC4 8000C0C4 F7BA0020 */ sdc1 $f26, 0x20($sp) -/* 00CCC8 8000C0C8 F7B80018 */ sdc1 $f24, 0x18($sp) -/* 00CCCC 8000C0CC F7B60010 */ sdc1 $f22, 0x10($sp) -/* 00CCD0 8000C0D0 F7B40008 */ sdc1 $f20, 8($sp) -/* 00CCD4 8000C0D4 AFA7006C */ sw $a3, 0x6c($sp) -/* 00CCD8 8000C0D8 8DE80000 */ lw $t0, ($t7) -/* 00CCDC 8000C0DC 4486B000 */ mtc1 $a2, $f22 -/* 00CCE0 8000C0E0 3C068016 */ lui $a2, %hi(gWaypointCountByPathIndex) # 0x8016 -/* 00CCE4 8000C0E4 0008C840 */ sll $t9, $t0, 1 -/* 00CCE8 8000C0E8 3C0A8016 */ lui $t2, %hi(D_80164550) # 0x8016 -/* 00CCEC 8000C0EC 00D93021 */ addu $a2, $a2, $t9 -/* 00CCF0 8000C0F0 0008C080 */ sll $t8, $t0, 2 -/* 00CCF4 8000C0F4 94C645C8 */ lhu $a2, %lo(gWaypointCountByPathIndex)($a2) # 0x45c8($a2) -/* 00CCF8 8000C0F8 01585021 */ addu $t2, $t2, $t8 -/* 00CCFC 8000C0FC 8D4A4550 */ lw $t2, %lo(D_80164550)($t2) # 0x4550($t2) -/* 00CD00 8000C100 30EEFFFF */ andi $t6, $a3, 0xffff -/* 00CD04 8000C104 3C01800F */ lui $at, %hi(D_800ECFE8) # $at, 0x800f -/* 00CD08 8000C108 01C03825 */ move $a3, $t6 -/* 00CD0C 8000C10C 46006506 */ mov.s $f20, $f12 -/* 00CD10 8000C110 C430CFE8 */ lwc1 $f16, %lo(D_800ECFE8)($at) -/* 00CD14 8000C114 00002025 */ move $a0, $zero -/* 00CD18 8000C118 00004825 */ move $t1, $zero -/* 00CD1C 8000C11C 00002825 */ move $a1, $zero -/* 00CD20 8000C120 00001825 */ move $v1, $zero -/* 00CD24 8000C124 18C00080 */ blez $a2, .L8000C328 -/* 00CD28 8000C128 01401025 */ move $v0, $t2 -/* 00CD2C 8000C12C 30CB0001 */ andi $t3, $a2, 1 -/* 00CD30 8000C130 1160002B */ beqz $t3, .L8000C1E0 -/* 00CD34 8000C134 00000000 */ nop -/* 00CD38 8000C138 954E0006 */ lhu $t6, 6($t2) -/* 00CD3C 8000C13C 3C0D800E */ lui $t5, %hi(gCurrentCourseId) -/* 00CD40 8000C140 25ADC5A0 */ addiu $t5, %lo(gCurrentCourseId) # addiu $t5, $t5, -0x3a60 -/* 00CD44 8000C144 10EE0005 */ beq $a3, $t6, .L8000C15C -/* 00CD48 8000C148 24030001 */ li $v1, 1 -/* 00CD4C 8000C14C 85AF0000 */ lh $t7, ($t5) -/* 00CD50 8000C150 240C0014 */ li $t4, 20 -/* 00CD54 8000C154 158F0020 */ bne $t4, $t7, .L8000C1D8 -/* 00CD58 8000C158 00000000 */ nop -.L8000C15C: -/* 00CD5C 8000C15C 85580000 */ lh $t8, ($t2) -/* 00CD60 8000C160 85590002 */ lh $t9, 2($t2) -/* 00CD64 8000C164 854E0004 */ lh $t6, 4($t2) -/* 00CD68 8000C168 44982000 */ mtc1 $t8, $f4 -/* 00CD6C 8000C16C 44994000 */ mtc1 $t9, $f8 -/* 00CD70 8000C170 3C01800F */ lui $at, %hi(D_800ECFEC) # $at, 0x800f -/* 00CD74 8000C174 468021A0 */ cvt.s.w $f6, $f4 -/* 00CD78 8000C178 448E2000 */ mtc1 $t6, $f4 -/* 00CD7C 8000C17C 24090001 */ li $t1, 1 -/* 00CD80 8000C180 468042A0 */ cvt.s.w $f10, $f8 -/* 00CD84 8000C184 46143481 */ sub.s $f18, $f6, $f20 -/* 00CD88 8000C188 468021A0 */ cvt.s.w $f6, $f4 -/* 00CD8C 8000C18C 46129202 */ mul.s $f8, $f18, $f18 -/* 00CD90 8000C190 460E5601 */ sub.s $f24, $f10, $f14 -/* 00CD94 8000C194 46163681 */ sub.s $f26, $f6, $f22 -/* 00CD98 8000C198 4618C282 */ mul.s $f10, $f24, $f24 -/* 00CD9C 8000C19C 460A4100 */ add.s $f4, $f8, $f10 -/* 00CDA0 8000C1A0 461AD182 */ mul.s $f6, $f26, $f26 -/* 00CDA4 8000C1A4 C42ACFEC */ lwc1 $f10, %lo(D_800ECFEC)($at) -/* 00CDA8 8000C1A8 46062200 */ add.s $f8, $f4, $f6 -/* 00CDAC 8000C1AC 460A403C */ c.lt.s $f8, $f10 -/* 00CDB0 8000C1B0 00000000 */ nop -/* 00CDB4 8000C1B4 45000008 */ bc1f .L8000C1D8 -/* 00CDB8 8000C1B8 00000000 */ nop -/* 00CDBC 8000C1BC 46129102 */ mul.s $f4, $f18, $f18 -/* 00CDC0 8000C1C0 00002025 */ move $a0, $zero -/* 00CDC4 8000C1C4 24050001 */ li $a1, 1 -/* 00CDC8 8000C1C8 4618C182 */ mul.s $f6, $f24, $f24 -/* 00CDCC 8000C1CC 46062200 */ add.s $f8, $f4, $f6 -/* 00CDD0 8000C1D0 461AD282 */ mul.s $f10, $f26, $f26 -/* 00CDD4 8000C1D4 460A4400 */ add.s $f16, $f8, $f10 -.L8000C1D8: -/* 00CDD8 8000C1D8 10660053 */ beq $v1, $a2, .L8000C328 -/* 00CDDC 8000C1DC 25420008 */ addiu $v0, $t2, 8 -.L8000C1E0: -/* 00CDE0 8000C1E0 3C0D800E */ lui $t5, %hi(gCurrentCourseId) -/* 00CDE4 8000C1E4 25ADC5A0 */ addiu $t5, %lo(gCurrentCourseId) # addiu $t5, $t5, -0x3a60 -/* 00CDE8 8000C1E8 240C0014 */ li $t4, 20 -/* 00CDEC 8000C1EC 00E05825 */ move $t3, $a3 -.L8000C1F0: -/* 00CDF0 8000C1F0 944F0006 */ lhu $t7, 6($v0) -/* 00CDF4 8000C1F4 516F0005 */ beql $t3, $t7, .L8000C20C -/* 00CDF8 8000C1F8 84590000 */ lh $t9, ($v0) -/* 00CDFC 8000C1FC 85B80000 */ lh $t8, ($t5) -/* 00CE00 8000C200 55980021 */ bnel $t4, $t8, .L8000C288 -/* 00CE04 8000C204 9459000E */ lhu $t9, 0xe($v0) -/* 00CE08 8000C208 84590000 */ lh $t9, ($v0) -.L8000C20C: -/* 00CE0C 8000C20C 844E0002 */ lh $t6, 2($v0) -/* 00CE10 8000C210 844F0004 */ lh $t7, 4($v0) -/* 00CE14 8000C214 44992000 */ mtc1 $t9, $f4 -/* 00CE18 8000C218 448E4000 */ mtc1 $t6, $f8 -/* 00CE1C 8000C21C 24090001 */ li $t1, 1 -/* 00CE20 8000C220 468021A0 */ cvt.s.w $f6, $f4 -/* 00CE24 8000C224 448F2000 */ mtc1 $t7, $f4 -/* 00CE28 8000C228 468042A0 */ cvt.s.w $f10, $f8 -/* 00CE2C 8000C22C 46143481 */ sub.s $f18, $f6, $f20 -/* 00CE30 8000C230 468021A0 */ cvt.s.w $f6, $f4 -/* 00CE34 8000C234 46129202 */ mul.s $f8, $f18, $f18 -/* 00CE38 8000C238 460E5601 */ sub.s $f24, $f10, $f14 -/* 00CE3C 8000C23C 46163681 */ sub.s $f26, $f6, $f22 -/* 00CE40 8000C240 4618C282 */ mul.s $f10, $f24, $f24 -/* 00CE44 8000C244 460A4100 */ add.s $f4, $f8, $f10 -/* 00CE48 8000C248 461AD182 */ mul.s $f6, $f26, $f26 -/* 00CE4C 8000C24C 46062200 */ add.s $f8, $f4, $f6 -/* 00CE50 8000C250 4610403C */ c.lt.s $f8, $f16 -/* 00CE54 8000C254 00000000 */ nop -/* 00CE58 8000C258 4502000B */ bc1fl .L8000C288 -/* 00CE5C 8000C25C 9459000E */ lhu $t9, 0xe($v0) -/* 00CE60 8000C260 46129282 */ mul.s $f10, $f18, $f18 -/* 00CE64 8000C264 00032400 */ sll $a0, $v1, 0x10 -/* 00CE68 8000C268 0004C403 */ sra $t8, $a0, 0x10 -/* 00CE6C 8000C26C 4618C102 */ mul.s $f4, $f24, $f24 -/* 00CE70 8000C270 03002025 */ move $a0, $t8 -/* 00CE74 8000C274 24050001 */ li $a1, 1 -/* 00CE78 8000C278 461AD202 */ mul.s $f8, $f26, $f26 -/* 00CE7C 8000C27C 46045180 */ add.s $f6, $f10, $f4 -/* 00CE80 8000C280 46083400 */ add.s $f16, $f6, $f8 -/* 00CE84 8000C284 9459000E */ lhu $t9, 0xe($v0) -.L8000C288: -/* 00CE88 8000C288 24420008 */ addiu $v0, $v0, 8 -/* 00CE8C 8000C28C 51790005 */ beql $t3, $t9, .L8000C2A4 -/* 00CE90 8000C290 844F0000 */ lh $t7, ($v0) -/* 00CE94 8000C294 85AE0000 */ lh $t6, ($t5) -/* 00CE98 8000C298 558E0021 */ bnel $t4, $t6, .L8000C320 -/* 00CE9C 8000C29C 24630002 */ addiu $v1, $v1, 2 -/* 00CEA0 8000C2A0 844F0000 */ lh $t7, ($v0) -.L8000C2A4: -/* 00CEA4 8000C2A4 84580002 */ lh $t8, 2($v0) -/* 00CEA8 8000C2A8 84590004 */ lh $t9, 4($v0) -/* 00CEAC 8000C2AC 448F5000 */ mtc1 $t7, $f10 -/* 00CEB0 8000C2B0 44983000 */ mtc1 $t8, $f6 -/* 00CEB4 8000C2B4 24090001 */ li $t1, 1 -/* 00CEB8 8000C2B8 46805120 */ cvt.s.w $f4, $f10 -/* 00CEBC 8000C2BC 44995000 */ mtc1 $t9, $f10 -/* 00CEC0 8000C2C0 46803220 */ cvt.s.w $f8, $f6 -/* 00CEC4 8000C2C4 46142481 */ sub.s $f18, $f4, $f20 -/* 00CEC8 8000C2C8 46805120 */ cvt.s.w $f4, $f10 -/* 00CECC 8000C2CC 46129182 */ mul.s $f6, $f18, $f18 -/* 00CED0 8000C2D0 460E4601 */ sub.s $f24, $f8, $f14 -/* 00CED4 8000C2D4 46162681 */ sub.s $f26, $f4, $f22 -/* 00CED8 8000C2D8 4618C202 */ mul.s $f8, $f24, $f24 -/* 00CEDC 8000C2DC 46083280 */ add.s $f10, $f6, $f8 -/* 00CEE0 8000C2E0 461AD102 */ mul.s $f4, $f26, $f26 -/* 00CEE4 8000C2E4 46045180 */ add.s $f6, $f10, $f4 -/* 00CEE8 8000C2E8 4610303C */ c.lt.s $f6, $f16 -/* 00CEEC 8000C2EC 00000000 */ nop -/* 00CEF0 8000C2F0 4502000B */ bc1fl .L8000C320 -/* 00CEF4 8000C2F4 24630002 */ addiu $v1, $v1, 2 -/* 00CEF8 8000C2F8 46129202 */ mul.s $f8, $f18, $f18 -/* 00CEFC 8000C2FC 24640001 */ addiu $a0, $v1, 1 -/* 00CF00 8000C300 00047400 */ sll $t6, $a0, 0x10 -/* 00CF04 8000C304 4618C282 */ mul.s $f10, $f24, $f24 -/* 00CF08 8000C308 000E2403 */ sra $a0, $t6, 0x10 -/* 00CF0C 8000C30C 24050001 */ li $a1, 1 -/* 00CF10 8000C310 461AD182 */ mul.s $f6, $f26, $f26 -/* 00CF14 8000C314 460A4100 */ add.s $f4, $f8, $f10 -/* 00CF18 8000C318 46062400 */ add.s $f16, $f4, $f6 -/* 00CF1C 8000C31C 24630002 */ addiu $v1, $v1, 2 -.L8000C320: -/* 00CF20 8000C320 1466FFB3 */ bne $v1, $a2, .L8000C1F0 -/* 00CF24 8000C324 24420008 */ addiu $v0, $v0, 8 -.L8000C328: -/* 00CF28 8000C328 15200086 */ bnez $t1, .L8000C544 -/* 00CF2C 8000C32C 8FAC0028 */ lw $t4, 0x28($sp) -/* 00CF30 8000C330 00004825 */ move $t1, $zero -.L8000C334: -/* 00CF34 8000C334 1128007E */ beq $t1, $t0, .L8000C530 -/* 00CF38 8000C338 00095880 */ sll $t3, $t1, 2 -/* 00CF3C 8000C33C 3C188016 */ lui $t8, %hi(D_80163368) # 0x8016 -/* 00CF40 8000C340 030BC021 */ addu $t8, $t8, $t3 -/* 00CF44 8000C344 8F183368 */ lw $t8, %lo(D_80163368)($t8) # 0x3368($t8) -/* 00CF48 8000C348 3C0A8016 */ lui $t2, %hi(D_80164550) # 0x8016 -/* 00CF4C 8000C34C 014B5021 */ addu $t2, $t2, $t3 -/* 00CF50 8000C350 2B010002 */ slti $at, $t8, 2 -/* 00CF54 8000C354 14200076 */ bnez $at, .L8000C530 -/* 00CF58 8000C358 0009C840 */ sll $t9, $t1, 1 -/* 00CF5C 8000C35C 3C068016 */ lui $a2, %hi(gWaypointCountByPathIndex) # 0x8016 -/* 00CF60 8000C360 00D93021 */ addu $a2, $a2, $t9 -/* 00CF64 8000C364 94C645C8 */ lhu $a2, %lo(gWaypointCountByPathIndex)($a2) # 0x45c8($a2) -/* 00CF68 8000C368 8D4A4550 */ lw $t2, %lo(D_80164550)($t2) # 0x4550($t2) -/* 00CF6C 8000C36C 00001825 */ move $v1, $zero -/* 00CF70 8000C370 18C0006F */ blez $a2, .L8000C530 -/* 00CF74 8000C374 01401025 */ move $v0, $t2 -/* 00CF78 8000C378 30CD0001 */ andi $t5, $a2, 1 -/* 00CF7C 8000C37C 11A00024 */ beqz $t5, .L8000C410 -/* 00CF80 8000C380 00E05825 */ move $t3, $a3 -/* 00CF84 8000C384 954E0006 */ lhu $t6, 6($t2) -/* 00CF88 8000C388 24030001 */ li $v1, 1 -/* 00CF8C 8000C38C 156E001E */ bne $t3, $t6, .L8000C408 -/* 00CF90 8000C390 00000000 */ nop -/* 00CF94 8000C394 854F0000 */ lh $t7, ($t2) -/* 00CF98 8000C398 85580002 */ lh $t8, 2($t2) -/* 00CF9C 8000C39C 85590004 */ lh $t9, 4($t2) -/* 00CFA0 8000C3A0 448F4000 */ mtc1 $t7, $f8 -/* 00CFA4 8000C3A4 44982000 */ mtc1 $t8, $f4 -/* 00CFA8 8000C3A8 468042A0 */ cvt.s.w $f10, $f8 -/* 00CFAC 8000C3AC 44994000 */ mtc1 $t9, $f8 -/* 00CFB0 8000C3B0 468021A0 */ cvt.s.w $f6, $f4 -/* 00CFB4 8000C3B4 46145481 */ sub.s $f18, $f10, $f20 -/* 00CFB8 8000C3B8 468042A0 */ cvt.s.w $f10, $f8 -/* 00CFBC 8000C3BC 46129102 */ mul.s $f4, $f18, $f18 -/* 00CFC0 8000C3C0 460E3601 */ sub.s $f24, $f6, $f14 -/* 00CFC4 8000C3C4 46165681 */ sub.s $f26, $f10, $f22 -/* 00CFC8 8000C3C8 4618C182 */ mul.s $f6, $f24, $f24 -/* 00CFCC 8000C3CC 46062200 */ add.s $f8, $f4, $f6 -/* 00CFD0 8000C3D0 461AD282 */ mul.s $f10, $f26, $f26 -/* 00CFD4 8000C3D4 460A4100 */ add.s $f4, $f8, $f10 -/* 00CFD8 8000C3D8 4610203C */ c.lt.s $f4, $f16 -/* 00CFDC 8000C3DC 00000000 */ nop -/* 00CFE0 8000C3E0 45000009 */ bc1f .L8000C408 -/* 00CFE4 8000C3E4 00000000 */ nop -/* 00CFE8 8000C3E8 46129182 */ mul.s $f6, $f18, $f18 -/* 00CFEC 8000C3EC 00002025 */ move $a0, $zero -/* 00CFF0 8000C3F0 01206025 */ move $t4, $t1 -/* 00CFF4 8000C3F4 4618C202 */ mul.s $f8, $f24, $f24 -/* 00CFF8 8000C3F8 24050002 */ li $a1, 2 -/* 00CFFC 8000C3FC 461AD102 */ mul.s $f4, $f26, $f26 -/* 00D000 8000C400 46083280 */ add.s $f10, $f6, $f8 -/* 00D004 8000C404 46045400 */ add.s $f16, $f10, $f4 -.L8000C408: -/* 00D008 8000C408 10660049 */ beq $v1, $a2, .L8000C530 -/* 00D00C 8000C40C 25420008 */ addiu $v0, $t2, 8 -.L8000C410: -/* 00D010 8000C410 944E0006 */ lhu $t6, 6($v0) -/* 00D014 8000C414 556E0021 */ bnel $t3, $t6, .L8000C49C -/* 00D018 8000C418 944F000E */ lhu $t7, 0xe($v0) -/* 00D01C 8000C41C 844F0000 */ lh $t7, ($v0) -/* 00D020 8000C420 84580002 */ lh $t8, 2($v0) -/* 00D024 8000C424 84590004 */ lh $t9, 4($v0) -/* 00D028 8000C428 448F3000 */ mtc1 $t7, $f6 -/* 00D02C 8000C42C 44985000 */ mtc1 $t8, $f10 -/* 00D030 8000C430 46803220 */ cvt.s.w $f8, $f6 -/* 00D034 8000C434 44993000 */ mtc1 $t9, $f6 -/* 00D038 8000C438 46805120 */ cvt.s.w $f4, $f10 -/* 00D03C 8000C43C 46144481 */ sub.s $f18, $f8, $f20 -/* 00D040 8000C440 46803220 */ cvt.s.w $f8, $f6 -/* 00D044 8000C444 46129282 */ mul.s $f10, $f18, $f18 -/* 00D048 8000C448 460E2601 */ sub.s $f24, $f4, $f14 -/* 00D04C 8000C44C 46164681 */ sub.s $f26, $f8, $f22 -/* 00D050 8000C450 4618C102 */ mul.s $f4, $f24, $f24 -/* 00D054 8000C454 46045180 */ add.s $f6, $f10, $f4 -/* 00D058 8000C458 461AD202 */ mul.s $f8, $f26, $f26 -/* 00D05C 8000C45C 46083280 */ add.s $f10, $f6, $f8 -/* 00D060 8000C460 4610503C */ c.lt.s $f10, $f16 -/* 00D064 8000C464 00000000 */ nop -/* 00D068 8000C468 4502000C */ bc1fl .L8000C49C -/* 00D06C 8000C46C 944F000E */ lhu $t7, 0xe($v0) -/* 00D070 8000C470 46129102 */ mul.s $f4, $f18, $f18 -/* 00D074 8000C474 00032400 */ sll $a0, $v1, 0x10 -/* 00D078 8000C478 00047403 */ sra $t6, $a0, 0x10 -/* 00D07C 8000C47C 4618C182 */ mul.s $f6, $f24, $f24 -/* 00D080 8000C480 01C02025 */ move $a0, $t6 -/* 00D084 8000C484 01206025 */ move $t4, $t1 -/* 00D088 8000C488 461AD282 */ mul.s $f10, $f26, $f26 -/* 00D08C 8000C48C 24050002 */ li $a1, 2 -/* 00D090 8000C490 46062200 */ add.s $f8, $f4, $f6 -/* 00D094 8000C494 460A4400 */ add.s $f16, $f8, $f10 -/* 00D098 8000C498 944F000E */ lhu $t7, 0xe($v0) -.L8000C49C: -/* 00D09C 8000C49C 24420008 */ addiu $v0, $v0, 8 -/* 00D0A0 8000C4A0 556F0021 */ bnel $t3, $t7, .L8000C528 -/* 00D0A4 8000C4A4 24630002 */ addiu $v1, $v1, 2 -/* 00D0A8 8000C4A8 84580000 */ lh $t8, ($v0) -/* 00D0AC 8000C4AC 84590002 */ lh $t9, 2($v0) -/* 00D0B0 8000C4B0 844E0004 */ lh $t6, 4($v0) -/* 00D0B4 8000C4B4 44982000 */ mtc1 $t8, $f4 -/* 00D0B8 8000C4B8 44994000 */ mtc1 $t9, $f8 -/* 00D0BC 8000C4BC 468021A0 */ cvt.s.w $f6, $f4 -/* 00D0C0 8000C4C0 448E2000 */ mtc1 $t6, $f4 -/* 00D0C4 8000C4C4 468042A0 */ cvt.s.w $f10, $f8 -/* 00D0C8 8000C4C8 46143481 */ sub.s $f18, $f6, $f20 -/* 00D0CC 8000C4CC 468021A0 */ cvt.s.w $f6, $f4 -/* 00D0D0 8000C4D0 46129202 */ mul.s $f8, $f18, $f18 -/* 00D0D4 8000C4D4 460E5601 */ sub.s $f24, $f10, $f14 -/* 00D0D8 8000C4D8 46163681 */ sub.s $f26, $f6, $f22 -/* 00D0DC 8000C4DC 4618C282 */ mul.s $f10, $f24, $f24 -/* 00D0E0 8000C4E0 460A4100 */ add.s $f4, $f8, $f10 -/* 00D0E4 8000C4E4 461AD182 */ mul.s $f6, $f26, $f26 -/* 00D0E8 8000C4E8 46062200 */ add.s $f8, $f4, $f6 -/* 00D0EC 8000C4EC 4610403C */ c.lt.s $f8, $f16 -/* 00D0F0 8000C4F0 00000000 */ nop -/* 00D0F4 8000C4F4 4502000C */ bc1fl .L8000C528 -/* 00D0F8 8000C4F8 24630002 */ addiu $v1, $v1, 2 -/* 00D0FC 8000C4FC 46129282 */ mul.s $f10, $f18, $f18 -/* 00D100 8000C500 24640001 */ addiu $a0, $v1, 1 -/* 00D104 8000C504 00047C00 */ sll $t7, $a0, 0x10 -/* 00D108 8000C508 4618C102 */ mul.s $f4, $f24, $f24 -/* 00D10C 8000C50C 000F2403 */ sra $a0, $t7, 0x10 -/* 00D110 8000C510 01206025 */ move $t4, $t1 -/* 00D114 8000C514 461AD202 */ mul.s $f8, $f26, $f26 -/* 00D118 8000C518 24050002 */ li $a1, 2 -/* 00D11C 8000C51C 46045180 */ add.s $f6, $f10, $f4 -/* 00D120 8000C520 46083400 */ add.s $f16, $f6, $f8 -/* 00D124 8000C524 24630002 */ addiu $v1, $v1, 2 -.L8000C528: -/* 00D128 8000C528 1466FFB9 */ bne $v1, $a2, .L8000C410 -/* 00D12C 8000C52C 24420008 */ addiu $v0, $v0, 8 -.L8000C530: -/* 00D130 8000C530 25290001 */ addiu $t1, $t1, 1 -/* 00D134 8000C534 24010004 */ li $at, 4 -/* 00D138 8000C538 1521FF7E */ bne $t1, $at, .L8000C334 -/* 00D13C 8000C53C 00000000 */ nop -/* 00D140 8000C540 AFAC0028 */ sw $t4, 0x28($sp) -.L8000C544: -/* 00D144 8000C544 14A000C4 */ bnez $a1, .L8000C858 -/* 00D148 8000C548 8FAC0028 */ lw $t4, 0x28($sp) -/* 00D14C 8000C54C 3C0A8016 */ lui $t2, %hi(D_80164550) # $t2, 0x8016 -/* 00D150 8000C550 8D424550 */ lw $v0, %lo(D_80164550)($t2) -/* 00D154 8000C554 3C068016 */ lui $a2, %hi(gWaypointCountByPathIndex) # $a2, 0x8016 -/* 00D158 8000C558 94C645C8 */ lhu $a2, %lo(gWaypointCountByPathIndex)($a2) -/* 00D15C 8000C55C 84590000 */ lh $t9, ($v0) -/* 00D160 8000C560 844E0002 */ lh $t6, 2($v0) -/* 00D164 8000C564 844F0004 */ lh $t7, 4($v0) -/* 00D168 8000C568 44995000 */ mtc1 $t9, $f10 -/* 00D16C 8000C56C 448E3000 */ mtc1 $t6, $f6 -/* 00D170 8000C570 28C10002 */ slti $at, $a2, 2 -/* 00D174 8000C574 46805120 */ cvt.s.w $f4, $f10 -/* 00D178 8000C578 448F5000 */ mtc1 $t7, $f10 -/* 00D17C 8000C57C 24C8FFFF */ addiu $t0, $a2, -1 -/* 00D180 8000C580 00002025 */ move $a0, $zero -/* 00D184 8000C584 31180003 */ andi $t8, $t0, 3 -/* 00D188 8000C588 46803220 */ cvt.s.w $f8, $f6 -/* 00D18C 8000C58C 24030001 */ li $v1, 1 -/* 00D190 8000C590 46142001 */ sub.s $f0, $f4, $f20 -/* 00D194 8000C594 46805120 */ cvt.s.w $f4, $f10 -/* 00D198 8000C598 46000182 */ mul.s $f6, $f0, $f0 -/* 00D19C 8000C59C 460E4081 */ sub.s $f2, $f8, $f14 -/* 00D1A0 8000C5A0 46162301 */ sub.s $f12, $f4, $f22 -/* 00D1A4 8000C5A4 46021202 */ mul.s $f8, $f2, $f2 -/* 00D1A8 8000C5A8 46083280 */ add.s $f10, $f6, $f8 -/* 00D1AC 8000C5AC 460C6102 */ mul.s $f4, $f12, $f12 -/* 00D1B0 8000C5B0 142000A9 */ bnez $at, .L8000C858 -/* 00D1B4 8000C5B4 46045400 */ add.s $f16, $f10, $f4 -/* 00D1B8 8000C5B8 13000025 */ beqz $t8, .L8000C650 -/* 00D1BC 8000C5BC 27070001 */ addiu $a3, $t8, 1 -.L8000C5C0: -/* 00D1C0 8000C5C0 84590000 */ lh $t9, ($v0) -/* 00D1C4 8000C5C4 844E0002 */ lh $t6, 2($v0) -/* 00D1C8 8000C5C8 844F0004 */ lh $t7, 4($v0) -/* 00D1CC 8000C5CC 44993000 */ mtc1 $t9, $f6 -/* 00D1D0 8000C5D0 448E5000 */ mtc1 $t6, $f10 -/* 00D1D4 8000C5D4 46803220 */ cvt.s.w $f8, $f6 -/* 00D1D8 8000C5D8 448F3000 */ mtc1 $t7, $f6 -/* 00D1DC 8000C5DC 46805120 */ cvt.s.w $f4, $f10 -/* 00D1E0 8000C5E0 46144481 */ sub.s $f18, $f8, $f20 -/* 00D1E4 8000C5E4 46803220 */ cvt.s.w $f8, $f6 -/* 00D1E8 8000C5E8 46129282 */ mul.s $f10, $f18, $f18 -/* 00D1EC 8000C5EC 460E2601 */ sub.s $f24, $f4, $f14 -/* 00D1F0 8000C5F0 46164681 */ sub.s $f26, $f8, $f22 -/* 00D1F4 8000C5F4 4618C102 */ mul.s $f4, $f24, $f24 -/* 00D1F8 8000C5F8 46045180 */ add.s $f6, $f10, $f4 -/* 00D1FC 8000C5FC 461AD202 */ mul.s $f8, $f26, $f26 -/* 00D200 8000C600 46083280 */ add.s $f10, $f6, $f8 -/* 00D204 8000C604 4610503C */ c.lt.s $f10, $f16 -/* 00D208 8000C608 00000000 */ nop -/* 00D20C 8000C60C 4502000C */ bc1fl .L8000C640 -/* 00D210 8000C610 24630001 */ addiu $v1, $v1, 1 -/* 00D214 8000C614 46129102 */ mul.s $f4, $f18, $f18 -/* 00D218 8000C618 00032400 */ sll $a0, $v1, 0x10 -/* 00D21C 8000C61C 0004C403 */ sra $t8, $a0, 0x10 -/* 00D220 8000C620 4618C182 */ mul.s $f6, $f24, $f24 -/* 00D224 8000C624 03002025 */ move $a0, $t8 -/* 00D228 8000C628 00006025 */ move $t4, $zero -/* 00D22C 8000C62C 461AD282 */ mul.s $f10, $f26, $f26 -/* 00D230 8000C630 24050002 */ li $a1, 2 -/* 00D234 8000C634 46062200 */ add.s $f8, $f4, $f6 -/* 00D238 8000C638 460A4400 */ add.s $f16, $f8, $f10 -/* 00D23C 8000C63C 24630001 */ addiu $v1, $v1, 1 -.L8000C640: -/* 00D240 8000C640 14E3FFDF */ bne $a3, $v1, .L8000C5C0 -/* 00D244 8000C644 24420008 */ addiu $v0, $v0, 8 -/* 00D248 8000C648 50660084 */ beql $v1, $a2, .L8000C85C -/* 00D24C 8000C64C 24010002 */ li $at, 2 -.L8000C650: -/* 00D250 8000C650 84590000 */ lh $t9, ($v0) -/* 00D254 8000C654 844E0002 */ lh $t6, 2($v0) -/* 00D258 8000C658 844F0004 */ lh $t7, 4($v0) -/* 00D25C 8000C65C 44992000 */ mtc1 $t9, $f4 -/* 00D260 8000C660 448E4000 */ mtc1 $t6, $f8 -/* 00D264 8000C664 468021A0 */ cvt.s.w $f6, $f4 -/* 00D268 8000C668 448F2000 */ mtc1 $t7, $f4 -/* 00D26C 8000C66C 468042A0 */ cvt.s.w $f10, $f8 -/* 00D270 8000C670 46143481 */ sub.s $f18, $f6, $f20 -/* 00D274 8000C674 468021A0 */ cvt.s.w $f6, $f4 -/* 00D278 8000C678 46129202 */ mul.s $f8, $f18, $f18 -/* 00D27C 8000C67C 460E5601 */ sub.s $f24, $f10, $f14 -/* 00D280 8000C680 46163681 */ sub.s $f26, $f6, $f22 -/* 00D284 8000C684 4618C282 */ mul.s $f10, $f24, $f24 -/* 00D288 8000C688 460A4100 */ add.s $f4, $f8, $f10 -/* 00D28C 8000C68C 461AD182 */ mul.s $f6, $f26, $f26 -/* 00D290 8000C690 46062200 */ add.s $f8, $f4, $f6 -/* 00D294 8000C694 4610403C */ c.lt.s $f8, $f16 -/* 00D298 8000C698 00000000 */ nop -/* 00D29C 8000C69C 4502000C */ bc1fl .L8000C6D0 -/* 00D2A0 8000C6A0 84590008 */ lh $t9, 8($v0) -/* 00D2A4 8000C6A4 46129282 */ mul.s $f10, $f18, $f18 -/* 00D2A8 8000C6A8 00032400 */ sll $a0, $v1, 0x10 -/* 00D2AC 8000C6AC 0004C403 */ sra $t8, $a0, 0x10 -/* 00D2B0 8000C6B0 4618C102 */ mul.s $f4, $f24, $f24 -/* 00D2B4 8000C6B4 03002025 */ move $a0, $t8 -/* 00D2B8 8000C6B8 00006025 */ move $t4, $zero -/* 00D2BC 8000C6BC 461AD202 */ mul.s $f8, $f26, $f26 -/* 00D2C0 8000C6C0 24050002 */ li $a1, 2 -/* 00D2C4 8000C6C4 46045180 */ add.s $f6, $f10, $f4 -/* 00D2C8 8000C6C8 46083400 */ add.s $f16, $f6, $f8 -/* 00D2CC 8000C6CC 84590008 */ lh $t9, 8($v0) -.L8000C6D0: -/* 00D2D0 8000C6D0 844E000A */ lh $t6, 0xa($v0) -/* 00D2D4 8000C6D4 844F000C */ lh $t7, 0xc($v0) -/* 00D2D8 8000C6D8 44995000 */ mtc1 $t9, $f10 -/* 00D2DC 8000C6DC 448E3000 */ mtc1 $t6, $f6 -/* 00D2E0 8000C6E0 24420008 */ addiu $v0, $v0, 8 -/* 00D2E4 8000C6E4 46805120 */ cvt.s.w $f4, $f10 -/* 00D2E8 8000C6E8 448F5000 */ mtc1 $t7, $f10 -/* 00D2EC 8000C6EC 46803220 */ cvt.s.w $f8, $f6 -/* 00D2F0 8000C6F0 46142481 */ sub.s $f18, $f4, $f20 -/* 00D2F4 8000C6F4 46805120 */ cvt.s.w $f4, $f10 -/* 00D2F8 8000C6F8 46129182 */ mul.s $f6, $f18, $f18 -/* 00D2FC 8000C6FC 460E4601 */ sub.s $f24, $f8, $f14 -/* 00D300 8000C700 46162681 */ sub.s $f26, $f4, $f22 -/* 00D304 8000C704 4618C202 */ mul.s $f8, $f24, $f24 -/* 00D308 8000C708 46083280 */ add.s $f10, $f6, $f8 -/* 00D30C 8000C70C 461AD102 */ mul.s $f4, $f26, $f26 -/* 00D310 8000C710 46045180 */ add.s $f6, $f10, $f4 -/* 00D314 8000C714 4610303C */ c.lt.s $f6, $f16 -/* 00D318 8000C718 00000000 */ nop -/* 00D31C 8000C71C 4502000C */ bc1fl .L8000C750 -/* 00D320 8000C720 844E0008 */ lh $t6, 8($v0) -/* 00D324 8000C724 46129202 */ mul.s $f8, $f18, $f18 -/* 00D328 8000C728 24640001 */ addiu $a0, $v1, 1 -/* 00D32C 8000C72C 0004C400 */ sll $t8, $a0, 0x10 -/* 00D330 8000C730 4618C282 */ mul.s $f10, $f24, $f24 -/* 00D334 8000C734 00182403 */ sra $a0, $t8, 0x10 -/* 00D338 8000C738 00006025 */ move $t4, $zero -/* 00D33C 8000C73C 461AD182 */ mul.s $f6, $f26, $f26 -/* 00D340 8000C740 24050002 */ li $a1, 2 -/* 00D344 8000C744 460A4100 */ add.s $f4, $f8, $f10 -/* 00D348 8000C748 46062400 */ add.s $f16, $f4, $f6 -/* 00D34C 8000C74C 844E0008 */ lh $t6, 8($v0) -.L8000C750: -/* 00D350 8000C750 844F000A */ lh $t7, 0xa($v0) -/* 00D354 8000C754 8458000C */ lh $t8, 0xc($v0) -/* 00D358 8000C758 448E4000 */ mtc1 $t6, $f8 -/* 00D35C 8000C75C 448F2000 */ mtc1 $t7, $f4 -/* 00D360 8000C760 24420008 */ addiu $v0, $v0, 8 -/* 00D364 8000C764 468042A0 */ cvt.s.w $f10, $f8 -/* 00D368 8000C768 44984000 */ mtc1 $t8, $f8 -/* 00D36C 8000C76C 468021A0 */ cvt.s.w $f6, $f4 -/* 00D370 8000C770 46145481 */ sub.s $f18, $f10, $f20 -/* 00D374 8000C774 468042A0 */ cvt.s.w $f10, $f8 -/* 00D378 8000C778 46129102 */ mul.s $f4, $f18, $f18 -/* 00D37C 8000C77C 460E3601 */ sub.s $f24, $f6, $f14 -/* 00D380 8000C780 46165681 */ sub.s $f26, $f10, $f22 -/* 00D384 8000C784 4618C182 */ mul.s $f6, $f24, $f24 -/* 00D388 8000C788 46062200 */ add.s $f8, $f4, $f6 -/* 00D38C 8000C78C 461AD282 */ mul.s $f10, $f26, $f26 -/* 00D390 8000C790 460A4100 */ add.s $f4, $f8, $f10 -/* 00D394 8000C794 4610203C */ c.lt.s $f4, $f16 -/* 00D398 8000C798 00000000 */ nop -/* 00D39C 8000C79C 4502000C */ bc1fl .L8000C7D0 -/* 00D3A0 8000C7A0 844F0008 */ lh $t7, 8($v0) -/* 00D3A4 8000C7A4 46129182 */ mul.s $f6, $f18, $f18 -/* 00D3A8 8000C7A8 24640002 */ addiu $a0, $v1, 2 -/* 00D3AC 8000C7AC 0004CC00 */ sll $t9, $a0, 0x10 -/* 00D3B0 8000C7B0 4618C202 */ mul.s $f8, $f24, $f24 -/* 00D3B4 8000C7B4 00192403 */ sra $a0, $t9, 0x10 -/* 00D3B8 8000C7B8 00006025 */ move $t4, $zero -/* 00D3BC 8000C7BC 461AD102 */ mul.s $f4, $f26, $f26 -/* 00D3C0 8000C7C0 24050002 */ li $a1, 2 -/* 00D3C4 8000C7C4 46083280 */ add.s $f10, $f6, $f8 -/* 00D3C8 8000C7C8 46045400 */ add.s $f16, $f10, $f4 -/* 00D3CC 8000C7CC 844F0008 */ lh $t7, 8($v0) -.L8000C7D0: -/* 00D3D0 8000C7D0 8458000A */ lh $t8, 0xa($v0) -/* 00D3D4 8000C7D4 8459000C */ lh $t9, 0xc($v0) -/* 00D3D8 8000C7D8 448F3000 */ mtc1 $t7, $f6 -/* 00D3DC 8000C7DC 44985000 */ mtc1 $t8, $f10 -/* 00D3E0 8000C7E0 24420008 */ addiu $v0, $v0, 8 -/* 00D3E4 8000C7E4 46803220 */ cvt.s.w $f8, $f6 -/* 00D3E8 8000C7E8 44993000 */ mtc1 $t9, $f6 -/* 00D3EC 8000C7EC 46805120 */ cvt.s.w $f4, $f10 -/* 00D3F0 8000C7F0 46144481 */ sub.s $f18, $f8, $f20 -/* 00D3F4 8000C7F4 46803220 */ cvt.s.w $f8, $f6 -/* 00D3F8 8000C7F8 46129282 */ mul.s $f10, $f18, $f18 -/* 00D3FC 8000C7FC 460E2601 */ sub.s $f24, $f4, $f14 -/* 00D400 8000C800 46164681 */ sub.s $f26, $f8, $f22 -/* 00D404 8000C804 4618C102 */ mul.s $f4, $f24, $f24 -/* 00D408 8000C808 46045180 */ add.s $f6, $f10, $f4 -/* 00D40C 8000C80C 461AD202 */ mul.s $f8, $f26, $f26 -/* 00D410 8000C810 46083280 */ add.s $f10, $f6, $f8 -/* 00D414 8000C814 4610503C */ c.lt.s $f10, $f16 -/* 00D418 8000C818 00000000 */ nop -/* 00D41C 8000C81C 4502000C */ bc1fl .L8000C850 -/* 00D420 8000C820 24630004 */ addiu $v1, $v1, 4 -/* 00D424 8000C824 46129102 */ mul.s $f4, $f18, $f18 -/* 00D428 8000C828 24640003 */ addiu $a0, $v1, 3 -/* 00D42C 8000C82C 00047400 */ sll $t6, $a0, 0x10 -/* 00D430 8000C830 4618C182 */ mul.s $f6, $f24, $f24 -/* 00D434 8000C834 000E2403 */ sra $a0, $t6, 0x10 -/* 00D438 8000C838 00006025 */ move $t4, $zero -/* 00D43C 8000C83C 461AD282 */ mul.s $f10, $f26, $f26 -/* 00D440 8000C840 24050002 */ li $a1, 2 -/* 00D444 8000C844 46062200 */ add.s $f8, $f4, $f6 -/* 00D448 8000C848 460A4400 */ add.s $f16, $f8, $f10 -/* 00D44C 8000C84C 24630004 */ addiu $v1, $v1, 4 -.L8000C850: -/* 00D450 8000C850 1466FF7F */ bne $v1, $a2, .L8000C650 -/* 00D454 8000C854 24420008 */ addiu $v0, $v0, 8 -.L8000C858: -/* 00D458 8000C858 24010002 */ li $at, 2 -.L8000C85C: -/* 00D45C 8000C85C 14A10003 */ bne $a1, $at, .L8000C86C -/* 00D460 8000C860 00801025 */ move $v0, $a0 -/* 00D464 8000C864 8FB80070 */ lw $t8, 0x70($sp) -/* 00D468 8000C868 AF0C0000 */ sw $t4, ($t8) -.L8000C86C: -/* 00D46C 8000C86C D7B40008 */ ldc1 $f20, 8($sp) -/* 00D470 8000C870 D7B60010 */ ldc1 $f22, 0x10($sp) -/* 00D474 8000C874 D7B80018 */ ldc1 $f24, 0x18($sp) -/* 00D478 8000C878 D7BA0020 */ ldc1 $f26, 0x20($sp) -/* 00D47C 8000C87C 03E00008 */ jr $ra -/* 00D480 8000C880 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/non_matchings/code_80005FD0/func_8000C884.s b/asm/non_matchings/code_80005FD0/func_8000C884.s deleted file mode 100644 index 31aa431bb..000000000 --- a/asm/non_matchings/code_80005FD0/func_8000C884.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel func_8000C884 -/* 00D484 8000C884 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 00D488 8000C888 8FA40028 */ lw $a0, 0x28($sp) -/* 00D48C 8000C88C 00077400 */ sll $t6, $a3, 0x10 -/* 00D490 8000C890 000E7C03 */ sra $t7, $t6, 0x10 -/* 00D494 8000C894 F7B60010 */ sdc1 $f22, 0x10($sp) -/* 00D498 8000C898 25E8FFFD */ addiu $t0, $t7, -3 -/* 00D49C 8000C89C 4486B000 */ mtc1 $a2, $f22 -/* 00D4A0 8000C8A0 3C01800F */ lui $at, %hi(D_800ECFF0) # $at, 0x800f -/* 00D4A4 8000C8A4 00085C00 */ sll $t3, $t0, 0x10 -/* 00D4A8 8000C8A8 C420CFF0 */ lwc1 $f0, %lo(D_800ECFF0)($at) -/* 00D4AC 8000C8AC 3C028016 */ lui $v0, %hi(gWaypointCountByPathIndex) # 0x8016 -/* 00D4B0 8000C8B0 3C058016 */ lui $a1, %hi(D_80164550) # 0x8016 -/* 00D4B4 8000C8B4 000B6403 */ sra $t4, $t3, 0x10 -/* 00D4B8 8000C8B8 00083400 */ sll $a2, $t0, 0x10 -/* 00D4BC 8000C8BC 25E90007 */ addiu $t1, $t7, 7 -/* 00D4C0 8000C8C0 0004C040 */ sll $t8, $a0, 1 -/* 00D4C4 8000C8C4 0004C880 */ sll $t9, $a0, 2 -/* 00D4C8 8000C8C8 F7B40008 */ sdc1 $f20, 8($sp) -/* 00D4CC 8000C8CC AFA70024 */ sw $a3, 0x24($sp) -/* 00D4D0 8000C8D0 00581021 */ addu $v0, $v0, $t8 -/* 00D4D4 8000C8D4 00B92821 */ addu $a1, $a1, $t9 -/* 00D4D8 8000C8D8 0189082A */ slt $at, $t4, $t1 -/* 00D4DC 8000C8DC 00065403 */ sra $t2, $a2, 0x10 -/* 00D4E0 8000C8E0 01E03825 */ move $a3, $t7 -/* 00D4E4 8000C8E4 46007506 */ mov.s $f20, $f14 -/* 00D4E8 8000C8E8 2403FFFF */ li $v1, -1 -/* 00D4EC 8000C8EC 944245C8 */ lhu $v0, %lo(gWaypointCountByPathIndex)($v0) # 0x45c8($v0) -/* 00D4F0 8000C8F0 8CA54550 */ lw $a1, %lo(D_80164550)($a1) # 0x4550($a1) -/* 00D4F4 8000C8F4 10200034 */ beqz $at, .L8000C9C8 -/* 00D4F8 8000C8F8 01403025 */ move $a2, $t2 -/* 00D4FC 8000C8FC 97A8002E */ lhu $t0, 0x2e($sp) -.L8000C900: -/* 00D500 8000C900 00C26821 */ addu $t5, $a2, $v0 -/* 00D504 8000C904 01A2001A */ div $zero, $t5, $v0 -/* 00D508 8000C908 00002010 */ mfhi $a0 -/* 00D50C 8000C90C 00047400 */ sll $t6, $a0, 0x10 -/* 00D510 8000C910 000E7C03 */ sra $t7, $t6, 0x10 -/* 00D514 8000C914 000FC0C0 */ sll $t8, $t7, 3 -/* 00D518 8000C918 03053821 */ addu $a3, $t8, $a1 -/* 00D51C 8000C91C 94F90006 */ lhu $t9, 6($a3) -/* 00D520 8000C920 14400002 */ bnez $v0, .L8000C92C -/* 00D524 8000C924 00000000 */ nop -/* 00D528 8000C928 0007000D */ break 7 -.L8000C92C: -/* 00D52C 8000C92C 2401FFFF */ li $at, -1 -/* 00D530 8000C930 14410004 */ bne $v0, $at, .L8000C944 -/* 00D534 8000C934 3C018000 */ lui $at, 0x8000 -/* 00D538 8000C938 15A10002 */ bne $t5, $at, .L8000C944 -/* 00D53C 8000C93C 00000000 */ nop -/* 00D540 8000C940 0006000D */ break 6 -.L8000C944: -/* 00D544 8000C944 24C60001 */ addiu $a2, $a2, 1 -/* 00D548 8000C948 1519001A */ bne $t0, $t9, .L8000C9B4 -/* 00D54C 8000C94C 01E02025 */ move $a0, $t7 -/* 00D550 8000C950 84EA0000 */ lh $t2, ($a3) -/* 00D554 8000C954 84EB0002 */ lh $t3, 2($a3) -/* 00D558 8000C958 84EC0004 */ lh $t4, 4($a3) -/* 00D55C 8000C95C 448A2000 */ mtc1 $t2, $f4 -/* 00D560 8000C960 448B4000 */ mtc1 $t3, $f8 -/* 00D564 8000C964 468021A0 */ cvt.s.w $f6, $f4 -/* 00D568 8000C968 448C2000 */ mtc1 $t4, $f4 -/* 00D56C 8000C96C 468042A0 */ cvt.s.w $f10, $f8 -/* 00D570 8000C970 460C3081 */ sub.s $f2, $f6, $f12 -/* 00D574 8000C974 468021A0 */ cvt.s.w $f6, $f4 -/* 00D578 8000C978 46021202 */ mul.s $f8, $f2, $f2 -/* 00D57C 8000C97C 46145381 */ sub.s $f14, $f10, $f20 -/* 00D580 8000C980 46163401 */ sub.s $f16, $f6, $f22 -/* 00D584 8000C984 460E7282 */ mul.s $f10, $f14, $f14 -/* 00D588 8000C988 460A4100 */ add.s $f4, $f8, $f10 -/* 00D58C 8000C98C 46108182 */ mul.s $f6, $f16, $f16 -/* 00D590 8000C990 46062480 */ add.s $f18, $f4, $f6 -/* 00D594 8000C994 4600903C */ c.lt.s $f18, $f0 -/* 00D598 8000C998 00000000 */ nop -/* 00D59C 8000C99C 45020006 */ bc1fl .L8000C9B8 -/* 00D5A0 8000C9A0 00067400 */ sll $t6, $a2, 0x10 -/* 00D5A4 8000C9A4 000F1C00 */ sll $v1, $t7, 0x10 -/* 00D5A8 8000C9A8 00036C03 */ sra $t5, $v1, 0x10 -/* 00D5AC 8000C9AC 46009006 */ mov.s $f0, $f18 -/* 00D5B0 8000C9B0 01A01825 */ move $v1, $t5 -.L8000C9B4: -/* 00D5B4 8000C9B4 00067400 */ sll $t6, $a2, 0x10 -.L8000C9B8: -/* 00D5B8 8000C9B8 000E7C03 */ sra $t7, $t6, 0x10 -/* 00D5BC 8000C9BC 01E9082A */ slt $at, $t7, $t1 -/* 00D5C0 8000C9C0 1420FFCF */ bnez $at, .L8000C900 -/* 00D5C4 8000C9C4 01E03025 */ move $a2, $t7 -.L8000C9C8: -/* 00D5C8 8000C9C8 D7B40008 */ ldc1 $f20, 8($sp) -/* 00D5CC 8000C9CC D7B60010 */ ldc1 $f22, 0x10($sp) -/* 00D5D0 8000C9D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 00D5D4 8000C9D4 03E00008 */ jr $ra -/* 00D5D8 8000C9D8 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/code_80005FD0/func_8000C9DC.s b/asm/non_matchings/code_80005FD0/func_8000C9DC.s deleted file mode 100644 index 89357b3b6..000000000 --- a/asm/non_matchings/code_80005FD0/func_8000C9DC.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_8000C9DC -/* 00D5DC 8000C9DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 00D5E0 8000C9E0 8FA50028 */ lw $a1, 0x28($sp) -/* 00D5E4 8000C9E4 00077400 */ sll $t6, $a3, 0x10 -/* 00D5E8 8000C9E8 000E7C03 */ sra $t7, $t6, 0x10 -/* 00D5EC 8000C9EC F7B60010 */ sdc1 $f22, 0x10($sp) -/* 00D5F0 8000C9F0 25E9FFFD */ addiu $t1, $t7, -3 -/* 00D5F4 8000C9F4 4486B000 */ mtc1 $a2, $f22 -/* 00D5F8 8000C9F8 3C01800F */ lui $at, %hi(D_800ECFF4) # $at, 0x800f -/* 00D5FC 8000C9FC 00095400 */ sll $t2, $t1, 0x10 -/* 00D600 8000CA00 C420CFF4 */ lwc1 $f0, %lo(D_800ECFF4)($at) -/* 00D604 8000CA04 3C048016 */ lui $a0, %hi(gWaypointCountByPathIndex) # 0x8016 -/* 00D608 8000CA08 3C068016 */ lui $a2, %hi(D_80164550) # 0x8016 -/* 00D60C 8000CA0C 000A6C03 */ sra $t5, $t2, 0x10 -/* 00D610 8000CA10 00094400 */ sll $t0, $t1, 0x10 -/* 00D614 8000CA14 25EB0007 */ addiu $t3, $t7, 7 -/* 00D618 8000CA18 0005C040 */ sll $t8, $a1, 1 -/* 00D61C 8000CA1C 0005C880 */ sll $t9, $a1, 2 -/* 00D620 8000CA20 F7B40008 */ sdc1 $f20, 8($sp) -/* 00D624 8000CA24 AFA70024 */ sw $a3, 0x24($sp) -/* 00D628 8000CA28 00982021 */ addu $a0, $a0, $t8 -/* 00D62C 8000CA2C 00D93021 */ addu $a2, $a2, $t9 -/* 00D630 8000CA30 01AB082A */ slt $at, $t5, $t3 -/* 00D634 8000CA34 00086403 */ sra $t4, $t0, 0x10 -/* 00D638 8000CA38 01E03825 */ move $a3, $t7 -/* 00D63C 8000CA3C 46007506 */ mov.s $f20, $f14 -/* 00D640 8000CA40 00001025 */ move $v0, $zero -/* 00D644 8000CA44 2403FFFF */ li $v1, -1 -/* 00D648 8000CA48 948445C8 */ lhu $a0, %lo(gWaypointCountByPathIndex)($a0) # 0x45c8($a0) -/* 00D64C 8000CA4C 8CC64550 */ lw $a2, %lo(D_80164550)($a2) # 0x4550($a2) -/* 00D650 8000CA50 01804025 */ move $t0, $t4 -/* 00D654 8000CA54 10200032 */ beqz $at, .L8000CB20 -/* 00D658 8000CA58 01A05025 */ move $t2, $t5 -.L8000CA5C: -/* 00D65C 8000CA5C 01047021 */ addu $t6, $t0, $a0 -/* 00D660 8000CA60 01C4001A */ div $zero, $t6, $a0 -/* 00D664 8000CA64 00002810 */ mfhi $a1 -/* 00D668 8000CA68 00057C00 */ sll $t7, $a1, 0x10 -/* 00D66C 8000CA6C 000FC403 */ sra $t8, $t7, 0x10 -/* 00D670 8000CA70 0018C8C0 */ sll $t9, $t8, 3 -/* 00D674 8000CA74 03263821 */ addu $a3, $t9, $a2 -/* 00D678 8000CA78 84EC0000 */ lh $t4, ($a3) -/* 00D67C 8000CA7C 84ED0002 */ lh $t5, 2($a3) -/* 00D680 8000CA80 14800002 */ bnez $a0, .L8000CA8C -/* 00D684 8000CA84 00000000 */ nop -/* 00D688 8000CA88 0007000D */ break 7 -.L8000CA8C: -/* 00D68C 8000CA8C 2401FFFF */ li $at, -1 -/* 00D690 8000CA90 14810004 */ bne $a0, $at, .L8000CAA4 -/* 00D694 8000CA94 3C018000 */ lui $at, 0x8000 -/* 00D698 8000CA98 15C10002 */ bne $t6, $at, .L8000CAA4 -/* 00D69C 8000CA9C 00000000 */ nop -/* 00D6A0 8000CAA0 0006000D */ break 6 -.L8000CAA4: -/* 00D6A4 8000CAA4 448C2000 */ mtc1 $t4, $f4 -/* 00D6A8 8000CAA8 448D4000 */ mtc1 $t5, $f8 -/* 00D6AC 8000CAAC 84EE0004 */ lh $t6, 4($a3) -/* 00D6B0 8000CAB0 468021A0 */ cvt.s.w $f6, $f4 -/* 00D6B4 8000CAB4 25080001 */ addiu $t0, $t0, 1 -/* 00D6B8 8000CAB8 448E2000 */ mtc1 $t6, $f4 -/* 00D6BC 8000CABC 03002825 */ move $a1, $t8 -/* 00D6C0 8000CAC0 468042A0 */ cvt.s.w $f10, $f8 -/* 00D6C4 8000CAC4 460C3081 */ sub.s $f2, $f6, $f12 -/* 00D6C8 8000CAC8 468021A0 */ cvt.s.w $f6, $f4 -/* 00D6CC 8000CACC 46021202 */ mul.s $f8, $f2, $f2 -/* 00D6D0 8000CAD0 46145381 */ sub.s $f14, $f10, $f20 -/* 00D6D4 8000CAD4 46163401 */ sub.s $f16, $f6, $f22 -/* 00D6D8 8000CAD8 460E7282 */ mul.s $f10, $f14, $f14 -/* 00D6DC 8000CADC 460A4100 */ add.s $f4, $f8, $f10 -/* 00D6E0 8000CAE0 46108182 */ mul.s $f6, $f16, $f16 -/* 00D6E4 8000CAE4 46062480 */ add.s $f18, $f4, $f6 -/* 00D6E8 8000CAE8 4600903C */ c.lt.s $f18, $f0 -/* 00D6EC 8000CAEC 00000000 */ nop -/* 00D6F0 8000CAF0 45020007 */ bc1fl .L8000CB10 -/* 00D6F4 8000CAF4 0008C400 */ sll $t8, $t0, 0x10 -/* 00D6F8 8000CAF8 00181C00 */ sll $v1, $t8, 0x10 -/* 00D6FC 8000CAFC 00037C03 */ sra $t7, $v1, 0x10 -/* 00D700 8000CB00 46009006 */ mov.s $f0, $f18 -/* 00D704 8000CB04 01E01825 */ move $v1, $t7 -/* 00D708 8000CB08 24020001 */ li $v0, 1 -/* 00D70C 8000CB0C 0008C400 */ sll $t8, $t0, 0x10 -.L8000CB10: -/* 00D710 8000CB10 0018CC03 */ sra $t9, $t8, 0x10 -/* 00D714 8000CB14 032B082A */ slt $at, $t9, $t3 -/* 00D718 8000CB18 1420FFD0 */ bnez $at, .L8000CA5C -/* 00D71C 8000CB1C 03204025 */ move $t0, $t9 -.L8000CB20: -/* 00D720 8000CB20 1440001C */ bnez $v0, .L8000CB94 -/* 00D724 8000CB24 D7B40008 */ ldc1 $f20, 8($sp) -/* 00D728 8000CB28 00094400 */ sll $t0, $t1, 0x10 -/* 00D72C 8000CB2C 00086403 */ sra $t4, $t0, 0x10 -/* 00D730 8000CB30 014B082A */ slt $at, $t2, $t3 -/* 00D734 8000CB34 10200017 */ beqz $at, .L8000CB94 -/* 00D738 8000CB38 01804025 */ move $t0, $t4 -.L8000CB3C: -/* 00D73C 8000CB3C 01046821 */ addu $t5, $t0, $a0 -/* 00D740 8000CB40 01A4001A */ div $zero, $t5, $a0 -/* 00D744 8000CB44 14800002 */ bnez $a0, .L8000CB50 -/* 00D748 8000CB48 00000000 */ nop -/* 00D74C 8000CB4C 0007000D */ break 7 -.L8000CB50: -/* 00D750 8000CB50 2401FFFF */ li $at, -1 -/* 00D754 8000CB54 14810004 */ bne $a0, $at, .L8000CB68 -/* 00D758 8000CB58 3C018000 */ lui $at, 0x8000 -/* 00D75C 8000CB5C 15A10002 */ bne $t5, $at, .L8000CB68 -/* 00D760 8000CB60 00000000 */ nop -/* 00D764 8000CB64 0006000D */ break 6 -.L8000CB68: -/* 00D768 8000CB68 25080001 */ addiu $t0, $t0, 1 -/* 00D76C 8000CB6C 00007010 */ mfhi $t6 -/* 00D770 8000CB70 00086400 */ sll $t4, $t0, 0x10 -/* 00D774 8000CB74 000E7C00 */ sll $t7, $t6, 0x10 -/* 00D778 8000CB78 000C6C03 */ sra $t5, $t4, 0x10 -/* 00D77C 8000CB7C 000FC403 */ sra $t8, $t7, 0x10 -/* 00D780 8000CB80 01AB082A */ slt $at, $t5, $t3 -/* 00D784 8000CB84 0018C8C0 */ sll $t9, $t8, 3 -/* 00D788 8000CB88 01A04025 */ move $t0, $t5 -/* 00D78C 8000CB8C 1420FFEB */ bnez $at, .L8000CB3C -/* 00D790 8000CB90 03263821 */ addu $a3, $t9, $a2 -.L8000CB94: -/* 00D794 8000CB94 D7B60010 */ ldc1 $f22, 0x10($sp) -/* 00D798 8000CB98 27BD0018 */ addiu $sp, $sp, 0x18 -/* 00D79C 8000CB9C 03E00008 */ jr $ra -/* 00D7A0 8000CBA0 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/code_80005FD0/func_8000D100.s b/asm/non_matchings/code_80005FD0/func_8000D100.s index d5119397f..1adb23386 100644 --- a/asm/non_matchings/code_80005FD0/func_8000D100.s +++ b/asm/non_matchings/code_80005FD0/func_8000D100.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ECFF8 +.float 250000 + +.section .text + glabel func_8000D100 /* 00DD00 8000D100 00077400 */ sll $t6, $a3, 0x10 /* 00DD04 8000D104 000E7C03 */ sra $t7, $t6, 0x10 diff --git a/asm/non_matchings/code_80005FD0/func_8000D6D0.s b/asm/non_matchings/code_80005FD0/func_8000D6D0.s index 3908c3069..97002cc29 100644 --- a/asm/non_matchings/code_80005FD0/func_8000D6D0.s +++ b/asm/non_matchings/code_80005FD0/func_8000D6D0.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ECFFC +.float 0.01 + +.section .text + glabel func_8000D6D0 /* 00E2D0 8000D6D0 27BDFF50 */ addiu $sp, $sp, -0xb0 /* 00E2D4 8000D6D4 87AE00C2 */ lh $t6, 0xc2($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8000D940.s b/asm/non_matchings/code_80005FD0/func_8000D940.s index 7e719a88d..64974e065 100644 --- a/asm/non_matchings/code_80005FD0/func_8000D940.s +++ b/asm/non_matchings/code_80005FD0/func_8000D940.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED000 +.float 0.01 + +.section .text + glabel func_8000D940 /* 00E540 8000D940 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 00E544 8000D944 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8000DBAC.s b/asm/non_matchings/code_80005FD0/func_8000DBAC.s index dfd4a5c33..9db3d2ebb 100644 --- a/asm/non_matchings/code_80005FD0/func_8000DBAC.s +++ b/asm/non_matchings/code_80005FD0/func_8000DBAC.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED004 +.float 0.01 + +.section .text + glabel func_8000DBAC /* 00E7AC 8000DBAC 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 00E7B0 8000DBB0 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8000DF8C.s b/asm/non_matchings/code_80005FD0/func_8000DF8C.s index 482d22aec..1b8c0e8af 100644 --- a/asm/non_matchings/code_80005FD0/func_8000DF8C.s +++ b/asm/non_matchings/code_80005FD0/func_8000DF8C.s @@ -1,3 +1,35 @@ +.section .late_rodata + +glabel jpt_800ED008 +.word L8000E1F4, L8000E45C, L8000E618, L8000E968 +.word L8000E634 + +glabel D_800ED01C +.float -2409.197021 + +glabel D_800ED020 +.float -355.253998 + +glabel D_800ED024 +.float 0.01 + +glabel D_800ED028 +.double -1000.0 + +glabel D_800ED030 +.float 0.3 + +glabel D_800ED034 +.float 2.3 + +glabel D_800ED038 +.float 2.3 + +glabel D_800ED03C +.float 0.15 + +.section .text + glabel func_8000DF8C /* 00EB8C 8000DF8C 00047880 */ sll $t7, $a0, 2 /* 00EB90 8000DF90 01E47821 */ addu $t7, $t7, $a0 diff --git a/asm/non_matchings/code_80005FD0/func_8000EF20.s b/asm/non_matchings/code_80005FD0/func_8000EF20.s deleted file mode 100644 index b2b21df49..000000000 --- a/asm/non_matchings/code_80005FD0/func_8000EF20.s +++ /dev/null @@ -1,121 +0,0 @@ -glabel func_8000EF20 -/* 00FB20 8000EF20 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 00FB24 8000EF24 F7BE0040 */ sdc1 $f30, 0x40($sp) -/* 00FB28 8000EF28 3C01800F */ lui $at, %hi(D_800ED040) # $at, 0x800f -/* 00FB2C 8000EF2C C43ED040 */ lwc1 $f30, %lo(D_800ED040)($at) -/* 00FB30 8000EF30 F7BC0038 */ sdc1 $f28, 0x38($sp) -/* 00FB34 8000EF34 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 00FB38 8000EF38 4481E000 */ mtc1 $at, $f28 -/* 00FB3C 8000EF3C F7BA0030 */ sdc1 $f26, 0x30($sp) -/* 00FB40 8000EF40 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 00FB44 8000EF44 4481D000 */ mtc1 $at, $f26 -/* 00FB48 8000EF48 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 00FB4C 8000EF4C 3C01800F */ lui $at, %hi(D_800ED044) # $at, 0x800f -/* 00FB50 8000EF50 AFB60060 */ sw $s6, 0x60($sp) -/* 00FB54 8000EF54 AFB30054 */ sw $s3, 0x54($sp) -/* 00FB58 8000EF58 AFB00048 */ sw $s0, 0x48($sp) -/* 00FB5C 8000EF5C C438D044 */ lwc1 $f24, %lo(D_800ED044)($at) -/* 00FB60 8000EF60 AFB5005C */ sw $s5, 0x5c($sp) -/* 00FB64 8000EF64 AFB40058 */ sw $s4, 0x58($sp) -/* 00FB68 8000EF68 AFB20050 */ sw $s2, 0x50($sp) -/* 00FB6C 8000EF6C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 00FB70 8000EF70 3C01800F */ lui $at, %hi(D_800ED048) # $at, 0x800f -/* 00FB74 8000EF74 3C108016 */ lui $s0, %hi(D_801641F8) # $s0, 0x8016 -/* 00FB78 8000EF78 3C138016 */ lui $s3, %hi(gActorList) # $s3, 0x8016 -/* 00FB7C 8000EF7C 3C168016 */ lui $s6, %hi(D_801642D8) # $s6, 0x8016 -/* 00FB80 8000EF80 AFBF0064 */ sw $ra, 0x64($sp) -/* 00FB84 8000EF84 AFB1004C */ sw $s1, 0x4c($sp) -/* 00FB88 8000EF88 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 00FB8C 8000EF8C 26D642D8 */ addiu $s6, %lo(D_801642D8) # addiu $s6, $s6, 0x42d8 -/* 00FB90 8000EF90 2673F9B8 */ addiu $s3, %lo(gActorList) # addiu $s3, $s3, -0x648 -/* 00FB94 8000EF94 261041F8 */ addiu $s0, %lo(D_801641F8) # addiu $s0, $s0, 0x41f8 -/* 00FB98 8000EF98 C436D048 */ lwc1 $f22, %lo(D_800ED048)($at) -/* 00FB9C 8000EF9C 24120001 */ li $s2, 1 -/* 00FBA0 8000EFA0 24140070 */ li $s4, 112 -/* 00FBA4 8000EFA4 24150002 */ li $s5, 2 -/* 00FBA8 8000EFA8 960E000C */ lhu $t6, 0xc($s0) -.L8000EFAC: -/* 00FBAC 8000EFAC 564E003A */ bnel $s2, $t6, .L8000F098 -/* 00FBB0 8000EFB0 2610001C */ addiu $s0, $s0, 0x1c -/* 00FBB4 8000EFB4 960F000E */ lhu $t7, 0xe($s0) -/* 00FBB8 8000EFB8 8E190014 */ lw $t9, 0x14($s0) -/* 00FBBC 8000EFBC 86020010 */ lh $v0, 0x10($s0) -/* 00FBC0 8000EFC0 01F40019 */ multu $t7, $s4 -/* 00FBC4 8000EFC4 27280001 */ addiu $t0, $t9, 1 -/* 00FBC8 8000EFC8 AE080014 */ sw $t0, 0x14($s0) -/* 00FBCC 8000EFCC 0000C012 */ mflo $t8 -/* 00FBD0 8000EFD0 02788821 */ addu $s1, $s3, $t8 -/* 00FBD4 8000EFD4 50400009 */ beql $v0, $zero, .L8000EFFC -/* 00FBD8 8000EFD8 8E020014 */ lw $v0, 0x14($s0) -/* 00FBDC 8000EFDC 50520010 */ beql $v0, $s2, .L8000F020 -/* 00FBE0 8000EFE0 8E020014 */ lw $v0, 0x14($s0) -/* 00FBE4 8000EFE4 50550016 */ beql $v0, $s5, .L8000F040 -/* 00FBE8 8000EFE8 8E020014 */ lw $v0, 0x14($s0) -/* 00FBEC 8000EFEC 4600D506 */ mov.s $f20, $f26 -/* 00FBF0 8000EFF0 10000019 */ b .L8000F058 -/* 00FBF4 8000EFF4 01001025 */ move $v0, $t0 -/* 00FBF8 8000EFF8 8E020014 */ lw $v0, 0x14($s0) -.L8000EFFC: -/* 00FBFC 8000EFFC 2C41000A */ sltiu $at, $v0, 0xa -/* 00FC00 8000F000 10200003 */ beqz $at, .L8000F010 -/* 00FC04 8000F004 00000000 */ nop -/* 00FC08 8000F008 10000013 */ b .L8000F058 -/* 00FC0C 8000F00C 4600F506 */ mov.s $f20, $f30 -.L8000F010: -/* 00FC10 8000F010 3C01800F */ lui $at, %hi(D_800ED04C) # $at, 0x800f -/* 00FC14 8000F014 10000010 */ b .L8000F058 -/* 00FC18 8000F018 C434D04C */ lwc1 $f20, %lo(D_800ED04C)($at) -/* 00FC1C 8000F01C 8E020014 */ lw $v0, 0x14($s0) -.L8000F020: -/* 00FC20 8000F020 2C41000A */ sltiu $at, $v0, 0xa -/* 00FC24 8000F024 10200003 */ beqz $at, .L8000F034 -/* 00FC28 8000F028 00000000 */ nop -/* 00FC2C 8000F02C 1000000A */ b .L8000F058 -/* 00FC30 8000F030 4600B506 */ mov.s $f20, $f22 -.L8000F034: -/* 00FC34 8000F034 10000008 */ b .L8000F058 -/* 00FC38 8000F038 4600C506 */ mov.s $f20, $f24 -/* 00FC3C 8000F03C 8E020014 */ lw $v0, 0x14($s0) -.L8000F040: -/* 00FC40 8000F040 2C41000A */ sltiu $at, $v0, 0xa -/* 00FC44 8000F044 50200004 */ beql $at, $zero, .L8000F058 -/* 00FC48 8000F048 4600C506 */ mov.s $f20, $f24 -/* 00FC4C 8000F04C 10000002 */ b .L8000F058 -/* 00FC50 8000F050 4600B506 */ mov.s $f20, $f22 -/* 00FC54 8000F054 4600C506 */ mov.s $f20, $f24 -.L8000F058: -/* 00FC58 8000F058 30490001 */ andi $t1, $v0, 1 -/* 00FC5C 8000F05C 5520000E */ bnel $t1, $zero, .L8000F098 -/* 00FC60 8000F060 2610001C */ addiu $s0, $s0, 0x1c -/* 00FC64 8000F064 0C0ADF8D */ jal random_int -/* 00FC68 8000F068 2404001E */ li $a0, 30 -/* 00FC6C 8000F06C 244A0014 */ addiu $t2, $v0, 0x14 -/* 00FC70 8000F070 448A2000 */ mtc1 $t2, $f4 -/* 00FC74 8000F074 26240018 */ addiu $a0, $s1, 0x18 -/* 00FC78 8000F078 86060010 */ lh $a2, 0x10($s0) -/* 00FC7C 8000F07C 468021A0 */ cvt.s.w $f6, $f4 -/* 00FC80 8000F080 46143202 */ mul.s $f8, $f6, $f20 -/* 00FC84 8000F084 461C4283 */ div.s $f10, $f8, $f28 -/* 00FC88 8000F088 44055000 */ mfc1 $a1, $f10 -/* 00FC8C 8000F08C 0C01DB5C */ jal func_80076D70 -/* 00FC90 8000F090 00000000 */ nop -/* 00FC94 8000F094 2610001C */ addiu $s0, $s0, 0x1c -.L8000F098: -/* 00FC98 8000F098 5616FFC4 */ bnel $s0, $s6, .L8000EFAC -/* 00FC9C 8000F09C 960E000C */ lhu $t6, 0xc($s0) -/* 00FCA0 8000F0A0 8FBF0064 */ lw $ra, 0x64($sp) -/* 00FCA4 8000F0A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 00FCA8 8000F0A8 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 00FCAC 8000F0AC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 00FCB0 8000F0B0 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* 00FCB4 8000F0B4 D7BC0038 */ ldc1 $f28, 0x38($sp) -/* 00FCB8 8000F0B8 D7BE0040 */ ldc1 $f30, 0x40($sp) -/* 00FCBC 8000F0BC 8FB00048 */ lw $s0, 0x48($sp) -/* 00FCC0 8000F0C0 8FB1004C */ lw $s1, 0x4c($sp) -/* 00FCC4 8000F0C4 8FB20050 */ lw $s2, 0x50($sp) -/* 00FCC8 8000F0C8 8FB30054 */ lw $s3, 0x54($sp) -/* 00FCCC 8000F0CC 8FB40058 */ lw $s4, 0x58($sp) -/* 00FCD0 8000F0D0 8FB5005C */ lw $s5, 0x5c($sp) -/* 00FCD4 8000F0D4 8FB60060 */ lw $s6, 0x60($sp) -/* 00FCD8 8000F0D8 03E00008 */ jr $ra -/* 00FCDC 8000F0DC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/non_matchings/code_80005FD0/func_8000F628.s b/asm/non_matchings/code_80005FD0/func_8000F628.s index d596426bc..a3f5da7f3 100644 --- a/asm/non_matchings/code_80005FD0/func_8000F628.s +++ b/asm/non_matchings/code_80005FD0/func_8000F628.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel D_800ED050 +.float 0.015 +.word 0x00000000 + +.section .text + glabel func_8000F628 /* 010228 8000F628 27BDFEE0 */ addiu $sp, $sp, -0x120 /* 01022C 8000F62C 3C0E8016 */ lui $t6, %hi(D_80163210) # $t6, 0x8016 diff --git a/asm/non_matchings/code_80005FD0/func_800107C4.s b/asm/non_matchings/code_80005FD0/func_800107C4.s deleted file mode 100644 index a57c66695..000000000 --- a/asm/non_matchings/code_80005FD0/func_800107C4.s +++ /dev/null @@ -1,361 +0,0 @@ -glabel func_800107C4 -/* 0113C4 800107C4 3C0E800E */ lui $t6, %hi(gCurrentCourseId) -/* 0113C8 800107C8 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) -/* 0113CC 800107CC 3C01800E */ lui $at, %hi(D_800DCA4C) -/* 0113D0 800107D0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 0113D4 800107D4 000E7880 */ sll $t7, $t6, 2 -/* 0113D8 800107D8 002F0821 */ addu $at, $at, $t7 -/* 0113DC 800107DC C424CA4C */ lwc1 $f4, %lo(D_800DCA4C)($at) -/* 0113E0 800107E0 AFBF0034 */ sw $ra, 0x34($sp) -/* 0113E4 800107E4 AFB30030 */ sw $s3, 0x30($sp) -/* 0113E8 800107E8 4600218D */ trunc.w.s $f6, $f4 -/* 0113EC 800107EC AFB2002C */ sw $s2, 0x2c($sp) -/* 0113F0 800107F0 AFB10028 */ sw $s1, 0x28($sp) -/* 0113F4 800107F4 AFB00024 */ sw $s0, 0x24($sp) -/* 0113F8 800107F8 44193000 */ mfc1 $t9, $f6 -/* 0113FC 800107FC F7B60018 */ sdc1 $f22, 0x18($sp) -/* 011400 80010800 F7B40010 */ sdc1 $f20, 0x10($sp) -/* 011404 80010804 07200121 */ bltz $t9, .L80010C8C -/* 011408 80010808 00046840 */ sll $t5, $a0, 1 -/* 01140C 8001080C 3C078016 */ lui $a3, %hi(gWaypointCountByPathIndex) # 0x8016 -/* 011410 80010810 00ED3821 */ addu $a3, $a3, $t5 -/* 011414 80010814 94E745C8 */ lhu $a3, %lo(gWaypointCountByPathIndex)($a3) # 0x45c8($a3) -/* 011418 80010818 3C0F8016 */ lui $t7, %hi(D_80164580) # $t7, 0x8016 -/* 01141C 8001081C 25EF4580 */ addiu $t7, %lo(D_80164580) # addiu $t7, $t7, 0x4580 -/* 011420 80010820 00047080 */ sll $t6, $a0, 2 -/* 011424 80010824 01CF4021 */ addu $t0, $t6, $t7 -/* 011428 80010828 8D0C0000 */ lw $t4, ($t0) -/* 01142C 8001082C 18E00021 */ blez $a3, .L800108B4 -/* 011430 80010830 00008025 */ move $s0, $zero -/* 011434 80010834 3C01800F */ lui $at, %hi(D_800ED058) -/* 011438 80010838 D436D058 */ ldc1 $f22, %lo(D_800ED058)($at) -/* 01143C 8001083C 3C01800F */ lui $at, %hi(D_800ED060) -/* 011440 80010840 D434D060 */ ldc1 $f20, %lo(D_800ED060)($at) -/* 011444 80010844 AFA40070 */ sw $a0, 0x70($sp) -/* 011448 80010848 24130004 */ li $s3, 4 -/* 01144C 8001084C 24120003 */ li $s2, 3 -/* 011450 80010850 24110002 */ li $s1, 2 -.L80010854: -/* 011454 80010854 8FA40070 */ lw $a0, 0x70($sp) -/* 011458 80010858 3205FFFF */ andi $a1, $s0, 0xffff -/* 01145C 8001085C AFA70050 */ sw $a3, 0x50($sp) -/* 011460 80010860 AFA8003C */ sw $t0, 0x3c($sp) -/* 011464 80010864 0C004120 */ jal func_80010480 -/* 011468 80010868 AFAC0054 */ sw $t4, 0x54($sp) -/* 01146C 8001086C 460000A1 */ cvt.d.s $f2, $f0 -/* 011470 80010870 8FAC0054 */ lw $t4, 0x54($sp) -/* 011474 80010874 4622A03C */ c.lt.d $f20, $f2 -/* 011478 80010878 8FA70050 */ lw $a3, 0x50($sp) -/* 01147C 8001087C 8FA8003C */ lw $t0, 0x3c($sp) -/* 011480 80010880 26100001 */ addiu $s0, $s0, 1 -/* 011484 80010884 45000002 */ bc1f .L80010890 -/* 011488 80010888 A5930000 */ sh $s3, ($t4) -/* 01148C 8001088C A5910000 */ sh $s1, ($t4) -.L80010890: -/* 011490 80010890 4636103C */ c.lt.d $f2, $f22 -/* 011494 80010894 00000000 */ nop -/* 011498 80010898 45000002 */ bc1f .L800108A4 -/* 01149C 8001089C 00000000 */ nop -/* 0114A0 800108A0 A5920000 */ sh $s2, ($t4) -.L800108A4: -/* 0114A4 800108A4 1607FFEB */ bne $s0, $a3, .L80010854 -/* 0114A8 800108A8 258C0002 */ addiu $t4, $t4, 2 -/* 0114AC 800108AC 8D0C0000 */ lw $t4, ($t0) -/* 0114B0 800108B0 00008025 */ move $s0, $zero -.L800108B4: -/* 0114B4 800108B4 24110002 */ li $s1, 2 -/* 0114B8 800108B8 24120003 */ li $s2, 3 -/* 0114BC 800108BC 18E000F3 */ blez $a3, .L80010C8C -/* 0114C0 800108C0 24130004 */ li $s3, 4 -/* 0114C4 800108C4 24090001 */ li $t1, 1 -.L800108C8: -/* 0114C8 800108C8 85980000 */ lh $t8, ($t4) -/* 0114CC 800108CC 28E10002 */ slti $at, $a3, 2 -/* 0114D0 800108D0 567800EB */ bnel $s3, $t8, .L80010C80 -/* 0114D4 800108D4 26100001 */ addiu $s0, $s0, 1 -/* 0114D8 800108D8 142000E8 */ bnez $at, .L80010C7C -/* 0114DC 800108DC 01205025 */ move $t2, $t1 -/* 0114E0 800108E0 020A5821 */ addu $t3, $s0, $t2 -.L800108E4: -/* 0114E4 800108E4 0167001A */ div $zero, $t3, $a3 -/* 0114E8 800108E8 8D190000 */ lw $t9, ($t0) -/* 0114EC 800108EC 00006810 */ mfhi $t5 -/* 0114F0 800108F0 000D7040 */ sll $t6, $t5, 1 -/* 0114F4 800108F4 032E1821 */ addu $v1, $t9, $t6 -/* 0114F8 800108F8 84620000 */ lh $v0, ($v1) -/* 0114FC 800108FC 14E00002 */ bnez $a3, .L80010908 -/* 011500 80010900 00000000 */ nop -/* 011504 80010904 0007000D */ break 7 -.L80010908: -/* 011508 80010908 2401FFFF */ li $at, -1 -/* 01150C 8001090C 14E10004 */ bne $a3, $at, .L80010920 -/* 011510 80010910 3C018000 */ lui $at, 0x8000 -/* 011514 80010914 15610002 */ bne $t3, $at, .L80010920 -/* 011518 80010918 00000000 */ nop -/* 01151C 8001091C 0006000D */ break 6 -.L80010920: -/* 011520 80010920 10400009 */ beqz $v0, .L80010948 -/* 011524 80010924 00000000 */ nop -/* 011528 80010928 1049006C */ beq $v0, $t1, .L80010ADC -/* 01152C 8001092C 00000000 */ nop -/* 011530 80010930 10510005 */ beq $v0, $s1, .L80010948 -/* 011534 80010934 00000000 */ nop -/* 011538 80010938 10520068 */ beq $v0, $s2, .L80010ADC -/* 01153C 8001093C 00000000 */ nop -/* 011540 80010940 100000CB */ b .L80010C70 -/* 011544 80010944 254A0001 */ addiu $t2, $t2, 1 -.L80010948: -/* 011548 80010948 1940005F */ blez $t2, .L80010AC8 -/* 01154C 8001094C 00003025 */ move $a2, $zero -/* 011550 80010950 31440003 */ andi $a0, $t2, 3 -/* 011554 80010954 10800016 */ beqz $a0, .L800109B0 -/* 011558 80010958 00801825 */ move $v1, $a0 -/* 01155C 8001095C 02061021 */ addu $v0, $s0, $a2 -.L80010960: -/* 011560 80010960 0047001A */ div $zero, $v0, $a3 -/* 011564 80010964 8D0F0000 */ lw $t7, ($t0) -/* 011568 80010968 0000C010 */ mfhi $t8 -/* 01156C 8001096C 00186840 */ sll $t5, $t8, 1 -/* 011570 80010970 14E00002 */ bnez $a3, .L8001097C -/* 011574 80010974 00000000 */ nop -/* 011578 80010978 0007000D */ break 7 -.L8001097C: -/* 01157C 8001097C 2401FFFF */ li $at, -1 -/* 011580 80010980 14E10004 */ bne $a3, $at, .L80010994 -/* 011584 80010984 3C018000 */ lui $at, 0x8000 -/* 011588 80010988 14410002 */ bne $v0, $at, .L80010994 -/* 01158C 8001098C 00000000 */ nop -/* 011590 80010990 0006000D */ break 6 -.L80010994: -/* 011594 80010994 24C60001 */ addiu $a2, $a2, 1 -/* 011598 80010998 01EDC821 */ addu $t9, $t7, $t5 -/* 01159C 8001099C A7200000 */ sh $zero, ($t9) -/* 0115A0 800109A0 1466FFEF */ bne $v1, $a2, .L80010960 -/* 0115A4 800109A4 24420001 */ addiu $v0, $v0, 1 -/* 0115A8 800109A8 50CA0048 */ beql $a2, $t2, .L80010ACC -/* 0115AC 800109AC 000A7040 */ sll $t6, $t2, 1 -.L800109B0: -/* 0115B0 800109B0 02061021 */ addu $v0, $s0, $a2 -/* 0115B4 800109B4 24430001 */ addiu $v1, $v0, 1 -/* 0115B8 800109B8 24440002 */ addiu $a0, $v0, 2 -/* 0115BC 800109BC 24450003 */ addiu $a1, $v0, 3 -.L800109C0: -/* 0115C0 800109C0 0047001A */ div $zero, $v0, $a3 -/* 0115C4 800109C4 0000C010 */ mfhi $t8 -/* 0115C8 800109C8 00187840 */ sll $t7, $t8, 1 -/* 0115CC 800109CC 8D0E0000 */ lw $t6, ($t0) -/* 0115D0 800109D0 0067001A */ div $zero, $v1, $a3 -/* 0115D4 800109D4 0000C010 */ mfhi $t8 -/* 0115D8 800109D8 01CF6821 */ addu $t5, $t6, $t7 -/* 0115DC 800109DC 00187040 */ sll $t6, $t8, 1 -/* 0115E0 800109E0 0087001A */ div $zero, $a0, $a3 -/* 0115E4 800109E4 0000C010 */ mfhi $t8 -/* 0115E8 800109E8 A5A00000 */ sh $zero, ($t5) -/* 0115EC 800109EC 14E00002 */ bnez $a3, .L800109F8 -/* 0115F0 800109F0 00000000 */ nop -/* 0115F4 800109F4 0007000D */ break 7 -.L800109F8: -/* 0115F8 800109F8 2401FFFF */ li $at, -1 -/* 0115FC 800109FC 14E10004 */ bne $a3, $at, .L80010A10 -/* 011600 80010A00 3C018000 */ lui $at, 0x8000 -/* 011604 80010A04 14410002 */ bne $v0, $at, .L80010A10 -/* 011608 80010A08 00000000 */ nop -/* 01160C 80010A0C 0006000D */ break 6 -.L80010A10: -/* 011610 80010A10 00A7001A */ div $zero, $a1, $a3 -/* 011614 80010A14 8D190000 */ lw $t9, ($t0) -/* 011618 80010A18 14E00002 */ bnez $a3, .L80010A24 -/* 01161C 80010A1C 00000000 */ nop -/* 011620 80010A20 0007000D */ break 7 -.L80010A24: -/* 011624 80010A24 2401FFFF */ li $at, -1 -/* 011628 80010A28 14E10004 */ bne $a3, $at, .L80010A3C -/* 01162C 80010A2C 3C018000 */ lui $at, 0x8000 -/* 011630 80010A30 14610002 */ bne $v1, $at, .L80010A3C -/* 011634 80010A34 00000000 */ nop -/* 011638 80010A38 0006000D */ break 6 -.L80010A3C: -/* 01163C 80010A3C 032E7821 */ addu $t7, $t9, $t6 -/* 011640 80010A40 A5E00000 */ sh $zero, ($t7) -/* 011644 80010A44 8D0D0000 */ lw $t5, ($t0) -/* 011648 80010A48 14E00002 */ bnez $a3, .L80010A54 -/* 01164C 80010A4C 00000000 */ nop -/* 011650 80010A50 0007000D */ break 7 -.L80010A54: -/* 011654 80010A54 2401FFFF */ li $at, -1 -/* 011658 80010A58 14E10004 */ bne $a3, $at, .L80010A6C -/* 01165C 80010A5C 3C018000 */ lui $at, 0x8000 -/* 011660 80010A60 14810002 */ bne $a0, $at, .L80010A6C -/* 011664 80010A64 00000000 */ nop -/* 011668 80010A68 0006000D */ break 6 -.L80010A6C: -/* 01166C 80010A6C 0018C840 */ sll $t9, $t8, 1 -/* 011670 80010A70 01B97021 */ addu $t6, $t5, $t9 -/* 011674 80010A74 A5C00000 */ sh $zero, ($t6) -/* 011678 80010A78 8D0F0000 */ lw $t7, ($t0) -/* 01167C 80010A7C 0000C010 */ mfhi $t8 -/* 011680 80010A80 00186840 */ sll $t5, $t8, 1 -/* 011684 80010A84 14E00002 */ bnez $a3, .L80010A90 -/* 011688 80010A88 00000000 */ nop -/* 01168C 80010A8C 0007000D */ break 7 -.L80010A90: -/* 011690 80010A90 2401FFFF */ li $at, -1 -/* 011694 80010A94 14E10004 */ bne $a3, $at, .L80010AA8 -/* 011698 80010A98 3C018000 */ lui $at, 0x8000 -/* 01169C 80010A9C 14A10002 */ bne $a1, $at, .L80010AA8 -/* 0116A0 80010AA0 00000000 */ nop -/* 0116A4 80010AA4 0006000D */ break 6 -.L80010AA8: -/* 0116A8 80010AA8 24C60004 */ addiu $a2, $a2, 4 -/* 0116AC 80010AAC 01EDC821 */ addu $t9, $t7, $t5 -/* 0116B0 80010AB0 A7200000 */ sh $zero, ($t9) -/* 0116B4 80010AB4 24A50004 */ addiu $a1, $a1, 4 -/* 0116B8 80010AB8 24840004 */ addiu $a0, $a0, 4 -/* 0116BC 80010ABC 24630004 */ addiu $v1, $v1, 4 -/* 0116C0 80010AC0 14CAFFBF */ bne $a2, $t2, .L800109C0 -/* 0116C4 80010AC4 24420004 */ addiu $v0, $v0, 4 -.L80010AC8: -/* 0116C8 80010AC8 000A7040 */ sll $t6, $t2, 1 -.L80010ACC: -/* 0116CC 80010ACC 01608025 */ move $s0, $t3 -/* 0116D0 80010AD0 018E6021 */ addu $t4, $t4, $t6 -/* 0116D4 80010AD4 10000065 */ b .L80010C6C -/* 0116D8 80010AD8 00E05025 */ move $t2, $a3 -.L80010ADC: -/* 0116DC 80010ADC 1940005F */ blez $t2, .L80010C5C -/* 0116E0 80010AE0 00003025 */ move $a2, $zero -/* 0116E4 80010AE4 31440003 */ andi $a0, $t2, 3 -/* 0116E8 80010AE8 10800016 */ beqz $a0, .L80010B44 -/* 0116EC 80010AEC 00801825 */ move $v1, $a0 -/* 0116F0 80010AF0 02061021 */ addu $v0, $s0, $a2 -.L80010AF4: -/* 0116F4 80010AF4 0047001A */ div $zero, $v0, $a3 -/* 0116F8 80010AF8 8D180000 */ lw $t8, ($t0) -/* 0116FC 80010AFC 00007810 */ mfhi $t7 -/* 011700 80010B00 000F6840 */ sll $t5, $t7, 1 -/* 011704 80010B04 14E00002 */ bnez $a3, .L80010B10 -/* 011708 80010B08 00000000 */ nop -/* 01170C 80010B0C 0007000D */ break 7 -.L80010B10: -/* 011710 80010B10 2401FFFF */ li $at, -1 -/* 011714 80010B14 14E10004 */ bne $a3, $at, .L80010B28 -/* 011718 80010B18 3C018000 */ lui $at, 0x8000 -/* 01171C 80010B1C 14410002 */ bne $v0, $at, .L80010B28 -/* 011720 80010B20 00000000 */ nop -/* 011724 80010B24 0006000D */ break 6 -.L80010B28: -/* 011728 80010B28 24C60001 */ addiu $a2, $a2, 1 -/* 01172C 80010B2C 030DC821 */ addu $t9, $t8, $t5 -/* 011730 80010B30 A7290000 */ sh $t1, ($t9) -/* 011734 80010B34 1466FFEF */ bne $v1, $a2, .L80010AF4 -/* 011738 80010B38 24420001 */ addiu $v0, $v0, 1 -/* 01173C 80010B3C 50CA0048 */ beql $a2, $t2, .L80010C60 -/* 011740 80010B40 000A7040 */ sll $t6, $t2, 1 -.L80010B44: -/* 011744 80010B44 02061021 */ addu $v0, $s0, $a2 -/* 011748 80010B48 24430001 */ addiu $v1, $v0, 1 -/* 01174C 80010B4C 24440002 */ addiu $a0, $v0, 2 -/* 011750 80010B50 24450003 */ addiu $a1, $v0, 3 -.L80010B54: -/* 011754 80010B54 0047001A */ div $zero, $v0, $a3 -/* 011758 80010B58 00007810 */ mfhi $t7 -/* 01175C 80010B5C 000FC040 */ sll $t8, $t7, 1 -/* 011760 80010B60 8D0E0000 */ lw $t6, ($t0) -/* 011764 80010B64 0067001A */ div $zero, $v1, $a3 -/* 011768 80010B68 00007810 */ mfhi $t7 -/* 01176C 80010B6C 01D86821 */ addu $t5, $t6, $t8 -/* 011770 80010B70 000F7040 */ sll $t6, $t7, 1 -/* 011774 80010B74 0087001A */ div $zero, $a0, $a3 -/* 011778 80010B78 00007810 */ mfhi $t7 -/* 01177C 80010B7C A5A90000 */ sh $t1, ($t5) -/* 011780 80010B80 14E00002 */ bnez $a3, .L80010B8C -/* 011784 80010B84 00000000 */ nop -/* 011788 80010B88 0007000D */ break 7 -.L80010B8C: -/* 01178C 80010B8C 2401FFFF */ li $at, -1 -/* 011790 80010B90 14E10004 */ bne $a3, $at, .L80010BA4 -/* 011794 80010B94 3C018000 */ lui $at, 0x8000 -/* 011798 80010B98 14410002 */ bne $v0, $at, .L80010BA4 -/* 01179C 80010B9C 00000000 */ nop -/* 0117A0 80010BA0 0006000D */ break 6 -.L80010BA4: -/* 0117A4 80010BA4 00A7001A */ div $zero, $a1, $a3 -/* 0117A8 80010BA8 8D190000 */ lw $t9, ($t0) -/* 0117AC 80010BAC 14E00002 */ bnez $a3, .L80010BB8 -/* 0117B0 80010BB0 00000000 */ nop -/* 0117B4 80010BB4 0007000D */ break 7 -.L80010BB8: -/* 0117B8 80010BB8 2401FFFF */ li $at, -1 -/* 0117BC 80010BBC 14E10004 */ bne $a3, $at, .L80010BD0 -/* 0117C0 80010BC0 3C018000 */ lui $at, 0x8000 -/* 0117C4 80010BC4 14610002 */ bne $v1, $at, .L80010BD0 -/* 0117C8 80010BC8 00000000 */ nop -/* 0117CC 80010BCC 0006000D */ break 6 -.L80010BD0: -/* 0117D0 80010BD0 032EC021 */ addu $t8, $t9, $t6 -/* 0117D4 80010BD4 A7090000 */ sh $t1, ($t8) -/* 0117D8 80010BD8 8D0D0000 */ lw $t5, ($t0) -/* 0117DC 80010BDC 14E00002 */ bnez $a3, .L80010BE8 -/* 0117E0 80010BE0 00000000 */ nop -/* 0117E4 80010BE4 0007000D */ break 7 -.L80010BE8: -/* 0117E8 80010BE8 2401FFFF */ li $at, -1 -/* 0117EC 80010BEC 14E10004 */ bne $a3, $at, .L80010C00 -/* 0117F0 80010BF0 3C018000 */ lui $at, 0x8000 -/* 0117F4 80010BF4 14810002 */ bne $a0, $at, .L80010C00 -/* 0117F8 80010BF8 00000000 */ nop -/* 0117FC 80010BFC 0006000D */ break 6 -.L80010C00: -/* 011800 80010C00 000FC840 */ sll $t9, $t7, 1 -/* 011804 80010C04 01B97021 */ addu $t6, $t5, $t9 -/* 011808 80010C08 A5C90000 */ sh $t1, ($t6) -/* 01180C 80010C0C 8D180000 */ lw $t8, ($t0) -/* 011810 80010C10 00007810 */ mfhi $t7 -/* 011814 80010C14 000F6840 */ sll $t5, $t7, 1 -/* 011818 80010C18 14E00002 */ bnez $a3, .L80010C24 -/* 01181C 80010C1C 00000000 */ nop -/* 011820 80010C20 0007000D */ break 7 -.L80010C24: -/* 011824 80010C24 2401FFFF */ li $at, -1 -/* 011828 80010C28 14E10004 */ bne $a3, $at, .L80010C3C -/* 01182C 80010C2C 3C018000 */ lui $at, 0x8000 -/* 011830 80010C30 14A10002 */ bne $a1, $at, .L80010C3C -/* 011834 80010C34 00000000 */ nop -/* 011838 80010C38 0006000D */ break 6 -.L80010C3C: -/* 01183C 80010C3C 24C60004 */ addiu $a2, $a2, 4 -/* 011840 80010C40 030DC821 */ addu $t9, $t8, $t5 -/* 011844 80010C44 A7290000 */ sh $t1, ($t9) -/* 011848 80010C48 24A50004 */ addiu $a1, $a1, 4 -/* 01184C 80010C4C 24840004 */ addiu $a0, $a0, 4 -/* 011850 80010C50 24630004 */ addiu $v1, $v1, 4 -/* 011854 80010C54 14CAFFBF */ bne $a2, $t2, .L80010B54 -/* 011858 80010C58 24420004 */ addiu $v0, $v0, 4 -.L80010C5C: -/* 01185C 80010C5C 000A7040 */ sll $t6, $t2, 1 -.L80010C60: -/* 011860 80010C60 01608025 */ move $s0, $t3 -/* 011864 80010C64 018E6021 */ addu $t4, $t4, $t6 -/* 011868 80010C68 00E05025 */ move $t2, $a3 -.L80010C6C: -/* 01186C 80010C6C 254A0001 */ addiu $t2, $t2, 1 -.L80010C70: -/* 011870 80010C70 0147082A */ slt $at, $t2, $a3 -/* 011874 80010C74 5420FF1B */ bnel $at, $zero, .L800108E4 -/* 011878 80010C78 020A5821 */ addu $t3, $s0, $t2 -.L80010C7C: -/* 01187C 80010C7C 26100001 */ addiu $s0, $s0, 1 -.L80010C80: -/* 011880 80010C80 0207082A */ slt $at, $s0, $a3 -/* 011884 80010C84 1420FF10 */ bnez $at, .L800108C8 -/* 011888 80010C88 258C0002 */ addiu $t4, $t4, 2 -.L80010C8C: -/* 01188C 80010C8C 8FBF0034 */ lw $ra, 0x34($sp) -/* 011890 80010C90 D7B40010 */ ldc1 $f20, 0x10($sp) -/* 011894 80010C94 D7B60018 */ ldc1 $f22, 0x18($sp) -/* 011898 80010C98 8FB00024 */ lw $s0, 0x24($sp) -/* 01189C 80010C9C 8FB10028 */ lw $s1, 0x28($sp) -/* 0118A0 80010CA0 8FB2002C */ lw $s2, 0x2c($sp) -/* 0118A4 80010CA4 8FB30030 */ lw $s3, 0x30($sp) -/* 0118A8 80010CA8 03E00008 */ jr $ra -/* 0118AC 80010CAC 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/non_matchings/code_80005FD0/func_80011014.s b/asm/non_matchings/code_80005FD0/func_80011014.s index 587e3ead6..ee4823d44 100644 --- a/asm/non_matchings/code_80005FD0/func_80011014.s +++ b/asm/non_matchings/code_80005FD0/func_80011014.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ED068 +.double 0.05 + +glabel D_800ED070 +.double -500.0 + +.section .text + glabel func_80011014 /* 011C14 80011014 27BDFF10 */ addiu $sp, $sp, -0xf0 /* 011C18 80011018 AFBF0074 */ sw $ra, 0x74($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8001168C.s b/asm/non_matchings/code_80005FD0/func_8001168C.s index 392eab312..d43b0ca30 100644 --- a/asm/non_matchings/code_80005FD0/func_8001168C.s +++ b/asm/non_matchings/code_80005FD0/func_8001168C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED078 +.double 0.05 + +.section .text + glabel func_8001168C /* 01228C 8001168C 27BDFF28 */ addiu $sp, $sp, -0xd8 /* 012290 80011690 44802000 */ mtc1 $zero, $f4 diff --git a/asm/non_matchings/code_80005FD0/func_80011B14.s b/asm/non_matchings/code_80005FD0/func_80011B14.s index af7786693..14e6f1ad1 100644 --- a/asm/non_matchings/code_80005FD0/func_80011B14.s +++ b/asm/non_matchings/code_80005FD0/func_80011B14.s @@ -1,3 +1,18 @@ +.section .late_rodata + +glabel jpt_800ED080 +.word L80011BE8, L80011C04, L80011C3C, L80011C54 +.word L80011C70, L80011C8C, L80011C9C, L80011CB0 +.word L80011CD4, L80011D2C, L80011CC0 + +glabel D_800ED0AC +.float -0.6 + +glabel D_800ED0B0 +.float 0.6 + +.section .text + glabel func_80011B14 /* 012714 80011B14 3C0F800E */ lui $t7, %hi(gCurrentCourseId) /* 012718 80011B18 85EFC5A0 */ lh $t7, %lo(gCurrentCourseId)($t7) diff --git a/asm/non_matchings/code_80005FD0/func_80011D48.s b/asm/non_matchings/code_80005FD0/func_80011D48.s index 58e24833f..d4d844e02 100644 --- a/asm/non_matchings/code_80005FD0/func_80011D48.s +++ b/asm/non_matchings/code_80005FD0/func_80011D48.s @@ -1,3 +1,12 @@ +.section .late_rodata + +glabel jpt_800ED0B4 +.word L80011DC4, L80011E20, L80011DF4, L80011DF4 +.word L80011DF4, L80011E20, L80011E20, L80011E20 +.word L80011E20, L80011E20, L80011E20 + +.section .text + glabel func_80011D48 /* 012948 80011D48 3C18800E */ lui $t8, %hi(gCurrentCourseId) /* 01294C 80011D4C 8718C5A0 */ lh $t8, %lo(gCurrentCourseId)($t8) diff --git a/asm/non_matchings/code_80005FD0/func_80011EC0.s b/asm/non_matchings/code_80005FD0/func_80011EC0.s index 28fcc0fdc..42fff30d0 100644 --- a/asm/non_matchings/code_80005FD0/func_80011EC0.s +++ b/asm/non_matchings/code_80005FD0/func_80011EC0.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ED0E0 +.double -0.8 + +glabel D_800ED0E8 +.double 0.8 + +.section .text + glabel func_80011EC0 /* 012AC0 80011EC0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 012AC4 80011EC4 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80012AC0.s b/asm/non_matchings/code_80005FD0/func_80012AC0.s index cf08e780e..6bdf659f3 100644 --- a/asm/non_matchings/code_80005FD0/func_80012AC0.s +++ b/asm/non_matchings/code_80005FD0/func_80012AC0.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel D_800ED0F0 +.float 1.1 +.word 0x00000000 + +glabel D_800ED0F8 +.double 65.0 + +.section .text + glabel func_80012AC0 /* 0136C0 80012AC0 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 0136C4 80012AC4 3C028016 */ lui $v0, %hi(D_80162FCC) # $v0, 0x8016 diff --git a/asm/non_matchings/code_80005FD0/func_80013054.s b/asm/non_matchings/code_80005FD0/func_80013054.s index feb793df9..af0eeba0b 100644 --- a/asm/non_matchings/code_80005FD0/func_80013054.s +++ b/asm/non_matchings/code_80005FD0/func_80013054.s @@ -1,3 +1,24 @@ +.section .late_rodata + +glabel D_800ED100 +.float 0.42299348 +.word 0x00000000 + +glabel D_800ED108 +.double 0.1 + +glabel D_800ED110 +.float 0.72017353 +.word 0x00000000 + +glabel D_800ED118 +.double 0.1 + +glabel D_800ED120 +.double 0.01 + +.section .text + glabel func_80013054 /* 013C54 80013054 3C048016 */ lui $a0, %hi(D_801637B8) # $a0, 0x8016 /* 013C58 80013058 248437B8 */ addiu $a0, %lo(D_801637B8) # addiu $a0, $a0, 0x37b8 diff --git a/asm/non_matchings/code_80005FD0/func_800132F4.s b/asm/non_matchings/code_80005FD0/func_800132F4.s index 54475cb5c..9024b10c4 100644 --- a/asm/non_matchings/code_80005FD0/func_800132F4.s +++ b/asm/non_matchings/code_80005FD0/func_800132F4.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel D_800ED128 +.float 1.66666666 +.word 0x00000000 + +.section .text + glabel func_800132F4 /* 013EF4 800132F4 3C058016 */ lui $a1, %hi(D_801637C0) # $a1, 0x8016 /* 013EF8 800132F8 3C01800F */ lui $at, %hi(D_800ED128) # $at, 0x800f diff --git a/asm/non_matchings/code_80005FD0/func_800133C4.s b/asm/non_matchings/code_80005FD0/func_800133C4.s index 94f47a4dd..009c9ba79 100644 --- a/asm/non_matchings/code_80005FD0/func_800133C4.s +++ b/asm/non_matchings/code_80005FD0/func_800133C4.s @@ -1,3 +1,22 @@ +.section .late_rodata + +glabel D_800ED130 +.double 45.0 + +glabel D_800ED138 +.double 180.0 + +glabel D_800ED140 +.double 0.2 + +glabel D_800ED148 +.double 0.04 + +glabel D_800ED150 +.double 0.02 + +.section .text + glabel func_800133C4 /* 013FC4 800133C4 27BDFF38 */ addiu $sp, $sp, -0xc8 /* 013FC8 800133C8 3C0E8016 */ lui $t6, %hi(D_801630FC) # $t6, 0x8016 diff --git a/asm/non_matchings/code_80005FD0/func_80013854.s b/asm/non_matchings/code_80005FD0/func_80013854.s deleted file mode 100644 index eb7535b0d..000000000 --- a/asm/non_matchings/code_80005FD0/func_80013854.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_80013854 -/* 014454 80013854 27BDFF70 */ addiu $sp, $sp, -0x90 -/* 014458 80013858 AFBF006C */ sw $ra, 0x6c($sp) -/* 01445C 8001385C AFB40068 */ sw $s4, 0x68($sp) -/* 014460 80013860 AFB30064 */ sw $s3, 0x64($sp) -/* 014464 80013864 AFB20060 */ sw $s2, 0x60($sp) -/* 014468 80013868 AFB1005C */ sw $s1, 0x5c($sp) -/* 01446C 8001386C AFB00058 */ sw $s0, 0x58($sp) -/* 014470 80013870 F7BE0050 */ sdc1 $f30, 0x50($sp) -/* 014474 80013874 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 014478 80013878 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 01447C 8001387C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 014480 80013880 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 014484 80013884 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 014488 80013888 8C8200BC */ lw $v0, 0xbc($a0) -/* 01448C 8001388C 00808825 */ move $s1, $a0 -/* 014490 80013890 000271C0 */ sll $t6, $v0, 7 -/* 014494 80013894 05C00045 */ bltz $t6, .L800139AC -/* 014498 80013898 00027980 */ sll $t7, $v0, 6 -/* 01449C 8001389C 05E00043 */ bltz $t7, .L800139AC -/* 0144A0 800138A0 3C108016 */ lui $s0, %hi(D_801637C0) # $s0, 0x8016 -/* 0144A4 800138A4 3C01404E */ li $at, 0x404E0000 # 3.218750 -/* 0144A8 800138A8 4481F800 */ mtc1 $at, $f31 -/* 0144AC 800138AC 3C01800F */ lui $at, %hi(D_800ED158) -/* 0144B0 800138B0 D436D158 */ ldc1 $f22, %lo(D_800ED158)($at) -/* 0144B4 800138B4 3C01800F */ lui $at, %hi(D_800ED160) -/* 0144B8 800138B8 3C148016 */ lui $s4, %hi(D_801637EC) # $s4, 0x8016 -/* 0144BC 800138BC 4480F000 */ mtc1 $zero, $f30 -/* 0144C0 800138C0 C49A0014 */ lwc1 $f26, 0x14($a0) -/* 0144C4 800138C4 C4920018 */ lwc1 $f18, 0x18($a0) -/* 0144C8 800138C8 C49C001C */ lwc1 $f28, 0x1c($a0) -/* 0144CC 800138CC 269437EC */ addiu $s4, %lo(D_801637EC) # addiu $s4, $s4, 0x37ec -/* 0144D0 800138D0 D434D160 */ ldc1 $f20, %lo(D_800ED160)($at) -/* 0144D4 800138D4 261037C0 */ addiu $s0, %lo(D_801637C0) # addiu $s0, $s0, 0x37c0 -/* 0144D8 800138D8 3C130008 */ lui $s3, 8 -/* 0144DC 800138DC 24120001 */ li $s2, 1 -/* 0144E0 800138E0 86180000 */ lh $t8, ($s0) -.L800138E4: -/* 0144E4 800138E4 5658002F */ bnel $s2, $t8, .L800139A4 -/* 0144E8 800138E8 2610002C */ addiu $s0, $s0, 0x2c -/* 0144EC 800138EC C60C0004 */ lwc1 $f12, 4($s0) -/* 0144F0 800138F0 C6040008 */ lwc1 $f4, 8($s0) -/* 0144F4 800138F4 C60E000C */ lwc1 $f14, 0xc($s0) -/* 0144F8 800138F8 460CD081 */ sub.s $f2, $f26, $f12 -/* 0144FC 800138FC 46049601 */ sub.s $f24, $f18, $f4 -/* 014500 80013900 46001021 */ cvt.d.s $f0, $f2 -/* 014504 80013904 460EE401 */ sub.s $f16, $f28, $f14 -/* 014508 80013908 4620A03C */ c.lt.d $f20, $f0 -/* 01450C 8001390C 00000000 */ nop -/* 014510 80013910 45020024 */ bc1fl .L800139A4 -/* 014514 80013914 2610002C */ addiu $s0, $s0, 0x2c -/* 014518 80013918 4636003C */ c.lt.d $f0, $f22 -/* 01451C 8001391C 00000000 */ nop -/* 014520 80013920 45020020 */ bc1fl .L800139A4 -/* 014524 80013924 2610002C */ addiu $s0, $s0, 0x2c -/* 014528 80013928 46008021 */ cvt.d.s $f0, $f16 -/* 01452C 8001392C 4620A03C */ c.lt.d $f20, $f0 -/* 014530 80013930 00000000 */ nop -/* 014534 80013934 4502001B */ bc1fl .L800139A4 -/* 014538 80013938 2610002C */ addiu $s0, $s0, 0x2c -/* 01453C 8001393C 4636003C */ c.lt.d $f0, $f22 -/* 014540 80013940 3C014348 */ li $at, 0x43480000 # 200.000000 -/* 014544 80013944 45020017 */ bc1fl .L800139A4 -/* 014548 80013948 2610002C */ addiu $s0, $s0, 0x2c -/* 01454C 8001394C 44813000 */ mtc1 $at, $f6 -/* 014550 80013950 3C014270 */ li $at, 0x42700000 # 60.000000 -/* 014554 80013954 44814000 */ mtc1 $at, $f8 -/* 014558 80013958 8E060010 */ lw $a2, 0x10($s0) -/* 01455C 8001395C 8E070018 */ lw $a3, 0x18($s0) -/* 014560 80013960 E7BA0018 */ swc1 $f26, 0x18($sp) -/* 014564 80013964 E7BC001C */ swc1 $f28, 0x1c($sp) -/* 014568 80013968 E7B20070 */ swc1 $f18, 0x70($sp) -/* 01456C 8001396C E7A60010 */ swc1 $f6, 0x10($sp) -/* 014570 80013970 0C001806 */ jal func_80006018 -/* 014574 80013974 E7A80014 */ swc1 $f8, 0x14($sp) -/* 014578 80013978 14520009 */ bne $v0, $s2, .L800139A0 -/* 01457C 8001397C C7B20070 */ lwc1 $f18, 0x70($sp) -/* 014580 80013980 4600C2A1 */ cvt.d.s $f10, $f24 -/* 014584 80013984 463E503C */ c.lt.d $f10, $f30 -/* 014588 80013988 00000000 */ nop -/* 01458C 8001398C 45020005 */ bc1fl .L800139A4 -/* 014590 80013990 2610002C */ addiu $s0, $s0, 0x2c -/* 014594 80013994 8E39000C */ lw $t9, 0xc($s1) -/* 014598 80013998 03334025 */ or $t0, $t9, $s3 -/* 01459C 8001399C AE28000C */ sw $t0, 0xc($s1) -.L800139A0: -/* 0145A0 800139A0 2610002C */ addiu $s0, $s0, 0x2c -.L800139A4: -/* 0145A4 800139A4 5614FFCF */ bnel $s0, $s4, .L800138E4 -/* 0145A8 800139A8 86180000 */ lh $t8, ($s0) -.L800139AC: -/* 0145AC 800139AC 8FBF006C */ lw $ra, 0x6c($sp) -/* 0145B0 800139B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 0145B4 800139B4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 0145B8 800139B8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 0145BC 800139BC D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 0145C0 800139C0 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 0145C4 800139C4 D7BE0050 */ ldc1 $f30, 0x50($sp) -/* 0145C8 800139C8 8FB00058 */ lw $s0, 0x58($sp) -/* 0145CC 800139CC 8FB1005C */ lw $s1, 0x5c($sp) -/* 0145D0 800139D0 8FB20060 */ lw $s2, 0x60($sp) -/* 0145D4 800139D4 8FB30064 */ lw $s3, 0x64($sp) -/* 0145D8 800139D8 8FB40068 */ lw $s4, 0x68($sp) -/* 0145DC 800139DC 03E00008 */ jr $ra -/* 0145E0 800139E0 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/asm/non_matchings/code_80005FD0/func_800139E4.s b/asm/non_matchings/code_80005FD0/func_800139E4.s index 6af817ea9..663f71488 100644 --- a/asm/non_matchings/code_80005FD0/func_800139E4.s +++ b/asm/non_matchings/code_80005FD0/func_800139E4.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED168 +.double 0.6 + +.section .text + glabel func_800139E4 /* 0145E4 800139E4 27BDFF98 */ addiu $sp, $sp, -0x68 /* 0145E8 800139E8 AFB7005C */ sw $s7, 0x5c($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80013C74.s b/asm/non_matchings/code_80005FD0/func_80013C74.s deleted file mode 100644 index 8201e0f2b..000000000 --- a/asm/non_matchings/code_80005FD0/func_80013C74.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80013C74 -/* 014874 80013C74 0005C400 */ sll $t8, $a1, 0x10 -/* 014878 80013C78 0018CC03 */ sra $t9, $t8, 0x10 -/* 01487C 80013C7C 00047400 */ sll $t6, $a0, 0x10 -/* 014880 80013C80 000E7C03 */ sra $t7, $t6, 0x10 -/* 014884 80013C84 AFA40000 */ sw $a0, ($sp) -/* 014888 80013C88 44801000 */ mtc1 $zero, $f2 -/* 01488C 80013C8C 2B21028A */ slti $at, $t9, 0x28a -/* 014890 80013C90 01E02025 */ move $a0, $t7 -/* 014894 80013C94 10200011 */ beqz $at, .L80013CDC -/* 014898 80013C98 AFA50004 */ sw $a1, 4($sp) -/* 01489C 80013C9C 11E00008 */ beqz $t7, .L80013CC0 -/* 0148A0 80013CA0 3C01800F */ lui $at, %hi(D_800ED170) -/* 0148A4 80013CA4 24010001 */ li $at, 1 -/* 0148A8 80013CA8 11E1001B */ beq $t7, $at, .L80013D18 -/* 0148AC 80013CAC 24010002 */ li $at, 2 -/* 0148B0 80013CB0 11E10006 */ beq $t7, $at, .L80013CCC -/* 0148B4 80013CB4 00000000 */ nop -/* 0148B8 80013CB8 03E00008 */ jr $ra -/* 0148BC 80013CBC 46001006 */ mov.s $f0, $f2 - -.L80013CC0: -/* 0148C0 80013CC0 C422D170 */ lwc1 $f2, %lo(D_800ED170)($at) -/* 0148C4 80013CC4 03E00008 */ jr $ra -/* 0148C8 80013CC8 46001006 */ mov.s $f0, $f2 - -.L80013CCC: -/* 0148CC 80013CCC 3C01800F */ lui $at, %hi(D_800ED174) # $at, 0x800f -/* 0148D0 80013CD0 C422D174 */ lwc1 $f2, %lo(D_800ED174)($at) -/* 0148D4 80013CD4 03E00008 */ jr $ra -/* 0148D8 80013CD8 46001006 */ mov.s $f0, $f2 - -.L80013CDC: -/* 0148DC 80013CDC 10800007 */ beqz $a0, .L80013CFC -/* 0148E0 80013CE0 24010001 */ li $at, 1 -/* 0148E4 80013CE4 10810005 */ beq $a0, $at, .L80013CFC -/* 0148E8 80013CE8 24010002 */ li $at, 2 -/* 0148EC 80013CEC 50810008 */ beql $a0, $at, .L80013D10 -/* 0148F0 80013CF0 3C013F00 */ lui $at, 0x3f00 -/* 0148F4 80013CF4 03E00008 */ jr $ra -/* 0148F8 80013CF8 46001006 */ mov.s $f0, $f2 - -.L80013CFC: -/* 0148FC 80013CFC 3C01BF00 */ li $at, 0xBF000000 # -0.500000 -/* 014900 80013D00 44811000 */ mtc1 $at, $f2 -/* 014904 80013D04 03E00008 */ jr $ra -/* 014908 80013D08 46001006 */ mov.s $f0, $f2 - -/* 01490C 80013D0C 3C013F00 */ li $at, 0x3F000000 # 0.500000 -.L80013D10: -/* 014910 80013D10 44811000 */ mtc1 $at, $f2 -/* 014914 80013D14 00000000 */ nop -.L80013D18: -/* 014918 80013D18 03E00008 */ jr $ra -/* 01491C 80013D1C 46001006 */ mov.s $f0, $f2 diff --git a/asm/non_matchings/code_80005FD0/func_80013D20.s b/asm/non_matchings/code_80005FD0/func_80013D20.s deleted file mode 100644 index c785d01d1..000000000 --- a/asm/non_matchings/code_80005FD0/func_80013D20.s +++ /dev/null @@ -1,158 +0,0 @@ -glabel func_80013D20 -/* 014920 80013D20 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 014924 80013D24 AFBF0024 */ sw $ra, 0x24($sp) -/* 014928 80013D28 AFB00020 */ sw $s0, 0x20($sp) -/* 01492C 80013D2C C4840004 */ lwc1 $f4, 4($a0) -/* 014930 80013D30 44801000 */ mtc1 $zero, $f2 -/* 014934 80013D34 00808025 */ move $s0, $a0 -/* 014938 80013D38 E7A4005C */ swc1 $f4, 0x5c($sp) -/* 01493C 80013D3C C4800008 */ lwc1 $f0, 8($a0) -/* 014940 80013D40 C486000C */ lwc1 $f6, 0xc($a0) -/* 014944 80013D44 E7A20044 */ swc1 $f2, 0x44($sp) -/* 014948 80013D48 E7A20048 */ swc1 $f2, 0x48($sp) -/* 01494C 80013D4C E7A00040 */ swc1 $f0, 0x40($sp) -/* 014950 80013D50 E7A60054 */ swc1 $f6, 0x54($sp) -/* 014954 80013D54 8605001C */ lh $a1, 0x1c($s0) -/* 014958 80013D58 8484002E */ lh $a0, 0x2e($a0) -/* 01495C 80013D5C 0C004F1D */ jal func_80013C74 -/* 014960 80013D60 E7A00058 */ swc1 $f0, 0x58($sp) -/* 014964 80013D64 C6020024 */ lwc1 $f2, 0x24($s0) -/* 014968 80013D68 3C01800F */ lui $at, %hi(D_800ED178) -/* 01496C 80013D6C 3C0E8016 */ lui $t6, %hi(D_8016347A) # $t6, 0x8016 -/* 014970 80013D70 4600103C */ c.lt.s $f2, $f0 -/* 014974 80013D74 26040004 */ addiu $a0, $s0, 4 -/* 014978 80013D78 2605001C */ addiu $a1, $s0, 0x1c -/* 01497C 80013D7C 4502000E */ bc1fl .L80013DB8 -/* 014980 80013D80 4602003C */ c.lt.s $f0, $f2 -/* 014984 80013D84 D42AD178 */ ldc1 $f10, %lo(D_800ED178)($at) -/* 014988 80013D88 46001221 */ cvt.d.s $f8, $f2 -/* 01498C 80013D8C 462A4400 */ add.d $f16, $f8, $f10 -/* 014990 80013D90 462084A0 */ cvt.s.d $f18, $f16 -/* 014994 80013D94 E6120024 */ swc1 $f18, 0x24($s0) -/* 014998 80013D98 C6020024 */ lwc1 $f2, 0x24($s0) -/* 01499C 80013D9C 4602003C */ c.lt.s $f0, $f2 -/* 0149A0 80013DA0 00000000 */ nop -/* 0149A4 80013DA4 45020004 */ bc1fl .L80013DB8 -/* 0149A8 80013DA8 4602003C */ c.lt.s $f0, $f2 -/* 0149AC 80013DAC E6000024 */ swc1 $f0, 0x24($s0) -/* 0149B0 80013DB0 C6020024 */ lwc1 $f2, 0x24($s0) -/* 0149B4 80013DB4 4602003C */ c.lt.s $f0, $f2 -.L80013DB8: -/* 0149B8 80013DB8 3C01800F */ lui $at, %hi(D_800ED180) -/* 0149BC 80013DBC 240F0003 */ li $t7, 3 -/* 0149C0 80013DC0 4500000D */ bc1f .L80013DF8 -/* 0149C4 80013DC4 00000000 */ nop -/* 0149C8 80013DC8 D426D180 */ ldc1 $f6, %lo(D_800ED180)($at) -/* 0149CC 80013DCC 46001121 */ cvt.d.s $f4, $f2 -/* 0149D0 80013DD0 46262201 */ sub.d $f8, $f4, $f6 -/* 0149D4 80013DD4 462042A0 */ cvt.s.d $f10, $f8 -/* 0149D8 80013DD8 E60A0024 */ swc1 $f10, 0x24($s0) -/* 0149DC 80013DDC C6020024 */ lwc1 $f2, 0x24($s0) -/* 0149E0 80013DE0 4600103C */ c.lt.s $f2, $f0 -/* 0149E4 80013DE4 00000000 */ nop -/* 0149E8 80013DE8 45000003 */ bc1f .L80013DF8 -/* 0149EC 80013DEC 00000000 */ nop -/* 0149F0 80013DF0 E6000024 */ swc1 $f0, 0x24($s0) -/* 0149F4 80013DF4 C6020024 */ lwc1 $f2, 0x24($s0) -.L80013DF8: -/* 0149F8 80013DF8 85CE347A */ lh $t6, %lo(D_8016347A)($t6) -/* 0149FC 80013DFC 55C0000D */ bnel $t6, $zero, .L80013E34 -/* 014A00 80013E00 8E060020 */ lw $a2, 0x20($s0) -/* 014A04 80013E04 8E060020 */ lw $a2, 0x20($s0) -/* 014A08 80013E08 44071000 */ mfc1 $a3, $f2 -/* 014A0C 80013E0C AFAF0014 */ sw $t7, 0x14($sp) -/* 014A10 80013E10 AFA00010 */ sw $zero, 0x10($sp) -/* 014A14 80013E14 26040004 */ addiu $a0, $s0, 4 -/* 014A18 80013E18 0C0035B4 */ jal func_8000D6D0 -/* 014A1C 80013E1C 2605001C */ addiu $a1, $s0, 0x1c -/* 014A20 80013E20 00022C00 */ sll $a1, $v0, 0x10 -/* 014A24 80013E24 0005C403 */ sra $t8, $a1, 0x10 -/* 014A28 80013E28 10000008 */ b .L80013E4C -/* 014A2C 80013E2C 03002825 */ move $a1, $t8 -/* 014A30 80013E30 8E060020 */ lw $a2, 0x20($s0) -.L80013E34: -/* 014A34 80013E34 44071000 */ mfc1 $a3, $f2 -/* 014A38 80013E38 0C003650 */ jal func_8000D940 -/* 014A3C 80013E3C AFA00010 */ sw $zero, 0x10($sp) -/* 014A40 80013E40 00022C00 */ sll $a1, $v0, 0x10 -/* 014A44 80013E44 0005CC03 */ sra $t9, $a1, 0x10 -/* 014A48 80013E48 03202825 */ move $a1, $t9 -.L80013E4C: -/* 014A4C 80013E4C 2604002A */ addiu $a0, $s0, 0x2a -/* 014A50 80013E50 0C00893C */ jal func_800224F0 -/* 014A54 80013E54 24060064 */ li $a2, 100 -/* 014A58 80013E58 C6100004 */ lwc1 $f16, 4($s0) -/* 014A5C 80013E5C C7B2005C */ lwc1 $f18, 0x5c($sp) -/* 014A60 80013E60 C604000C */ lwc1 $f4, 0xc($s0) -/* 014A64 80013E64 C7A60054 */ lwc1 $f6, 0x54($sp) -/* 014A68 80013E68 46128001 */ sub.s $f0, $f16, $f18 -/* 014A6C 80013E6C C6080008 */ lwc1 $f8, 8($s0) -/* 014A70 80013E70 44805000 */ mtc1 $zero, $f10 -/* 014A74 80013E74 46062081 */ sub.s $f2, $f4, $f6 -/* 014A78 80013E78 46000402 */ mul.s $f16, $f0, $f0 -/* 014A7C 80013E7C E7A80034 */ swc1 $f8, 0x34($sp) -/* 014A80 80013E80 E7AA0038 */ swc1 $f10, 0x38($sp) -/* 014A84 80013E84 46021482 */ mul.s $f18, $f2, $f2 -/* 014A88 80013E88 0C033850 */ jal sqrtf -/* 014A8C 80013E8C 46128300 */ add.s $f12, $f16, $f18 -/* 014A90 80013E90 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 014A94 80013E94 27A40040 */ addiu $a0, $sp, 0x40 -/* 014A98 80013E98 0C0AD489 */ jal func_802B5224 -/* 014A9C 80013E9C 27A50034 */ addiu $a1, $sp, 0x34 -/* 014AA0 80013EA0 00022823 */ negu $a1, $v0 -/* 014AA4 80013EA4 00054C00 */ sll $t1, $a1, 0x10 -/* 014AA8 80013EA8 00092C03 */ sra $a1, $t1, 0x10 -/* 014AAC 80013EAC 26040028 */ addiu $a0, $s0, 0x28 -/* 014AB0 80013EB0 0C00893C */ jal func_800224F0 -/* 014AB4 80013EB4 24060064 */ li $a2, 100 -/* 014AB8 80013EB8 C6000004 */ lwc1 $f0, 4($s0) -/* 014ABC 80013EBC C7A4005C */ lwc1 $f4, 0x5c($sp) -/* 014AC0 80013EC0 C6080008 */ lwc1 $f8, 8($s0) -/* 014AC4 80013EC4 C612000C */ lwc1 $f18, 0xc($s0) -/* 014AC8 80013EC8 46040181 */ sub.s $f6, $f0, $f4 -/* 014ACC 80013ECC 860B001E */ lh $t3, 0x1e($s0) -/* 014AD0 80013ED0 3C0D8016 */ lui $t5, %hi(gActorList) # $t5, 0x8016 -/* 014AD4 80013ED4 25ADF9B8 */ addiu $t5, %lo(gActorList) # addiu $t5, $t5, -0x648 -/* 014AD8 80013ED8 E6060010 */ swc1 $f6, 0x10($s0) -/* 014ADC 80013EDC C7AA0058 */ lwc1 $f10, 0x58($sp) -/* 014AE0 80013EE0 000B60C0 */ sll $t4, $t3, 3 -/* 014AE4 80013EE4 018B6023 */ subu $t4, $t4, $t3 -/* 014AE8 80013EE8 460A4401 */ sub.s $f16, $f8, $f10 -/* 014AEC 80013EEC 000C6100 */ sll $t4, $t4, 4 -/* 014AF0 80013EF0 018D1821 */ addu $v1, $t4, $t5 -/* 014AF4 80013EF4 3C0F800E */ lui $t7, %hi(gIsMirrorMode) -/* 014AF8 80013EF8 E6100014 */ swc1 $f16, 0x14($s0) -/* 014AFC 80013EFC C7A40054 */ lwc1 $f4, 0x54($sp) -/* 014B00 80013F00 46049181 */ sub.s $f6, $f18, $f4 -/* 014B04 80013F04 E6060018 */ swc1 $f6, 0x18($s0) -/* 014B08 80013F08 E4600018 */ swc1 $f0, 0x18($v1) -/* 014B0C 80013F0C C6080008 */ lwc1 $f8, 8($s0) -/* 014B10 80013F10 E468001C */ swc1 $f8, 0x1c($v1) -/* 014B14 80013F14 C60A000C */ lwc1 $f10, 0xc($s0) -/* 014B18 80013F18 E46A0020 */ swc1 $f10, 0x20($v1) -/* 014B1C 80013F1C 860E0028 */ lh $t6, 0x28($s0) -/* 014B20 80013F20 A46E0010 */ sh $t6, 0x10($v1) -/* 014B24 80013F24 8DEFC604 */ lw $t7, %lo(gIsMirrorMode)($t7) -/* 014B28 80013F28 51E00006 */ beql $t7, $zero, .L80013F44 -/* 014B2C 80013F2C 8608002A */ lh $t0, 0x2a($s0) -/* 014B30 80013F30 8618002A */ lh $t8, 0x2a($s0) -/* 014B34 80013F34 0018C823 */ negu $t9, $t8 -/* 014B38 80013F38 10000003 */ b .L80013F48 -/* 014B3C 80013F3C A4790012 */ sh $t9, 0x12($v1) -/* 014B40 80013F40 8608002A */ lh $t0, 0x2a($s0) -.L80013F44: -/* 014B44 80013F44 A4680012 */ sh $t0, 0x12($v1) -.L80013F48: -/* 014B48 80013F48 8609002C */ lh $t1, 0x2c($s0) -/* 014B4C 80013F4C A4690014 */ sh $t1, 0x14($v1) -/* 014B50 80013F50 C6100010 */ lwc1 $f16, 0x10($s0) -/* 014B54 80013F54 E4700024 */ swc1 $f16, 0x24($v1) -/* 014B58 80013F58 C6120014 */ lwc1 $f18, 0x14($s0) -/* 014B5C 80013F5C E4720028 */ swc1 $f18, 0x28($v1) -/* 014B60 80013F60 C6040018 */ lwc1 $f4, 0x18($s0) -/* 014B64 80013F64 E464002C */ swc1 $f4, 0x2c($v1) -/* 014B68 80013F68 8FBF0024 */ lw $ra, 0x24($sp) -/* 014B6C 80013F6C 8FB00020 */ lw $s0, 0x20($sp) -/* 014B70 80013F70 27BD0068 */ addiu $sp, $sp, 0x68 -/* 014B74 80013F74 03E00008 */ jr $ra -/* 014B78 80013F78 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_80013F7C.s b/asm/non_matchings/code_80005FD0/func_80013F7C.s index 9df825bc4..110b75710 100644 --- a/asm/non_matchings/code_80005FD0/func_80013F7C.s +++ b/asm/non_matchings/code_80005FD0/func_80013F7C.s @@ -1,3 +1,19 @@ +.section .late_rodata + +glabel D_800ED188 +.double -300.0 + +glabel D_800ED190 +.double 300.0 + +glabel D_800ED198 +.double -300.0 + +glabel D_800ED1A0 +.double 300.0 + +.section .text + glabel func_80013F7C /* 014B7C 80013F7C 27BDFF28 */ addiu $sp, $sp, -0xd8 /* 014B80 80013F80 AFB70074 */ sw $s7, 0x74($sp) diff --git a/asm/non_matchings/code_80005FD0/func_800145A8.s b/asm/non_matchings/code_80005FD0/func_800145A8.s deleted file mode 100644 index da0d7c137..000000000 --- a/asm/non_matchings/code_80005FD0/func_800145A8.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_800145A8 -/* 0151A8 800145A8 0006C400 */ sll $t8, $a2, 0x10 -/* 0151AC 800145AC 0018CC03 */ sra $t9, $t8, 0x10 -/* 0151B0 800145B0 00047400 */ sll $t6, $a0, 0x10 -/* 0151B4 800145B4 000E7C03 */ sra $t7, $t6, 0x10 -/* 0151B8 800145B8 AFA40000 */ sw $a0, ($sp) -/* 0151BC 800145BC 44856000 */ mtc1 $a1, $f12 -/* 0151C0 800145C0 2B21028A */ slti $at, $t9, 0x28a -/* 0151C4 800145C4 01E02025 */ move $a0, $t7 -/* 0151C8 800145C8 1020002A */ beqz $at, .L80014674 -/* 0151CC 800145CC AFA60008 */ sw $a2, 8($sp) -/* 0151D0 800145D0 11E00007 */ beqz $t7, .L800145F0 -/* 0151D4 800145D4 24010001 */ li $at, 1 -/* 0151D8 800145D8 11E1000F */ beq $t7, $at, .L80014618 -/* 0151DC 800145DC 24010002 */ li $at, 2 -/* 0151E0 800145E0 51E1001B */ beql $t7, $at, .L80014650 -/* 0151E4 800145E4 44809800 */ mtc1 $zero, $f19 -/* 0151E8 800145E8 03E00008 */ jr $ra -/* 0151EC 800145EC 46006006 */ mov.s $f0, $f12 - -.L800145F0: -/* 0151F0 800145F0 44803800 */ mtc1 $zero, $f7 -/* 0151F4 800145F4 44803000 */ mtc1 $zero, $f6 -/* 0151F8 800145F8 46006121 */ cvt.d.s $f4, $f12 -/* 0151FC 800145FC 4626203C */ c.lt.d $f4, $f6 -/* 015200 80014600 00000000 */ nop -/* 015204 80014604 4500002A */ bc1f .L800146B0 -/* 015208 80014608 00000000 */ nop -/* 01520C 8001460C 44800000 */ mtc1 $zero, $f0 -/* 015210 80014610 03E00008 */ jr $ra -/* 015214 80014614 00000000 */ nop - -.L80014618: -/* 015218 80014618 44805800 */ mtc1 $zero, $f11 -/* 01521C 8001461C 44805000 */ mtc1 $zero, $f10 -/* 015220 80014620 46006221 */ cvt.d.s $f8, $f12 -/* 015224 80014624 3C01800F */ lui $at, %hi(D_800ED1AC) -/* 015228 80014628 462A403C */ c.lt.d $f8, $f10 -/* 01522C 8001462C 00000000 */ nop -/* 015230 80014630 45000004 */ bc1f .L80014644 -/* 015234 80014634 00000000 */ nop -/* 015238 80014638 3C01800F */ lui $at, %hi(D_800ED1A8) -/* 01523C 8001463C 03E00008 */ jr $ra -/* 015240 80014640 C420D1A8 */ lwc1 $f0, %lo(D_800ED1A8)($at) - -.L80014644: -/* 015244 80014644 03E00008 */ jr $ra -/* 015248 80014648 C420D1AC */ lwc1 $f0, %lo(D_800ED1AC)($at) - -/* 01524C 8001464C 44809800 */ mtc1 $zero, $f19 -.L80014650: -/* 015250 80014650 44809000 */ mtc1 $zero, $f18 -/* 015254 80014654 46006421 */ cvt.d.s $f16, $f12 -/* 015258 80014658 4630903E */ c.le.d $f18, $f16 -/* 01525C 8001465C 00000000 */ nop -/* 015260 80014660 45000013 */ bc1f .L800146B0 -/* 015264 80014664 00000000 */ nop -/* 015268 80014668 44800000 */ mtc1 $zero, $f0 -/* 01526C 8001466C 03E00008 */ jr $ra -/* 015270 80014670 00000000 */ nop - -.L80014674: -/* 015274 80014674 10800007 */ beqz $a0, .L80014694 -/* 015278 80014678 24010001 */ li $at, 1 -/* 01527C 8001467C 10810005 */ beq $a0, $at, .L80014694 -/* 015280 80014680 24010002 */ li $at, 2 -/* 015284 80014684 50810008 */ beql $a0, $at, .L800146A8 -/* 015288 80014688 3C01BF00 */ lui $at, 0xbf00 -/* 01528C 8001468C 03E00008 */ jr $ra -/* 015290 80014690 46006006 */ mov.s $f0, $f12 - -.L80014694: -/* 015294 80014694 3C013F00 */ li $at, 0x3F000000 # 0.500000 -/* 015298 80014698 44810000 */ mtc1 $at, $f0 -/* 01529C 8001469C 03E00008 */ jr $ra -/* 0152A0 800146A0 00000000 */ nop - -/* 0152A4 800146A4 3C01BF00 */ li $at, 0xBF000000 # -0.500000 -.L800146A8: -/* 0152A8 800146A8 44816000 */ mtc1 $at, $f12 -/* 0152AC 800146AC 00000000 */ nop -.L800146B0: -/* 0152B0 800146B0 03E00008 */ jr $ra -/* 0152B4 800146B4 46006006 */ mov.s $f0, $f12 diff --git a/asm/non_matchings/code_80005FD0/func_800146B8.s b/asm/non_matchings/code_80005FD0/func_800146B8.s index 8608c0cb3..b59bcb726 100644 --- a/asm/non_matchings/code_80005FD0/func_800146B8.s +++ b/asm/non_matchings/code_80005FD0/func_800146B8.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED1B0 +.double 1.6666666666666667 + +.section .text + glabel func_800146B8 /* 0152B8 800146B8 000478C0 */ sll $t7, $a0, 3 /* 0152BC 800146BC 01E47823 */ subu $t7, $t7, $a0 diff --git a/asm/non_matchings/code_80005FD0/func_800147E0.s b/asm/non_matchings/code_80005FD0/func_800147E0.s index e757c8950..cadb2da91 100644 --- a/asm/non_matchings/code_80005FD0/func_800147E0.s +++ b/asm/non_matchings/code_80005FD0/func_800147E0.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel D_800ED1B8 +.double 90.0 + +glabel D_800ED1C0 +.double 4.583333333333333 + +glabel D_800ED1C8 +.double 2.9166666666666665 + +.section .text + glabel func_800147E0 /* 0153E0 800147E0 3C0E800E */ lui $t6, %hi(gCCSelection) /* 0153E4 800147E4 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6) diff --git a/asm/non_matchings/code_80005FD0/func_80014934.s b/asm/non_matchings/code_80005FD0/func_80014934.s index 51e7010e6..f9935a9f8 100644 --- a/asm/non_matchings/code_80005FD0/func_80014934.s +++ b/asm/non_matchings/code_80005FD0/func_80014934.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel D_800ED1D0 +.double 90.0 + +glabel D_800ED1D8 +.double 4.583333333333333 + +glabel D_800ED1E0 +.double 2.9166666666666665 + +.section .text + glabel func_80014934 /* 015534 80014934 3C0E800E */ lui $t6, %hi(gCCSelection) /* 015538 80014938 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6) diff --git a/asm/non_matchings/code_80005FD0/func_80014A88.s b/asm/non_matchings/code_80005FD0/func_80014A88.s index bc524bc5e..0f21a45e6 100644 --- a/asm/non_matchings/code_80005FD0/func_80014A88.s +++ b/asm/non_matchings/code_80005FD0/func_80014A88.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel D_800ED1E8 +.double 90.0 + +glabel D_800ED1F0 +.double 4.583333333333333 + +glabel D_800ED1F8 +.double 2.9166666666666665 + +.section .text + glabel func_80014A88 /* 015688 80014A88 3C0E800E */ lui $t6, %hi(gCCSelection) /* 01568C 80014A8C 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6) diff --git a/asm/non_matchings/code_80005FD0/func_80014BDC.s b/asm/non_matchings/code_80005FD0/func_80014BDC.s index 6a35f3373..5c861caa9 100644 --- a/asm/non_matchings/code_80005FD0/func_80014BDC.s +++ b/asm/non_matchings/code_80005FD0/func_80014BDC.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel D_800ED200 +.double 90.0 + +glabel D_800ED208 +.double 4.583333333333333 + +glabel D_800ED210 +.double 2.9166666666666665 + +.section .text + glabel func_80014BDC /* 0157DC 80014BDC 3C0E800E */ lui $t6, %hi(gCCSelection) /* 0157E0 80014BE0 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6) diff --git a/asm/non_matchings/code_80005FD0/func_80015544.s b/asm/non_matchings/code_80005FD0/func_80015544.s index a88851ae2..3e781ae35 100644 --- a/asm/non_matchings/code_80005FD0/func_80015544.s +++ b/asm/non_matchings/code_80005FD0/func_80015544.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED218 +.double 3000.0 + +.section .text + glabel func_80015544 /* 016144 80015544 00045840 */ sll $t3, $a0, 1 /* 016148 80015548 3C0C8016 */ lui $t4, %hi(gNearestWaypointByPlayerId) # 0x8016 diff --git a/asm/non_matchings/code_80005FD0/func_8001577C.s b/asm/non_matchings/code_80005FD0/func_8001577C.s index 7ec953bc9..432154657 100644 --- a/asm/non_matchings/code_80005FD0/func_8001577C.s +++ b/asm/non_matchings/code_80005FD0/func_8001577C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ED220 +.double -0.7 + +glabel D_800ED228 +.double 0.7 + +.section .text + glabel func_8001577C /* 01637C 8001577C 27BDFF70 */ addiu $sp, $sp, -0x90 /* 016380 80015780 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80015C94.s b/asm/non_matchings/code_80005FD0/func_80015C94.s index 4d1badb7c..a3d60d22e 100644 --- a/asm/non_matchings/code_80005FD0/func_80015C94.s +++ b/asm/non_matchings/code_80005FD0/func_80015C94.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED230 +.double 3000.0 + +.section .text + glabel func_80015C94 /* 016894 80015C94 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 016898 80015C98 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80016494.s b/asm/non_matchings/code_80005FD0/func_80016494.s index b541fddb5..23404a819 100644 --- a/asm/non_matchings/code_80005FD0/func_80016494.s +++ b/asm/non_matchings/code_80005FD0/func_80016494.s @@ -1,3 +1,22 @@ +.section .late_rodata + +glabel D_800ED238 +.double 0.01 + +glabel D_800ED240 +.double 0.01 + +glabel D_800ED248 +.double 0.4 + +glabel D_800ED250 +.double 0.4 + +glabel D_800ED258 +.double 3000.0 + +.section .text + glabel func_80016494 /* 017094 80016494 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 017098 80016498 AFA500BC */ sw $a1, 0xbc($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80016C3C.s b/asm/non_matchings/code_80005FD0/func_80016C3C.s index 1925f7bfb..a3ed541e3 100644 --- a/asm/non_matchings/code_80005FD0/func_80016C3C.s +++ b/asm/non_matchings/code_80005FD0/func_80016C3C.s @@ -1,3 +1,17 @@ +.section .late_rodata + +glabel D_800ED260 +.float 0.1 + +glabel D_800ED264 +.float -0.1 + +glabel D_800ED268 +.float 16.666666031 +.word 0x00000000 + +.section .text + glabel func_80016C3C /* 01783C 80016C3C 27BDFF98 */ addiu $sp, $sp, -0x68 /* 017840 80016C40 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80017054.s b/asm/non_matchings/code_80005FD0/func_80017054.s index fb7490216..4befbf325 100644 --- a/asm/non_matchings/code_80005FD0/func_80017054.s +++ b/asm/non_matchings/code_80005FD0/func_80017054.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ED270 +.double -10000.0 + +glabel D_800ED278 +.double 10000.0 + +.section .text + glabel func_80017054 /* 017C54 80017054 00077080 */ sll $t6, $a3, 2 /* 017C58 80017058 3C0F8016 */ lui $t7, %hi(D_80164648) # $t7, 0x8016 diff --git a/asm/non_matchings/code_80005FD0/func_800178F4.s b/asm/non_matchings/code_80005FD0/func_800178F4.s index a87f02ff5..d8420ea69 100644 --- a/asm/non_matchings/code_80005FD0/func_800178F4.s +++ b/asm/non_matchings/code_80005FD0/func_800178F4.s @@ -1,3 +1,17 @@ +.section .late_rodata + +# This one doesn't appear to be used in anywhere? +glabel D_800ED280 +.double 10000.0 + +glabel D_800ED288 +.double 0.1 + +glabel D_800ED290 +.double 0.1 + +.section .text + glabel func_800178F4 /* 0184F4 800178F4 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 0184F8 800178F8 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80005FD0/func_800180F0.s b/asm/non_matchings/code_80005FD0/func_800180F0.s index ce123ab5f..c1441bc80 100644 --- a/asm/non_matchings/code_80005FD0/func_800180F0.s +++ b/asm/non_matchings/code_80005FD0/func_800180F0.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ED298 +.double 0.1 + +glabel D_800ED2A0 +.double 0.1 + +.section .text + glabel func_800180F0 /* 018CF0 800180F0 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 018CF4 800180F4 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80005FD0/func_800188F4.s b/asm/non_matchings/code_80005FD0/func_800188F4.s index 4840cd023..269d6d757 100644 --- a/asm/non_matchings/code_80005FD0/func_800188F4.s +++ b/asm/non_matchings/code_80005FD0/func_800188F4.s @@ -1,3 +1,48 @@ +.section .late_rodata + +glabel D_800ED2A8 +.double 0.2 + +glabel D_800ED2B0 +.double 0.7 + +glabel D_800ED2B8 +.double 0.01 + +glabel D_800ED2C0 +.double -0.9 + +glabel D_800ED2C8 +.float -0.9 +.word 0x00000000 + +glabel D_800ED2D0 +.double 0.8 + +glabel D_800ED2D8 +.double 0.2 + +glabel D_800ED2E0 +.double 1.3 + +glabel D_800ED2E8 +.double 0.01 + +glabel D_800ED2F0 +.double 0.9 + +glabel D_800ED2F8 +.float 0.9 +.word 0x00000000 + +glabel D_800ED300 +.double 1.2 + +glabel D_800ED308 +.double 3000.0 + +.section .text + glabel func_800188F4 /* 0194F4 800188F4 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 0194F8 800188F8 3C0E800E */ lui $t6, %hi(gPlayerOne) diff --git a/asm/non_matchings/code_80005FD0/func_80019118.s b/asm/non_matchings/code_80005FD0/func_80019118.s index c50ad062f..a885eaf0e 100644 --- a/asm/non_matchings/code_80005FD0/func_80019118.s +++ b/asm/non_matchings/code_80005FD0/func_80019118.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED310 +.double 3000.0 + +.section .text + glabel func_80019118 /* 019D18 80019118 00044840 */ sll $t1, $a0, 1 /* 019D1C 8001911C 3C0A8016 */ lui $t2, %hi(gNearestWaypointByPlayerId) # 0x8016 diff --git a/asm/non_matchings/code_80005FD0/func_8001933C.s b/asm/non_matchings/code_80005FD0/func_8001933C.s index 8329c3edb..0b007ff56 100644 --- a/asm/non_matchings/code_80005FD0/func_8001933C.s +++ b/asm/non_matchings/code_80005FD0/func_8001933C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ED318 +.double 0.8 + +glabel D_800ED320 +.double 0.2 + +.section .text + glabel func_8001933C /* 019F3C 8001933C 27BDFF68 */ addiu $sp, $sp, -0x98 /* 019F40 80019340 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80019890.s b/asm/non_matchings/code_80005FD0/func_80019890.s index 329242813..e55cb6df2 100644 --- a/asm/non_matchings/code_80005FD0/func_80019890.s +++ b/asm/non_matchings/code_80005FD0/func_80019890.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel jpt_800ED328 +.word L80019928, L80019A08, L8001993C, L80019954 +.word L800199B4, L800199D4, L8001996C, L80019990 +.word L80019A48, L800199F4, L80019AE8, L80019AE8 +.word L80019A68, L80019A88, L80019A28, L80019AA8 +.word L80019AC8 + +.section .text + glabel func_80019890 /* 01A490 80019890 3C0E800E */ lui $t6, %hi(camera1) /* 01A494 80019894 0005C080 */ sll $t8, $a1, 2 diff --git a/asm/non_matchings/code_80005FD0/func_8001A220.s b/asm/non_matchings/code_80005FD0/func_8001A220.s index 65045060c..e3620b81c 100644 --- a/asm/non_matchings/code_80005FD0/func_8001A220.s +++ b/asm/non_matchings/code_80005FD0/func_8001A220.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800ED36C +.word L8001A25C, L8001A274, L8001A28C +.word L8001A2A4, L8001A2BC, L8001A2D4 + +.section .text + glabel func_8001A220 /* 01AE20 8001A220 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 01AE24 8001A224 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8001A588.s b/asm/non_matchings/code_80005FD0/func_8001A588.s index 4d721309f..7a82fea75 100644 --- a/asm/non_matchings/code_80005FD0/func_8001A588.s +++ b/asm/non_matchings/code_80005FD0/func_8001A588.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel jpt_800ED384 +.word L8001A998, L8001AA10, L8001A9B0, L8001A9B0 +.word L8001A9E0, L8001A9E0, L8001A9C8, L8001A9C8 +.word L8001AA40, L8001A9F8, L8001AA88, L8001AA88 +.word L8001AA58, L8001AA58, L8001AA28, L8001AA70 +.word L8001AA70 + +.section .text + glabel func_8001A588 /* 01B188 8001A588 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 01B18C 8001A58C 3C0F800E */ lui $t7, %hi(gModeSelection) diff --git a/asm/non_matchings/code_80005FD0/func_8001AB74.s b/asm/non_matchings/code_80005FD0/func_8001AB74.s index cd3574c2a..5d3e0001f 100644 --- a/asm/non_matchings/code_80005FD0/func_8001AB74.s +++ b/asm/non_matchings/code_80005FD0/func_8001AB74.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel jpt_800ED3C8 +.word L8001ABB0, L8001ABCC, L8001ABCC, L8001ABCC +.word L8001ABCC, L8001ABCC, L8001ABCC, L8001ABB8 +.word L8001ABA0, L8001ABC0, L8001ABA8, L8001ABC8 +.word L8001ABCC, L8001ABCC, L8001ABCC + +.section .text + glabel func_8001AB74 /* 01B774 8001AB74 24CEFFFF */ addiu $t6, $a2, -1 /* 01B778 8001AB78 2DC1000F */ sltiu $at, $t6, 0xf diff --git a/asm/non_matchings/code_80005FD0/func_8001AC10.s b/asm/non_matchings/code_80005FD0/func_8001AC10.s index 3b3b36b26..12a360415 100644 --- a/asm/non_matchings/code_80005FD0/func_8001AC10.s +++ b/asm/non_matchings/code_80005FD0/func_8001AC10.s @@ -1,3 +1,26 @@ +.section .late_rodata + +glabel jpt_800ED404 +.word L8001ACAC, L8001AD64, L8001AF34, L8001AFD8 +.word L8001B4AC, L8001B528, L8001B5B8, L8001B630 +.word L8001B6AC, L8001B738, L8001B7BC, L8001B838 +.word L8001B90C, L8001BA38, L8001BA98, L8001BB30 +.word L8001BE30, L8001BE30, L8001BE30, L8001BE30 +.word L8001BE30, L8001BE30, L8001BC28, L8001BC64 +.word L8001BE30, L8001BC8C, L8001BCBC, L8001BCE0 +.word L8001BD10, L8001BD34, L8001BD60, L8001BD94 +.word L8001BDC8, L8001BDE4, L8001B0EC, L8001B2C4 +.word L8001B3B4 + +glabel D_800ED498 +.double 0.4 + +glabel jpt_800ED4A0 +.word L8001B970, L8001B988, L8001B9A0, L8001B9B8 +.word L8001B9D0 + +.section .text + glabel func_8001AC10 /* 01B810 8001AC10 000478C0 */ sll $t7, $a0, 3 /* 01B814 8001AC14 01E47823 */ subu $t7, $t7, $a0 diff --git a/asm/non_matchings/code_80005FD0/func_8001C05C.s b/asm/non_matchings/code_80005FD0/func_8001C05C.s index fc27ff3ac..86b3412c5 100644 --- a/asm/non_matchings/code_80005FD0/func_8001C05C.s +++ b/asm/non_matchings/code_80005FD0/func_8001C05C.s @@ -1,3 +1,34 @@ +.section .late_rodata + +glabel D_800ED4B4 +.float 19.166999817 + +glabel D_800ED4B8 +.float -3202.475097656 + +glabel D_800ED4BC +.float -477.623992920 + +glabel D_800ED4C0 +.float -3205.080078125 + +glabel D_800ED4C4 +.float -462.851989746 + +glabel D_800ED4C8 +.float -3199.870117188 + +glabel D_800ED4CC +.float -492.395996094 + +glabel D_800ED4D0 +.float -2409.197021484 + +glabel D_800ED4D4 +.float -355.253997803 + +.section .text + glabel func_8001C05C /* 01CC5C 8001C05C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 01CC60 8001C060 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/data/data_0DD0A0_3.s b/data/data_0DD0A0_3.s deleted file mode 100644 index bde79a057..000000000 --- a/data/data_0DD0A0_3.s +++ /dev/null @@ -1,1456 +0,0 @@ -.include "macros.inc" - -.section .rodata - -.balign 4 -glabel D_800EB710 # "ゴール直後の強制ソート\n" -.byte 0xa5, 0xb4, 0xa1, 0xbc, 0xa5, 0xeb, 0xc4, 0xbe, 0xb8, 0xe5, 0xa4, 0xce, 0xb6, 0xaf, 0xc0, 0xa9 -.byte 0xa5, 0xbd, 0xa1, 0xbc, 0xa5, 0xc8, 0x0a, 0x00 - -.balign 4 -glabel D_800EB728 # "2PGPで片方がゴール直後の強制ソート\n" -.byte 0x32, 0x50, 0x47, 0x50, 0xa4, 0xc7, 0xca, 0xd2, 0xca, 0xfd, 0xa4, 0xac, 0xa5, 0xb4, 0xa1, 0xbc -.byte 0xa5, 0xeb, 0xc4, 0xbe, 0xb8, 0xe5, 0xa4, 0xce, 0xb6, 0xaf, 0xc0, 0xa9, 0xa5, 0xbd, 0xa1, 0xbc -.byte 0xa5, 0xc8, 0x0a, 0x00 - -.balign 4 -glabel D_800EB74C # "順位計算エラー！！ (num %d) (rank %d) (e_rank %d)\n" -.byte 0xbd, 0xe7, 0xb0, 0xcc, 0xb7, 0xd7, 0xbb, 0xbb, 0xa5, 0xa8, 0xa5, 0xe9, 0xa1, 0xbc, 0xa1, 0xaa -.byte 0xa1, 0xaa, 0x20, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x20, 0x28, 0x72, 0x61, 0x6e -.byte 0x6b, 0x20, 0x25, 0x64, 0x29, 0x20, 0x28, 0x65, 0x5f, 0x72, 0x61, 0x6e, 0x6b, 0x20, 0x25, 0x64 -.byte 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EB780 # "バイパス切り替え エラー!!!(num %d org_bipas %d bipas %d)\n" -.byte 0xa5, 0xd0, 0xa5, 0xa4, 0xa5, 0xd1, 0xa5, 0xb9, 0xc0, 0xda, 0xa4, 0xea, 0xc2, 0xd8, 0xa4, 0xa8 -.byte 0x20, 0xa5, 0xa8, 0xa5, 0xe9, 0xa1, 0xbc, 0x21, 0x21, 0x21, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25 -.byte 0x64, 0x20, 0x20, 0x6f, 0x72, 0x67, 0x5f, 0x62, 0x69, 0x70, 0x61, 0x73, 0x20, 0x25, 0x64, 0x20 -.byte 0x20, 0x62, 0x69, 0x70, 0x61, 0x73, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EB7BC -.asciiz "(%d) rap %3d rate_count_F %10.2f rap_count_F %10.2f area %5d \n" - -.balign 4 -glabel D_800EB800 # "迷路に突入！ enemy %d (%d --> %d)\n" -.byte 0xcc, 0xc2, 0xcf, 0xa9, 0xa4, 0xcb, 0xc6, 0xcd, 0xc6, 0xfe, 0xa1, 0xaa, 0x20, 0x65, 0x6e, 0x65 -.byte 0x6d, 0x79, 0x20, 0x25, 0x64, 0x20, 0x28, 0x25, 0x64, 0x20, 0x2d, 0x2d, 0x3e, 0x20, 0x25, 0x64 -.byte 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EB824 # "迷路から出た！ enemy %d (%d --> %d)\n" -.byte 0xcc, 0xc2, 0xcf, 0xa9, 0xa4, 0xab, 0xa4, 0xe9, 0xbd, 0xd0, 0xa4, 0xbf, 0xa1, 0xaa, 0x20, 0x65 -.byte 0x6e, 0x65, 0x6d, 0x79, 0x20, 0x25, 0x64, 0x20, 0x28, 0x25, 0x64, 0x20, 0x2d, 0x2d, 0x3e, 0x20 -.byte 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EB84C -.asciiz "enemy voice set (%d slip_flag %x weapon %x)\n" - -.balign 4 -glabel D_800EB87C # "スピンヴォイス！！(%d , name %d)\n" -.byte 0xa5, 0xb9, 0xa5, 0xd4, 0xa5, 0xf3, 0xa5, 0xf4, 0xa5, 0xa9, 0xa5, 0xa4, 0xa5, 0xb9, 0xa1, 0xaa -.byte 0xa1, 0xaa, 0x28, 0x25, 0x64, 0x20, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x25, 0x64, 0x29 -.byte 0x0a, 0x00 - -.balign 4 -glabel D_800EB8A0 # "ダメージヴォイス！！(%d, name %d)\n" -.byte 0xa5, 0xc0, 0xa5, 0xe1, 0xa1, 0xbc, 0xa5, 0xb8, 0xa5, 0xf4, 0xa5, 0xa9, 0xa5, 0xa4, 0xa5, 0xb9 -.byte 0xa1, 0xaa, 0xa1, 0xaa, 0x28, 0x25, 0x64, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x25, 0x64 -.byte 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EB8C4 -.asciiz "===== ENEMY DRIVE SUB (%d) =====\n" - -.balign 4 -glabel D_800EB8E8 # "ENEMY END(手抜き)\n\n" -.byte 0x45, 0x4e, 0x45, 0x4d, 0x59, 0x20, 0x45, 0x4e, 0x44, 0x28, 0xbc, 0xea, 0xc8, 0xb4, 0xa4, 0xad -.byte 0x29, 0x0a, 0x0a, 0x00 - -.balign 4 -glabel D_800EB8FC # "ENEMY END(手抜き)\n\n" -.byte 0x45, 0x4e, 0x45, 0x4d, 0x59, 0x20, 0x45, 0x4e, 0x44, 0x28, 0xbc, 0xea, 0xc8, 0xb4, 0xa4, 0xad -.byte 0x29, 0x0a, 0x0a, 0x00 - -.balign 4 -glabel D_800EB910 -.asciiz "(1)enemy stick angle over!! (%d)\n" - -.balign 4 -glabel D_800EB934 -.asciiz "ENEMY END\n\n" - -.balign 4 -glabel D_800EB940 -.asciiz "(2)enemy stick angle over!! (%d)\n" - -.balign 4 -glabel D_800EB964 -.asciiz "ENEMY END\n\n" - -.balign 4 -glabel D_800EB970 # "AREA ERR!!! (現在のセンターライン %d に未登録のグループです) %d\n" -.byte 0x41, 0x52, 0x45, 0x41, 0x20, 0x45, 0x52, 0x52, 0x21, 0x21, 0x21, 0x20, 0x28, 0xb8, 0xbd, 0xba -.byte 0xdf, 0xa4, 0xce, 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5 -.byte 0xf3, 0x20, 0x25, 0x64, 0x20, 0xa4, 0xcb, 0xcc, 0xa4, 0xc5, 0xd0, 0xcf, 0xbf, 0xa4, 0xce, 0xa5 -.byte 0xb0, 0xa5, 0xeb, 0xa1, 0xbc, 0xa5, 0xd7, 0xa4, 0xc7, 0xa4, 0xb9, 0x29, 0x20, 0x25, 0x64, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EB9B4 # "AREA ERR!!! (未登録のグループです) %d\n" -.byte 0x41, 0x52, 0x45, 0x41, 0x20, 0x45, 0x52, 0x52, 0x21, 0x21, 0x21, 0x20, 0x28, 0xcc, 0xa4, 0xc5 -.byte 0xd0, 0xcf, 0xbf, 0xa4, 0xce, 0xa5, 0xb0, 0xa5, 0xeb, 0xa1, 0xbc, 0xa5, 0xd7, 0xa4, 0xc7, 0xa4 -.byte 0xb9, 0x29, 0x20, 0x25, 0x64, 0x0a, 0x00 - -.balign 4 -glabel D_800EB9DC # "get_oga_area_sub_BP() ... エリアが見つからないッス！ (b_num = %d)\n" -.byte 0x67, 0x65, 0x74, 0x5f, 0x6f, 0x67, 0x61, 0x5f, 0x61, 0x72, 0x65, 0x61, 0x5f, 0x73, 0x75, 0x62 -.byte 0x5f, 0x42, 0x50, 0x28, 0x29, 0x20, 0x2e, 0x2e, 0x2e, 0x20, 0xa5, 0xa8, 0xa5, 0xea, 0xa5, 0xa2 -.byte 0xa4, 0xac, 0xb8, 0xab, 0xa4, 0xc4, 0xa4, 0xab, 0xa4, 0xe9, 0xa4, 0xca, 0xa4, 0xa4, 0xa5, 0xc3 -.byte 0xa5, 0xb9, 0xa1, 0xaa, 0x20, 0x28, 0x62, 0x5f, 0x6e, 0x75, 0x6d, 0x20, 0x3d, 0x20, 0x25, 0x64 -.byte 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBA20 # " 状況: (%d, %d, %d) \n" -.byte 0x20, 0x20, 0xbe, 0xf5, 0xb6, 0xb7, 0x3a, 0x20, 0x28, 0x25, 0x64, 0x2c, 0x20, 0x25, 0x64, 0x2c -.byte 0x20, 0x25, 0x64, 0x29, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EBA38 -.asciiz "<%d> (%d, %d, %d) [%d] lng %f\n" - -.balign 4 -glabel D_800EBA58 # "ワリオスタジアム ジャンプ失敗！！！ (area %d, y %7.2f)\n" -.byte 0xa5, 0xef, 0xa5, 0xea, 0xa5, 0xaa, 0xa5, 0xb9, 0xa5, 0xbf, 0xa5, 0xb8, 0xa5, 0xa2, 0xa5, 0xe0 -.byte 0x20, 0x20, 0xa5, 0xb8, 0xa5, 0xe3, 0xa5, 0xf3, 0xa5, 0xd7, 0xbc, 0xba, 0xc7, 0xd4, 0xa1, 0xaa -.byte 0xa1, 0xaa, 0xa1, 0xaa, 0x20, 0x28, 0x61, 0x72, 0x65, 0x61, 0x20, 0x25, 0x64, 0x2c, 0x20, 0x79 -.byte 0x20, 0x25, 0x37, 0x2e, 0x32, 0x66, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBA94 # "水に落ちた！！ センターラインに強制移動しました (num %d: area %d ) (%d,%d,%d)\n" -.byte 0xbf, 0xe5, 0xa4, 0xcb, 0xcd, 0xee, 0xa4, 0xc1, 0xa4, 0xbf, 0xa1, 0xaa, 0xa1, 0xaa, 0x20, 0x20 -.byte 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xa4, 0xcb -.byte 0xb6, 0xaf, 0xc0, 0xa9, 0xb0, 0xdc, 0xc6, 0xb0, 0xa4, 0xb7, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf -.byte 0x20, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x3a, 0x20, 0x61, 0x72, 0x65, 0x61, 0x20, 0x25 -.byte 0x64, 0x20, 0x29, 0x20, 0x28, 0x25, 0x64, 0x2c, 0x25, 0x64, 0x2c, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBAE4 # "こーすあうと！！（手抜き中:バンプ有り） センターラインに強制移動しました (num %d: area %d ==>%d) (group %d) (%d,%d,%d)\n" -.byte 0xa4, 0xb3, 0xa1, 0xbc, 0xa4, 0xb9, 0xa4, 0xa2, 0xa4, 0xa6, 0xa4, 0xc8, 0xa1, 0xaa, 0xa1, 0xaa -.byte 0xa1, 0xca, 0xbc, 0xea, 0xc8, 0xb4, 0xa4, 0xad, 0xc3, 0xe6, 0x3a, 0xa5, 0xd0, 0xa5, 0xf3, 0xa5 -.byte 0xd7, 0xcd, 0xad, 0xa4, 0xea, 0xa1, 0xcb, 0x20, 0x20, 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1 -.byte 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xa4, 0xcb, 0xb6, 0xaf, 0xc0, 0xa9, 0xb0, 0xdc, 0xc6 -.byte 0xb0, 0xa4, 0xb7, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0x20, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25 -.byte 0x64, 0x3a, 0x20, 0x61, 0x72, 0x65, 0x61, 0x20, 0x25, 0x64, 0x20, 0x3d, 0x3d, 0x3e, 0x25, 0x64 -.byte 0x29, 0x20, 0x28, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x25, 0x64, 0x29, 0x20, 0x28, 0x25, 0x64 -.byte 0x2c, 0x25, 0x64, 0x2c, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBB60 # "こーすあうと！！（手抜き中:バンプ無し） センターラインに強制移動しました (num %d: area %d ==>%d) (group %d) (%d,%d,%d)\n" -.byte 0xa4, 0xb3, 0xa1, 0xbc, 0xa4, 0xb9, 0xa4, 0xa2, 0xa4, 0xa6, 0xa4, 0xc8, 0xa1, 0xaa, 0xa1, 0xaa -.byte 0xa1, 0xca, 0xbc, 0xea, 0xc8, 0xb4, 0xa4, 0xad, 0xc3, 0xe6, 0x3a, 0xa5, 0xd0, 0xa5, 0xf3, 0xa5 -.byte 0xd7, 0xcc, 0xb5, 0xa4, 0xb7, 0xa1, 0xcb, 0x20, 0x20, 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1 -.byte 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xa4, 0xcb, 0xb6, 0xaf, 0xc0, 0xa9, 0xb0, 0xdc, 0xc6 -.byte 0xb0, 0xa4, 0xb7, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0x20, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25 -.byte 0x64, 0x3a, 0x20, 0x61, 0x72, 0x65, 0x61, 0x20, 0x25, 0x64, 0x20, 0x3d, 0x3d, 0x3e, 0x25, 0x64 -.byte 0x29, 0x20, 0x28, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x25, 0x64, 0x29, 0x20, 0x28, 0x25, 0x64 -.byte 0x2c, 0x25, 0x64, 0x2c, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBBDC # "こーすあうと！！！ エリアを再計算しました (num %d: area %d ==>%d)\n" -.byte 0xa4, 0xb3, 0xa1, 0xbc, 0xa4, 0xb9, 0xa4, 0xa2, 0xa4, 0xa6, 0xa4, 0xc8, 0xa1, 0xaa, 0xa1, 0xaa -.byte 0xa1, 0xaa, 0x20, 0x20, 0x20, 0x20, 0xa5, 0xa8, 0xa5, 0xea, 0xa5, 0xa2, 0xa4, 0xf2, 0xba, 0xc6 -.byte 0xb7, 0xd7, 0xbb, 0xbb, 0xa4, 0xb7, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0x20, 0x28, 0x6e, 0x75 -.byte 0x6d, 0x20, 0x25, 0x64, 0x3a, 0x20, 0x61, 0x72, 0x65, 0x61, 0x20, 0x25, 0x64, 0x20, 0x3d, 0x3d -.byte 0x3e, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBC24 # "直接指定のBOM(%d) (%7.2f, %7.2f, %7.2f) \n" -.byte 0xc4, 0xbe, 0xc0, 0xdc, 0xbb, 0xd8, 0xc4, 0xea, 0xa4, 0xce, 0x42, 0x4f, 0x4d, 0x28, 0x25, 0x64 -.byte 0x29, 0x20, 0x28, 0x25, 0x37, 0x2e, 0x32, 0x66, 0x2c, 0x20, 0x25, 0x37, 0x2e, 0x32, 0x66, 0x2c -.byte 0x20, 0x25, 0x37, 0x2e, 0x32, 0x66, 0x29, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EBC50 -.asciiz "BOM HIT CHECK\n" - -.balign 4 -glabel D_800EBC60 -.asciiz "BOM HIT !!!!! (%d)\n" - -.balign 4 -glabel D_800EBC74 # "BOM待機\n" -.byte 0x42, 0x4f, 0x4d, 0xc2, 0xd4, 0xb5, 0xa1, 0x0a, 0x00 - -.balign 4 -glabel D_800EBC80 -.asciiz "RESULT BOM area(%d)\n" - -.balign 4 -glabel D_800EBC98 # "BOM が 落ちました。\n" -.byte 0x42, 0x4f, 0x4d, 0x20, 0xa4, 0xac, 0x20, 0xcd, 0xee, 0xa4, 0xc1, 0xa4, 0xde, 0xa4, 0xb7, 0xa4 -.byte 0xbf, 0xa1, 0xa3, 0x0a, 0x00 - -.balign 4 -glabel D_800EBCB0 # "カメ用火柱 SET 失敗 (TABLE IS FULL)\n" -.byte 0xa5, 0xab, 0xa5, 0xe1, 0xcd, 0xd1, 0xb2, 0xd0, 0xc3, 0xec, 0x20, 0x53, 0x45, 0x54, 0x20, 0xbc -.byte 0xba, 0xc7, 0xd4, 0x20, 0x28, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x20, 0x49, 0x53, 0x20, 0x46, 0x55 -.byte 0x4c, 0x4c, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBCD8 # "赤ガメ火柱セットエラー！ (category %d)\n" -.byte 0xc0, 0xd6, 0xa5, 0xac, 0xa5, 0xe1, 0xb2, 0xd0, 0xc3, 0xec, 0xa5, 0xbb, 0xa5, 0xc3, 0xa5, 0xc8 -.byte 0xa5, 0xa8, 0xa5, 0xe9, 0xa1, 0xbc, 0xa1, 0xaa, 0x20, 0x28, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f -.byte 0x72, 0x79, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBD00 # "青ガメ火柱セットエラー！ (category %d)\n" -.byte 0xc0, 0xc4, 0xa5, 0xac, 0xa5, 0xe1, 0xb2, 0xd0, 0xc3, 0xec, 0xa5, 0xbb, 0xa5, 0xc3, 0xa5, 0xc8 -.byte 0xa5, 0xa8, 0xa5, 0xe9, 0xa1, 0xbc, 0xa1, 0xaa, 0x20, 0x28, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f -.byte 0x72, 0x79, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBD28 # "トゲガメ火柱セットエラー！ (category %d)\n" -.byte 0xa5, 0xc8, 0xa5, 0xb2, 0xa5, 0xac, 0xa5, 0xe1, 0xb2, 0xd0, 0xc3, 0xec, 0xa5, 0xbb, 0xa5, 0xc3 -.byte 0xa5, 0xc8, 0xa5, 0xa8, 0xa5, 0xe9, 0xa1, 0xbc, 0xa1, 0xaa, 0x20, 0x28, 0x63, 0x61, 0x74, 0x65 -.byte 0x67, 0x6f, 0x72, 0x79, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBD54 # "カメ火柱初期化！！\n" -.byte 0xa5, 0xab, 0xa5, 0xe1, 0xb2, 0xd0, 0xc3, 0xec, 0xbd, 0xe9, 0xb4, 0xfc, 0xb2, 0xbd, 0xa1, 0xaa -.byte 0xa1, 0xaa, 0x0a, 0x00 - -.balign 4 -glabel D_800EBD68 # "センターライン初期化\n" -.byte 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xbd, 0xe9 -.byte 0xb4, 0xfc, 0xb2, 0xbd, 0x0a, 0x00 - -.balign 4 -glabel D_800EBD80 -.asciiz "MAP NUMBER %d\n" - -.balign 4 -glabel D_800EBD90 -.asciiz "center_EX ptr = %x %x (%x)\n" - -.balign 4 -glabel D_800EBDB4 -.asciiz "\n" - -.balign 4 -glabel D_800EBDB8 -.asciiz "center_BP[%d] ptr = %x %x (%x)\n" - -.balign 4 -glabel D_800EBDE0 -.asciiz "side_point_L_BP[%d] ptr = %x %x (%x)\n" - -.balign 4 -glabel D_800EBE08 -.asciiz "side_point_R_BP[%d] ptr = %x %x (%x)\n" - -.balign 4 -glabel D_800EBE30 -.asciiz "curve_BP[%d] ptr = %x %x (%x)\n" - -.balign 4 -glabel D_800EBE58 -.asciiz "angle_BP[%d] ptr = %x %x (%x)\n" - -.balign 4 -glabel D_800EBE80 -.asciiz "short_cut_data_BP[%d] ptr = %x %x (%x)\n" - -.balign 4 -glabel D_800EBEA8 -.asciiz "\n" - -.balign 4 -glabel D_800EBEAC # "小川の使用メモリー合計 = %d\n" -.byte 0xbe, 0xae, 0xc0, 0xee, 0xa4, 0xce, 0xbb, 0xc8, 0xcd, 0xd1, 0xa5, 0xe1, 0xa5, 0xe2, 0xa5, 0xea -.byte 0xa1, 0xbc, 0xb9, 0xe7, 0xb7, 0xd7, 0x20, 0x3d, 0x20, 0x25, 0x64, 0x0a, 0x00 - -.balign 4 -glabel D_800EBECC # "敵初期化\n" -.byte 0xc5, 0xa8, 0xbd, 0xe9, 0xb4, 0xfc, 0xb2, 0xbd, 0x0a, 0x00 - -.balign 4 -glabel D_800EBED8 # "敵初期化終了\n" -.byte 0xc5, 0xa8, 0xbd, 0xe9, 0xb4, 0xfc, 0xb2, 0xbd, 0xbd, 0xaa, 0xce, 0xbb, 0x0a, 0x00 - -.balign 4 -glabel D_800EBEE8 # "バイパス CENTER LINE 分割開始\n" -.byte 0xa5, 0xd0, 0xa5, 0xa4, 0xa5, 0xd1, 0xa5, 0xb9, 0x20, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x20 -.byte 0x4c, 0x49, 0x4e, 0x45, 0x20, 0xca, 0xac, 0xb3, 0xe4, 0xb3, 0xab, 0xbb, 0xcf, 0x0a, 0x00 - -.balign 4 -glabel D_800EBF08 # "センターラインをROMから読みます (map:%d)\n" -.byte 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xa4, 0xf2 -.byte 0x52, 0x4f, 0x4d, 0xa4, 0xab, 0xa4, 0xe9, 0xc6, 0xc9, 0xa4, 0xdf, 0xa4, 0xde, 0xa4, 0xb9, 0x20 -.byte 0x28, 0x6d, 0x61, 0x70, 0x3a, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBF34 -.asciiz "ROM center (BP%d) line adr. = %x (%x)\n" - -.balign 4 -glabel D_800EBF5C # "センターラインを計算します (map:%d)\n" -.byte 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xa4, 0xf2 -.byte 0xb7, 0xd7, 0xbb, 0xbb, 0xa4, 0xb7, 0xa4, 0xde, 0xa4, 0xb9, 0x20, 0x28, 0x6d, 0x61, 0x70, 0x3a -.byte 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EBF84 -.asciiz "center (BP%d) line adr. = %x (%x)\n" - -.balign 4 -glabel D_800EBFA8 -.asciiz "BP center_point_number : %d\n" - -.balign 4 -glabel D_800EBFC8 # "センターライン データ エラー！！\n" -.byte 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0x20, 0xa5 -.byte 0xc7, 0xa1, 0xbc, 0xa5, 0xbf, 0x20, 0xa5, 0xa8, 0xa5, 0xe9, 0xa1, 0xbc, 0xa1, 0xaa, 0xa1, 0xaa -.byte 0x0a, 0x00 - -.balign 4 -glabel D_800EBFEC # "バイパス CENTER LINE 分割終了 (%d -> %d 個)\n" -.byte 0xa5, 0xd0, 0xa5, 0xa4, 0xa5, 0xd1, 0xa5, 0xb9, 0x20, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x20 -.byte 0x4c, 0x49, 0x4e, 0x45, 0x20, 0xca, 0xac, 0xb3, 0xe4, 0xbd, 0xaa, 0xce, 0xbb, 0x20, 0x28, 0x25 -.byte 0x64, 0x20, 0x2d, 0x3e, 0x20, 0x25, 0x64, 0x20, 0xb8, 0xc4, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC01C # "センターラインが ありません。(map:%d)\n" -.byte 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xa4, 0xac -.byte 0x20, 0xa4, 0xa2, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xbb, 0xa4, 0xf3, 0xa1, 0xa3, 0x28, 0x6d, 0x61 -.byte 0x70, 0x3a, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC044 # "サイドポイント計算 (バイパス %d)\n" -.byte 0xa5, 0xb5, 0xa5, 0xa4, 0xa5, 0xc9, 0xa5, 0xdd, 0xa5, 0xa4, 0xa5, 0xf3, 0xa5, 0xc8, 0xb7, 0xd7 -.byte 0xbb, 0xbb, 0x20, 0x28, 0xa5, 0xd0, 0xa5, 0xa4, 0xa5, 0xd1, 0xa5, 0xb9, 0x20, 0x25, 0x64, 0x29 -.byte 0x0a, 0x00 - -.balign 4 -glabel D_800EC068 # "カーブデータ計算 (バイパス %d)\n" -.byte 0xa5, 0xab, 0xa1, 0xbc, 0xa5, 0xd6, 0xa5, 0xc7, 0xa1, 0xbc, 0xa5, 0xbf, 0xb7, 0xd7, 0xbb, 0xbb -.byte 0x20, 0x28, 0xa5, 0xd0, 0xa5, 0xa4, 0xa5, 0xd1, 0xa5, 0xb9, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC088 # "センターラインが ありません。(map:%d)\n" -.byte 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xa4, 0xac -.byte 0x20, 0xa4, 0xa2, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xbb, 0xa4, 0xf3, 0xa1, 0xa3, 0x28, 0x6d, 0x61 -.byte 0x70, 0x3a, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC0B0 # "アングルデータ計算 (バイパス %d) \n" -.byte 0xa5, 0xa2, 0xa5, 0xf3, 0xa5, 0xb0, 0xa5, 0xeb, 0xa5, 0xc7, 0xa1, 0xbc, 0xa5, 0xbf, 0xb7, 0xd7 -.byte 0xbb, 0xbb, 0x20, 0x28, 0xa5, 0xd0, 0xa5, 0xa4, 0xa5, 0xd1, 0xa5, 0xb9, 0x20, 0x25, 0x64, 0x29 -.byte 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC0D4 # "センターラインが ありません。(map:%d)\n" -.byte 0xa5, 0xbb, 0xa5, 0xf3, 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xe9, 0xa5, 0xa4, 0xa5, 0xf3, 0xa4, 0xac -.byte 0x20, 0xa4, 0xa2, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xbb, 0xa4, 0xf3, 0xa1, 0xa3, 0x28, 0x6d, 0x61 -.byte 0x70, 0x3a, 0x25, 0x64, 0x29, 0x0a, 0x00 -.balign 4 - -glabel D_800EC0FC # "ショートカットデータ計算 (バイパス %d)\n" -.byte 0xa5, 0xb7, 0xa5, 0xe7, 0xa1, 0xbc, 0xa5, 0xc8, 0xa5, 0xab, 0xa5, 0xc3, 0xa5, 0xc8, 0xa5, 0xc7 -.byte 0xa1, 0xbc, 0xa5, 0xbf, 0xb7, 0xd7, 0xbb, 0xbb, 0x20, 0x28, 0xa5, 0xd0, 0xa5, 0xa4, 0xa5, 0xd1 -.byte 0xa5, 0xb9, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC124 -.asciiz "extern POINT rom_center_KT%d_BP%d[] = {\n" - -.balign 4 -glabel D_800EC150 -.asciiz " {%d,%d,%d,%d},\n" - -.balign 4 -glabel D_800EC164 -.asciiz " 0x8000,0x8000,0x8000,0\n};\n\n" - -.balign 4 -glabel D_800EC184 -.asciiz "area read from ROM (%d)\n" - -.balign 4 -glabel D_800EC1A0 # "ノーマルジャンプ！！！(%d)\n" -.byte 0xa5, 0xce, 0xa1, 0xbc, 0xa5, 0xde, 0xa5, 0xeb, 0xa5, 0xb8, 0xa5, 0xe3, 0xa5, 0xf3, 0xa5, 0xd7 -.byte 0xa1, 0xaa, 0xa1, 0xaa, 0xa1, 0xaa, 0x28, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC1BC # "ターボオン！！！(%d)\n" -.byte 0xa5, 0xbf, 0xa1, 0xbc, 0xa5, 0xdc, 0xa5, 0xaa, 0xa5, 0xf3, 0xa1, 0xaa, 0xa1, 0xaa, 0xa1, 0xaa -.byte 0x28, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC1D4 # "手抜き禁止！！！(%d)\n" -.byte 0xbc, 0xea, 0xc8, 0xb4, 0xa4, 0xad, 0xb6, 0xd8, 0xbb, 0xdf, 0xa1, 0xaa, 0xa1, 0xaa, 0xa1, 0xaa -.byte 0x28, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC1EC # "アクション開始データエラー！(num %d, act %d)\n" -.byte 0xa5, 0xa2, 0xa5, 0xaf, 0xa5, 0xb7, 0xa5, 0xe7, 0xa5, 0xf3, 0xb3, 0xab, 0xbb, 0xcf, 0xa5, 0xc7 -.byte 0xa1, 0xbc, 0xa5, 0xbf, 0xa5, 0xa8, 0xa5, 0xe9, 0xa1, 0xbc, 0xa1, 0xaa, 0x28, 0x6e, 0x75, 0x6d -.byte 0x20, 0x25, 0x64, 0x2c, 0x20, 0x61, 0x63, 0x74, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC21C # "アクション終了データエラー！(num %d, act %d, old_act_num %d)\n" -.byte 0xa5, 0xa2, 0xa5, 0xaf, 0xa5, 0xb7, 0xa5, 0xe7, 0xa5, 0xf3, 0xbd, 0xaa, 0xce, 0xbb, 0xa5, 0xc7 -.byte 0xa1, 0xbc, 0xa5, 0xbf, 0xa5, 0xa8, 0xa5, 0xe9, 0xa1, 0xbc, 0xa1, 0xaa, 0x28, 0x6e, 0x75, 0x6d -.byte 0x20, 0x25, 0x64, 0x2c, 0x20, 0x20, 0x61, 0x63, 0x74, 0x20, 0x25, 0x64, 0x2c, 0x20, 0x20, 0x6f -.byte 0x6c, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x5f, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC25C -.asciiz "SL : center_point_number : %d\n" - -.balign 4 -glabel D_800EC27C # "SL: CENTER LINE 分割開始\n" -.byte 0x53, 0x4c, 0x3a, 0x20, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x20, 0x4c, 0x49, 0x4e, 0x45, 0x20 -.byte 0xca, 0xac, 0xb3, 0xe4, 0xb3, 0xab, 0xbb, 0xcf, 0x0a, 0x00 - -.balign 4 -glabel D_800EC298 # "SL: CENTER LINE 分割終了 (%d -> %d 個)\n" -.byte 0x53, 0x4c, 0x3a, 0x20, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x20, 0x4c, 0x49, 0x4e, 0x45, 0x20 -.byte 0xca, 0xac, 0xb3, 0xe4, 0xbd, 0xaa, 0xce, 0xbb, 0x20, 0x28, 0x25, 0x64, 0x20, 0x2d, 0x3e, 0x20 -.byte 0x25, 0x64, 0x20, 0xb8, 0xc4, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC2C0 -.asciiz "SHIP : center_point_number : %d\n" - -.balign 4 -glabel D_800EC2E4 # "SHIP: CENTER LINE 分割開始\n" -.byte 0x53, 0x48, 0x49, 0x50, 0x3a, 0x20, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x20, 0x4c, 0x49, 0x4e -.byte 0x45, 0x20, 0xca, 0xac, 0xb3, 0xe4, 0xb3, 0xab, 0xbb, 0xcf, 0x0a, 0x00 - -.balign 4 -glabel D_800EC300 # "SHIP: CENTER LINE 分割終了 (%d -> %d 個)\n" -.byte 0x53, 0x48, 0x49, 0x50, 0x3a, 0x20, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x20, 0x4c, 0x49, 0x4e -.byte 0x45, 0x20, 0xca, 0xac, 0xb3, 0xe4, 0xbd, 0xaa, 0xce, 0xbb, 0x20, 0x28, 0x25, 0x64, 0x20, 0x2d -.byte 0x3e, 0x20, 0x25, 0x64, 0x20, 0xb8, 0xc4, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC32C # "汎用OBJキャラ初期化\n" -.byte 0xc8, 0xc6, 0xcd, 0xd1, 0x4f, 0x42, 0x4a, 0xa5, 0xad, 0xa5, 0xe3, 0xa5, 0xe9, 0xbd, 0xe9, 0xb4 -.byte 0xfc, 0xb2, 0xbd, 0x0a, 0x00 - -.balign 4 -glabel D_800EC344 # "SL OBJ設定\n" -.byte 0x53, 0x4c, 0x20, 0x4f, 0x42, 0x4a, 0xc0, 0xdf, 0xc4, 0xea, 0x0a, 0x00 - -.balign 4 -glabel D_800EC350 # "SHIP OBJ設定\n" -.byte 0x53, 0x48, 0x49, 0x50, 0x20, 0x4f, 0x42, 0x4a, 0xc0, 0xdf, 0xc4, 0xea, 0x0a, 0x00 - -.balign 4 -glabel D_800EC360 # "トラックOBJ設定\n" -.byte 0xa5, 0xc8, 0xa5, 0xe9, 0xa5, 0xc3, 0xa5, 0xaf, 0x4f, 0x42, 0x4a, 0xc0, 0xdf, 0xc4, 0xea, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC374 # "バスOBJ設定\n" -.byte 0xa5, 0xd0, 0xa5, 0xb9, 0x4f, 0x42, 0x4a, 0xc0, 0xdf, 0xc4, 0xea, 0x0a, 0x00 - -.balign 4 -glabel D_800EC384 # "タンクOBJ設定\n" -.byte 0xa5, 0xbf, 0xa5, 0xf3, 0xa5, 0xaf, 0x4f, 0x42, 0x4a, 0xc0, 0xdf, 0xc4, 0xea, 0x0a, 0x00 - -.balign 4 -glabel D_800EC394 # "RV OBJ設定\n" -.byte 0x52, 0x56, 0x20, 0x4f, 0x42, 0x4a, 0xc0, 0xdf, 0xc4, 0xea, 0x0a, 0x00 - -.balign 4 -glabel D_800EC3A0 # "汎用OBJキャラ初期化終了\n" -.byte 0xc8, 0xc6, 0xcd, 0xd1, 0x4f, 0x42, 0x4a, 0xa5, 0xad, 0xa5, 0xe3, 0xa5, 0xe9, 0xbd, 0xe9, 0xb4 -.byte 0xfc, 0xb2, 0xbd, 0xbd, 0xaa, 0xce, 0xbb, 0x0a, 0x00 - -.balign 4 -glabel D_800EC3BC # "クラクション (num %d, permit %d, %d)\n" -.byte 0xa5, 0xaf, 0xa5, 0xe9, 0xa5, 0xaf, 0xa5, 0xb7, 0xa5, 0xe7, 0xa5, 0xf3, 0x20, 0x28, 0x6e, 0x75 -.byte 0x6d, 0x20, 0x25, 0x64, 0x2c, 0x20, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x20, 0x25, 0x64, 0x2c -.byte 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC3E4 -.asciiz "OGA CAMERA INIT (%d)\n" - -.balign 4 -glabel D_800EC3FC -.asciiz "OGA CAMERA INIT END\n" - -.balign 4 -glabel D_800EC414 # "高速カメラ ERR !!! (ncx = %f)\n" -.byte 0xb9, 0xe2, 0xc2, 0xae, 0xa5, 0xab, 0xa5, 0xe1, 0xa5, 0xe9, 0x20, 0x45, 0x52, 0x52, 0x20, 0x21 -.byte 0x21, 0x21, 0x20, 0x28, 0x6e, 0x63, 0x78, 0x20, 0x3d, 0x20, 0x25, 0x66, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC434 # "高速カメラ ERR !!! (ncz = %f)\n" -.byte 0xb9, 0xe2, 0xc2, 0xae, 0xa5, 0xab, 0xa5, 0xe1, 0xa5, 0xe9, 0x20, 0x45, 0x52, 0x52, 0x20, 0x21 -.byte 0x21, 0x21, 0x20, 0x28, 0x6e, 0x63, 0x7a, 0x20, 0x3d, 0x20, 0x25, 0x66, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC454 # "高速カメラ ERR !!! (ecx = %f)\n" -.byte 0xb9, 0xe2, 0xc2, 0xae, 0xa5, 0xab, 0xa5, 0xe1, 0xa5, 0xe9, 0x20, 0x45, 0x52, 0x52, 0x20, 0x21 -.byte 0x21, 0x21, 0x20, 0x28, 0x65, 0x63, 0x78, 0x20, 0x3d, 0x20, 0x25, 0x66, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC474 # "高速カメラ ERR !!! (ecz = %f)\n" -.byte 0xb9, 0xe2, 0xc2, 0xae, 0xa5, 0xab, 0xa5, 0xe1, 0xa5, 0xe9, 0x20, 0x45, 0x52, 0x52, 0x20, 0x21 -.byte 0x21, 0x21, 0x20, 0x28, 0x65, 0x63, 0x7a, 0x20, 0x3d, 0x20, 0x25, 0x66, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC494 -.asciiz "OGA DRIVERS POINT CAMERA MODE \n" - -.balign 4 -glabel D_800EC4B4 -.asciiz "OGA WINNER CAMERA MODE \n" - -.balign 4 -glabel D_800EC4D0 -.asciiz "OGA TIMEATTACK QUICK CAMERA INIT \n" - -.balign 4 -glabel D_800EC4F4 -.asciiz "OGA BATTLE CAMERA INIT win(%d)\n" - -.balign 4 -glabel D_800EC514 -.asciiz "GOAL! <> camera %d rank %d\n" - -.balign 4 -glabel D_800EC53C -.asciiz "GOAL! <> camera %d rank %d\n" - -.balign 4 -glabel D_800EC568 -.asciiz "GOAL! <> camera %d rank %d\n" - -.balign 4 -glabel D_800EC594 # "カメラとカートが衝突しました！！！ (%d)\n" -.byte 0xa5, 0xab, 0xa5, 0xe1, 0xa5, 0xe9, 0xa4, 0xc8, 0xa5, 0xab, 0xa1, 0xbc, 0xa5, 0xc8, 0xa4, 0xac -.byte 0xbe, 0xd7, 0xc6, 0xcd, 0xa4, 0xb7, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xaa, 0xa1, 0xaa -.byte 0xa1, 0xaa, 0x20, 0x20, 0x28, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC5C0 -.asciiz "<<< ITEM OBJ NUMBER ERR !! >>> item %d obj_num %d \n" - -.balign 4 -glabel D_800EC5F8 # "<<< BANANA SET 失敗 >>> obj_num %d zure %f \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41, 0x20, 0x53, 0x45, 0x54, 0x20, 0xbc -.byte 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62, 0x6a, 0x5f, 0x6e, 0x75, 0x6d, 0x20 -.byte 0x25, 0x64, 0x20, 0x20, 0x20, 0x7a, 0x75, 0x72, 0x65, 0x20, 0x25, 0x66, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC628 # "BANANA 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41, 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5, 0xc1, 0xa5 -.byte 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4, 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4, 0xab, 0xa4 -.byte 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64 -.byte 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC65C # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC670 # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC684 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC694 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC6A0 -.asciiz "BANANA HOLD (num %d time %d hold_time %d)\n" - -.balign 4 -glabel D_800EC6D0 # "設置 BANANA 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0xc0, 0xdf, 0xc3, 0xd6, 0x20, 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41, 0x20, 0xbd, 0xea, 0xcd, 0xad -.byte 0xbc, 0xd4, 0xa5, 0xc1, 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4, 0xcb, 0xb0, 0xfa, 0xa4, 0xc3 -.byte 0xb3, 0xdd, 0xa4, 0xab, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xa3, 0x28, 0x6e -.byte 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC708 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC71C # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC730 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC740 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC74C # "BANANA 置きました。 (num %d)\n" -.byte 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41, 0x20, 0xc3, 0xd6, 0xa4, 0xad, 0xa4, 0xde, 0xa4, 0xb7, 0xa4 -.byte 0xbf, 0xa1, 0xa3, 0x20, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC76C # "<<< BANANA NAGE SET 失敗 >>> obj_num %d \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41, 0x20, 0x4e, 0x41, 0x47, 0x45, 0x20 -.byte 0x53, 0x45, 0x54, 0x20, 0xbc, 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62, 0x6a -.byte 0x5f, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC798 # "BANANA NAGE MOVE 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41, 0x20, 0x4e, 0x41, 0x47, 0x45, 0x20, 0x4d, 0x4f, 0x56, 0x45 -.byte 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5, 0xc1, 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4 -.byte 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4, 0xab, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4 -.byte 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC7D8 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC7EC # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC800 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC810 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC81C # "BANANA NAGE END 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41, 0x20, 0x4e, 0x41, 0x47, 0x45, 0x20, 0x45, 0x4e, 0x44, 0x20 -.byte 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5, 0xc1, 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4, 0xcb -.byte 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4, 0xab, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf -.byte 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC858 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC86C # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC880 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC890 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC89C -.asciiz "G_SHELL HOLD (num %d time %d hold_time %d)\n" - -.balign 4 -glabel D_800EC8CC # "<<< G_SHELL SET 失敗 >>> obj_num %d \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x47, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x20, 0x53, 0x45, 0x54, 0x20 -.byte 0xbc, 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62, 0x6a, 0x5f, 0x6e, 0x75, 0x6d -.byte 0x20, 0x25, 0x64, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC8F4 # "<<< G_SHELL SET 失敗 >>> object_count %d \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x47, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x20, 0x53, 0x45, 0x54, 0x20 -.byte 0xbc, 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f -.byte 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x25, 0x64, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC920 # "G_SHELL 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0x47, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5, 0xc1 -.byte 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4, 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4, 0xab -.byte 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25 -.byte 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC954 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC968 # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC97C # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC98C # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800EC998 # "発射直前 G_SHELL 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0xc8, 0xaf, 0xbc, 0xcd, 0xc4, 0xbe, 0xc1, 0xb0, 0x20, 0x47, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c -.byte 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5, 0xc1, 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4 -.byte 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4, 0xab, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4 -.byte 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800EC9D8 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800EC9EC # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECA00 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECA10 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECA1C # "G_SHELL 発射 (num %d)\n" -.byte 0x47, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x20, 0xc8, 0xaf, 0xbc, 0xcd, 0x20, 0x28, 0x6e, 0x75 -.byte 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800ECA34 -.asciiz "R_SHELL HOLD (num %d time %d hold_time %d obj_num %d)\n" - -.balign 4 -glabel D_800ECA70 # "<<< R_SHELL SET 失敗 >>> obj_num %d \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x52, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x20, 0x53, 0x45, 0x54, 0x20 -.byte 0xbc, 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62, 0x6a, 0x5f, 0x6e, 0x75, 0x6d -.byte 0x20, 0x25, 0x64, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECA98 # "<<< R_SHELL SET 失敗 >>> object_count %d \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x52, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x20, 0x53, 0x45, 0x54, 0x20 -.byte 0xbc, 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f -.byte 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x25, 0x64, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECAC4 # "R_SHELL 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0x52, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5, 0xc1 -.byte 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4, 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4, 0xab -.byte 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25 -.byte 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800ECAF8 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECB0C # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECB20 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECB30 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECB3C -.asciiz "R_SHELL SHOOT (num %d time %d hold_time %d obj_num %d)\n" - -.balign 4 -glabel D_800ECB78 # "発射直前 R_SHELL 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0xc8, 0xaf, 0xbc, 0xcd, 0xc4, 0xbe, 0xc1, 0xb0, 0x20, 0x52, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c -.byte 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5, 0xc1, 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4 -.byte 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4, 0xab, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4 -.byte 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800ECBB8 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECBCC # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECBE0 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECBF0 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECBFC # "R_SHELL 発射 (num %d)\n" -.byte 0x52, 0x5f, 0x53, 0x48, 0x45, 0x4c, 0x4c, 0x20, 0xc8, 0xaf, 0xbc, 0xcd, 0x20, 0x28, 0x6e, 0x75 -.byte 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800ECC14 -.asciiz "S_BANANA HOLD (num %d time %d hold_time %d)\n" - -.balign 4 -glabel D_800ECC44 # "<<< SUPER_BANANA SET 失敗 >>> obj_num %d \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x53, 0x55, 0x50, 0x45, 0x52, 0x5f, 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41 -.byte 0x20, 0x53, 0x45, 0x54, 0x20, 0xbc, 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62 -.byte 0x6a, 0x5f, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECC70 # "<<< SUPER_BANANA SET 失敗 >>> object_count %d \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x53, 0x55, 0x50, 0x45, 0x52, 0x5f, 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41 -.byte 0x20, 0x53, 0x45, 0x54, 0x20, 0xbc, 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62 -.byte 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x25, 0x64, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECCA0 # "S_BANANA 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0x53, 0x5f, 0x42, 0x41, 0x4e, 0x41, 0x4e, 0x41, 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5 -.byte 0xc1, 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4, 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4 -.byte 0xab, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20 -.byte 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800ECCD8 # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECCEC # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECCFC # "理由: sb_ok \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x62, 0x5f, 0x6f, 0x6b, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECD0C -.asciiz "S_BANANA RELEASE (num %d time %d )\n" - -.balign 4 -glabel D_800ECD34 # "<<< FAKE IBOX SET 失敗 >>> obj_num %d \n" -.byte 0x3c, 0x3c, 0x3c, 0x20, 0x46, 0x41, 0x4b, 0x45, 0x20, 0x49, 0x42, 0x4f, 0x58, 0x20, 0x53, 0x45 -.byte 0x54, 0x20, 0xbc, 0xba, 0xc7, 0xd4, 0x20, 0x3e, 0x3e, 0x3e, 0x20, 0x6f, 0x62, 0x6a, 0x5f, 0x6e -.byte 0x75, 0x6d, 0x20, 0x25, 0x64, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECD5C # "IBOX 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0x49, 0x42, 0x4f, 0x58, 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4, 0xa5, 0xc1, 0xa5, 0xa7, 0xa5 -.byte 0xc3, 0xa5, 0xaf, 0xa4, 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd, 0xa4, 0xab, 0xa4, 0xea, 0xa4 -.byte 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d, 0x20, 0x25, 0x64, 0x29, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECD90 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECDA4 # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECDB8 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECDC8 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECDD4 -.asciiz "FBOX HOLD (num %d time %d hold_time %d)\n" - -.balign 4 -glabel D_800ECE00 # "設置 IBOX 所有者チェックに引っ掛かりました。(num %d)\n" -.byte 0xc0, 0xdf, 0xc3, 0xd6, 0x20, 0x49, 0x42, 0x4f, 0x58, 0x20, 0xbd, 0xea, 0xcd, 0xad, 0xbc, 0xd4 -.byte 0xa5, 0xc1, 0xa5, 0xa7, 0xa5, 0xc3, 0xa5, 0xaf, 0xa4, 0xcb, 0xb0, 0xfa, 0xa4, 0xc3, 0xb3, 0xdd -.byte 0xa4, 0xab, 0xa4, 0xea, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xa3, 0x28, 0x6e, 0x75, 0x6d -.byte 0x20, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800ECE38 # "理由: EXISTOBJ \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x45, 0x58, 0x49, 0x53, 0x54, 0x4f, 0x42, 0x4a, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECE4C # "理由: category \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x20, 0x0a -.byte 0x00 - -.balign 4 -glabel D_800ECE60 # "理由: sparam \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECE70 # "理由: num \n" -.byte 0xcd, 0xfd, 0xcd, 0xb3, 0x3a, 0x20, 0x6e, 0x75, 0x6d, 0x20, 0x0a, 0x00 - -.balign 4 -glabel D_800ECE7C # "雷START (%d)\n" -.byte 0xcd, 0xeb, 0x53, 0x54, 0x41, 0x52, 0x54, 0x20, 0x28, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800ECE8C # "雷END (%d)\n" -.byte 0xcd, 0xeb, 0x45, 0x4e, 0x44, 0x20, 0x28, 0x25, 0x64, 0x29, 0x0a, 0x00 - -.balign 4 -glabel D_800ECE98 # "---------- 表彰台初期化\n" -.byte 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x20, 0xc9, 0xbd, 0xbe, 0xb4, 0xc2 -.byte 0xe6, 0xbd, 0xe9, 0xb4, 0xfc, 0xb2, 0xbd, 0x0a, 0x00 - -.balign 4 -glabel D_800ECEB4 # "map_number = %d - > 20 書き換え中。\n" -.byte 0x6d, 0x61, 0x70, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x25, 0x64, 0x20 -.byte 0x2d, 0x20, 0x3e, 0x20, 0x32, 0x30, 0x20, 0xbd, 0xf1, 0xa4, 0xad, 0xb4, 0xb9, 0xa4, 0xa8, 0xc3 -.byte 0xe6, 0xa1, 0xa3, 0x0a, 0x00 - -.balign 4 -glabel D_800ECEDC # "OGA 表彰 move 開始\n" -.byte 0x4f, 0x47, 0x41, 0x20, 0xc9, 0xbd, 0xbe, 0xb4, 0x20, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0xb3, 0xab -.byte 0xbb, 0xcf, 0x0a, 0x00 - -.balign 4 -glabel D_800ECEF0 # "４位の人の表示をコールしました。\n" -.byte 0xa3, 0xb4, 0xb0, 0xcc, 0xa4, 0xce, 0xbf, 0xcd, 0xa4, 0xce, 0xc9, 0xbd, 0xbc, 0xa8, 0xa4, 0xf2 -.byte 0xa5, 0xb3, 0xa1, 0xbc, 0xa5, 0xeb, 0xa4, 0xb7, 0xa4, 0xde, 0xa4, 0xb7, 0xa4, 0xbf, 0xa1, 0xa3 -.byte 0x0a, 0x00 - -.balign 4 -glabel D_800ECF14 # "表彰台に到着\n" -.byte 0xc9, 0xbd, 0xbe, 0xb4, 0xc2, 0xe6, 0xa4, 0xcb, 0xc5, 0xfe, 0xc3, 0xe5, 0x0a, 0x00 - -.balign 4 -glabel D_800ECF24 # "全員集合！\n" -.byte 0xc1, 0xb4, 0xb0, 0xf7, 0xbd, 0xb8, 0xb9, 0xe7, 0xa1, 0xaa, 0x0a, 0x00 - -.balign 4 -glabel D_800ECF30 # "道路に到着\n" -.byte 0xc6, 0xbb, 0xcf, 0xa9, 0xa4, 0xcb, 0xc5, 0xfe, 0xc3, 0xe5, 0x0a, 0x00 - -.balign 4 -glabel D_800ECF3C # "４位の人終了\n" -.byte 0xa3, 0xb4, 0xb0, 0xcc, 0xa4, 0xce, 0xbf, 0xcd, 0xbd, 0xaa, 0xce, 0xbb, 0x0a, 0x00 - -.balign 4 -glabel D_800ECF4C # "OGA 表彰 move 終了\n" -.byte 0x4f, 0x47, 0x41, 0x20, 0xc9, 0xbd, 0xbe, 0xb4, 0x20, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0xbd, 0xaa -.byte 0xce, 0xbb, 0x0a, 0x00 - -.balign 4 -glabel D_800ECF60 -.asciiz "OGAWA DEBUG DRAW\n" - -glabel D_800ECF74 -.float 0.01 - -glabel D_800ECF78 -.double 0.16666666666666666 - -glabel D_800ECF80 -.double 0.41666666666666669 - -glabel D_800ECF88 -.double 1.6666666666666667 - -glabel D_800ECF90 -.float 4900.0 - -glabel D_800ECF94 -.float 22500.0 - -glabel D_800ECF98 -.float 90000.0 - -glabel D_800ECF9C -.float 3.3333333 - -glabel D_800ECFA0 -.float 1.6666666 - -glabel D_800ECFA4 -.float 0.01666666 - -glabel D_800ECFA8 -.float 1300.0 - -glabel D_800ECFAC -.float -1300.0 - -glabel D_800ECFB0 -.float 4.3 - -glabel D_800ECFB4 -.float 8.33333333 - -glabel D_800ECFB8 -.float 0.9 - -glabel D_800ECFBC -.float -0.9 - -glabel D_800ECFC0 -.float 0.9 - -glabel D_800ECFC4 -.float -0.9 - -glabel D_800ECFC8 -.float 3.33333333 - -glabel D_800ECFCC -.float 0.2 - -glabel D_800ECFD0 -.float 0.2 - -glabel D_800ECFD4 -.float 0.2 - -glabel D_800ECFD8 -.float 1.1 - -glabel D_800ECFDC -.float -1.1 - -glabel D_800ECFE0 -.float 0.01 - -glabel D_800ECFE4 -.float 0.01 - -glabel D_800ECFE8 -.float 1000000 - -glabel D_800ECFEC -.float 1000000 - -glabel D_800ECFF0 -.float 250000 - -glabel D_800ECFF4 -.float 160000 - -glabel D_800ECFF8 -.float 250000 - -glabel D_800ECFFC -.float 0.01 - -glabel D_800ED000 -.float 0.01 - -glabel D_800ED004 -.float 0.01 - -glabel jpt_800ED008 -.word L8000E1F4, L8000E45C, L8000E618, L8000E968 -.word L8000E634 - -glabel D_800ED01C -.float -2409.197021 - -glabel D_800ED020 -.float -355.253998 - -glabel D_800ED024 -.float 0.01 - -glabel D_800ED028 -.double -1000.0 - -glabel D_800ED030 -.float 0.3 - -glabel D_800ED034 -.float 2.3 - -glabel D_800ED038 -.float 2.3 - -glabel D_800ED03C -.float 0.15 - -#begin func_8000EF20 -glabel D_800ED040 -.float 0.3 - -glabel D_800ED044 -.float 0.45 - -glabel D_800ED048 -.float 0.15 - -glabel D_800ED04C -.float 0.9 -#end func_8000EF20 - -glabel D_800ED050 -.float 0.015 -.word 0x00000000 - -glabel D_800ED058 -.double -0.1 - -glabel D_800ED060 -.double 0.1 - -glabel D_800ED068 -.double 0.05 - -glabel D_800ED070 -.double -500.0 - -glabel D_800ED078 -.double 0.05 - -glabel jpt_800ED080 -.word L80011BE8, L80011C04, L80011C3C, L80011C54 -.word L80011C70, L80011C8C, L80011C9C, L80011CB0 -.word L80011CD4, L80011D2C, L80011CC0 - -glabel D_800ED0AC -.float -0.6 - -glabel D_800ED0B0 -.float 0.6 - -glabel jpt_800ED0B4 -.word L80011DC4, L80011E20, L80011DF4, L80011DF4 -.word L80011DF4, L80011E20, L80011E20, L80011E20 -.word L80011E20, L80011E20, L80011E20 - -glabel D_800ED0E0 -.double -0.8 - -glabel D_800ED0E8 -.double 0.8 - -glabel D_800ED0F0 -.float 1.1 -.word 0x00000000 - -glabel D_800ED0F8 -.double 65.0 - -glabel D_800ED100 -.float 0.42299348 -.word 0x00000000 - -glabel D_800ED108 -.double 0.1 - -glabel D_800ED110 -.float 0.72017353 -.word 0x00000000 - -glabel D_800ED118 -.double 0.1 - -glabel D_800ED120 -.double 0.01 - -glabel D_800ED128 -.float 1.66666666 -.word 0x00000000 - -glabel D_800ED130 -.double 45.0 - -glabel D_800ED138 -.double 180.0 - -glabel D_800ED140 -.double 0.2 - -glabel D_800ED148 -.double 0.04 - -glabel D_800ED150 -.double 0.02 - -glabel D_800ED158 -.double 300.0 - -glabel D_800ED160 -.double -300.0 - -glabel D_800ED168 -.double 0.6 - -glabel D_800ED170 -.float -0.7 - -glabel D_800ED174 -.float 0.7 - -glabel D_800ED178 -.double 0.06 - -glabel D_800ED180 -.double 0.06 - -glabel D_800ED188 -.double -300.0 - -glabel D_800ED190 -.double 300.0 - -glabel D_800ED198 -.double -300.0 - -glabel D_800ED1A0 -.double 300.0 - -glabel D_800ED1A8 -.float -0.8 - -glabel D_800ED1AC -.float 0.8 - -glabel D_800ED1B0 -.double 1.6666666666666667 - -glabel D_800ED1B8 -.double 90.0 - -glabel D_800ED1C0 -.double 4.583333333333333 - -glabel D_800ED1C8 -.double 2.9166666666666665 - -glabel D_800ED1D0 -.double 90.0 - -glabel D_800ED1D8 -.double 4.583333333333333 - -glabel D_800ED1E0 -.double 2.9166666666666665 - -glabel D_800ED1E8 -.double 90.0 - -glabel D_800ED1F0 -.double 4.583333333333333 - -glabel D_800ED1F8 -.double 2.9166666666666665 - -glabel D_800ED200 -.double 90.0 - -glabel D_800ED208 -.double 4.583333333333333 - -glabel D_800ED210 -.double 2.9166666666666665 - -glabel D_800ED218 -.double 3000.0 - -glabel D_800ED220 -.double -0.7 - -glabel D_800ED228 -.double 0.7 - -glabel D_800ED230 -.double 3000.0 - -glabel D_800ED238 -.double 0.01 - -glabel D_800ED240 -.double 0.01 - -glabel D_800ED248 -.double 0.4 - -glabel D_800ED250 -.double 0.4 - -glabel D_800ED258 -.double 3000.0 - -glabel D_800ED260 -.float 0.1 - -glabel D_800ED264 -.float -0.1 - -glabel D_800ED268 -.float 16.666666031 -.word 0x00000000 - -glabel D_800ED270 -.double -10000.0 - -glabel D_800ED278 -.double 10000.0 - -glabel D_800ED280 -.double 10000.0 - -glabel D_800ED288 -.double 0.1 - -glabel D_800ED290 -.double 0.1 - -glabel D_800ED298 -.double 0.1 - -glabel D_800ED2A0 -.double 0.1 - -glabel D_800ED2A8 -.double 0.2 - -glabel D_800ED2B0 -.double 0.7 - -glabel D_800ED2B8 -.double 0.01 - -glabel D_800ED2C0 -.double -0.9 - -glabel D_800ED2C8 -.float -0.9 -.word 0x00000000 - -glabel D_800ED2D0 -.double 0.8 - -glabel D_800ED2D8 -.double 0.2 - -glabel D_800ED2E0 -.double 1.3 - -glabel D_800ED2E8 -.double 0.01 - -glabel D_800ED2F0 -.double 0.9 - -glabel D_800ED2F8 -.float 0.9 -.word 0x00000000 - -glabel D_800ED300 -.double 1.2 - -glabel D_800ED308 -.double 3000.0 - -glabel D_800ED310 -.double 3000.0 - -glabel D_800ED318 -.double 0.8 - -glabel D_800ED320 -.double 0.2 - -glabel jpt_800ED328 -.word L80019928, L80019A08, L8001993C, L80019954 -.word L800199B4, L800199D4, L8001996C, L80019990 -.word L80019A48, L800199F4, L80019AE8 - - -.word L80019AE8 -.word L80019A68, L80019A88, L80019A28, L80019AA8 -.word L80019AC8 - -glabel jpt_800ED36C -.word L8001A25C, L8001A274, L8001A28C -.word L8001A2A4, L8001A2BC, L8001A2D4 - -glabel jpt_800ED384 -.word L8001A998 -.word L8001AA10, L8001A9B0, L8001A9B0, L8001A9E0 -.word L8001A9E0, L8001A9C8, L8001A9C8, L8001AA40 - - -.word L8001A9F8, L8001AA88, L8001AA88, L8001AA58 -.word L8001AA58, L8001AA28, L8001AA70, L8001AA70 - -glabel jpt_800ED3C8 -.word L8001ABB0, L8001ABCC, L8001ABCC, L8001ABCC -.word L8001ABCC, L8001ABCC, L8001ABCC - - -.word L8001ABB8 -.word L8001ABA0, L8001ABC0, L8001ABA8, L8001ABC8 -.word L8001ABCC, L8001ABCC, L8001ABCC -glabel jpt_800ED404 -.word L8001ACAC -.word L8001AD64, L8001AF34, L8001AFD8, L8001B4AC -.word L8001B528, L8001B5B8, L8001B630, L8001B6AC -.word L8001B738, L8001B7BC, L8001B838, L8001B90C -.word L8001BA38, L8001BA98, L8001BB30, L8001BE30 -.word L8001BE30, L8001BE30, L8001BE30, L8001BE30 -.word L8001BE30, L8001BC28, L8001BC64, L8001BE30 -.word L8001BC8C, L8001BCBC, L8001BCE0, L8001BD10 -.word L8001BD34, L8001BD60, L8001BD94, L8001BDC8 -.word L8001BDE4, L8001B0EC, L8001B2C4, L8001B3B4 - -glabel D_800ED498 -.double 0.4 - -glabel jpt_800ED4A0 -.word L8001B970, L8001B988, L8001B9A0, L8001B9B8 -.word L8001B9D0 - -glabel D_800ED4B4 -.float 19.166999817 - -glabel D_800ED4B8 -.float -3202.475097656 - -glabel D_800ED4BC -.float -477.623992920 - -glabel D_800ED4C0 -.float -3205.080078125 - -glabel D_800ED4C4 -.float -462.851989746 - -glabel D_800ED4C8 -.float -3199.870117188 - -glabel D_800ED4CC -.float -492.395996094 - -glabel D_800ED4D0 -.float -2409.197021484 - -glabel D_800ED4D4 -.float -355.253997803 diff --git a/mk64.ld b/mk64.ld index 7aab19026..54ad3e49d 100644 --- a/mk64.ld +++ b/mk64.ld @@ -276,7 +276,7 @@ SECTIONS BUILD_DIR/src/os/_Litob.o(.data); BUILD_DIR/src/main.o(.rodata); BUILD_DIR/src/code_800029B0.o(.rodata); - BUILD_DIR/data/data_0DD0A0_3.o(.rodata); + BUILD_DIR/src/code_80005FD0.o(.rodata); BUILD_DIR/src/camera.o(.rodata); BUILD_DIR/src/code_8001F980.o(.rodata); BUILD_DIR/src/code_80027D00.o(.rodata); diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 323a52720..9a0cccb60 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -17,6 +17,343 @@ #include "hud_renderer.h" #include "code_80057C60.h" +// Strings, presented by google translate! +// Note that these are EUC-JP encoded, see: +// https://en.wikipedia.org/wiki/Extended_Unix_Code#EUC-JP + +// Force sort immediately after goal +char *D_800EB710 = "ľζ\n"; +// Forced sort immediately after one goal in 2PGP +char *D_800EB728 = "2PGPľζ\n"; +// rank calculation error +char *D_800EB74C = "̷׻顼 (num %d) (rank %d) (e_rank %d)\n"; +// Bypass switching error!!!(num %d org_bipas %d bipas %d) +char *D_800EB780 = "Хѥڤؤ 顼!!!(num %d org_bipas %d bipas %d)\n"; +char *D_800EB7BC = "(%d) rap %3d rate_count_F %10.2f rap_count_F %10.2f area %5d \n"; +// Enter the maze! enemy %d (%d --> %d) +char *D_800EB800 = "ϩ enemy %d (%d --> %d)\n"; +// Out of the maze! enemy %d (%d --> %d) +char *D_800EB824 = "ϩФ enemy %d (%d --> %d)\n"; +char *D_800EB84C = "enemy voice set (%d slip_flag %x weapon %x)\n"; +// Spin Voice! ! (%d , name %d) +char *D_800EB87C = "ԥ(%d , name %d)\n"; +// Damage voice! ! (%d, name %d) +char *D_800EB8A0 = "᡼(%d, name %d)\n"; +char *D_800EB8C4 = "===== ENEMY DRIVE SUB (%d) =====\n"; +// omission +char *D_800EB8E8 = "ENEMY END(ȴ)\n\n"; +char *D_800EB8FC = "ENEMY END(ȴ)\n\n"; +char *D_800EB910 = "(1)enemy stick angle over!! (%d)\n"; +char *D_800EB934 = "ENEMY END\n\n"; +char *D_800EB940 = "(2)enemy stick angle over!! (%d)\n"; +char *D_800EB964 = "ENEMY END\n\n"; +// AREA ERR!!! (group not registered at current centerline %d) %d +char *D_800EB970 = "AREA ERR!!! (ߤΥ󥿡饤 %d ̤ϿΥ롼פǤ) %d\n"; +// AREA ERR!!! (Unregistered group) %d +char *D_800EB9B4 = "AREA ERR!!! (̤ϿΥ롼פǤ) %d\n"; +// get_oga_area_sub_BP() ... Area not found! (b_num = %d) +char *D_800EB9DC = "get_oga_area_sub_BP() ... ꥢĤʤå (b_num = %d)\n"; +// Status: (%d, %d, %d) +char *D_800EBA20 = " : (%d, %d, %d) \n"; +char *D_800EBA38 = "<%d> (%d, %d, %d) [%d] lng %f\n"; +// Wario Stadium Jump failed! ! ! (area %d, y %7.2f) +char *D_800EBA58 = "ꥪ ׼ԡ (area %d, y %7.2f)\n"; +// I fell in the water! ! Forced to centerline (num %d: area %d ) (%d,%d,%d) +char *D_800EBA94 = " 󥿡饤˶ưޤ (num %d: area %d ) (%d,%d,%d)\n"; +// Course match! ! (Slacking: with bump) Forced move to center line (num %d: area %d ==>%d) (group %d) (%d,%d,%d) +char *D_800EBAE4 = "ȡʼȴ:Хͭ 󥿡饤˶ưޤ (num %d: area %d ==>%d) (group %d) (%d,%d,%d)\n"; +// Course match! ! (Sitting corners: no bump) Forced move to center line (num %d: area %d ==>%d) (group %d) (%d,%d,%d) +char *D_800EBB60 = "ȡʼȴ:Х̵ 󥿡饤˶ưޤ (num %d: area %d ==>%d) (group %d) (%d,%d,%d)\n"; +// Course match! ! ! Recalculated area (num %d: area %d ==>%d) +char *D_800EBBDC = "ȡ ꥢƷ׻ޤ (num %d: area %d ==>%d)\n"; +// Direct BOM(%d) (%7.2f, %7.2f, %7.2f) +char *D_800EBC24 = "ľܻBOM(%d) (%7.2f, %7.2f, %7.2f) \n"; +char *D_800EBC50 = "BOM HIT CHECK\n"; +char *D_800EBC60 = "BOM HIT !!!!! (%d)\n"; +// BOM standby +char *D_800EBC74 = "BOMԵ\n"; +char *D_800EBC80 = "RESULT BOM area(%d)\n"; +// BOM dropped. +char *D_800EBC98 = "BOM ޤ\n"; +// Tortoise fire pillar SET failed (TABLE IS FULL) +char *D_800EBCB0 = "Ѳ SET (TABLE IS FULL)\n"; +// Red turtle fire pillar set error! (category %d) +char *D_800EBCD8 = "֥쥻åȥ顼 (category %d)\n"; +// Blue turtle fire pillar set error! (category %d) +char *D_800EBD00 = "ĥ쥻åȥ顼 (category %d)\n"; +// Thorn Turtle Fire Pillar Set Error! (category %d) +char *D_800EBD28 = "ȥ쥻åȥ顼 (category %d)\n"; +// Turtle Fire Pillar Initialization! ! +char *D_800EBD54 = "\n"; +// Center line initialization +char *D_800EBD68 = "󥿡饤\n"; +char *D_800EBD80 = "MAP NUMBER %d\n"; +char *D_800EBD90 = "center_EX ptr = %x %x (%x)\n"; +char *D_800EBDB4 = "\n"; +char *D_800EBDB8 = "center_BP[%d] ptr = %x %x (%x)\n"; +char *D_800EBDE0 = "side_point_L_BP[%d] ptr = %x %x (%x)\n"; +char *D_800EBE08 = "side_point_R_BP[%d] ptr = %x %x (%x)\n"; +char *D_800EBE30 = "curve_BP[%d] ptr = %x %x (%x)\n"; +char *D_800EBE58 = "angle_BP[%d] ptr = %x %x (%x)\n"; +char *D_800EBE80 = "short_cut_data_BP[%d] ptr = %x %x (%x)\n"; +char *D_800EBEA8 = "\n"; +// Ogawa total memory used = %d +char *D_800EBEAC = "λѥ꡼ = %d\n"; +// Enemy initialization +char *D_800EBECC = "Ũ\n"; +// End of enemy initialization +char *D_800EBED8 = "Ũλ\n"; +// Bypass CENTER LINE Split start +char *D_800EBEE8 = "Хѥ CENTER LINE ʬ䳫\n"; +// Read centerline from ROM (map:%d) +char *D_800EBF08 = "󥿡饤ROMɤߤޤ (map:%d)\n"; +char *D_800EBF34 = "ROM center (BP%d) line adr. = %x (%x)\n"; +// Calculate centerline (map:%d) +char *D_800EBF5C = "󥿡饤׻ޤ (map:%d)\n"; +char *D_800EBF84 = "center (BP%d) line adr. = %x (%x)\n"; +char *D_800EBFA8 = "BP center_point_number : %d\n"; +// Centerline data error! ! +char *D_800EBFC8 = "󥿡饤 ǡ 顼\n"; +// Bypass CENTER LINE split end (%d -> %d number) +char *D_800EBFEC = "Хѥ CENTER LINE ʬ佪λ (%d -> %d )\n"; +// No center line. (map: %d) +char *D_800EC01C = "󥿡饤 ޤ(map:%d)\n"; +// side point calculation (bypass %d) +char *D_800EC044 = "ɥݥȷ׻ (Хѥ %d)\n"; +// Curve data calculation (bypass %d) +char *D_800EC068 = "֥ǡ׻ (Хѥ %d)\n"; +// No center line. (map: %d) +char *D_800EC088 = "󥿡饤 ޤ(map:%d)\n"; +// Angle data calculation (bypass %d) +char *D_800EC0B0 = "󥰥ǡ׻ (Хѥ %d) \n"; +// No center line. (map: %d) +char *D_800EC0D4 = "󥿡饤 ޤ(map:%d)\n"; +// Shortcut data calculation (bypass %d) +char *D_800EC0FC = "硼ȥåȥǡ׻ (Хѥ %d)\n"; +char *D_800EC124 = "extern POINT rom_center_KT%d_BP%d[] = {\n"; +char *D_800EC150 = "\t{%d,%d,%d,%d},\n"; +char *D_800EC164 = "\t0x8000,0x8000,0x8000,0\n};\n\n"; +char *D_800EC184 = "area read from ROM (%d)\n"; +// Normal jump! ! ! (%d) +char *D_800EC1A0 = "Ρޥ른ס(%d)\n"; +// Turbo on! ! ! (%d) +char *D_800EC1BC = "ܥ󡪡(%d)\n"; +// No cutting corners! ! ! (%d) +char *D_800EC1D4 = "ȴػߡ(%d)\n"; +// Action start data error! (num %d, act %d) +char *D_800EC1EC = "󳫻ϥǡ顼(num %d, act %d)\n"; +// Action end data error! (num %d, act %d, old_act_num %d) +char *D_800EC21C = "λǡ顼(num %d, act %d, old_act_num %d)\n"; +char *D_800EC25C = "SL : center_point_number : %d\n"; +// SL: CENTER LINE split start +char *D_800EC27C = "SL: CENTER LINE ʬ䳫\n"; +// SL: CENTER LINE split ended (%d -> %d indivual) +char *D_800EC298 = "SL: CENTER LINE ʬ佪λ (%d -> %d )\n"; +char *D_800EC2C0 = "SHIP : center_point_number : %d\n"; +// SHIP: CENTER LINE split start +char *D_800EC2E4 = "SHIP: CENTER LINE ʬ䳫\n"; +// SHIP: CENTER LINE split ended (%d -> %d indivual) +char *D_800EC300 = "SHIP: CENTER LINE ʬ佪λ (%d -> %d )\n"; +// General-purpose OBJ character initialization +char *D_800EC32C = "OBJ\n"; +// SL OBJ settings +char *D_800EC344 = "SL OBJ\n"; +// SHIP OBJ settings +char *D_800EC350 = "SHIP OBJ\n"; +// Track OBJ settings +char *D_800EC360 = "ȥåOBJ\n"; +// Bus OBJ setting +char *D_800EC374 = "ХOBJ\n"; +// Tank OBJ setting +char *D_800EC384 = "OBJ\n"; +// RV OBJ settings +char *D_800EC394 = "RV OBJ\n"; +// Generic OBJ character initialization completed +char *D_800EC3A0 = "OBJλ\n"; +// horn (num %d, permit %d, %d) +char *D_800EC3BC = "饯 (num %d, permit %d, %d)\n"; +char *D_800EC3E4 = "OGA CAMERA INIT (%d)\n"; +char *D_800EC3FC = "OGA CAMERA INIT END\n"; +// High speed camera ERR !!! (ncx = %f) +char *D_800EC414 = "® ERR !!! (ncx = %f)\n"; +// High speed camera ERR !!! (ncz = %f) +char *D_800EC434 = "® ERR !!! (ncz = %f)\n"; +// High speed camera ERR !!! (ecx = %f) +char *D_800EC454 = "® ERR !!! (ecx = %f)\n"; +// High speed camera ERR !!! (ecz = %f) +char *D_800EC474 = "® ERR !!! (ecz = %f)\n"; +char *D_800EC494 = "OGA DRIVERS POINT CAMERA MODE \n"; +char *D_800EC4B4 = "OGA WINNER CAMERA MODE \n"; +char *D_800EC4D0 = "OGA TIMEATTACK QUICK CAMERA INIT \n"; +char *D_800EC4F4 = "OGA BATTLE CAMERA INIT win(%d)\n"; +char *D_800EC514 = "GOAL! <> camera %d rank %d\n"; +char *D_800EC53C = "GOAL! <> camera %d rank %d\n"; +char *D_800EC568 = "GOAL! <> camera %d rank %d\n"; +// Camera and cart collided! ! ! +char *D_800EC594 = "ȥȤͤޤ (%d)\n"; +char *D_800EC5C0 = "<<< ITEM OBJ NUMBER ERR !! >>> item %d obj_num %d \n"; +// <<< BANANA SET HOUSE >>> obj_num %d zure %f +char *D_800EC5F8 = "<<< BANANA SET >>> obj_num %d zure %f \n"; +// BANANA Caught in owner check. (num %d) +char *D_800EC628 = "BANANA ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800EC65C = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800EC670 = "ͳ: category \n"; +// Reason: sparam +char *D_800EC684 = "ͳ: sparam \n"; +// Reason: num +char *D_800EC694 = "ͳ: num \n"; +char *D_800EC6A0 = "BANANA HOLD (num %d time %d hold_time %d)\n"; +// Installation Caught in BANANA owner check. (num %d) +char *D_800EC6D0 = " BANANA ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800EC708 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800EC71C = "ͳ: category \n"; +// Reason: sparam +char *D_800EC730 = "ͳ: sparam \n"; +// Reason: num +char *D_800EC740 = "ͳ: num \n"; +// I put BANANA. (num %d) +char *D_800EC74C = "BANANA ֤ޤ (num %d)\n"; +// <<< BANANA NAGE SET failed >>> obj_num %d +char *D_800EC76C = "<<< BANANA NAGE SET >>> obj_num %d \n"; +// BANANA NAGE MOVE Caught in owner check. (num %d) +char *D_800EC798 = "BANANA NAGE MOVE ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800EC7D8 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800EC7EC = "ͳ: category \n"; +// Reason: sparam +char *D_800EC800 = "ͳ: sparam \n"; +// Reason: num +char *D_800EC810 = "ͳ: num \n"; +char *D_800EC81C = "BANANA NAGE END ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800EC858 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800EC86C = "ͳ: category \n"; +// Reason: sparam +char *D_800EC880 = "ͳ: sparam \n"; +// Reason: num +char *D_800EC890 = "ͳ: num \n"; +char *D_800EC89C = "G_SHELL HOLD (num %d time %d hold_time %d)\n"; +// <<< G_SHELL SET failed >>> obj_num %d +char *D_800EC8CC = "<<< G_SHELL SET >>> obj_num %d \n"; +// <<< G_SHELL SET failed >>> object_count %d +char *D_800EC8F4 = "<<< G_SHELL SET >>> object_count %d \n"; +// G_SHELL Caught in owner check. (num %d) +char *D_800EC920 = "G_SHELL ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800EC954 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800EC968 = "ͳ: category \n"; +// Reason: sparam +char *D_800EC97C = "ͳ: sparam \n"; +// Reason: num +char *D_800EC98C = "ͳ: num \n"; +// Just before launch G_SHELL Caught in owner check. (num %d) +char *D_800EC998 = "ȯľ G_SHELL ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800EC9D8 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800EC9EC = "ͳ: category \n"; +// Reason: sparam +char *D_800ECA00 = "ͳ: sparam \n"; +// Reason: num +char *D_800ECA10 = "ͳ: num \n"; +// G_SHELL firing (num %d) +char *D_800ECA1C = "G_SHELL ȯ (num %d)\n"; +char *D_800ECA34 = "R_SHELL HOLD (num %d time %d hold_time %d obj_num %d)\n"; +// <<< R_SHELL SET failed >>> obj_num %d +char *D_800ECA70 = "<<< R_SHELL SET >>> obj_num %d \n"; +// <<< R_SHELL SET failed >>> object_count %d +char *D_800ECA98 = "<<< R_SHELL SET >>> object_count %d \n"; +// R_SHELL Caught in owner check. (num %d) +char *D_800ECAC4 = "R_SHELL ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800ECAF8 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800ECB0C = "ͳ: category \n"; +// Reason: sparam +char *D_800ECB20 = "ͳ: sparam \n"; +// Reason: num +char *D_800ECB30 = "ͳ: num \n"; +char *D_800ECB3C = "R_SHELL SHOOT (num %d time %d hold_time %d obj_num %d)\n"; +// Just before launch R_SHELL Caught in owner check. (num %d) +char *D_800ECB78 = "ȯľ R_SHELL ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800ECBB8 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800ECBCC = "ͳ: category \n"; +// Reason: sparam +char *D_800ECBE0 = "ͳ: sparam \n"; +// Reason: num +char *D_800ECBF0 = "ͳ: num \n"; +// R_SHELL firing (num %d) +char *D_800ECBFC = "R_SHELL ȯ (num %d)\n"; +char *D_800ECC14 = "S_BANANA HOLD (num %d time %d hold_time %d)\n"; +// <<< SUPER_BANANA SET failed >>> obj_num %d +char *D_800ECC44 = "<<< SUPER_BANANA SET >>> obj_num %d \n"; +// <<< SUPER_BANANA SET failed >>> object_count %d +char *D_800ECC70 = "<<< SUPER_BANANA SET >>> object_count %d \n"; +// S_BANANA Caught in owner check. (num %d) +char *D_800ECCA0 = "S_BANANA ͭԥå˰óݤޤ(num %d)\n"; +// Reason: category +char *D_800ECCD8 = "ͳ: category \n"; +// Reason: sparam +char *D_800ECCEC = "ͳ: sparam \n"; +// Reason: sb_ok +char *D_800ECCFC = "ͳ: sb_ok \n"; +char *D_800ECD0C = "S_BANANA RELEASE (num %d time %d )\n"; +// <<< FAKE IBOX SET failed >>> obj_num %d +char *D_800ECD34 = "<<< FAKE IBOX SET >>> obj_num %d \n"; +// IBOX Caught in owner check. (num %d) +char *D_800ECD5C = "IBOX ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800ECD90 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800ECDA4 = "ͳ: category \n"; +// Reason: sparam +char *D_800ECDB8 = "ͳ: sparam \n"; +// Reason: num +char *D_800ECDC8 = "ͳ: num \n"; +char *D_800ECDD4 = "FBOX HOLD (num %d time %d hold_time %d)\n"; +// Installation IBOX owner check failed. (num %d) +char *D_800ECE00 = " IBOX ͭԥå˰óݤޤ(num %d)\n"; +// Reason: EXISTOBJ +char *D_800ECE38 = "ͳ: EXISTOBJ \n"; +// Reason: category +char *D_800ECE4C = "ͳ: category \n"; +// Reason: sparam +char *D_800ECE60 = "ͳ: sparam \n"; +// Reason: num +char *D_800ECE70 = "ͳ: num \n"; +// Ray START (%d) +char *D_800ECE7C = "START (%d)\n"; +// Ray END (%d) +char *D_800ECE8C = "END (%d)\n"; +// ---------- Initialization of commendation table +char *D_800ECE98 = "---------- ɽ\n"; +// map_number = %d -> 20 Rewriting. +char *D_800ECEB4 = "map_number = %d - > 20 񤭴档\n"; +// OGA Recognition move begins +char *D_800ECEDC = "OGA ɽ move \n"; +// I called the display of the 4th place person. +char *D_800ECEF0 = "̤οͤɽ򥳡뤷ޤ\n"; +// Arrive at the podium +char *D_800ECF14 = "ɽ\n"; +// Everyone gather! +char *D_800ECF24 = "硪\n"; +// Arrive on the road +char *D_800ECF30 = "ƻϩ\n"; +// 4th place finished +char *D_800ECF3C = "̤οͽλ\n"; +// OGA commendation move end +char *D_800ECF4C = "OGA ɽ move λ\n"; +char *D_800ECF60 = "OGAWA DEBUG DRAW\n"; + s16 func_80005FD0(Vec3f arg0, Vec3f arg1) { s16 temp_ret; s16 phi_v1; @@ -29,9 +366,6 @@ s16 func_80005FD0(Vec3f arg0, Vec3f arg1) { return phi_v1; } -#ifdef NEEDS_RODATA -extern f32 D_800ECF74;// = 0.01f; - s32 func_80006018(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { f32 temp_f0; f32 temp_f18; @@ -50,9 +384,6 @@ s32 func_80006018(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f3 } return 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80006018.s") -#endif void func_80006114(Vec3f arg0, Vec3f arg1, s16 arg2) { f32 x_dist; @@ -1905,7 +2236,6 @@ void func_800090F0(s32 playerId, Player *player) { } } -extern f32 D_800ECFA4; extern f32 D_8016344C; extern f32 gCourseTimer; @@ -1916,7 +2246,7 @@ f32 func_80009258(UNUSED s32 playerId, f32 arg1, f32 arg2) { f32 temp_f2 = D_8016344C - arg2; f32 temp_f12 = arg1 - D_8016344C; - return gCourseTimer - ( (D_800ECFA4 * temp_f2) / (temp_f2 + temp_f12) ); + return gCourseTimer - ( (0.01666666f * temp_f2) / (temp_f2 + temp_f12) ); } #ifdef MIPS_TO_C @@ -3038,16 +3368,12 @@ s32 func_8000B7E4(UNUSED s32 arg0, u16 wayPointIndex) { s32 func_8000B820(s32 playerIndex) { f32 value = D_80163068[playerIndex]; - // Check if value between 1.1 and -1.1 - if ((D_800ECFD8 <= value) || (value <= D_800ECFDC)) { + if ((1.1f <= value) || (value <= -1.1f)) { return 1; } return 0; } -#ifdef NEEDS_RODATA -extern f32 D_800ECFE0;// = 0.01f; - f32 func_8000B874(f32 posX, f32 posZ, u16 wayPointIndex, s32 pathIndex) { f32 x1; f32 z1; @@ -3073,9 +3399,6 @@ f32 func_8000B874(f32 posX, f32 posZ, u16 wayPointIndex, s32 pathIndex) { math = ((2.0f * ((x2 - x1) * (posX - x1) + (z2 - z1) * (posZ - z1))) / squaredDistance) - 1.0f; return math; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000B874.s") -#endif void func_8000B95C(s32 playerId, u16 wayPointIndex, s32 pathIndex) { UNUSED Vec3f pad; @@ -3228,10 +3551,6 @@ s16 func_8000BD94(f32 posX, f32 posY, f32 posZ, s32 pathIndex) { return nearestWayPointIndex; } -#ifdef NEEDS_RODATA -extern f32 D_800ECFE8;// = 1000000.0f; -extern f32 D_800ECFEC;// = 1000000.0f; - s16 func_8000C0BC(f32 posX, f32 posY, f32 posZ, u16 trackSegment, s32 *pathIndex) { struct TrackWayPoint *pathWayPoints; struct TrackWayPoint *considerWayPoint; @@ -3321,12 +3640,6 @@ s16 func_8000C0BC(f32 posX, f32 posY, f32 posZ, u16 trackSegment, s32 *pathIndex } return nearestWayPointIndex; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000C0BC.s") -#endif - -#ifdef NEEDS_RODATA -extern f32 D_800ECFF0;// = 250000.0f; /** * Tries to find the waypoint nearest to (posX, posY, posZ) @@ -3369,12 +3682,6 @@ s16 func_8000C884(f32 posX, f32 posY, f32 posZ, s16 wayPointIndex, s32 pathIndex } return nearestWayPointIndex; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000C884.s") -#endif - -#ifdef NEEDS_RODATA -extern f32 D_800ECFF4;// = 160000.0f; /** * Tries to find the waypoint nearest to (posX, posY, posZ) @@ -3429,9 +3736,6 @@ s16 func_8000C9DC(f32 posX, f32 posY, f32 posZ, s16 wayPointIndex, s32 pathIndex } return nearestWayPointIndex; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000C9DC.s") -#endif void func_8000CBA4(UNUSED f32 posX, f32 posY, UNUSED f32 posZ, s16 *wayPointIndex) { s16 var_v0; @@ -3471,7 +3775,7 @@ s16 func_8000CC88(f32 posX, f32 posY, f32 posZ, Player *player, s32 playerId, s3 } #ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-08-2023 s16 func_8000CD24(f32 posX, f32 posY, f32 posZ, s16 wayPointIndex, Player *player, s32 playerId, s32 pathIndex) { s16 sp5E; s32 sp48; @@ -3491,11 +3795,13 @@ s16 func_8000CD24(f32 posX, f32 posY, f32 posZ, s16 wayPointIndex, Player *playe struct TrackWayPoint *temp_v1; struct TrackWayPoint *temp_v1_3; struct TrackWayPoint *temp_v1_4; + u16 temp_v0; + temp_v0 = player->unk_000; var_f24 = posZ; var_f20 = posX; var_f22 = posY; - if ((player->unk_000 & 0x4000) && !(player->unk_000 & 0x1000)) { + if ((temp_v0 & 0x4000) && !(temp_v0 & 0x1000)) { temp_v0_2 = func_8000C884(var_f20, var_f22, var_f24, wayPointIndex, pathIndex, (u16) func_802ABD40(player->unk_110.unk3A)); sp5E = temp_v0_2; if (temp_v0_2 == -1) { @@ -4499,13 +4805,6 @@ void func_8000EEDC(void) { } } -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3.s -extern f32 D_800ED040;// = 0.3f; -extern f32 D_800ED044;// = 0.45f; -extern f32 D_800ED048;// = 0.15f; -extern f32 D_800ED04C;// = 0.9f; - void func_8000EF20(void) { s32 someIndex; f32 var_f20; @@ -4549,9 +4848,6 @@ void func_8000EF20(void) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000EF20.s") -#endif void func_8000F0E0(void) { D_80164670 = 0; @@ -5476,10 +5772,6 @@ f32 func_80010480(s32 pathIndex, u16 wayPointIndex) { return -((temp_f10 * temp_f10_2) - (temp_f8_2 * temp_f8)) / (root2 * root1); } -#ifdef NEEDS_RODATA -extern f64 D_800ED058;// = -0.1; -extern f64 D_800ED060;// = 0.1; - void func_800107C4(s32 pathIndex) { f64 temp_f2; s32 temp_t3; @@ -5533,9 +5825,6 @@ void func_800107C4(s32 pathIndex) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800107C4.s") -#endif // Seemingly calculates the atan2 angle between a wayPoint and its forward neighbor s16 func_80010CB0(s32 pathIndex, s32 wayPointIndex) { @@ -6963,11 +7252,6 @@ void func_800133C4(void) { GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800133C4.s") #endif -#ifdef NEEDS_RODATA -// data_0DD0A0_3.s -extern f64 D_800ED158;// = 300.0; -extern f64 D_800ED160;// = -300.0; - void func_80013854(Player *player) { s32 someIndex; PaddleWheelBoatStuff *tempPaddleWheelBoat; @@ -6999,9 +7283,6 @@ void func_80013854(Player *player) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80013854.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -7074,11 +7355,6 @@ void func_800139E4(f32 arg0, f32 arg1, s32 arg2, s32 arg3, VehicleStuff *vehicle GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800139E4.s") #endif -#ifdef NEEDS_RODATA - -extern f32 D_800ED170;// = -0.7f; -extern f32 D_800ED174;// = 0.7f; - f32 func_80013C74(s16 arg0, s16 arg1) { f32 var_f2; @@ -7111,14 +7387,6 @@ f32 func_80013C74(s16 arg0, s16 arg1) { } return var_f2; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80013C74.s") -#endif - -#ifdef NEEDS_RODATA -//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -extern f64 D_800ED178;// = 0.06; -extern f64 D_800ED180;// = 0.06; void func_80013D20(VehicleStuff *vehicle) { f32 temp_f0_2; @@ -7183,9 +7451,6 @@ void func_80013D20(VehicleStuff *vehicle) { vehicleActor->velocity[1] = vehicle->velocity[1]; vehicleActor->velocity[2] = vehicle->velocity[2]; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80013D20.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de @@ -7360,11 +7625,6 @@ void func_80013F7C(s32 playerId, Player *player, VehicleStuff *vehicle, f32 arg3 GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80013F7C.s") #endif -#ifdef NEEDS_RODATA - -extern f32 D_800ED1A8;// = -0.8; -extern f32 D_800ED1AC;// = 0.8; - f32 func_800145A8(s16 arg0, f32 arg1, s16 arg2) { if (arg2 < 0x28A) { switch (arg0) { /* switch 1; irregular */ @@ -7403,9 +7663,6 @@ f32 func_800145A8(s16 arg0, f32 arg1, s16 arg2) { } return arg1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800145A8.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de diff --git a/src/code_80005FD0.h b/src/code_80005FD0.h index 663e7b6b8..ed2cca429 100644 --- a/src/code_80005FD0.h +++ b/src/code_80005FD0.h @@ -144,8 +144,6 @@ extern s32 D_80163488; extern s32 D_8016337C; extern s32 gModeSelection; -extern f32 D_800ECFD8;// = 1.1f; -extern f32 D_800ECFDC;// = -1.1f; extern struct unk_41F8 D_801641F8[]; extern s16 D_80164670; extern s16 D_80164672;