From 779ae6f6f1a91db2a560aecdbc9fa55fb203a63c Mon Sep 17 00:00:00 2001 From: MegaMech Date: Fri, 16 Jun 2023 10:30:39 -0600 Subject: [PATCH] Item & Various decomp (#311) * Item & Various decomp --- asm/bss_8001C4D0.s | 4 +- .../code_80071F00/func_80072120.s | 27 - .../code_80071F00/func_800729EC.s | 38 - .../code_80071F00/func_80074574.s | 22 - .../code_80071F00/func_800747F0.s | 43 - .../code_80071F00/func_80074924.s | 321 --- .../code_80071F00/func_80076884.s | 60 - .../code_80071F00/func_80076FEC.s | 73 - .../code_80071F00/func_80077138.s | 191 -- .../code_80071F00/func_80077EB8.s | 47 - .../code_80071F00/func_80077F64.s | 104 - .../code_80071F00/func_800780CC.s | 47 - .../code_80071F00/func_80078170.s | 48 - .../code_80071F00/func_800788F8.s | 48 - .../code_80071F00/func_80078A44.s | 156 -- .../code_80071F00/func_80078C70.s | 229 -- .../code_80071F00/func_80079114.s | 63 - .../code_80071F00/func_800792D8.s | 51 - .../code_80071F00/func_80079380.s | 205 -- .../code_80071F00/func_8007963C.s | 60 - .../code_80071F00/func_80079700.s | 59 - .../code_80071F00/func_800799A8.s | 53 - .../code_80071F00/func_80079B40.s | 151 -- .../code_80071F00/func_80079D44.s | 225 -- .../code_80071F00/func_8007A060.s | 60 - .../code_80071F00/func_8007A124.s | 84 - .../code_80071F00/func_8007A228.s | 60 - .../code_80071F00/func_8007A2EC.s | 84 - .../code_80071F00/func_8007A3F0.s | 68 - .../code_80071F00/func_8007A4D4.s | 122 - .../code_80071F00/func_8007A948.s | 83 - .../code_80071F00/func_8007AFB0.s | 38 - .../code_80071F00/func_8007BDE0.s | 70 - .../code_80071F00/func_8007C2F8.s | 22 - .../code_80071F00/func_8007C5B4.s | 60 - .../code_80071F00/func_8007FF5C.s | 29 - .../code_80071F00/func_8007FFC0.s | 51 - .../code_80071F00/func_80083474.s | 19 - .../code_80071F00/gen_random_item.s | 113 - assets.json | 3 - include/common_structs.h | 2 +- include/sounds.h | 2 +- src/audio/external.c | 19 +- src/code_80027D00.c | 2 +- src/code_80057C60.c | 156 +- src/code_80057C60.h | 2 +- src/code_80071F00.c | 2239 +++++++---------- src/code_80071F00.h | 4 +- src/code_8008C1D0.c | 5 +- src/common_textures.inc.c | 245 +- src/hud_renderer.c | 80 +- undefined_syms.txt | 4 + 52 files changed, 1306 insertions(+), 4745 deletions(-) delete mode 100644 asm/non_matchings/code_80071F00/func_80072120.s delete mode 100644 asm/non_matchings/code_80071F00/func_800729EC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80074574.s delete mode 100644 asm/non_matchings/code_80071F00/func_800747F0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80074924.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076884.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076FEC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077138.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077EB8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077F64.s delete mode 100644 asm/non_matchings/code_80071F00/func_800780CC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80078170.s delete mode 100644 asm/non_matchings/code_80071F00/func_800788F8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80078A44.s delete mode 100644 asm/non_matchings/code_80071F00/func_80078C70.s delete mode 100644 asm/non_matchings/code_80071F00/func_80079114.s delete mode 100644 asm/non_matchings/code_80071F00/func_800792D8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80079380.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007963C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80079700.s delete mode 100644 asm/non_matchings/code_80071F00/func_800799A8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80079B40.s delete mode 100644 asm/non_matchings/code_80071F00/func_80079D44.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007A060.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007A124.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007A228.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007A2EC.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007A3F0.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007A4D4.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007A948.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007AFB0.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007BDE0.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007C2F8.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007C5B4.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007FF5C.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007FFC0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083474.s delete mode 100644 asm/non_matchings/code_80071F00/gen_random_item.s diff --git a/asm/bss_8001C4D0.s b/asm/bss_8001C4D0.s index af9f23829..ae595e3fe 100644 --- a/asm/bss_8001C4D0.s +++ b/asm/bss_8001C4D0.s @@ -574,13 +574,13 @@ glabel D_801658EC glabel D_801658F4 .skip 9 -glabel D_801658FD +glabel sRandomItemIndex .skip 1 glabel D_801658FE .skip 1 -glabel D_801658FF +glabel gControllerRandom .skip 1 glabel D_80165900 diff --git a/asm/non_matchings/code_80071F00/func_80072120.s b/asm/non_matchings/code_80071F00/func_80072120.s deleted file mode 100644 index b31b2ac39..000000000 --- a/asm/non_matchings/code_80071F00/func_80072120.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80072120 -/* 072D20 80072120 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 072D24 80072124 AFB2001C */ sw $s2, 0x1c($sp) -/* 072D28 80072128 AFB10018 */ sw $s1, 0x18($sp) -/* 072D2C 8007212C AFB00014 */ sw $s0, 0x14($sp) -/* 072D30 80072130 00808825 */ move $s1, $a0 -/* 072D34 80072134 00A09025 */ move $s2, $a1 -/* 072D38 80072138 AFBF0024 */ sw $ra, 0x24($sp) -/* 072D3C 8007213C AFB30020 */ sw $s3, 0x20($sp) -/* 072D40 80072140 18A00008 */ blez $a1, .L80072164 -/* 072D44 80072144 00008025 */ move $s0, $zero -/* 072D48 80072148 3C130060 */ lui $s3, 0x60 -.L8007214C: -/* 072D4C 8007214C 8E240000 */ lw $a0, ($s1) -/* 072D50 80072150 0C01C87A */ jal func_800721E8 -/* 072D54 80072154 02602825 */ move $a1, $s3 -/* 072D58 80072158 26100001 */ addiu $s0, $s0, 1 -/* 072D5C 8007215C 1612FFFB */ bne $s0, $s2, .L8007214C -/* 072D60 80072160 26310004 */ addiu $s1, $s1, 4 -.L80072164: -/* 072D64 80072164 8FBF0024 */ lw $ra, 0x24($sp) -/* 072D68 80072168 8FB00014 */ lw $s0, 0x14($sp) -/* 072D6C 8007216C 8FB10018 */ lw $s1, 0x18($sp) -/* 072D70 80072170 8FB2001C */ lw $s2, 0x1c($sp) -/* 072D74 80072174 8FB30020 */ lw $s3, 0x20($sp) -/* 072D78 80072178 03E00008 */ jr $ra -/* 072D7C 8007217C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_800729EC.s b/asm/non_matchings/code_80071F00/func_800729EC.s deleted file mode 100644 index 1bb81024d..000000000 --- a/asm/non_matchings/code_80071F00/func_800729EC.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_800729EC -/* 0735EC 800729EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0735F0 800729F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 0735F4 800729F4 0C0A3B6A */ jal start_race -/* 0735F8 800729F8 AFA40018 */ sw $a0, 0x18($sp) -/* 0735FC 800729FC 0C01C922 */ jal func_80072488 -/* 073600 80072A00 8FA40018 */ lw $a0, 0x18($sp) -/* 073604 80072A04 24020001 */ li $v0, 1 -/* 073608 80072A08 3C018019 */ lui $at, %hi(D_8018D2BC) # $at, 0x8019 -/* 07360C 80072A0C AC22D2BC */ sw $v0, %lo(D_8018D2BC)($at) -/* 073610 80072A10 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e -/* 073614 80072A14 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) -/* 073618 80072A18 3C018019 */ lui $at, %hi(D_8018D2A4) # $at, 0x8019 -/* 07361C 80072A1C AC22D2A4 */ sw $v0, %lo(D_8018D2A4)($at) -/* 073620 80072A20 24010004 */ li $at, 4 -/* 073624 80072A24 11C1000E */ beq $t6, $at, .L80072A60 -/* 073628 80072A28 3C038019 */ lui $v1, %hi(D_8018EDF3) # $v1, 0x8019 -/* 07362C 80072A2C 8063EDF3 */ lb $v1, %lo(D_8018EDF3)($v1) -/* 073630 80072A30 3C0F8019 */ lui $t7, %hi(D_8018CA70) # x8019 -/* 073634 80072A34 25E2CA70 */ addiu $v0, $t7, %lo(D_8018CA70) # -0x3590 -/* 073638 80072A38 18600009 */ blez $v1, .L80072A60 -/* 07363C 80072A3C 0003C140 */ sll $t8, $v1, 5 -/* 073640 80072A40 0303C021 */ addu $t8, $t8, $v1 -/* 073644 80072A44 0018C080 */ sll $t8, $t8, 2 -/* 073648 80072A48 03022021 */ addu $a0, $t8, $v0 -/* 07364C 80072A4C 24030001 */ li $v1, 1 -.L80072A50: -/* 073650 80072A50 24420084 */ addiu $v0, $v0, 0x84 -/* 073654 80072A54 0044082B */ sltu $at, $v0, $a0 -/* 073658 80072A58 1420FFFD */ bnez $at, .L80072A50 -/* 07365C 80072A5C A043FFFD */ sb $v1, -3($v0) -.L80072A60: -/* 073660 80072A60 0C016AC8 */ jal func_8005AB20 -/* 073664 80072A64 00000000 */ nop -/* 073668 80072A68 8FBF0014 */ lw $ra, 0x14($sp) -/* 07366C 80072A6C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 073670 80072A70 03E00008 */ jr $ra -/* 073674 80072A74 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80074574.s b/asm/non_matchings/code_80071F00/func_80074574.s deleted file mode 100644 index ced1d2fed..000000000 --- a/asm/non_matchings/code_80071F00/func_80074574.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80074574 -/* 075174 80074574 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 075178 80074578 AFA60020 */ sw $a2, 0x20($sp) -/* 07517C 8007457C 97A80022 */ lhu $t0, 0x22($sp) -/* 075180 80074580 30EEFFFF */ andi $t6, $a3, 0xffff -/* 075184 80074584 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* 075188 80074588 010E0019 */ multu $t0, $t6 -/* 07518C 8007458C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 075190 80074590 3C190064 */ lui $t9, %hi(_other_texturesSegmentRomStart) # $t9, 0x64 -/* 075194 80074594 AFBF0014 */ sw $ra, 0x14($sp) -/* 075198 80074598 AFA40018 */ sw $a0, 0x18($sp) -/* 07519C 8007459C 27391F70 */ addiu $t9, %lo(_other_texturesSegmentRomStart) # addiu $t9, $t9, 0x1f70 -/* 0751A0 800745A0 0081C024 */ and $t8, $a0, $at -/* 0751A4 800745A4 AFA70024 */ sw $a3, 0x24($sp) -/* 0751A8 800745A8 03192021 */ addu $a0, $t8, $t9 -/* 0751AC 800745AC 00003012 */ mflo $a2 -/* 0751B0 800745B0 0C01D144 */ jal func_80074510 -/* 0751B4 800745B4 00000000 */ nop -/* 0751B8 800745B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0751BC 800745BC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0751C0 800745C0 03E00008 */ jr $ra -/* 0751C4 800745C4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800747F0.s b/asm/non_matchings/code_80071F00/func_800747F0.s deleted file mode 100644 index 7f626b40e..000000000 --- a/asm/non_matchings/code_80071F00/func_800747F0.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_800747F0 -/* 0753F0 800747F0 000470C0 */ sll $t6, $a0, 3 -/* 0753F4 800747F4 01C47023 */ subu $t6, $t6, $a0 -/* 0753F8 800747F8 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 0753FC 800747FC 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 075400 80074800 000E7140 */ sll $t6, $t6, 5 -/* 075404 80074804 01CF1821 */ addu $v1, $t6, $t7 -/* 075408 80074808 806200D2 */ lb $v0, 0xd2($v1) -/* 07540C 8007480C 807800D3 */ lb $t8, 0xd3($v1) -/* 075410 80074810 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 075414 80074814 AFBF0014 */ sw $ra, 0x14($sp) -/* 075418 80074818 5058001B */ beql $v0, $t8, .L80074888 -/* 07541C 8007481C 8FBF0014 */ lw $ra, 0x14($sp) -/* 075420 80074820 907900D9 */ lbu $t9, 0xd9($v1) -/* 075424 80074824 906900DA */ lbu $t1, 0xda($v1) -/* 075428 80074828 8C6B006C */ lw $t3, 0x6c($v1) -/* 07542C 8007482C 00590019 */ multu $v0, $t9 -/* 075430 80074830 AFA3001C */ sw $v1, 0x1c($sp) -/* 075434 80074834 AFA40028 */ sw $a0, 0x28($sp) -/* 075438 80074838 00004012 */ mflo $t0 -/* 07543C 8007483C 00000000 */ nop -/* 075440 80074840 00000000 */ nop -/* 075444 80074844 01090019 */ multu $t0, $t1 -/* 075448 80074848 00005012 */ mflo $t2 -/* 07544C 8007484C 014B6021 */ addu $t4, $t2, $t3 -/* 075450 80074850 0C01D1E4 */ jal func_80074790 -/* 075454 80074854 AFAC0024 */ sw $t4, 0x24($sp) -/* 075458 80074858 8FA3001C */ lw $v1, 0x1c($sp) -/* 07545C 8007485C 8FA40024 */ lw $a0, 0x24($sp) -/* 075460 80074860 00402825 */ move $a1, $v0 -/* 075464 80074864 906600D9 */ lbu $a2, 0xd9($v1) -/* 075468 80074868 0C01D15D */ jal func_80074574 -/* 07546C 8007486C 906700DA */ lbu $a3, 0xda($v1) -/* 075470 80074870 8FA3001C */ lw $v1, 0x1c($sp) -/* 075474 80074874 8FA40028 */ lw $a0, 0x28($sp) -/* 075478 80074878 806D00D2 */ lb $t5, 0xd2($v1) -/* 07547C 8007487C 0C01D11E */ jal func_80074478 -/* 075480 80074880 A06D00D3 */ sb $t5, 0xd3($v1) -/* 075484 80074884 8FBF0014 */ lw $ra, 0x14($sp) -.L80074888: -/* 075488 80074888 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07548C 8007488C 03E00008 */ jr $ra -/* 075490 80074890 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80074924.s b/asm/non_matchings/code_80071F00/func_80074924.s deleted file mode 100644 index 0d5d89f82..000000000 --- a/asm/non_matchings/code_80071F00/func_80074924.s +++ /dev/null @@ -1,321 +0,0 @@ -.section .late_rodata - -glabel D_800EEA80 -.float 0.15 -.word 0x00000000 - -glabel D_800EEA88 -.double 180.0 - -glabel D_800EEA90 -.double 150.0 - -glabel D_800EEA98 -.double 0.8 - -glabel D_800EEAA0 -.double 0.2 - -glabel D_800EEAA8 -.double 0.4 - -.section .text - -glabel func_80074924 -/* 075524 80074924 000478C0 */ sll $t7, $a0, 3 -/* 075528 80074928 3C01800F */ lui $at, %hi(D_800EEA80) # $at, 0x800f -/* 07552C 8007492C C424EA80 */ lwc1 $f4, %lo(D_800EEA80)($at) -/* 075530 80074930 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 075534 80074934 01E47823 */ subu $t7, $t7, $a0 -/* 075538 80074938 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07553C 8007493C AFB00018 */ sw $s0, 0x18($sp) -/* 075540 80074940 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 075544 80074944 000F7940 */ sll $t7, $t7, 5 -/* 075548 80074948 01F88021 */ addu $s0, $t7, $t8 -/* 07554C 8007494C 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 075550 80074950 E6040000 */ swc1 $f4, ($s0) -/* 075554 80074954 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 075558 80074958 AFBF001C */ sw $ra, 0x1c($sp) -/* 07555C 8007495C AFA40030 */ sw $a0, 0x30($sp) -/* 075560 80074960 10400007 */ beqz $v0, .L80074980 -/* 075564 80074964 24010007 */ li $at, 7 -/* 075568 80074968 1041003C */ beq $v0, $at, .L80074A5C -/* 07556C 8007496C 24010008 */ li $at, 8 -/* 075570 80074970 10410070 */ beq $v0, $at, .L80074B34 -/* 075574 80074974 00000000 */ nop -/* 075578 80074978 100000A4 */ b .L80074C0C -/* 07557C 8007497C 44800000 */ mtc1 $zero, $f0 -.L80074980: -/* 075580 80074980 0C0ADF8D */ jal random_int -/* 075584 80074984 240400C8 */ li $a0, 200 -/* 075588 80074988 3C048016 */ lui $a0, %hi(D_80165748) # $a0, 0x8016 -/* 07558C 8007498C AFA2002C */ sw $v0, 0x2c($sp) -/* 075590 80074990 0C0ADF8D */ jal random_int -/* 075594 80074994 94845748 */ lhu $a0, %lo(D_80165748)($a0) -/* 075598 80074998 AFA20028 */ sw $v0, 0x28($sp) -/* 07559C 8007499C 0C0ADF8D */ jal random_int -/* 0755A0 800749A0 24040096 */ li $a0, 150 -/* 0755A4 800749A4 AFA20024 */ sw $v0, 0x24($sp) -/* 0755A8 800749A8 0C0ADF8D */ jal random_int -/* 0755AC 800749AC 24042000 */ li $a0, 8192 -/* 0755B0 800749B0 3C198016 */ lui $t9, %hi(D_80165718) # $t9, 0x8016 -/* 0755B4 800749B4 87395718 */ lh $t9, %lo(D_80165718)($t9) -/* 0755B8 800749B8 8FA8002C */ lw $t0, 0x2c($sp) -/* 0755BC 800749BC 3C014059 */ li $at, 0x40590000 # 3.390625 -/* 0755C0 800749C0 44993000 */ mtc1 $t9, $f6 -/* 0755C4 800749C4 44889000 */ mtc1 $t0, $f18 -/* 0755C8 800749C8 44815800 */ mtc1 $at, $f11 -/* 0755CC 800749CC 46803221 */ cvt.d.w $f8, $f6 -/* 0755D0 800749D0 44805000 */ mtc1 $zero, $f10 -/* 0755D4 800749D4 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 0755D8 800749D8 3C098016 */ lui $t1, %hi(D_80165720) # $t1, 0x8016 -/* 0755DC 800749DC 46809121 */ cvt.d.w $f4, $f18 -/* 0755E0 800749E0 8FAA0028 */ lw $t2, 0x28($sp) -/* 0755E4 800749E4 3C0C8016 */ lui $t4, %hi(D_80165728) # $t4, 0x8016 -/* 0755E8 800749E8 8FAD0024 */ lw $t5, 0x24($sp) -/* 0755EC 800749EC 462A4400 */ add.d $f16, $f8, $f10 -/* 0755F0 800749F0 C428D01C */ lwc1 $f8, %lo(D_8018D01C)($at) -/* 0755F4 800749F4 3C014069 */ li $at, 0x40690000 # 3.640625 -/* 0755F8 800749F8 AFA20020 */ sw $v0, 0x20($sp) -/* 0755FC 800749FC 46248181 */ sub.d $f6, $f16, $f4 -/* 075600 80074A00 460042A1 */ cvt.d.s $f10, $f8 -/* 075604 80074A04 462A3482 */ mul.d $f18, $f6, $f10 -/* 075608 80074A08 46209420 */ cvt.s.d $f16, $f18 -/* 07560C 80074A0C 44809000 */ mtc1 $zero, $f18 -/* 075610 80074A10 44819800 */ mtc1 $at, $f19 -/* 075614 80074A14 E6100010 */ swc1 $f16, 0x10($s0) -/* 075618 80074A18 85295720 */ lh $t1, %lo(D_80165720)($t1) -/* 07561C 80074A1C 012A5821 */ addu $t3, $t1, $t2 -/* 075620 80074A20 448B2000 */ mtc1 $t3, $f4 -/* 075624 80074A24 00000000 */ nop -/* 075628 80074A28 46802220 */ cvt.s.w $f8, $f4 -/* 07562C 80074A2C 448D2000 */ mtc1 $t5, $f4 -/* 075630 80074A30 E6080014 */ swc1 $f8, 0x14($s0) -/* 075634 80074A34 858C5728 */ lh $t4, %lo(D_80165728)($t4) -/* 075638 80074A38 46802221 */ cvt.d.w $f8, $f4 -/* 07563C 80074A3C 448C3000 */ mtc1 $t4, $f6 -/* 075640 80074A40 00000000 */ nop -/* 075644 80074A44 468032A1 */ cvt.d.w $f10, $f6 -/* 075648 80074A48 46325400 */ add.d $f16, $f10, $f18 -/* 07564C 80074A4C 46288181 */ sub.d $f6, $f16, $f8 -/* 075650 80074A50 462032A0 */ cvt.s.d $f10, $f6 -/* 075654 80074A54 1000006C */ b .L80074C08 -/* 075658 80074A58 E60A0018 */ swc1 $f10, 0x18($s0) -.L80074A5C: -/* 07565C 80074A5C 0C0ADF8D */ jal random_int -/* 075660 80074A60 24040168 */ li $a0, 360 -/* 075664 80074A64 3C048016 */ lui $a0, %hi(D_80165748) # $a0, 0x8016 -/* 075668 80074A68 AFA2002C */ sw $v0, 0x2c($sp) -/* 07566C 80074A6C 0C0ADF8D */ jal random_int -/* 075670 80074A70 94845748 */ lhu $a0, %lo(D_80165748)($a0) -/* 075674 80074A74 AFA20028 */ sw $v0, 0x28($sp) -/* 075678 80074A78 0C0ADF8D */ jal random_int -/* 07567C 80074A7C 240400B4 */ li $a0, 180 -/* 075680 80074A80 AFA20024 */ sw $v0, 0x24($sp) -/* 075684 80074A84 0C0ADF8D */ jal random_int -/* 075688 80074A88 24042000 */ li $a0, 8192 -/* 07568C 80074A8C 3C0E8016 */ lui $t6, %hi(D_80165718) # $t6, 0x8016 -/* 075690 80074A90 85CE5718 */ lh $t6, %lo(D_80165718)($t6) -/* 075694 80074A94 8FAF002C */ lw $t7, 0x2c($sp) -/* 075698 80074A98 3C01800F */ lui $at, %hi(D_800EEA88) -/* 07569C 80074A9C 448E9000 */ mtc1 $t6, $f18 -/* 0756A0 80074AA0 448F3000 */ mtc1 $t7, $f6 -/* 0756A4 80074AA4 D430EA88 */ ldc1 $f16, %lo(D_800EEA88)($at) -/* 0756A8 80074AA8 46809121 */ cvt.d.w $f4, $f18 -/* 0756AC 80074AAC 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 0756B0 80074AB0 3C188016 */ lui $t8, %hi(D_80165720) # $t8, 0x8016 -/* 0756B4 80074AB4 8FB90028 */ lw $t9, 0x28($sp) -/* 0756B8 80074AB8 468032A1 */ cvt.d.w $f10, $f6 -/* 0756BC 80074ABC 3C098016 */ lui $t1, %hi(D_80165728) # $t1, 0x8016 -/* 0756C0 80074AC0 8FAA0024 */ lw $t2, 0x24($sp) -/* 0756C4 80074AC4 AFA20020 */ sw $v0, 0x20($sp) -/* 0756C8 80074AC8 46302200 */ add.d $f8, $f4, $f16 -/* 0756CC 80074ACC C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) -/* 0756D0 80074AD0 3C014069 */ li $at, 0x40690000 # 3.640625 -/* 0756D4 80074AD4 462A4481 */ sub.d $f18, $f8, $f10 -/* 0756D8 80074AD8 46002421 */ cvt.d.s $f16, $f4 -/* 0756DC 80074ADC 46309182 */ mul.d $f6, $f18, $f16 -/* 0756E0 80074AE0 46203220 */ cvt.s.d $f8, $f6 -/* 0756E4 80074AE4 44803000 */ mtc1 $zero, $f6 -/* 0756E8 80074AE8 44813800 */ mtc1 $at, $f7 -/* 0756EC 80074AEC E6080010 */ swc1 $f8, 0x10($s0) -/* 0756F0 80074AF0 87185720 */ lh $t8, %lo(D_80165720)($t8) -/* 0756F4 80074AF4 03194021 */ addu $t0, $t8, $t9 -/* 0756F8 80074AF8 44885000 */ mtc1 $t0, $f10 -/* 0756FC 80074AFC 00000000 */ nop -/* 075700 80074B00 46805120 */ cvt.s.w $f4, $f10 -/* 075704 80074B04 448A5000 */ mtc1 $t2, $f10 -/* 075708 80074B08 E6040014 */ swc1 $f4, 0x14($s0) -/* 07570C 80074B0C 85295728 */ lh $t1, %lo(D_80165728)($t1) -/* 075710 80074B10 46805121 */ cvt.d.w $f4, $f10 -/* 075714 80074B14 44899000 */ mtc1 $t1, $f18 -/* 075718 80074B18 00000000 */ nop -/* 07571C 80074B1C 46809421 */ cvt.d.w $f16, $f18 -/* 075720 80074B20 46268200 */ add.d $f8, $f16, $f6 -/* 075724 80074B24 46244481 */ sub.d $f18, $f8, $f4 -/* 075728 80074B28 46209420 */ cvt.s.d $f16, $f18 -/* 07572C 80074B2C 10000036 */ b .L80074C08 -/* 075730 80074B30 E6100018 */ swc1 $f16, 0x18($s0) -.L80074B34: -/* 075734 80074B34 0C0ADF8D */ jal random_int -/* 075738 80074B38 2404012C */ li $a0, 300 -/* 07573C 80074B3C 3C048016 */ lui $a0, %hi(D_80165748) # $a0, 0x8016 -/* 075740 80074B40 AFA2002C */ sw $v0, 0x2c($sp) -/* 075744 80074B44 0C0ADF8D */ jal random_int -/* 075748 80074B48 94845748 */ lhu $a0, %lo(D_80165748)($a0) -/* 07574C 80074B4C AFA20028 */ sw $v0, 0x28($sp) -/* 075750 80074B50 0C0ADF8D */ jal random_int -/* 075754 80074B54 24040096 */ li $a0, 150 -/* 075758 80074B58 AFA20024 */ sw $v0, 0x24($sp) -/* 07575C 80074B5C 0C0ADF8D */ jal random_int -/* 075760 80074B60 24042000 */ li $a0, 8192 -/* 075764 80074B64 3C0B8016 */ lui $t3, %hi(D_80165718) # $t3, 0x8016 -/* 075768 80074B68 856B5718 */ lh $t3, %lo(D_80165718)($t3) -/* 07576C 80074B6C 8FAC002C */ lw $t4, 0x2c($sp) -/* 075770 80074B70 3C01800F */ lui $at, %hi(D_800EEA90) -/* 075774 80074B74 448B3000 */ mtc1 $t3, $f6 -/* 075778 80074B78 448C9000 */ mtc1 $t4, $f18 -/* 07577C 80074B7C D428EA90 */ ldc1 $f8, %lo(D_800EEA90)($at) -/* 075780 80074B80 468032A1 */ cvt.d.w $f10, $f6 -/* 075784 80074B84 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 075788 80074B88 3C0D8016 */ lui $t5, %hi(D_80165720) # $t5, 0x8016 -/* 07578C 80074B8C 8FAE0028 */ lw $t6, 0x28($sp) -/* 075790 80074B90 46809421 */ cvt.d.w $f16, $f18 -/* 075794 80074B94 3C188016 */ lui $t8, %hi(D_80165728) # $t8, 0x8016 -/* 075798 80074B98 8FB90024 */ lw $t9, 0x24($sp) -/* 07579C 80074B9C AFA20020 */ sw $v0, 0x20($sp) -/* 0757A0 80074BA0 46285100 */ add.d $f4, $f10, $f8 -/* 0757A4 80074BA4 C42AD01C */ lwc1 $f10, %lo(D_8018D01C)($at) -/* 0757A8 80074BA8 3C014069 */ li $at, 0x40690000 # 3.640625 -/* 0757AC 80074BAC 46302181 */ sub.d $f6, $f4, $f16 -/* 0757B0 80074BB0 46005221 */ cvt.d.s $f8, $f10 -/* 0757B4 80074BB4 46283482 */ mul.d $f18, $f6, $f8 -/* 0757B8 80074BB8 46209120 */ cvt.s.d $f4, $f18 -/* 0757BC 80074BBC 44809000 */ mtc1 $zero, $f18 -/* 0757C0 80074BC0 44819800 */ mtc1 $at, $f19 -/* 0757C4 80074BC4 E6040010 */ swc1 $f4, 0x10($s0) -/* 0757C8 80074BC8 85AD5720 */ lh $t5, %lo(D_80165720)($t5) -/* 0757CC 80074BCC 01AE7821 */ addu $t7, $t5, $t6 -/* 0757D0 80074BD0 448F8000 */ mtc1 $t7, $f16 -/* 0757D4 80074BD4 00000000 */ nop -/* 0757D8 80074BD8 468082A0 */ cvt.s.w $f10, $f16 -/* 0757DC 80074BDC 44998000 */ mtc1 $t9, $f16 -/* 0757E0 80074BE0 E60A0014 */ swc1 $f10, 0x14($s0) -/* 0757E4 80074BE4 87185728 */ lh $t8, %lo(D_80165728)($t8) -/* 0757E8 80074BE8 468082A1 */ cvt.d.w $f10, $f16 -/* 0757EC 80074BEC 44983000 */ mtc1 $t8, $f6 -/* 0757F0 80074BF0 00000000 */ nop -/* 0757F4 80074BF4 46803221 */ cvt.d.w $f8, $f6 -/* 0757F8 80074BF8 46324100 */ add.d $f4, $f8, $f18 -/* 0757FC 80074BFC 462A2181 */ sub.d $f6, $f4, $f10 -/* 075800 80074C00 46203220 */ cvt.s.d $f8, $f6 -/* 075804 80074C04 E6080018 */ swc1 $f8, 0x18($s0) -.L80074C08: -/* 075808 80074C08 44800000 */ mtc1 $zero, $f0 -.L80074C0C: -/* 07580C 80074C0C 8FA40030 */ lw $a0, 0x30($sp) -/* 075810 80074C10 44050000 */ mfc1 $a1, $f0 -/* 075814 80074C14 44060000 */ mfc1 $a2, $f0 -/* 075818 80074C18 44070000 */ mfc1 $a3, $f0 -/* 07581C 80074C1C 0C022E03 */ jal func_8008B80C -/* 075820 80074C20 00000000 */ nop -/* 075824 80074C24 3C088019 */ lui $t0, %hi(D_8018EDF3) # $t0, 0x8019 -/* 075828 80074C28 8108EDF3 */ lb $t0, %lo(D_8018EDF3)($t0) -/* 07582C 80074C2C 24010001 */ li $at, 1 -/* 075830 80074C30 8FA50020 */ lw $a1, 0x20($sp) -/* 075834 80074C34 15010014 */ bne $t0, $at, .L80074C88 -/* 075838 80074C38 3C0D800E */ lui $t5, %hi(D_800E6F30) # $t5, 0x800e -/* 07583C 80074C3C 8FA6002C */ lw $a2, 0x2c($sp) -/* 075840 80074C40 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 -/* 075844 80074C44 44815800 */ mtc1 $at, $f11 -/* 075848 80074C48 04C10004 */ bgez $a2, .L80074C5C -/* 07584C 80074C4C 30C90003 */ andi $t1, $a2, 3 -/* 075850 80074C50 11200002 */ beqz $t1, .L80074C5C -/* 075854 80074C54 00000000 */ nop -/* 075858 80074C58 2529FFFC */ addiu $t1, $t1, -4 -.L80074C5C: -/* 07585C 80074C5C 44899000 */ mtc1 $t1, $f18 -/* 075860 80074C60 44805000 */ mtc1 $zero, $f10 -/* 075864 80074C64 3C01800F */ lui $at, %hi(D_800EEA98) -/* 075868 80074C68 46809420 */ cvt.s.w $f16, $f18 -/* 07586C 80074C6C D428EA98 */ ldc1 $f8, %lo(D_800EEA98)($at) -/* 075870 80074C70 46008121 */ cvt.d.s $f4, $f16 -/* 075874 80074C74 462A2182 */ mul.d $f6, $f4, $f10 -/* 075878 80074C78 46283480 */ add.d $f18, $f6, $f8 -/* 07587C 80074C7C 46209420 */ cvt.s.d $f16, $f18 -/* 075880 80074C80 10000011 */ b .L80074CC8 -/* 075884 80074C84 E610003C */ swc1 $f16, 0x3c($s0) -.L80074C88: -/* 075888 80074C88 8FAA002C */ lw $t2, 0x2c($sp) -/* 07588C 80074C8C 24010003 */ li $at, 3 -/* 075890 80074C90 8FA6002C */ lw $a2, 0x2c($sp) -/* 075894 80074C94 0141001A */ div $zero, $t2, $at -/* 075898 80074C98 00005810 */ mfhi $t3 -/* 07589C 80074C9C 448B2000 */ mtc1 $t3, $f4 -/* 0758A0 80074CA0 3C01800F */ lui $at, %hi(D_800EEAA0) -/* 0758A4 80074CA4 D428EAA0 */ ldc1 $f8, %lo(D_800EEAA0)($at) -/* 0758A8 80074CA8 468022A0 */ cvt.s.w $f10, $f4 -/* 0758AC 80074CAC 3C01800F */ lui $at, %hi(D_800EEAA8) -/* 0758B0 80074CB0 D430EAA8 */ ldc1 $f16, %lo(D_800EEAA8)($at) -/* 0758B4 80074CB4 460051A1 */ cvt.d.s $f6, $f10 -/* 0758B8 80074CB8 46283482 */ mul.d $f18, $f6, $f8 -/* 0758BC 80074CBC 46309100 */ add.d $f4, $f18, $f16 -/* 0758C0 80074CC0 462022A0 */ cvt.s.d $f10, $f4 -/* 0758C4 80074CC4 E60A003C */ swc1 $f10, 0x3c($s0) -.L80074CC8: -/* 0758C8 80074CC8 04C10004 */ bgez $a2, .L80074CDC -/* 0758CC 80074CCC 30C40007 */ andi $a0, $a2, 7 -/* 0758D0 80074CD0 10800002 */ beqz $a0, .L80074CDC -/* 0758D4 80074CD4 00000000 */ nop -/* 0758D8 80074CD8 2484FFF8 */ addiu $a0, $a0, -8 -.L80074CDC: -/* 0758DC 80074CDC 00046080 */ sll $t4, $a0, 2 -/* 0758E0 80074CE0 01846023 */ subu $t4, $t4, $a0 -/* 0758E4 80074CE4 3C19800E */ lui $t9, %hi(D_800E6F48) # $t9, 0x800e -/* 0758E8 80074CE8 25AD6F30 */ addiu $t5, %lo(D_800E6F30) # addiu $t5, $t5, 0x6f30 -/* 0758EC 80074CEC 27396F48 */ addiu $t9, %lo(D_800E6F48) # addiu $t9, $t9, 0x6f48 -/* 0758F0 80074CF0 018D1021 */ addu $v0, $t4, $t5 -/* 0758F4 80074CF4 01991821 */ addu $v1, $t4, $t9 -/* 0758F8 80074CF8 904E0000 */ lbu $t6, ($v0) -/* 0758FC 80074CFC 904F0001 */ lbu $t7, 1($v0) -/* 075900 80074D00 90580002 */ lbu $t8, 2($v0) -/* 075904 80074D04 90680000 */ lbu $t0, ($v1) -/* 075908 80074D08 90690001 */ lbu $t1, 1($v1) -/* 07590C 80074D0C 906A0002 */ lbu $t2, 2($v1) -/* 075910 80074D10 24ABF000 */ addiu $t3, $a1, -0x1000 -/* 075914 80074D14 30CC0001 */ andi $t4, $a2, 1 -/* 075918 80074D18 A60B0090 */ sh $t3, 0x90($s0) -/* 07591C 80074D1C A60E0084 */ sh $t6, 0x84($s0) -/* 075920 80074D20 A60F0086 */ sh $t7, 0x86($s0) -/* 075924 80074D24 A6180088 */ sh $t8, 0x88($s0) -/* 075928 80074D28 A608008A */ sh $t0, 0x8a($s0) -/* 07592C 80074D2C A609008C */ sh $t1, 0x8c($s0) -/* 075930 80074D30 11800008 */ beqz $t4, .L80074D54 -/* 075934 80074D34 A60A008E */ sh $t2, 0x8e($s0) -/* 075938 80074D38 04A10003 */ bgez $a1, .L80074D48 -/* 07593C 80074D3C 00056943 */ sra $t5, $a1, 5 -/* 075940 80074D40 24A1001F */ addiu $at, $a1, 0x1f -/* 075944 80074D44 00016943 */ sra $t5, $at, 5 -.L80074D48: -/* 075948 80074D48 25AE0100 */ addiu $t6, $t5, 0x100 -/* 07594C 80074D4C 10000008 */ b .L80074D70 -/* 075950 80074D50 A60E0092 */ sh $t6, 0x92($s0) -.L80074D54: -/* 075954 80074D54 04A10003 */ bgez $a1, .L80074D64 -/* 075958 80074D58 00057943 */ sra $t7, $a1, 5 -/* 07595C 80074D5C 24A1001F */ addiu $at, $a1, 0x1f -/* 075960 80074D60 00017943 */ sra $t7, $at, 5 -.L80074D64: -/* 075964 80074D64 2418FF00 */ li $t8, -256 -/* 075968 80074D68 030FC823 */ subu $t9, $t8, $t7 -/* 07596C 80074D6C A6190092 */ sh $t9, 0x92($s0) -.L80074D70: -/* 075970 80074D70 240800E6 */ li $t0, 230 -/* 075974 80074D74 A60800A0 */ sh $t0, 0xa0($s0) -/* 075978 80074D78 0C01C922 */ jal func_80072488 -/* 07597C 80074D7C 8FA40030 */ lw $a0, 0x30($sp) -/* 075980 80074D80 8FBF001C */ lw $ra, 0x1c($sp) -/* 075984 80074D84 8FB00018 */ lw $s0, 0x18($sp) -/* 075988 80074D88 27BD0030 */ addiu $sp, $sp, 0x30 -/* 07598C 80074D8C 03E00008 */ jr $ra -/* 075990 80074D90 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80076884.s b/asm/non_matchings/code_80071F00/func_80076884.s deleted file mode 100644 index 53e6b6621..000000000 --- a/asm/non_matchings/code_80071F00/func_80076884.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80076884 -/* 077484 80076884 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 077488 80076888 AFB00014 */ sw $s0, 0x14($sp) -/* 07748C 8007688C 00808025 */ move $s0, $a0 -/* 077490 80076890 AFBF0024 */ sw $ra, 0x24($sp) -/* 077494 80076894 AFB30020 */ sw $s3, 0x20($sp) -/* 077498 80076898 AFB2001C */ sw $s2, 0x1c($sp) -/* 07749C 8007689C AFB10018 */ sw $s1, 0x18($sp) -/* 0774A0 800768A0 0C0ADF8D */ jal random_int -/* 0774A4 800768A4 2404000F */ li $a0, 15 -/* 0774A8 800768A8 12000009 */ beqz $s0, .L800768D0 -/* 0774AC 800768AC 2411FFFF */ li $s1, -1 -/* 0774B0 800768B0 24130001 */ li $s3, 1 -/* 0774B4 800768B4 1213000E */ beq $s0, $s3, .L800768F0 -/* 0774B8 800768B8 0002C880 */ sll $t9, $v0, 2 -/* 0774BC 800768BC 24010002 */ li $at, 2 -/* 0774C0 800768C0 12010011 */ beq $s0, $at, .L80076908 -/* 0774C4 800768C4 00025080 */ sll $t2, $v0, 2 -/* 0774C8 800768C8 10000014 */ b .L8007691C -/* 0774CC 800768CC 8FB20028 */ lw $s2, 0x28($sp) -.L800768D0: -/* 0774D0 800768D0 00027080 */ sll $t6, $v0, 2 -/* 0774D4 800768D4 01C27023 */ subu $t6, $t6, $v0 -/* 0774D8 800768D8 3C18800E */ lui $t8, %hi(D_800E5740) # $t8, 0x800e -/* 0774DC 800768DC 27185740 */ addiu $t8, %lo(D_800E5740) # addiu $t8, $t8, 0x5740 -/* 0774E0 800768E0 000E7840 */ sll $t7, $t6, 1 -/* 0774E4 800768E4 01F89021 */ addu $s2, $t7, $t8 -/* 0774E8 800768E8 1000000C */ b .L8007691C -/* 0774EC 800768EC 24130001 */ li $s3, 1 -.L800768F0: -/* 0774F0 800768F0 0322C823 */ subu $t9, $t9, $v0 -/* 0774F4 800768F4 3C09800E */ lui $t1, %hi(D_800E579C) # $t1, 0x800e -/* 0774F8 800768F8 2529579C */ addiu $t1, %lo(D_800E579C) # addiu $t1, $t1, 0x579c -/* 0774FC 800768FC 00194040 */ sll $t0, $t9, 1 -/* 077500 80076900 10000006 */ b .L8007691C -/* 077504 80076904 01099021 */ addu $s2, $t0, $t1 -.L80076908: -/* 077508 80076908 01425023 */ subu $t2, $t2, $v0 -/* 07750C 8007690C 3C0C800E */ lui $t4, %hi(D_800E57F8) # $t4, 0x800e -/* 077510 80076910 258C57F8 */ addiu $t4, %lo(D_800E57F8) # addiu $t4, $t4, 0x57f8 -/* 077514 80076914 000A5840 */ sll $t3, $t2, 1 -/* 077518 80076918 016C9021 */ addu $s2, $t3, $t4 -.L8007691C: -/* 07751C 8007691C 00008025 */ move $s0, $zero -/* 077520 80076920 02402025 */ move $a0, $s2 -.L80076924: -/* 077524 80076924 0C01DA0A */ jal func_80076828 -/* 077528 80076928 02002825 */ move $a1, $s0 -/* 07752C 8007692C 10510003 */ beq $v0, $s1, .L8007693C -/* 077530 80076930 26100001 */ addiu $s0, $s0, 1 -/* 077534 80076934 5613FFFB */ bnel $s0, $s3, .L80076924 -/* 077538 80076938 02402025 */ move $a0, $s2 -.L8007693C: -/* 07753C 8007693C 8FBF0024 */ lw $ra, 0x24($sp) -/* 077540 80076940 8FB00014 */ lw $s0, 0x14($sp) -/* 077544 80076944 8FB10018 */ lw $s1, 0x18($sp) -/* 077548 80076948 8FB2001C */ lw $s2, 0x1c($sp) -/* 07754C 8007694C 8FB30020 */ lw $s3, 0x20($sp) -/* 077550 80076950 03E00008 */ jr $ra -/* 077554 80076954 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_80076FEC.s b/asm/non_matchings/code_80071F00/func_80076FEC.s deleted file mode 100644 index 7dcb8c6d7..000000000 --- a/asm/non_matchings/code_80071F00/func_80076FEC.s +++ /dev/null @@ -1,73 +0,0 @@ -.section .late_rodata - -glabel D_800EEB18 -.float 0.8 - -.section .text - -glabel func_80076FEC -/* 077BEC 80076FEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 077BF0 80076FF0 AFBF0014 */ sw $ra, 0x14($sp) -/* 077BF4 80076FF4 AFA5001C */ sw $a1, 0x1c($sp) -/* 077BF8 80076FF8 AFA40018 */ sw $a0, 0x18($sp) -/* 077BFC 80076FFC 0C01C8E9 */ jal func_800723A4 -/* 077C00 80077000 24050003 */ li $a1, 3 -/* 077C04 80077004 8FB9001C */ lw $t9, 0x1c($sp) -/* 077C08 80077008 8FA40018 */ lw $a0, 0x18($sp) -/* 077C0C 8007700C 3C0C800E */ lui $t4, %hi(D_800E6788) # $t4, 0x800e -/* 077C10 80077010 00195080 */ sll $t2, $t9, 2 -/* 077C14 80077014 01595023 */ subu $t2, $t2, $t9 -/* 077C18 80077018 000A5840 */ sll $t3, $t2, 1 -/* 077C1C 8007701C 258C6788 */ addiu $t4, %lo(D_800E6788) # addiu $t4, $t4, 0x6788 -/* 077C20 80077020 000470C0 */ sll $t6, $a0, 3 -/* 077C24 80077024 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 077C28 80077028 016C1821 */ addu $v1, $t3, $t4 -/* 077C2C 8007702C 01C47023 */ subu $t6, $t6, $a0 -/* 077C30 80077030 846D0000 */ lh $t5, ($v1) -/* 077C34 80077034 000E7140 */ sll $t6, $t6, 5 -/* 077C38 80077038 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 077C3C 8007703C 3C090D03 */ lui $t1, %hi(D_0D02BC58) # $t1, 0xd03 -/* 077C40 80077040 01CF1021 */ addu $v0, $t6, $t7 -/* 077C44 80077044 2529BC58 */ addiu $t1, %lo(D_0D02BC58) # addiu $t1, $t1, -0x43a8 -/* 077C48 80077048 448D3000 */ mtc1 $t5, $f6 -/* 077C4C 8007704C 2418000B */ li $t8, 11 -/* 077C50 80077050 A05800D5 */ sb $t8, 0xd5($v0) -/* 077C54 80077054 AC490064 */ sw $t1, 0x64($v0) -/* 077C58 80077058 AC49006C */ sw $t1, 0x6c($v0) -/* 077C5C 8007705C 3C01800F */ lui $at, %hi(D_800EEB18) # $at, 0x800f -/* 077C60 80077060 C424EB18 */ lwc1 $f4, %lo(D_800EEB18)($at) -/* 077C64 80077064 46803220 */ cvt.s.w $f8, $f6 -/* 077C68 80077068 846E0002 */ lh $t6, 2($v1) -/* 077C6C 8007706C 846F0004 */ lh $t7, 4($v1) -/* 077C70 80077070 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 077C74 80077074 E4440000 */ swc1 $f4, ($v0) -/* 077C78 80077078 C42AD01C */ lwc1 $f10, %lo(D_8018D01C)($at) -/* 077C7C 8007707C 448E9000 */ mtc1 $t6, $f18 -/* 077C80 80077080 448F3000 */ mtc1 $t7, $f6 -/* 077C84 80077084 460A4402 */ mul.s $f16, $f8, $f10 -/* 077C88 80077088 44800000 */ mtc1 $zero, $f0 -/* 077C8C 8007708C 240800FF */ li $t0, 255 -/* 077C90 80077090 A44800A4 */ sh $t0, 0xa4($v0) -/* 077C94 80077094 A44800A2 */ sh $t0, 0xa2($v0) -/* 077C98 80077098 A44800A0 */ sh $t0, 0xa0($v0) -/* 077C9C 8007709C 46809120 */ cvt.s.w $f4, $f18 -/* 077CA0 800770A0 E4500010 */ swc1 $f16, 0x10($v0) -/* 077CA4 800770A4 00002825 */ move $a1, $zero -/* 077CA8 800770A8 00003025 */ move $a2, $zero -/* 077CAC 800770AC 00003825 */ move $a3, $zero -/* 077CB0 800770B0 46803220 */ cvt.s.w $f8, $f6 -/* 077CB4 800770B4 E4440014 */ swc1 $f4, 0x14($v0) -/* 077CB8 800770B8 E4400034 */ swc1 $f0, 0x34($v0) -/* 077CBC 800770BC 0C022E2F */ jal func_8008B8BC -/* 077CC0 800770C0 E4480018 */ swc1 $f8, 0x18($v0) -/* 077CC4 800770C4 44800000 */ mtc1 $zero, $f0 -/* 077CC8 800770C8 8FA40018 */ lw $a0, 0x18($sp) -/* 077CCC 800770CC 44050000 */ mfc1 $a1, $f0 -/* 077CD0 800770D0 44060000 */ mfc1 $a2, $f0 -/* 077CD4 800770D4 44070000 */ mfc1 $a3, $f0 -/* 077CD8 800770D8 0C022E03 */ jal func_8008B80C -/* 077CDC 800770DC 00000000 */ nop -/* 077CE0 800770E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 077CE4 800770E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 077CE8 800770E8 03E00008 */ jr $ra -/* 077CEC 800770EC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80077138.s b/asm/non_matchings/code_80071F00/func_80077138.s deleted file mode 100644 index 33124dc48..000000000 --- a/asm/non_matchings/code_80071F00/func_80077138.s +++ /dev/null @@ -1,191 +0,0 @@ -.section .late_rodata - -glabel D_800EEB1C -.float 0.05 - -glabel D_800EEB20 -.double 0.01 - -glabel D_800EEB28 -.double 0.01 - -.section .text - -glabel func_80077138 -/* 077D38 80077138 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 077D3C 8007713C AFBF001C */ sw $ra, 0x1c($sp) -/* 077D40 80077140 AFA5003C */ sw $a1, 0x3c($sp) -/* 077D44 80077144 AFB00018 */ sw $s0, 0x18($sp) -/* 077D48 80077148 AFA40038 */ sw $a0, 0x38($sp) -/* 077D4C 8007714C AFA60040 */ sw $a2, 0x40($sp) -/* 077D50 80077150 0C01C8E9 */ jal func_800723A4 -/* 077D54 80077154 00C02825 */ move $a1, $a2 -/* 077D58 80077158 8FA40038 */ lw $a0, 0x38($sp) -/* 077D5C 8007715C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 077D60 80077160 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 077D64 80077164 000470C0 */ sll $t6, $a0, 3 -/* 077D68 80077168 01C47023 */ subu $t6, $t6, $a0 -/* 077D6C 8007716C 000E7140 */ sll $t6, $t6, 5 -/* 077D70 80077170 01CF8021 */ addu $s0, $t6, $t7 -/* 077D74 80077174 2418000C */ li $t8, 12 -/* 077D78 80077178 A21800D5 */ sb $t8, 0xd5($s0) -/* 077D7C 8007717C 3C01800F */ lui $at, %hi(D_800EEB1C) # $at, 0x800f -/* 077D80 80077180 C424EB1C */ lwc1 $f4, %lo(D_800EEB1C)($at) -/* 077D84 80077184 8FA2003C */ lw $v0, 0x3c($sp) -/* 077D88 80077188 E6040000 */ swc1 $f4, ($s0) -/* 077D8C 8007718C 8C470008 */ lw $a3, 8($v0) -/* 077D90 80077190 8C460004 */ lw $a2, 4($v0) -/* 077D94 80077194 0C022DF5 */ jal func_8008B7D4 -/* 077D98 80077198 8C450000 */ lw $a1, ($v0) -/* 077D9C 8007719C 8FA40038 */ lw $a0, 0x38($sp) -/* 077DA0 800771A0 00002825 */ move $a1, $zero -/* 077DA4 800771A4 00003025 */ move $a2, $zero -/* 077DA8 800771A8 0C022E2F */ jal func_8008B8BC -/* 077DAC 800771AC 00003825 */ move $a3, $zero -/* 077DB0 800771B0 44800000 */ mtc1 $zero, $f0 -/* 077DB4 800771B4 8FA40038 */ lw $a0, 0x38($sp) -/* 077DB8 800771B8 44050000 */ mfc1 $a1, $f0 -/* 077DBC 800771BC 44060000 */ mfc1 $a2, $f0 -/* 077DC0 800771C0 44070000 */ mfc1 $a3, $f0 -/* 077DC4 800771C4 0C022E03 */ jal func_8008B80C -/* 077DC8 800771C8 00000000 */ nop -/* 077DCC 800771CC 8FA20040 */ lw $v0, 0x40($sp) -/* 077DD0 800771D0 3C01BF80 */ li $at, 0xBF800000 # -1.000000 -/* 077DD4 800771D4 50400007 */ beql $v0, $zero, .L800771F4 -/* 077DD8 800771D8 44813000 */ mtc1 $at, $f6 -/* 077DDC 800771DC 24010001 */ li $at, 1 -/* 077DE0 800771E0 50410022 */ beql $v0, $at, .L8007726C -/* 077DE4 800771E4 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 077DE8 800771E8 1000003D */ b .L800772E0 -/* 077DEC 800771EC 00000000 */ nop -/* 077DF0 800771F0 44813000 */ mtc1 $at, $f6 -.L800771F4: -/* 077DF4 800771F4 2404004B */ li $a0, 75 -/* 077DF8 800771F8 0C0ADF8D */ jal random_int -/* 077DFC 800771FC E606003C */ swc1 $f6, 0x3c($s0) -/* 077E00 80077200 44824000 */ mtc1 $v0, $f8 -/* 077E04 80077204 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 077E08 80077208 04410005 */ bgez $v0, .L80077220 -/* 077E0C 8007720C 468042A1 */ cvt.d.w $f10, $f8 -/* 077E10 80077210 44818800 */ mtc1 $at, $f17 -/* 077E14 80077214 44808000 */ mtc1 $zero, $f16 -/* 077E18 80077218 00000000 */ nop -/* 077E1C 8007721C 46305280 */ add.d $f10, $f10, $f16 -.L80077220: -/* 077E20 80077220 3C01800F */ lui $at, %hi(D_800EEB20) -/* 077E24 80077224 D432EB20 */ ldc1 $f18, %lo(D_800EEB20)($at) -/* 077E28 80077228 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 -/* 077E2C 8007722C 44813800 */ mtc1 $at, $f7 -/* 077E30 80077230 46325102 */ mul.d $f4, $f10, $f18 -/* 077E34 80077234 44803000 */ mtc1 $zero, $f6 -/* 077E38 80077238 24040040 */ li $a0, 64 -/* 077E3C 8007723C 46262200 */ add.d $f8, $f4, $f6 -/* 077E40 80077240 46204420 */ cvt.s.d $f16, $f8 -/* 077E44 80077244 0C0ADF8D */ jal random_int -/* 077E48 80077248 E6100034 */ swc1 $f16, 0x34($s0) -/* 077E4C 8007724C 0002CA80 */ sll $t9, $v0, 0xa -/* 077E50 80077250 A61900C0 */ sh $t9, 0xc0($s0) -/* 077E54 80077254 0C021D47 */ jal func_8008751C -/* 077E58 80077258 8FA40038 */ lw $a0, 0x38($sp) -/* 077E5C 8007725C 2408001E */ li $t0, 30 -/* 077E60 80077260 1000001F */ b .L800772E0 -/* 077E64 80077264 A608008E */ sh $t0, 0x8e($s0) -/* 077E68 80077268 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -.L8007726C: -/* 077E6C 8007726C 44815000 */ mtc1 $at, $f10 -/* 077E70 80077270 24040064 */ li $a0, 100 -/* 077E74 80077274 0C0ADF8D */ jal random_int -/* 077E78 80077278 E60A003C */ swc1 $f10, 0x3c($s0) -/* 077E7C 8007727C 44829000 */ mtc1 $v0, $f18 -/* 077E80 80077280 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 077E84 80077284 04410005 */ bgez $v0, .L8007729C -/* 077E88 80077288 46809121 */ cvt.d.w $f4, $f18 -/* 077E8C 8007728C 44813800 */ mtc1 $at, $f7 -/* 077E90 80077290 44803000 */ mtc1 $zero, $f6 -/* 077E94 80077294 00000000 */ nop -/* 077E98 80077298 46262100 */ add.d $f4, $f4, $f6 -.L8007729C: -/* 077E9C 8007729C 3C01800F */ lui $at, %hi(D_800EEB28) -/* 077EA0 800772A0 D428EB28 */ ldc1 $f8, %lo(D_800EEB28)($at) -/* 077EA4 800772A4 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 077EA8 800772A8 44815800 */ mtc1 $at, $f11 -/* 077EAC 800772AC 46282402 */ mul.d $f16, $f4, $f8 -/* 077EB0 800772B0 44805000 */ mtc1 $zero, $f10 -/* 077EB4 800772B4 24040040 */ li $a0, 64 -/* 077EB8 800772B8 462A8480 */ add.d $f18, $f16, $f10 -/* 077EBC 800772BC 462091A0 */ cvt.s.d $f6, $f18 -/* 077EC0 800772C0 0C0ADF8D */ jal random_int -/* 077EC4 800772C4 E6060034 */ swc1 $f6, 0x34($s0) -/* 077EC8 800772C8 00024A80 */ sll $t1, $v0, 0xa -/* 077ECC 800772CC A60900C0 */ sh $t1, 0xc0($s0) -/* 077ED0 800772D0 0C021D47 */ jal func_8008751C -/* 077ED4 800772D4 8FA40038 */ lw $a0, 0x38($sp) -/* 077ED8 800772D8 240A0032 */ li $t2, 50 -/* 077EDC 800772DC A60A008E */ sh $t2, 0x8e($s0) -.L800772E0: -/* 077EE0 800772E0 0C0ADF8D */ jal random_int -/* 077EE4 800772E4 2404000C */ li $a0, 12 -/* 077EE8 800772E8 00026600 */ sll $t4, $v0, 0x18 -/* 077EEC 800772EC 00022600 */ sll $a0, $v0, 0x18 -/* 077EF0 800772F0 000C6E03 */ sra $t5, $t4, 0x18 -/* 077EF4 800772F4 00045E03 */ sra $t3, $a0, 0x18 -/* 077EF8 800772F8 29A10009 */ slti $at, $t5, 9 -/* 077EFC 800772FC 1020000D */ beqz $at, .L80077334 -/* 077F00 80077300 01602025 */ move $a0, $t3 -/* 077F04 80077304 27A50034 */ addiu $a1, $sp, 0x34 -/* 077F08 80077308 27A60032 */ addiu $a2, $sp, 0x32 -/* 077F0C 8007730C 0C01719D */ jal func_8005C674 -/* 077F10 80077310 27A70030 */ addiu $a3, $sp, 0x30 -/* 077F14 80077314 87AE0034 */ lh $t6, 0x34($sp) -/* 077F18 80077318 87AF0032 */ lh $t7, 0x32($sp) -/* 077F1C 8007731C 87B80030 */ lh $t8, 0x30($sp) -/* 077F20 80077320 AE000048 */ sw $zero, 0x48($s0) -/* 077F24 80077324 A60E0084 */ sh $t6, 0x84($s0) -/* 077F28 80077328 A60F0086 */ sh $t7, 0x86($s0) -/* 077F2C 8007732C 10000015 */ b .L80077384 -/* 077F30 80077330 A6180088 */ sh $t8, 0x88($s0) -.L80077334: -/* 077F34 80077334 0C0ADF8D */ jal random_int -/* 077F38 80077338 24040003 */ li $a0, 3 -/* 077F3C 8007733C 00022600 */ sll $a0, $v0, 0x18 -/* 077F40 80077340 0004CE03 */ sra $t9, $a0, 0x18 -/* 077F44 80077344 A3A20037 */ sb $v0, 0x37($sp) -/* 077F48 80077348 03202025 */ move $a0, $t9 -/* 077F4C 8007734C 27A50034 */ addiu $a1, $sp, 0x34 -/* 077F50 80077350 27A60032 */ addiu $a2, $sp, 0x32 -/* 077F54 80077354 0C0171AD */ jal func_8005C6B4 -/* 077F58 80077358 27A70030 */ addiu $a3, $sp, 0x30 -/* 077F5C 8007735C 87A80034 */ lh $t0, 0x34($sp) -/* 077F60 80077360 87A90032 */ lh $t1, 0x32($sp) -/* 077F64 80077364 87AA0030 */ lh $t2, 0x30($sp) -/* 077F68 80077368 83AB0037 */ lb $t3, 0x37($sp) -/* 077F6C 8007736C 240C0001 */ li $t4, 1 -/* 077F70 80077370 AE0C0048 */ sw $t4, 0x48($s0) -/* 077F74 80077374 A6080084 */ sh $t0, 0x84($s0) -/* 077F78 80077378 A6090086 */ sh $t1, 0x86($s0) -/* 077F7C 8007737C A60A0088 */ sh $t2, 0x88($s0) -/* 077F80 80077380 A60B008C */ sh $t3, 0x8c($s0) -.L80077384: -/* 077F84 80077384 240D00FF */ li $t5, 255 -/* 077F88 80077388 A60D00A0 */ sh $t5, 0xa0($s0) -/* 077F8C 8007738C 0C0ADF8D */ jal random_int -/* 077F90 80077390 24040800 */ li $a0, 2048 -/* 077F94 80077394 960300C0 */ lhu $v1, 0xc0($s0) -/* 077F98 80077398 244E0400 */ addiu $t6, $v0, 0x400 -/* 077F9C 8007739C A60E008A */ sh $t6, 0x8a($s0) -/* 077FA0 800773A0 28613000 */ slti $at, $v1, 0x3000 -/* 077FA4 800773A4 14200004 */ bnez $at, .L800773B8 -/* 077FA8 800773A8 3401B001 */ li $at, 45057 -/* 077FAC 800773AC 0061082A */ slt $at, $v1, $at -/* 077FB0 800773B0 54200005 */ bnel $at, $zero, .L800773C8 -/* 077FB4 800773B4 8FBF001C */ lw $ra, 0x1c($sp) -.L800773B8: -/* 077FB8 800773B8 860F008A */ lh $t7, 0x8a($s0) -/* 077FBC 800773BC 000FC023 */ negu $t8, $t7 -/* 077FC0 800773C0 A618008A */ sh $t8, 0x8a($s0) -/* 077FC4 800773C4 8FBF001C */ lw $ra, 0x1c($sp) -.L800773C8: -/* 077FC8 800773C8 8FB00018 */ lw $s0, 0x18($sp) -/* 077FCC 800773CC 27BD0038 */ addiu $sp, $sp, 0x38 -/* 077FD0 800773D0 03E00008 */ jr $ra -/* 077FD4 800773D4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80077EB8.s b/asm/non_matchings/code_80071F00/func_80077EB8.s deleted file mode 100644 index 32fcf9820..000000000 --- a/asm/non_matchings/code_80071F00/func_80077EB8.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80077EB8 -/* 078AB8 80077EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 078ABC 80077EBC AFBF0014 */ sw $ra, 0x14($sp) -/* 078AC0 80077EC0 AFA5001C */ sw $a1, 0x1c($sp) -/* 078AC4 80077EC4 84CF0026 */ lh $t7, 0x26($a2) -/* 078AC8 80077EC8 3C088019 */ lui $t0, %hi(D_8018D210) # $t0, 0x8019 -/* 078ACC 80077ECC 8508D210 */ lh $t0, %lo(D_8018D210)($t0) -/* 078AD0 80077ED0 01E51023 */ subu $v0, $t7, $a1 -/* 078AD4 80077ED4 0002C400 */ sll $t8, $v0, 0x10 -/* 078AD8 80077ED8 0018CC03 */ sra $t9, $t8, 0x10 -/* 078ADC 80077EDC 0328082A */ slt $at, $t9, $t0 -/* 078AE0 80077EE0 10200006 */ beqz $at, .L80077EFC -/* 078AE4 80077EE4 03201025 */ move $v0, $t9 -/* 078AE8 80077EE8 3C098019 */ lui $t1, %hi(D_8018D208) # $t1, 0x8019 -/* 078AEC 80077EEC 8529D208 */ lh $t1, %lo(D_8018D208)($t1) -/* 078AF0 80077EF0 0139082A */ slt $at, $t1, $t9 -/* 078AF4 80077EF4 14200015 */ bnez $at, .L80077F4C -/* 078AF8 80077EF8 00000000 */ nop -.L80077EFC: -/* 078AFC 80077EFC 44823000 */ mtc1 $v0, $f6 -/* 078B00 80077F00 3C0A8019 */ lui $t2, %hi(D_8018D218) # $t2, 0x8019 -/* 078B04 80077F04 854AD218 */ lh $t2, %lo(D_8018D218)($t2) -/* 078B08 80077F08 46803220 */ cvt.s.w $f8, $f6 -/* 078B0C 80077F0C 3C018019 */ lui $at, %hi(D_8018D1E8) # $at, 0x8019 -/* 078B10 80077F10 C424D1E8 */ lwc1 $f4, %lo(D_8018D1E8)($at) -/* 078B14 80077F14 448A8000 */ mtc1 $t2, $f16 -/* 078B18 80077F18 000458C0 */ sll $t3, $a0, 3 -/* 078B1C 80077F1C 01645823 */ subu $t3, $t3, $a0 -/* 078B20 80077F20 46082282 */ mul.s $f10, $f4, $f8 -/* 078B24 80077F24 000B5940 */ sll $t3, $t3, 5 -/* 078B28 80077F28 3C018016 */ lui $at, %hi(D_80165C40) -/* 078B2C 80077F2C 002B0821 */ addu $at, $at, $t3 -/* 078B30 80077F30 24050010 */ li $a1, 16 -/* 078B34 80077F34 468084A0 */ cvt.s.w $f18, $f16 -/* 078B38 80077F38 460A9180 */ add.s $f6, $f18, $f10 -/* 078B3C 80077F3C 0C01C870 */ jal func_800721C0 -/* 078B40 80077F40 E4265C40 */ swc1 $f6, %lo(D_80165C40)($at) -/* 078B44 80077F44 10000004 */ b .L80077F58 -/* 078B48 80077F48 8FBF0014 */ lw $ra, 0x14($sp) -.L80077F4C: -/* 078B4C 80077F4C 0C01C87A */ jal func_800721E8 -/* 078B50 80077F50 24050010 */ li $a1, 16 -/* 078B54 80077F54 8FBF0014 */ lw $ra, 0x14($sp) -.L80077F58: -/* 078B58 80077F58 27BD0018 */ addiu $sp, $sp, 0x18 -/* 078B5C 80077F5C 03E00008 */ jr $ra -/* 078B60 80077F60 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80077F64.s b/asm/non_matchings/code_80071F00/func_80077F64.s deleted file mode 100644 index 3d6abfe8f..000000000 --- a/asm/non_matchings/code_80071F00/func_80077F64.s +++ /dev/null @@ -1,104 +0,0 @@ -.section .late_rodata - -glabel D_800EEB40 -.double 0.01 - -.section .text - -glabel func_80077F64 -/* 078B64 80077F64 000470C0 */ sll $t6, $a0, 3 -/* 078B68 80077F68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 078B6C 80077F6C 01C47023 */ subu $t6, $t6, $a0 -/* 078B70 80077F70 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 078B74 80077F74 AFB00014 */ sw $s0, 0x14($sp) -/* 078B78 80077F78 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 078B7C 80077F7C 000E7140 */ sll $t6, $t6, 5 -/* 078B80 80077F80 01CF8021 */ addu $s0, $t6, $t7 -/* 078B84 80077F84 860200AE */ lh $v0, 0xae($s0) -/* 078B88 80077F88 AFB10018 */ sw $s1, 0x18($sp) -/* 078B8C 80077F8C 00808825 */ move $s1, $a0 -/* 078B90 80077F90 AFBF001C */ sw $ra, 0x1c($sp) -/* 078B94 80077F94 10400048 */ beqz $v0, .L800780B8 -/* 078B98 80077F98 00A03825 */ move $a3, $a1 -/* 078B9C 80077F9C 24010001 */ li $at, 1 -/* 078BA0 80077FA0 10410009 */ beq $v0, $at, .L80077FC8 -/* 078BA4 80077FA4 24044000 */ li $a0, 16384 -/* 078BA8 80077FA8 24010002 */ li $at, 2 -/* 078BAC 80077FAC 1041002D */ beq $v0, $at, .L80078064 -/* 078BB0 80077FB0 02202025 */ move $a0, $s1 -/* 078BB4 80077FB4 24010003 */ li $at, 3 -/* 078BB8 80077FB8 1041003D */ beq $v0, $at, .L800780B0 -/* 078BBC 80077FBC 00000000 */ nop -/* 078BC0 80077FC0 1000003E */ b .L800780BC -/* 078BC4 80077FC4 8FBF001C */ lw $ra, 0x1c($sp) -.L80077FC8: -/* 078BC8 80077FC8 0C0ADF8D */ jal random_int -/* 078BCC 80077FCC AFA70024 */ sw $a3, 0x24($sp) -/* 078BD0 80077FD0 8FA70024 */ lw $a3, 0x24($sp) -/* 078BD4 80077FD4 02202025 */ move $a0, $s1 -/* 078BD8 80077FD8 240500B4 */ li $a1, 180 -/* 078BDC 80077FDC 84F80026 */ lh $t8, 0x26($a3) -/* 078BE0 80077FE0 24060014 */ li $a2, 20 -/* 078BE4 80077FE4 0058C821 */ addu $t9, $v0, $t8 -/* 078BE8 80077FE8 2728E000 */ addiu $t0, $t9, -0x2000 -/* 078BEC 80077FEC 0C022EAD */ jal func_8008BAB4 -/* 078BF0 80077FF0 A60800C0 */ sh $t0, 0xc0($s0) -/* 078BF4 80077FF4 0C0ADF8D */ jal random_int -/* 078BF8 80077FF8 24040064 */ li $a0, 100 -/* 078BFC 80077FFC 44822000 */ mtc1 $v0, $f4 -/* 078C00 80078000 44800000 */ mtc1 $zero, $f0 -/* 078C04 80078004 04410006 */ bgez $v0, .L80078020 -/* 078C08 80078008 468021A1 */ cvt.d.w $f6, $f4 -/* 078C0C 8007800C 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 078C10 80078010 44814800 */ mtc1 $at, $f9 -/* 078C14 80078014 44804000 */ mtc1 $zero, $f8 -/* 078C18 80078018 00000000 */ nop -/* 078C1C 8007801C 46283180 */ add.d $f6, $f6, $f8 -.L80078020: -/* 078C20 80078020 3C01800F */ lui $at, %hi(D_800EEB40) -/* 078C24 80078024 D42AEB40 */ ldc1 $f10, %lo(D_800EEB40)($at) -/* 078C28 80078028 3C01BFE8 */ li $at, 0xBFE80000 # -1.812500 -/* 078C2C 8007802C 44814800 */ mtc1 $at, $f9 -/* 078C30 80078030 462A3402 */ mul.d $f16, $f6, $f10 -/* 078C34 80078034 44804000 */ mtc1 $zero, $f8 -/* 078C38 80078038 E6000028 */ swc1 $f0, 0x28($s0) -/* 078C3C 8007803C E600002C */ swc1 $f0, 0x2c($s0) -/* 078C40 80078040 02202025 */ move $a0, $s1 -/* 078C44 80078044 462084A0 */ cvt.s.d $f18, $f16 -/* 078C48 80078048 46009121 */ cvt.d.s $f4, $f18 -/* 078C4C 8007804C 46244181 */ sub.d $f6, $f8, $f4 -/* 078C50 80078050 462032A0 */ cvt.s.d $f10, $f6 -/* 078C54 80078054 0C021BF5 */ jal func_80086FD4 -/* 078C58 80078058 E60A003C */ swc1 $f10, 0x3c($s0) -/* 078C5C 8007805C 10000017 */ b .L800780BC -/* 078C60 80078060 8FBF001C */ lw $ra, 0x1c($sp) -.L80078064: -/* 078C64 80078064 960500C0 */ lhu $a1, 0xc0($s0) -/* 078C68 80078068 0C01DFAE */ jal func_80077EB8 -/* 078C6C 8007806C 00E03025 */ move $a2, $a3 -/* 078C70 80078070 0C021DF1 */ jal func_800877C4 -/* 078C74 80078074 02202025 */ move $a0, $s1 -/* 078C78 80078078 0C022FC6 */ jal func_8008BF18 -/* 078C7C 8007807C 02202025 */ move $a0, $s1 -/* 078C80 80078080 0C022FF0 */ jal func_8008BFC0 -/* 078C84 80078084 02202025 */ move $a0, $s1 -/* 078C88 80078088 44800000 */ mtc1 $zero, $f0 -/* 078C8C 8007808C C6100008 */ lwc1 $f16, 8($s0) -/* 078C90 80078090 4600803E */ c.le.s $f16, $f0 -/* 078C94 80078094 00000000 */ nop -/* 078C98 80078098 45020008 */ bc1fl .L800780BC -/* 078C9C 8007809C 8FBF001C */ lw $ra, 0x1c($sp) -/* 078CA0 800780A0 0C021BF5 */ jal func_80086FD4 -/* 078CA4 800780A4 02202025 */ move $a0, $s1 -/* 078CA8 800780A8 10000004 */ b .L800780BC -/* 078CAC 800780AC 8FBF001C */ lw $ra, 0x1c($sp) -.L800780B0: -/* 078CB0 800780B0 0C021BD8 */ jal func_80086F60 -/* 078CB4 800780B4 02202025 */ move $a0, $s1 -.L800780B8: -/* 078CB8 800780B8 8FBF001C */ lw $ra, 0x1c($sp) -.L800780BC: -/* 078CBC 800780BC 8FB00014 */ lw $s0, 0x14($sp) -/* 078CC0 800780C0 8FB10018 */ lw $s1, 0x18($sp) -/* 078CC4 800780C4 03E00008 */ jr $ra -/* 078CC8 800780C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80071F00/func_800780CC.s b/asm/non_matchings/code_80071F00/func_800780CC.s deleted file mode 100644 index c204cd6b6..000000000 --- a/asm/non_matchings/code_80071F00/func_800780CC.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_800780CC -/* 078CCC 800780CC 000470C0 */ sll $t6, $a0, 3 -/* 078CD0 800780D0 01C47023 */ subu $t6, $t6, $a0 -/* 078CD4 800780D4 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 078CD8 800780D8 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 078CDC 800780DC 000E7140 */ sll $t6, $t6, 5 -/* 078CE0 800780E0 01CF1821 */ addu $v1, $t6, $t7 -/* 078CE4 800780E4 846200A6 */ lh $v0, 0xa6($v1) -/* 078CE8 800780E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 078CEC 800780EC AFBF0014 */ sw $ra, 0x14($sp) -/* 078CF0 800780F0 1040001B */ beqz $v0, .L80078160 -/* 078CF4 800780F4 24010001 */ li $at, 1 -/* 078CF8 800780F8 10410007 */ beq $v0, $at, .L80078118 -/* 078CFC 800780FC 24010002 */ li $at, 2 -/* 078D00 80078100 10410009 */ beq $v0, $at, .L80078128 -/* 078D04 80078104 24010003 */ li $at, 3 -/* 078D08 80078108 10410013 */ beq $v0, $at, .L80078158 -/* 078D0C 8007810C 00000000 */ nop -/* 078D10 80078110 10000014 */ b .L80078164 -/* 078D14 80078114 8FBF0014 */ lw $ra, 0x14($sp) -.L80078118: -/* 078D18 80078118 0C01DF88 */ jal func_80077E20 -/* 078D1C 8007811C 00000000 */ nop -/* 078D20 80078120 10000010 */ b .L80078164 -/* 078D24 80078124 8FBF0014 */ lw $ra, 0x14($sp) -.L80078128: -/* 078D28 80078128 AFA30018 */ sw $v1, 0x18($sp) -/* 078D2C 8007812C 0C01DFD9 */ jal func_80077F64 -/* 078D30 80078130 AFA40020 */ sw $a0, 0x20($sp) -/* 078D34 80078134 8FA30018 */ lw $v1, 0x18($sp) -/* 078D38 80078138 8FA40020 */ lw $a0, 0x20($sp) -/* 078D3C 8007813C 847800AE */ lh $t8, 0xae($v1) -/* 078D40 80078140 57000008 */ bnel $t8, $zero, .L80078164 -/* 078D44 80078144 8FBF0014 */ lw $ra, 0x14($sp) -/* 078D48 80078148 0C01C922 */ jal func_80072488 -/* 078D4C 8007814C 00000000 */ nop -/* 078D50 80078150 10000004 */ b .L80078164 -/* 078D54 80078154 8FBF0014 */ lw $ra, 0x14($sp) -.L80078158: -/* 078D58 80078158 0C01C90A */ jal func_80072428 -/* 078D5C 8007815C 00000000 */ nop -.L80078160: -/* 078D60 80078160 8FBF0014 */ lw $ra, 0x14($sp) -.L80078164: -/* 078D64 80078164 27BD0020 */ addiu $sp, $sp, 0x20 -/* 078D68 80078168 03E00008 */ jr $ra -/* 078D6C 8007816C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80078170.s b/asm/non_matchings/code_80071F00/func_80078170.s deleted file mode 100644 index 9a361c0f5..000000000 --- a/asm/non_matchings/code_80071F00/func_80078170.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80078170 -/* 078D70 80078170 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 078D74 80078174 AFBF002C */ sw $ra, 0x2c($sp) -/* 078D78 80078178 AFB40028 */ sw $s4, 0x28($sp) -/* 078D7C 8007817C AFB20020 */ sw $s2, 0x20($sp) -/* 078D80 80078180 00809025 */ move $s2, $a0 -/* 078D84 80078184 00A0A025 */ move $s4, $a1 -/* 078D88 80078188 AFB30024 */ sw $s3, 0x24($sp) -/* 078D8C 8007818C AFB1001C */ sw $s1, 0x1c($sp) -/* 078D90 80078190 0C01DF57 */ jal func_80077D5C -/* 078D94 80078194 AFB00018 */ sw $s0, 0x18($sp) -/* 078D98 80078198 3C028019 */ lui $v0, %hi(D_8018D1F0) # $v0, 0x8019 -/* 078D9C 8007819C 8C42D1F0 */ lw $v0, %lo(D_8018D1F0)($v0) -/* 078DA0 800781A0 00008825 */ move $s1, $zero -/* 078DA4 800781A4 00127080 */ sll $t6, $s2, 2 -/* 078DA8 800781A8 18400015 */ blez $v0, .L80078200 -/* 078DAC 800781AC 3C0F8019 */ lui $t7, %hi(D_8018CC80) # $t7, 0x8019 -/* 078DB0 800781B0 25EFCC80 */ addiu $t7, %lo(D_8018CC80) # addiu $t7, $t7, -0x3380 -/* 078DB4 800781B4 3C128016 */ lui $s2, %hi(D_80165C18) # $s2, 0x8016 -/* 078DB8 800781B8 26525C18 */ addiu $s2, %lo(D_80165C18) # addiu $s2, $s2, 0x5c18 -/* 078DBC 800781BC 01CF8021 */ addu $s0, $t6, $t7 -/* 078DC0 800781C0 241300E0 */ li $s3, 224 -.L800781C4: -/* 078DC4 800781C4 8E040000 */ lw $a0, ($s0) -/* 078DC8 800781C8 00930019 */ multu $a0, $s3 -/* 078DCC 800781CC 0000C012 */ mflo $t8 -/* 078DD0 800781D0 0258C821 */ addu $t9, $s2, $t8 -/* 078DD4 800781D4 872800A6 */ lh $t0, 0xa6($t9) -/* 078DD8 800781D8 51000006 */ beql $t0, $zero, .L800781F4 -/* 078DDC 800781DC 26310001 */ addiu $s1, $s1, 1 -/* 078DE0 800781E0 0C01E033 */ jal func_800780CC -/* 078DE4 800781E4 02802825 */ move $a1, $s4 -/* 078DE8 800781E8 3C028019 */ lui $v0, %hi(D_8018D1F0) # $v0, 0x8019 -/* 078DEC 800781EC 8C42D1F0 */ lw $v0, %lo(D_8018D1F0)($v0) -/* 078DF0 800781F0 26310001 */ addiu $s1, $s1, 1 -.L800781F4: -/* 078DF4 800781F4 0222082A */ slt $at, $s1, $v0 -/* 078DF8 800781F8 1420FFF2 */ bnez $at, .L800781C4 -/* 078DFC 800781FC 26100004 */ addiu $s0, $s0, 4 -.L80078200: -/* 078E00 80078200 8FBF002C */ lw $ra, 0x2c($sp) -/* 078E04 80078204 8FB00018 */ lw $s0, 0x18($sp) -/* 078E08 80078208 8FB1001C */ lw $s1, 0x1c($sp) -/* 078E0C 8007820C 8FB20020 */ lw $s2, 0x20($sp) -/* 078E10 80078210 8FB30024 */ lw $s3, 0x24($sp) -/* 078E14 80078214 8FB40028 */ lw $s4, 0x28($sp) -/* 078E18 80078218 03E00008 */ jr $ra -/* 078E1C 8007821C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_800788F8.s b/asm/non_matchings/code_80071F00/func_800788F8.s deleted file mode 100644 index eb70a42a1..000000000 --- a/asm/non_matchings/code_80071F00/func_800788F8.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_800788F8 -/* 0794F8 800788F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0794FC 800788FC AFBF0014 */ sw $ra, 0x14($sp) -/* 079500 80078900 AFA5001C */ sw $a1, 0x1c($sp) -/* 079504 80078904 84CF0026 */ lh $t7, 0x26($a2) -/* 079508 80078908 3C088019 */ lui $t0, %hi(D_8018D210) # $t0, 0x8019 -/* 07950C 8007890C 8508D210 */ lh $t0, %lo(D_8018D210)($t0) -/* 079510 80078910 01E51021 */ addu $v0, $t7, $a1 -/* 079514 80078914 0002C400 */ sll $t8, $v0, 0x10 -/* 079518 80078918 0018CC03 */ sra $t9, $t8, 0x10 -/* 07951C 8007891C 0328082A */ slt $at, $t9, $t0 -/* 079520 80078920 1420001C */ bnez $at, .L80078994 -/* 079524 80078924 03201025 */ move $v0, $t9 -/* 079528 80078928 3C098019 */ lui $t1, %hi(D_8018D208) # $t1, 0x8019 -/* 07952C 8007892C 8529D208 */ lh $t1, %lo(D_8018D208)($t1) -/* 079530 80078930 3C0A8019 */ lui $t2, %hi(D_8018D218) # $t2, 0x8019 -/* 079534 80078934 0139082A */ slt $at, $t1, $t9 -/* 079538 80078938 14200016 */ bnez $at, .L80078994 -/* 07953C 8007893C 00000000 */ nop -/* 079540 80078940 44823000 */ mtc1 $v0, $f6 -/* 079544 80078944 854AD218 */ lh $t2, %lo(D_8018D218)($t2) -/* 079548 80078948 3C018019 */ lui $at, %hi(D_8018D1E8) # $at, 0x8019 -/* 07954C 8007894C 46803220 */ cvt.s.w $f8, $f6 -/* 079550 80078950 C424D1E8 */ lwc1 $f4, %lo(D_8018D1E8)($at) -/* 079554 80078954 448A8000 */ mtc1 $t2, $f16 -/* 079558 80078958 000468C0 */ sll $t5, $a0, 3 -/* 07955C 8007895C 01A46823 */ subu $t5, $t5, $a0 -/* 079560 80078960 468084A0 */ cvt.s.w $f18, $f16 -/* 079564 80078964 46082282 */ mul.s $f10, $f4, $f8 -/* 079568 80078968 000D6940 */ sll $t5, $t5, 5 -/* 07956C 8007896C 3C018016 */ lui $at, %hi(D_80165CB4) # 0x8016 -/* 079570 80078970 002D0821 */ addu $at, $at, $t5 -/* 079574 80078974 24050010 */ li $a1, 16 -/* 079578 80078978 460A9180 */ add.s $f6, $f18, $f10 -/* 07957C 8007897C 4600310D */ trunc.w.s $f4, $f6 -/* 079580 80078980 440C2000 */ mfc1 $t4, $f4 -/* 079584 80078984 0C01C870 */ jal func_800721C0 -/* 079588 80078988 A42C5CB4 */ sh $t4, %lo(D_80165CB4)($at) # 0x5cb4($at) -/* 07958C 8007898C 10000004 */ b .L800789A0 -/* 079590 80078990 8FBF0014 */ lw $ra, 0x14($sp) -.L80078994: -/* 079594 80078994 0C01C87A */ jal func_800721E8 -/* 079598 80078998 24050010 */ li $a1, 16 -/* 07959C 8007899C 8FBF0014 */ lw $ra, 0x14($sp) -.L800789A0: -/* 0795A0 800789A0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0795A4 800789A4 03E00008 */ jr $ra -/* 0795A8 800789A8 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80078A44.s b/asm/non_matchings/code_80071F00/func_80078A44.s deleted file mode 100644 index cb2895d16..000000000 --- a/asm/non_matchings/code_80071F00/func_80078A44.s +++ /dev/null @@ -1,156 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEB88 -.word L80078AFC, L80078B38, L80078B74, L80078BB0 -.word L80078BEC - -.section .text - -glabel func_80078A44 -/* 079644 80078A44 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 079648 80078A48 AFBE0048 */ sw $fp, 0x48($sp) -/* 07964C 80078A4C 3C1E8019 */ lui $fp, %hi(D_8018D1F0) # $fp, 0x8019 -/* 079650 80078A50 27DED1F0 */ addiu $fp, %lo(D_8018D1F0) # addiu $fp, $fp, -0x2e10 -/* 079654 80078A54 8FCE0000 */ lw $t6, ($fp) -/* 079658 80078A58 AFB70044 */ sw $s7, 0x44($sp) -/* 07965C 80078A5C AFB60040 */ sw $s6, 0x40($sp) -/* 079660 80078A60 AFB30034 */ sw $s3, 0x34($sp) -/* 079664 80078A64 00C0B025 */ move $s6, $a2 -/* 079668 80078A68 00A0B825 */ move $s7, $a1 -/* 07966C 80078A6C AFBF004C */ sw $ra, 0x4c($sp) -/* 079670 80078A70 AFB5003C */ sw $s5, 0x3c($sp) -/* 079674 80078A74 AFB40038 */ sw $s4, 0x38($sp) -/* 079678 80078A78 AFB20030 */ sw $s2, 0x30($sp) -/* 07967C 80078A7C AFB1002C */ sw $s1, 0x2c($sp) -/* 079680 80078A80 AFB00028 */ sw $s0, 0x28($sp) -/* 079684 80078A84 19C0006C */ blez $t6, .L80078C38 -/* 079688 80078A88 00009825 */ move $s3, $zero -/* 07968C 80078A8C 3C188019 */ lui $t8, %hi(D_8018CC80) # $t8, 0x8019 -/* 079690 80078A90 2718CC80 */ addiu $t8, %lo(D_8018CC80) # addiu $t8, $t8, -0x3380 -/* 079694 80078A94 00047880 */ sll $t7, $a0, 2 -/* 079698 80078A98 3C118016 */ lui $s1, %hi(D_80165C18) # $s1, 0x8016 -/* 07969C 80078A9C 26315C18 */ addiu $s1, %lo(D_80165C18) # addiu $s1, $s1, 0x5c18 -/* 0796A0 80078AA0 01F8A021 */ addu $s4, $t7, $t8 -/* 0796A4 80078AA4 24150005 */ li $s5, 5 -/* 0796A8 80078AA8 241200E0 */ li $s2, 224 -/* 0796AC 80078AAC 8E900000 */ lw $s0, ($s4) -.L80078AB0: -/* 0796B0 80078AB0 0013C8C0 */ sll $t9, $s3, 3 -/* 0796B4 80078AB4 03364021 */ addu $t0, $t9, $s6 -/* 0796B8 80078AB8 95050000 */ lhu $a1, ($t0) -/* 0796BC 80078ABC 02E03025 */ move $a2, $s7 -/* 0796C0 80078AC0 0C01E23E */ jal func_800788F8 -/* 0796C4 80078AC4 02002025 */ move $a0, $s0 -/* 0796C8 80078AC8 0275001B */ divu $zero, $s3, $s5 -/* 0796CC 80078ACC 00004810 */ mfhi $t1 -/* 0796D0 80078AD0 2D210005 */ sltiu $at, $t1, 5 -/* 0796D4 80078AD4 16A00002 */ bnez $s5, .L80078AE0 -/* 0796D8 80078AD8 00000000 */ nop -/* 0796DC 80078ADC 0007000D */ break 7 -.L80078AE0: -/* 0796E0 80078AE0 00094880 */ sll $t1, $t1, 2 -/* 0796E4 80078AE4 1020004E */ beqz $at, .L80078C20 -/* 0796E8 80078AE8 3C01800F */ lui $at, %hi(jpt_800EEB88) -/* 0796EC 80078AEC 00290821 */ addu $at, $at, $t1 -/* 0796F0 80078AF0 8C29EB88 */ lw $t1, %lo(jpt_800EEB88)($at) -/* 0796F4 80078AF4 01200008 */ jr $t1 -/* 0796F8 80078AF8 00000000 */ nop -glabel L80078AFC -/* 0796FC 80078AFC 02120019 */ multu $s0, $s2 -/* 079700 80078B00 240B00FF */ li $t3, 255 -/* 079704 80078B04 240CFFFF */ li $t4, -1 -/* 079708 80078B08 AFAC0018 */ sw $t4, 0x18($sp) -/* 07970C 80078B0C AFAB0010 */ sw $t3, 0x10($sp) -/* 079710 80078B10 02002025 */ move $a0, $s0 -/* 079714 80078B14 24060028 */ li $a2, 40 -/* 079718 80078B18 240700B4 */ li $a3, 180 -/* 07971C 80078B1C AFA00014 */ sw $zero, 0x14($sp) -/* 079720 80078B20 00005012 */ mflo $t2 -/* 079724 80078B24 022A2821 */ addu $a1, $s1, $t2 -/* 079728 80078B28 0C01CF2C */ jal func_80073CB0 -/* 07972C 80078B2C 24A500A0 */ addiu $a1, $a1, 0xa0 -/* 079730 80078B30 1000003C */ b .L80078C24 -/* 079734 80078B34 8FCF0000 */ lw $t7, ($fp) -glabel L80078B38 -/* 079738 80078B38 02120019 */ multu $s0, $s2 -/* 07973C 80078B3C 240E00FF */ li $t6, 255 -/* 079740 80078B40 240FFFFF */ li $t7, -1 -/* 079744 80078B44 AFAF0018 */ sw $t7, 0x18($sp) -/* 079748 80078B48 AFAE0010 */ sw $t6, 0x10($sp) -/* 07974C 80078B4C 02002025 */ move $a0, $s0 -/* 079750 80078B50 24060080 */ li $a2, 128 -/* 079754 80078B54 240700FF */ li $a3, 255 -/* 079758 80078B58 AFA00014 */ sw $zero, 0x14($sp) -/* 07975C 80078B5C 00006812 */ mflo $t5 -/* 079760 80078B60 022D2821 */ addu $a1, $s1, $t5 -/* 079764 80078B64 0C01CF2C */ jal func_80073CB0 -/* 079768 80078B68 24A500A0 */ addiu $a1, $a1, 0xa0 -/* 07976C 80078B6C 1000002D */ b .L80078C24 -/* 079770 80078B70 8FCF0000 */ lw $t7, ($fp) -glabel L80078B74 -/* 079774 80078B74 02120019 */ multu $s0, $s2 -/* 079778 80078B78 241900FF */ li $t9, 255 -/* 07977C 80078B7C 2408FFFF */ li $t0, -1 -/* 079780 80078B80 AFA80018 */ sw $t0, 0x18($sp) -/* 079784 80078B84 AFB90010 */ sw $t9, 0x10($sp) -/* 079788 80078B88 02002025 */ move $a0, $s0 -/* 07978C 80078B8C 24060050 */ li $a2, 80 -/* 079790 80078B90 240700C8 */ li $a3, 200 -/* 079794 80078B94 AFA00014 */ sw $zero, 0x14($sp) -/* 079798 80078B98 0000C012 */ mflo $t8 -/* 07979C 80078B9C 02382821 */ addu $a1, $s1, $t8 -/* 0797A0 80078BA0 0C01CF2C */ jal func_80073CB0 -/* 0797A4 80078BA4 24A500A0 */ addiu $a1, $a1, 0xa0 -/* 0797A8 80078BA8 1000001E */ b .L80078C24 -/* 0797AC 80078BAC 8FCF0000 */ lw $t7, ($fp) -glabel L80078BB0 -/* 0797B0 80078BB0 02120019 */ multu $s0, $s2 -/* 0797B4 80078BB4 240A00FF */ li $t2, 255 -/* 0797B8 80078BB8 240BFFFF */ li $t3, -1 -/* 0797BC 80078BBC AFAB0018 */ sw $t3, 0x18($sp) -/* 0797C0 80078BC0 AFAA0010 */ sw $t2, 0x10($sp) -/* 0797C4 80078BC4 02002025 */ move $a0, $s0 -/* 0797C8 80078BC8 00003025 */ move $a2, $zero -/* 0797CC 80078BCC 2407009B */ li $a3, 155 -/* 0797D0 80078BD0 AFA00014 */ sw $zero, 0x14($sp) -/* 0797D4 80078BD4 00004812 */ mflo $t1 -/* 0797D8 80078BD8 02292821 */ addu $a1, $s1, $t1 -/* 0797DC 80078BDC 0C01CF2C */ jal func_80073CB0 -/* 0797E0 80078BE0 24A500A0 */ addiu $a1, $a1, 0xa0 -/* 0797E4 80078BE4 1000000F */ b .L80078C24 -/* 0797E8 80078BE8 8FCF0000 */ lw $t7, ($fp) -glabel L80078BEC -/* 0797EC 80078BEC 02120019 */ multu $s0, $s2 -/* 0797F0 80078BF0 240D00FF */ li $t5, 255 -/* 0797F4 80078BF4 240EFFFF */ li $t6, -1 -/* 0797F8 80078BF8 AFAE0018 */ sw $t6, 0x18($sp) -/* 0797FC 80078BFC AFAD0010 */ sw $t5, 0x10($sp) -/* 079800 80078C00 02002025 */ move $a0, $s0 -/* 079804 80078C04 2406005A */ li $a2, 90 -/* 079808 80078C08 24070080 */ li $a3, 128 -/* 07980C 80078C0C AFA00014 */ sw $zero, 0x14($sp) -/* 079810 80078C10 00006012 */ mflo $t4 -/* 079814 80078C14 022C2821 */ addu $a1, $s1, $t4 -/* 079818 80078C18 0C01CF2C */ jal func_80073CB0 -/* 07981C 80078C1C 24A500A0 */ addiu $a1, $a1, 0xa0 -.L80078C20: -/* 079820 80078C20 8FCF0000 */ lw $t7, ($fp) -.L80078C24: -/* 079824 80078C24 26730001 */ addiu $s3, $s3, 1 -/* 079828 80078C28 26940004 */ addiu $s4, $s4, 4 -/* 07982C 80078C2C 026F082A */ slt $at, $s3, $t7 -/* 079830 80078C30 5420FF9F */ bnel $at, $zero, .L80078AB0 -/* 079834 80078C34 8E900000 */ lw $s0, ($s4) -.L80078C38: -/* 079838 80078C38 8FBF004C */ lw $ra, 0x4c($sp) -/* 07983C 80078C3C 8FB00028 */ lw $s0, 0x28($sp) -/* 079840 80078C40 8FB1002C */ lw $s1, 0x2c($sp) -/* 079844 80078C44 8FB20030 */ lw $s2, 0x30($sp) -/* 079848 80078C48 8FB30034 */ lw $s3, 0x34($sp) -/* 07984C 80078C4C 8FB40038 */ lw $s4, 0x38($sp) -/* 079850 80078C50 8FB5003C */ lw $s5, 0x3c($sp) -/* 079854 80078C54 8FB60040 */ lw $s6, 0x40($sp) -/* 079858 80078C58 8FB70044 */ lw $s7, 0x44($sp) -/* 07985C 80078C5C 8FBE0048 */ lw $fp, 0x48($sp) -/* 079860 80078C60 03E00008 */ jr $ra -/* 079864 80078C64 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_80071F00/func_80078C70.s b/asm/non_matchings/code_80071F00/func_80078C70.s deleted file mode 100644 index cf5d54e2d..000000000 --- a/asm/non_matchings/code_80071F00/func_80078C70.s +++ /dev/null @@ -1,229 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEB9C -.word L80078CA4, L80078CDC, L80078D14 -.word L80078D54, L80078D8C - -glabel D_800EEBB0 -.double 1.7578125 - -glabel jpt_800EEBB8 -.word L80078E70, L80078F54, L80078F54, L80078F54 -.word L80078E84, L80078E98, L80078EA8, L80078EBC -.word L80078ED0, L80078EE4, L80078EF8, L80078F0C -.word L80078F20, L80078F34, L80078F48 - -.section .text - -glabel func_80078C70 -/* 079870 80078C70 3C0E8016 */ lui $t6, %hi(D_801657C8) # $t6, 0x8016 -/* 079874 80078C74 81CE57C8 */ lb $t6, %lo(D_801657C8)($t6) -/* 079878 80078C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07987C 80078C7C AFBF0014 */ sw $ra, 0x14($sp) -/* 079880 80078C80 15C000B4 */ bnez $t6, .L80078F54 -/* 079884 80078C84 2C810005 */ sltiu $at, $a0, 5 -/* 079888 80078C88 10200050 */ beqz $at, .L80078DCC -/* 07988C 80078C8C 00047880 */ sll $t7, $a0, 2 -/* 079890 80078C90 3C01800F */ lui $at, %hi(jpt_800EEB9C) # 0x800f -/* 079894 80078C94 002F0821 */ addu $at, $at, $t7 -/* 079898 80078C98 8C2FEB9C */ lw $t7, %lo(jpt_800EEB9C)($at) # -0x1464($at) -/* 07989C 80078C9C 01E00008 */ jr $t7 -/* 0798A0 80078CA0 00000000 */ nop -glabel L80078CA4 -/* 0798A4 80078CA4 3C018015 */ lui $at, %hi(D_80150130) # $at, 0x8015 -/* 0798A8 80078CA8 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 0798AC 80078CAC 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 0798B0 80078CB0 44813000 */ mtc1 $at, $f6 -/* 0798B4 80078CB4 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e -/* 0798B8 80078CB8 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 0798BC 80078CBC 46062200 */ add.s $f8, $f4, $f6 -/* 0798C0 80078CC0 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 -/* 0798C4 80078CC4 AFA0001C */ sw $zero, 0x1c($sp) -/* 0798C8 80078CC8 AFA50018 */ sw $a1, 0x18($sp) -/* 0798CC 80078CCC 4600428D */ trunc.w.s $f10, $f8 -/* 0798D0 80078CD0 44195000 */ mfc1 $t9, $f10 -/* 0798D4 80078CD4 1000003D */ b .L80078DCC -/* 0798D8 80078CD8 A439D200 */ sh $t9, %lo(D_8018D200)($at) -glabel L80078CDC -/* 0798DC 80078CDC 3C018015 */ lui $at, %hi(D_80150130) # $at, 0x8015 -/* 0798E0 80078CE0 C4300130 */ lwc1 $f16, %lo(D_80150130)($at) -/* 0798E4 80078CE4 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 0798E8 80078CE8 44819000 */ mtc1 $at, $f18 -/* 0798EC 80078CEC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e -/* 0798F0 80078CF0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 0798F4 80078CF4 46128100 */ add.s $f4, $f16, $f18 -/* 0798F8 80078CF8 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 -/* 0798FC 80078CFC AFA0001C */ sw $zero, 0x1c($sp) -/* 079900 80078D00 AFA50018 */ sw $a1, 0x18($sp) -/* 079904 80078D04 4600218D */ trunc.w.s $f6, $f4 -/* 079908 80078D08 44093000 */ mfc1 $t1, $f6 -/* 07990C 80078D0C 1000002F */ b .L80078DCC -/* 079910 80078D10 A429D200 */ sh $t1, %lo(D_8018D200)($at) -glabel L80078D14 -/* 079914 80078D14 3C018015 */ lui $at, %hi(D_80150130+0x4) # $at, 0x8015 -/* 079918 80078D18 C4280134 */ lwc1 $f8, %lo(D_80150130+0x4)($at) -/* 07991C 80078D1C 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 079920 80078D20 44815000 */ mtc1 $at, $f10 -/* 079924 80078D24 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e -/* 079928 80078D28 3C048019 */ lui $a0, %hi(D_8018D1F0) # $a0, 0x8019 -/* 07992C 80078D2C 460A4400 */ add.s $f16, $f8, $f10 -/* 079930 80078D30 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 079934 80078D34 8C84D1F0 */ lw $a0, %lo(D_8018D1F0)($a0) -/* 079938 80078D38 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 -/* 07993C 80078D3C 4600848D */ trunc.w.s $f18, $f16 -/* 079940 80078D40 AFA50018 */ sw $a1, 0x18($sp) -/* 079944 80078D44 AFA4001C */ sw $a0, 0x1c($sp) -/* 079948 80078D48 440B9000 */ mfc1 $t3, $f18 -/* 07994C 80078D4C 1000001F */ b .L80078DCC -/* 079950 80078D50 A42BD200 */ sh $t3, %lo(D_8018D200)($at) -glabel L80078D54 -/* 079954 80078D54 3C018015 */ lui $at, %hi(D_80150130) # $at, 0x8015 -/* 079958 80078D58 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) -/* 07995C 80078D5C 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 079960 80078D60 44813000 */ mtc1 $at, $f6 -/* 079964 80078D64 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e -/* 079968 80078D68 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 07996C 80078D6C 46062200 */ add.s $f8, $f4, $f6 -/* 079970 80078D70 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 -/* 079974 80078D74 AFA0001C */ sw $zero, 0x1c($sp) -/* 079978 80078D78 AFA50018 */ sw $a1, 0x18($sp) -/* 07997C 80078D7C 4600428D */ trunc.w.s $f10, $f8 -/* 079980 80078D80 440D5000 */ mfc1 $t5, $f10 -/* 079984 80078D84 10000011 */ b .L80078DCC -/* 079988 80078D88 A42DD200 */ sh $t5, %lo(D_8018D200)($at) -glabel L80078D8C -/* 07998C 80078D8C 3C018015 */ lui $at, %hi(D_80150130+0x4) # $at, 0x8015 -/* 079990 80078D90 C4300134 */ lwc1 $f16, %lo(D_80150130+0x4)($at) -/* 079994 80078D94 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 079998 80078D98 44819000 */ mtc1 $at, $f18 -/* 07999C 80078D9C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e -/* 0799A0 80078DA0 3C048019 */ lui $a0, %hi(D_8018D1F0) # $a0, 0x8019 -/* 0799A4 80078DA4 46128100 */ add.s $f4, $f16, $f18 -/* 0799A8 80078DA8 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 0799AC 80078DAC 8C84D1F0 */ lw $a0, %lo(D_8018D1F0)($a0) -/* 0799B0 80078DB0 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 -/* 0799B4 80078DB4 4600218D */ trunc.w.s $f6, $f4 -/* 0799B8 80078DB8 AFA50018 */ sw $a1, 0x18($sp) -/* 0799BC 80078DBC AFA4001C */ sw $a0, 0x1c($sp) -/* 0799C0 80078DC0 440F3000 */ mfc1 $t7, $f6 -/* 0799C4 80078DC4 00000000 */ nop -/* 0799C8 80078DC8 A42FD200 */ sh $t7, %lo(D_8018D200)($at) -.L80078DCC: -/* 0799CC 80078DCC 3C028019 */ lui $v0, %hi(D_8018D200) # $v0, 0x8019 -/* 0799D0 80078DD0 8442D200 */ lh $v0, %lo(D_8018D200)($v0) -/* 0799D4 80078DD4 240600B6 */ li $a2, 182 -/* 0799D8 80078DD8 3C0C800E */ lui $t4, %hi(gCurrentCourseId) # $t4, 0x800e -/* 0799DC 80078DDC 44825000 */ mtc1 $v0, $f10 -/* 0799E0 80078DE0 958CC5A0 */ lhu $t4, %lo(gCurrentCourseId)($t4) -/* 0799E4 80078DE4 240B00A0 */ li $t3, 160 -/* 0799E8 80078DE8 46805421 */ cvt.d.w $f16, $f10 -/* 0799EC 80078DEC 8FA4001C */ lw $a0, 0x1c($sp) -/* 0799F0 80078DF0 8FA50018 */ lw $a1, 0x18($sp) -/* 0799F4 80078DF4 04410003 */ bgez $v0, .L80078E04 -/* 0799F8 80078DF8 00021843 */ sra $v1, $v0, 1 -/* 0799FC 80078DFC 24410001 */ addiu $at, $v0, 1 -/* 079A00 80078E00 00011843 */ sra $v1, $at, 1 -.L80078E04: -/* 079A04 80078E04 00660019 */ multu $v1, $a2 -/* 079A08 80078E08 00034023 */ negu $t0, $v1 -/* 079A0C 80078E0C 3C018019 */ lui $at, %hi(D_8018D208) # $at, 0x8019 -/* 079A10 80078E10 0000C012 */ mflo $t8 -/* 079A14 80078E14 2719071C */ addiu $t9, $t8, 0x71c -/* 079A18 80078E18 A439D208 */ sh $t9, %lo(D_8018D208)($at) -/* 079A1C 80078E1C 01060019 */ multu $t0, $a2 -/* 079A20 80078E20 3C018019 */ lui $at, %hi(D_8018D210) # $at, 0x8019 -/* 079A24 80078E24 00004812 */ mflo $t1 -/* 079A28 80078E28 252AF8E4 */ addiu $t2, $t1, -0x71c -/* 079A2C 80078E2C A42AD210 */ sh $t2, %lo(D_8018D210)($at) -/* 079A30 80078E30 3C01800F */ lui $at, %hi(D_800EEBB0) -/* 079A34 80078E34 D428EBB0 */ ldc1 $f8, %lo(D_800EEBB0)($at) -/* 079A38 80078E38 3C018019 */ lui $at, %hi(D_8018D1E8) # $at, 0x8019 -/* 079A3C 80078E3C 46304483 */ div.d $f18, $f8, $f16 -/* 079A40 80078E40 46209120 */ cvt.s.d $f4, $f18 -/* 079A44 80078E44 E424D1E8 */ swc1 $f4, %lo(D_8018D1E8)($at) -/* 079A48 80078E48 3C018019 */ lui $at, %hi(D_8018D218) # $at, 0x8019 -/* 079A4C 80078E4C A42BD218 */ sh $t3, %lo(D_8018D218)($at) -/* 079A50 80078E50 2D81000F */ sltiu $at, $t4, 0xf -/* 079A54 80078E54 1020003F */ beqz $at, .L80078F54 -/* 079A58 80078E58 000C6080 */ sll $t4, $t4, 2 -/* 079A5C 80078E5C 3C01800F */ lui $at, %hi(jpt_800EEBB8) -/* 079A60 80078E60 002C0821 */ addu $at, $at, $t4 -/* 079A64 80078E64 8C2CEBB8 */ lw $t4, %lo(jpt_800EEBB8)($at) -/* 079A68 80078E68 01800008 */ jr $t4 -/* 079A6C 80078E6C 00000000 */ nop -glabel L80078E70 -/* 079A70 80078E70 3C06800E */ lui $a2, %hi(D_800E6A38) # $a2, 0x800e -/* 079A74 80078E74 0C01E26B */ jal func_800789AC -/* 079A78 80078E78 24C66A38 */ addiu $a2, %lo(D_800E6A38) # addiu $a2, $a2, 0x6a38 -/* 079A7C 80078E7C 10000036 */ b .L80078F58 -/* 079A80 80078E80 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078E84 -/* 079A84 80078E84 3C06800E */ lui $a2, %hi(D_800E6AA8) # $a2, 0x800e -/* 079A88 80078E88 0C01E26B */ jal func_800789AC -/* 079A8C 80078E8C 24C66AA8 */ addiu $a2, %lo(D_800E6AA8) # addiu $a2, $a2, 0x6aa8 -/* 079A90 80078E90 10000031 */ b .L80078F58 -/* 079A94 80078E94 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078E98 -/* 079A98 80078E98 0C01E05C */ jal func_80078170 -/* 079A9C 80078E9C 00000000 */ nop -/* 079AA0 80078EA0 1000002D */ b .L80078F58 -/* 079AA4 80078EA4 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078EA8 -/* 079AA8 80078EA8 3C06800E */ lui $a2, %hi(D_800E6B00) # $a2, 0x800e -/* 079AAC 80078EAC 0C01E26B */ jal func_800789AC -/* 079AB0 80078EB0 24C66B00 */ addiu $a2, %lo(D_800E6B00) # addiu $a2, $a2, 0x6b00 -/* 079AB4 80078EB4 10000028 */ b .L80078F58 -/* 079AB8 80078EB8 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078EBC -/* 079ABC 80078EBC 3C06800E */ lui $a2, %hi(D_800E6B38) # $a2, 0x800e -/* 079AC0 80078EC0 0C01E26B */ jal func_800789AC -/* 079AC4 80078EC4 24C66B38 */ addiu $a2, %lo(D_800E6B38) # addiu $a2, $a2, 0x6b38 -/* 079AC8 80078EC8 10000023 */ b .L80078F58 -/* 079ACC 80078ECC 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078ED0 -/* 079AD0 80078ED0 3C06800E */ lui $a2, %hi(D_800E6A38) # $a2, 0x800e -/* 079AD4 80078ED4 0C01E26B */ jal func_800789AC -/* 079AD8 80078ED8 24C66A38 */ addiu $a2, %lo(D_800E6A38) # addiu $a2, $a2, 0x6a38 -/* 079ADC 80078EDC 1000001E */ b .L80078F58 -/* 079AE0 80078EE0 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078EE4 -/* 079AE4 80078EE4 3C06800E */ lui $a2, %hi(D_800E6AA8) # $a2, 0x800e -/* 079AE8 80078EE8 0C01E26B */ jal func_800789AC -/* 079AEC 80078EEC 24C66AA8 */ addiu $a2, %lo(D_800E6AA8) # addiu $a2, $a2, 0x6aa8 -/* 079AF0 80078EF0 10000019 */ b .L80078F58 -/* 079AF4 80078EF4 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078EF8 -/* 079AF8 80078EF8 3C06800E */ lui $a2, %hi(D_800E6C80) # $a2, 0x800e -/* 079AFC 80078EFC 0C01E291 */ jal func_80078A44 -/* 079B00 80078F00 24C66C80 */ addiu $a2, %lo(D_800E6C80) # addiu $a2, $a2, 0x6c80 -/* 079B04 80078F04 10000014 */ b .L80078F58 -/* 079B08 80078F08 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078F0C -/* 079B0C 80078F0C 3C06800E */ lui $a2, %hi(D_800E6C10) # $a2, 0x800e -/* 079B10 80078F10 0C01E26B */ jal func_800789AC -/* 079B14 80078F14 24C66C10 */ addiu $a2, %lo(D_800E6C10) # addiu $a2, $a2, 0x6c10 -/* 079B18 80078F18 1000000F */ b .L80078F58 -/* 079B1C 80078F1C 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078F20 -/* 079B20 80078F20 3C06800E */ lui $a2, %hi(D_800E6BA8) # $a2, 0x800e -/* 079B24 80078F24 0C01E26B */ jal func_800789AC -/* 079B28 80078F28 24C66BA8 */ addiu $a2, %lo(D_800E6BA8) # addiu $a2, $a2, 0x6ba8 -/* 079B2C 80078F2C 1000000A */ b .L80078F58 -/* 079B30 80078F30 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078F34 -/* 079B34 80078F34 3C06800E */ lui $a2, %hi(D_800E6C80) # $a2, 0x800e -/* 079B38 80078F38 0C01E291 */ jal func_80078A44 -/* 079B3C 80078F3C 24C66C80 */ addiu $a2, %lo(D_800E6C80) # addiu $a2, $a2, 0x6c80 -/* 079B40 80078F40 10000005 */ b .L80078F58 -/* 079B44 80078F44 8FBF0014 */ lw $ra, 0x14($sp) -glabel L80078F48 -/* 079B48 80078F48 3C06800E */ lui $a2, %hi(D_800E6DE0) # $a2, 0x800e -/* 079B4C 80078F4C 0C01E291 */ jal func_80078A44 -/* 079B50 80078F50 24C66DE0 */ addiu $a2, %lo(D_800E6DE0) # addiu $a2, $a2, 0x6de0 -.L80078F54: -glabel L80078F54 -/* 079B54 80078F54 8FBF0014 */ lw $ra, 0x14($sp) -.L80078F58: -/* 079B58 80078F58 27BD0020 */ addiu $sp, $sp, 0x20 -/* 079B5C 80078F5C 03E00008 */ jr $ra -/* 079B60 80078F60 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80079114.s b/asm/non_matchings/code_80071F00/func_80079114.s deleted file mode 100644 index ed31a541b..000000000 --- a/asm/non_matchings/code_80071F00/func_80079114.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80079114 -/* 079D14 80079114 240800E0 */ li $t0, 224 -/* 079D18 80079118 00880019 */ multu $a0, $t0 -/* 079D1C 8007911C 3C078016 */ lui $a3, %hi(D_80165C18) # $a3, 0x8016 -/* 079D20 80079120 24E75C18 */ addiu $a3, %lo(D_80165C18) # addiu $a3, $a3, 0x5c18 -/* 079D24 80079124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 079D28 80079128 AFBF0014 */ sw $ra, 0x14($sp) -/* 079D2C 8007912C 00007012 */ mflo $t6 -/* 079D30 80079130 00EE1821 */ addu $v1, $a3, $t6 -/* 079D34 80079134 846F00A6 */ lh $t7, 0xa6($v1) -/* 079D38 80079138 29E10002 */ slti $at, $t7, 2 -/* 079D3C 8007913C 54200029 */ bnel $at, $zero, .L800791E4 -/* 079D40 80079140 8FBF0014 */ lw $ra, 0x14($sp) -/* 079D44 80079144 907800D8 */ lbu $t8, 0xd8($v1) -/* 079D48 80079148 24020001 */ li $v0, 1 -/* 079D4C 8007914C 14580011 */ bne $v0, $t8, .L80079194 -/* 079D50 80079150 00000000 */ nop -/* 079D54 80079154 14A00005 */ bnez $a1, .L8007916C -/* 079D58 80079158 3C058019 */ lui $a1, %hi(D_8018C028) # $a1, 0x8019 -/* 079D5C 8007915C 0C01D225 */ jal func_80074894 -/* 079D60 80079160 8CA5C028 */ lw $a1, %lo(D_8018C028)($a1) -/* 079D64 80079164 1000001F */ b .L800791E4 -/* 079D68 80079168 8FBF0014 */ lw $ra, 0x14($sp) -.L8007916C: -/* 079D6C 8007916C 3C048018 */ lui $a0, %hi(D_80183DB8) # $a0, 0x8018 -/* 079D70 80079170 8C843DB8 */ lw $a0, %lo(D_80183DB8)($a0) -/* 079D74 80079174 00880019 */ multu $a0, $t0 -/* 079D78 80079178 0000C812 */ mflo $t9 -/* 079D7C 8007917C 00F91021 */ addu $v0, $a3, $t9 -/* 079D80 80079180 8C490060 */ lw $t1, 0x60($v0) -/* 079D84 80079184 AC690060 */ sw $t1, 0x60($v1) -/* 079D88 80079188 8C4A0064 */ lw $t2, 0x64($v0) -/* 079D8C 8007918C 10000014 */ b .L800791E0 -/* 079D90 80079190 AC6A0064 */ sw $t2, 0x64($v1) -.L80079194: -/* 079D94 80079194 10C00008 */ beqz $a2, .L800791B8 -/* 079D98 80079198 3C058019 */ lui $a1, %hi(D_8018C028) # 0x8019 -/* 079D9C 8007919C 10C2000A */ beq $a2, $v0, .L800791C8 -/* 079DA0 800791A0 3C058019 */ lui $a1, %hi(D_8018C028) # 0x8019 -/* 079DA4 800791A4 24010002 */ li $at, 2 -/* 079DA8 800791A8 10C1000B */ beq $a2, $at, .L800791D8 -/* 079DAC 800791AC 3C058019 */ lui $a1, %hi(D_8018C028) # $a1, 0x8019 -/* 079DB0 800791B0 1000000C */ b .L800791E4 -/* 079DB4 800791B4 8FBF0014 */ lw $ra, 0x14($sp) -.L800791B8: -/* 079DB8 800791B8 0C01D23D */ jal func_800748F4 -/* 079DBC 800791BC 8CA5C028 */ lw $a1, %lo(D_8018C028)($a1) -/* 079DC0 800791C0 10000008 */ b .L800791E4 -/* 079DC4 800791C4 8FBF0014 */ lw $ra, 0x14($sp) -.L800791C8: -/* 079DC8 800791C8 0C01D231 */ jal func_800748C4 -/* 079DCC 800791CC 8CA5C028 */ lw $a1, %lo(D_8018C028)($a1) # -0x3fd8($a1) -/* 079DD0 800791D0 10000004 */ b .L800791E4 -/* 079DD4 800791D4 8FBF0014 */ lw $ra, 0x14($sp) -.L800791D8: -/* 079DD8 800791D8 0C01D225 */ jal func_80074894 -/* 079DDC 800791DC 8CA5C028 */ lw $a1, %lo(D_8018C028)($a1) # -0x3fd8($a1) -.L800791E0: -/* 079DE0 800791E0 8FBF0014 */ lw $ra, 0x14($sp) -.L800791E4: -/* 079DE4 800791E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 079DE8 800791E8 03E00008 */ jr $ra -/* 079DEC 800791EC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800792D8.s b/asm/non_matchings/code_80071F00/func_800792D8.s deleted file mode 100644 index a4ef62816..000000000 --- a/asm/non_matchings/code_80071F00/func_800792D8.s +++ /dev/null @@ -1,51 +0,0 @@ -.section .late_rodata - -glabel D_800EEBF4 -.float 0.15 - -.section .text - -glabel func_800792D8 -/* 079ED8 800792D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 079EDC 800792DC AFBF001C */ sw $ra, 0x1c($sp) -/* 079EE0 800792E0 14A00005 */ bnez $a1, .L800792F8 -/* 079EE4 800792E4 AFA40028 */ sw $a0, 0x28($sp) -/* 079EE8 800792E8 3C018016 */ lui $at, %hi(D_801656F0) # $at, 0x8016 -/* 079EEC 800792EC A42056F0 */ sh $zero, %lo(D_801656F0)($at) -/* 079EF0 800792F0 3C018019 */ lui $at, %hi(D_8018D168) # $at, 0x8019 -/* 079EF4 800792F4 AC20D168 */ sw $zero, %lo(D_8018D168)($at) -.L800792F8: -/* 079EF8 800792F8 3C050D02 */ lui $a1, %hi(gTLUTLakituCountdown) # $a1, 0xd02 -/* 079EFC 800792FC 3C060F06 */ lui $a2, %hi(D_0F05EB50) # $a2, 0xf06 -/* 079F00 80079300 240E0048 */ li $t6, 72 -/* 079F04 80079304 AFAE0010 */ sw $t6, 0x10($sp) -/* 079F08 80079308 24C6EB50 */ addiu $a2, %lo(D_0F05EB50) # addiu $a2, $a2, -0x14b0 -/* 079F0C 8007930C 24A54ED8 */ addiu $a1, %lo(gTLUTLakituCountdown) # addiu $a1, $a1, 0x4ed8 -/* 079F10 80079310 8FA40028 */ lw $a0, 0x28($sp) -/* 079F14 80079314 0C01CD11 */ jal func_80073444 -/* 079F18 80079318 24070038 */ li $a3, 56 -/* 079F1C 8007931C 8FA40028 */ lw $a0, 0x28($sp) -/* 079F20 80079320 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 079F24 80079324 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 079F28 80079328 000478C0 */ sll $t7, $a0, 3 -/* 079F2C 8007932C 01E47823 */ subu $t7, $t7, $a0 -/* 079F30 80079330 000F7940 */ sll $t7, $t7, 5 -/* 079F34 80079334 3C190D00 */ lui $t9, %hi(D_0D005EB0) # $t9, 0xd00 -/* 079F38 80079338 27395EB0 */ addiu $t9, %lo(D_0D005EB0) # addiu $t9, $t9, 0x5eb0 -/* 079F3C 8007933C 01F81021 */ addu $v0, $t7, $t8 -/* 079F40 80079340 AC590074 */ sw $t9, 0x74($v0) -/* 079F44 80079344 3C01800F */ lui $at, %hi(D_800EEBF4) # $at, 0x800f -/* 079F48 80079348 C424EBF4 */ lwc1 $f4, %lo(D_800EEBF4)($at) -/* 079F4C 8007934C AFA20024 */ sw $v0, 0x24($sp) -/* 079F50 80079350 24050010 */ li $a1, 16 -/* 079F54 80079354 0C01C87A */ jal func_800721E8 -/* 079F58 80079358 E4440000 */ swc1 $f4, ($v0) -/* 079F5C 8007935C 0C01C922 */ jal func_80072488 -/* 079F60 80079360 8FA40028 */ lw $a0, 0x28($sp) -/* 079F64 80079364 8FBF001C */ lw $ra, 0x1c($sp) -/* 079F68 80079368 3C088019 */ lui $t0, %hi(D_8018D180) # $t0, 0x8019 -/* 079F6C 8007936C 8FA20024 */ lw $v0, 0x24($sp) -/* 079F70 80079370 8D08D180 */ lw $t0, %lo(D_8018D180)($t0) -/* 079F74 80079374 27BD0028 */ addiu $sp, $sp, 0x28 -/* 079F78 80079378 03E00008 */ jr $ra -/* 079F7C 8007937C AC480048 */ sw $t0, 0x48($v0) diff --git a/asm/non_matchings/code_80071F00/func_80079380.s b/asm/non_matchings/code_80071F00/func_80079380.s deleted file mode 100644 index fdfe9fad2..000000000 --- a/asm/non_matchings/code_80071F00/func_80079380.s +++ /dev/null @@ -1,205 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEBF8 -.word L8007962C, L800793C8, L800793D8, L80079424 -.word L80079454, L8007948C, L8007949C, L800794C0 -.word L800794FC, L80079520, L80079548, L80079580 -.word L800795BC, L800795E0, L80079614, L80079624 - -.section .text - -glabel func_80079380 -/* 079F80 80079380 000470C0 */ sll $t6, $a0, 3 -/* 079F84 80079384 01C47023 */ subu $t6, $t6, $a0 -/* 079F88 80079388 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 079F8C 8007938C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 079F90 80079390 000E7140 */ sll $t6, $t6, 5 -/* 079F94 80079394 01CF1821 */ addu $v1, $t6, $t7 -/* 079F98 80079398 947800A6 */ lhu $t8, 0xa6($v1) -/* 079F9C 8007939C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 079FA0 800793A0 AFBF001C */ sw $ra, 0x1c($sp) -/* 079FA4 800793A4 2F010010 */ sltiu $at, $t8, 0x10 -/* 079FA8 800793A8 102000A0 */ beqz $at, .L8007962C -/* 079FAC 800793AC AFA5002C */ sw $a1, 0x2c($sp) -/* 079FB0 800793B0 0018C080 */ sll $t8, $t8, 2 -/* 079FB4 800793B4 3C01800F */ lui $at, %hi(jpt_800EEBF8) -/* 079FB8 800793B8 00380821 */ addu $at, $at, $t8 -/* 079FBC 800793BC 8C38EBF8 */ lw $t8, %lo(jpt_800EEBF8)($at) -/* 079FC0 800793C0 03000008 */ jr $t8 -/* 079FC4 800793C4 00000000 */ nop -glabel L800793C8 -/* 079FC8 800793C8 0C01E4B6 */ jal func_800792D8 -/* 079FCC 800793CC 8FA5002C */ lw $a1, 0x2c($sp) -/* 079FD0 800793D0 10000097 */ b .L80079630 -/* 079FD4 800793D4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800793D8 -/* 079FD8 800793D8 8C650048 */ lw $a1, 0x48($v1) -/* 079FDC 800793DC 0C01C9E3 */ jal func_8007278C -/* 079FE0 800793E0 AFA30020 */ sw $v1, 0x20($sp) -/* 079FE4 800793E4 8FA30020 */ lw $v1, 0x20($sp) -/* 079FE8 800793E8 24010055 */ li $at, 85 -/* 079FEC 800793EC 3C088019 */ lui $t0, %hi(D_8018EDF3) # $t0, 0x8019 -/* 079FF0 800793F0 8C790050 */ lw $t9, 0x50($v1) -/* 079FF4 800793F4 5721008E */ bnel $t9, $at, .L80079630 -/* 079FF8 800793F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 079FFC 800793FC 8108EDF3 */ lb $t0, %lo(D_8018EDF3)($t0) -/* 07A000 80079400 24010003 */ li $at, 3 -/* 07A004 80079404 8FA9002C */ lw $t1, 0x2c($sp) -/* 07A008 80079408 55010089 */ bnel $t0, $at, .L80079630 -/* 07A00C 8007940C 8FBF001C */ lw $ra, 0x1c($sp) -/* 07A010 80079410 15200086 */ bnez $t1, .L8007962C -/* 07A014 80079414 240A0001 */ li $t2, 1 -/* 07A018 80079418 3C018019 */ lui $at, %hi(D_8018D168) # $at, 0x8019 -/* 07A01C 8007941C 10000083 */ b .L8007962C -/* 07A020 80079420 AC2AD168 */ sw $t2, %lo(D_8018D168)($at) -glabel L80079424 -/* 07A024 80079424 24050010 */ li $a1, 16 -/* 07A028 80079428 0C01C870 */ jal func_800721C0 -/* 07A02C 8007942C AFA40028 */ sw $a0, 0x28($sp) -/* 07A030 80079430 3C06800E */ lui $a2, %hi(D_800E67B8) # $a2, 0x800e -/* 07A034 80079434 8FA40028 */ lw $a0, 0x28($sp) -/* 07A038 80079438 24C667B8 */ addiu $a2, %lo(D_800E67B8) # addiu $a2, $a2, 0x67b8 -/* 07A03C 8007943C 0C021BC4 */ jal func_80086F10 -/* 07A040 80079440 24050001 */ li $a1, 1 -/* 07A044 80079444 0C01C922 */ jal func_80072488 -/* 07A048 80079448 8FA40028 */ lw $a0, 0x28($sp) -/* 07A04C 8007944C 10000078 */ b .L80079630 -/* 07A050 80079450 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80079454 -/* 07A054 80079454 0C01C9E3 */ jal func_8007278C -/* 07A058 80079458 2405001E */ li $a1, 30 -/* 07A05C 8007945C 10400073 */ beqz $v0, .L8007962C -/* 07A060 80079460 3C0B8019 */ lui $t3, %hi(D_8018EDF3) # $t3, 0x8019 -/* 07A064 80079464 816BEDF3 */ lb $t3, %lo(D_8018EDF3)($t3) -/* 07A068 80079468 24010003 */ li $at, 3 -/* 07A06C 8007946C 8FAC002C */ lw $t4, 0x2c($sp) -/* 07A070 80079470 5161006F */ beql $t3, $at, .L80079630 -/* 07A074 80079474 8FBF001C */ lw $ra, 0x1c($sp) -/* 07A078 80079478 1580006C */ bnez $t4, .L8007962C -/* 07A07C 8007947C 240D0001 */ li $t5, 1 -/* 07A080 80079480 3C018019 */ lui $at, %hi(D_8018D168) # $at, 0x8019 -/* 07A084 80079484 10000069 */ b .L8007962C -/* 07A088 80079488 AC2DD168 */ sw $t5, %lo(D_8018D168)($at) -glabel L8007948C -/* 07A08C 8007948C 0C01C9E3 */ jal func_8007278C -/* 07A090 80079490 2405001E */ li $a1, 30 -/* 07A094 80079494 10000066 */ b .L80079630 -/* 07A098 80079498 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007949C -/* 07A09C 8007949C 240E0002 */ li $t6, 2 -/* 07A0A0 800794A0 AFAE0010 */ sw $t6, 0x10($sp) -/* 07A0A4 800794A4 24050001 */ li $a1, 1 -/* 07A0A8 800794A8 24060007 */ li $a2, 7 -/* 07A0AC 800794AC 24070001 */ li $a3, 1 -/* 07A0B0 800794B0 0C01CB95 */ jal func_80072E54 -/* 07A0B4 800794B4 AFA00014 */ sw $zero, 0x14($sp) -/* 07A0B8 800794B8 1000005D */ b .L80079630 -/* 07A0BC 800794BC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800794C0 -/* 07A0C0 800794C0 24050014 */ li $a1, 20 -/* 07A0C4 800794C4 0C01C9E3 */ jal func_8007278C -/* 07A0C8 800794C8 AFA30020 */ sw $v1, 0x20($sp) -/* 07A0CC 800794CC 10400057 */ beqz $v0, .L8007962C -/* 07A0D0 800794D0 8FA30020 */ lw $v1, 0x20($sp) -/* 07A0D4 800794D4 8C6F0068 */ lw $t7, 0x68($v1) -/* 07A0D8 800794D8 8FB9002C */ lw $t9, 0x2c($sp) -/* 07A0DC 800794DC 3C044900 */ lui $a0, (0x49008003 >> 16) # lui $a0, 0x4900 -/* 07A0E0 800794E0 25F80200 */ addiu $t8, $t7, 0x200 -/* 07A0E4 800794E4 17200051 */ bnez $t9, .L8007962C -/* 07A0E8 800794E8 AC780068 */ sw $t8, 0x68($v1) -/* 07A0EC 800794EC 0C032384 */ jal play_sound2 -/* 07A0F0 800794F0 34848003 */ ori $a0, (0x49008003 & 0xFFFF) # ori $a0, $a0, 0x8003 -/* 07A0F4 800794F4 1000004E */ b .L80079630 -/* 07A0F8 800794F8 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800794FC -/* 07A0FC 800794FC 24080006 */ li $t0, 6 -/* 07A100 80079500 AFA80010 */ sw $t0, 0x10($sp) -/* 07A104 80079504 24050008 */ li $a1, 8 -/* 07A108 80079508 2406000F */ li $a2, 15 -/* 07A10C 8007950C 24070001 */ li $a3, 1 -/* 07A110 80079510 0C01CB95 */ jal func_80072E54 -/* 07A114 80079514 AFA00014 */ sw $zero, 0x14($sp) -/* 07A118 80079518 10000045 */ b .L80079630 -/* 07A11C 8007951C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80079520 -/* 07A120 80079520 0C01C9E3 */ jal func_8007278C -/* 07A124 80079524 24050008 */ li $a1, 8 -/* 07A128 80079528 10400040 */ beqz $v0, .L8007962C -/* 07A12C 8007952C 8FA9002C */ lw $t1, 0x2c($sp) -/* 07A130 80079530 1520003E */ bnez $t1, .L8007962C -/* 07A134 80079534 3C044900 */ lui $a0, (0x49008003 >> 16) # lui $a0, 0x4900 -/* 07A138 80079538 0C032384 */ jal play_sound2 -/* 07A13C 8007953C 34848003 */ ori $a0, (0x49008003 & 0xFFFF) # ori $a0, $a0, 0x8003 -/* 07A140 80079540 1000003B */ b .L80079630 -/* 07A144 80079544 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80079548 -/* 07A148 80079548 240A0006 */ li $t2, 6 -/* 07A14C 8007954C AFAA0010 */ sw $t2, 0x10($sp) -/* 07A150 80079550 24050010 */ li $a1, 16 -/* 07A154 80079554 24060017 */ li $a2, 23 -/* 07A158 80079558 24070001 */ li $a3, 1 -/* 07A15C 8007955C 0C01CB95 */ jal func_80072E54 -/* 07A160 80079560 AFA00014 */ sw $zero, 0x14($sp) -/* 07A164 80079564 10400031 */ beqz $v0, .L8007962C -/* 07A168 80079568 8FAB002C */ lw $t3, 0x2c($sp) -/* 07A16C 8007956C 1560002F */ bnez $t3, .L8007962C -/* 07A170 80079570 240C0001 */ li $t4, 1 -/* 07A174 80079574 3C018016 */ lui $at, %hi(D_801656F0) # $at, 0x8016 -/* 07A178 80079578 1000002C */ b .L8007962C -/* 07A17C 8007957C A42C56F0 */ sh $t4, %lo(D_801656F0)($at) -glabel L80079580 -/* 07A180 80079580 24050008 */ li $a1, 8 -/* 07A184 80079584 0C01C9E3 */ jal func_8007278C -/* 07A188 80079588 AFA30020 */ sw $v1, 0x20($sp) -/* 07A18C 8007958C 10400027 */ beqz $v0, .L8007962C -/* 07A190 80079590 8FA30020 */ lw $v1, 0x20($sp) -/* 07A194 80079594 8C6D0068 */ lw $t5, 0x68($v1) -/* 07A198 80079598 8FAF002C */ lw $t7, 0x2c($sp) -/* 07A19C 8007959C 3C044900 */ lui $a0, (0x49008004 >> 16) # lui $a0, 0x4900 -/* 07A1A0 800795A0 25AE0200 */ addiu $t6, $t5, 0x200 -/* 07A1A4 800795A4 15E00021 */ bnez $t7, .L8007962C -/* 07A1A8 800795A8 AC6E0068 */ sw $t6, 0x68($v1) -/* 07A1AC 800795AC 0C032384 */ jal play_sound2 -/* 07A1B0 800795B0 34848004 */ ori $a0, (0x49008004 & 0xFFFF) # ori $a0, $a0, 0x8004 -/* 07A1B4 800795B4 1000001E */ b .L80079630 -/* 07A1B8 800795B8 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800795BC -/* 07A1BC 800795BC 24180006 */ li $t8, 6 -/* 07A1C0 800795C0 AFB80010 */ sw $t8, 0x10($sp) -/* 07A1C4 800795C4 24050018 */ li $a1, 24 -/* 07A1C8 800795C8 2406001B */ li $a2, 27 -/* 07A1CC 800795CC 24070001 */ li $a3, 1 -/* 07A1D0 800795D0 0C01CB95 */ jal func_80072E54 -/* 07A1D4 800795D4 AFA00014 */ sw $zero, 0x14($sp) -/* 07A1D8 800795D8 10000015 */ b .L80079630 -/* 07A1DC 800795DC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800795E0 -/* 07A1E0 800795E0 8FB9002C */ lw $t9, 0x2c($sp) -/* 07A1E4 800795E4 17200007 */ bnez $t9, .L80079604 -/* 07A1E8 800795E8 00000000 */ nop -/* 07A1EC 800795EC 0C01CA7B */ jal func_800729EC -/* 07A1F0 800795F0 00000000 */ nop -/* 07A1F4 800795F4 24080001 */ li $t0, 1 -/* 07A1F8 800795F8 3C018019 */ lui $at, %hi(D_8018D160) # $at, 0x8019 -/* 07A1FC 800795FC 1000000B */ b .L8007962C -/* 07A200 80079600 AC28D160 */ sw $t0, %lo(D_8018D160)($at) -.L80079604: -/* 07A204 80079604 0C01C922 */ jal func_80072488 -/* 07A208 80079608 00000000 */ nop -/* 07A20C 8007960C 10000008 */ b .L80079630 -/* 07A210 80079610 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80079614 -/* 07A214 80079614 0C01C9E3 */ jal func_8007278C -/* 07A218 80079618 24050078 */ li $a1, 120 -/* 07A21C 8007961C 10000004 */ b .L80079630 -/* 07A220 80079620 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80079624 -/* 07A224 80079624 0C01C90A */ jal func_80072428 -/* 07A228 80079628 00000000 */ nop -.L8007962C: -glabel L8007962C -/* 07A22C 8007962C 8FBF001C */ lw $ra, 0x1c($sp) -.L80079630: -/* 07A230 80079630 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07A234 80079634 03E00008 */ jr $ra -/* 07A238 80079638 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007963C.s b/asm/non_matchings/code_80071F00/func_8007963C.s deleted file mode 100644 index c6c189118..000000000 --- a/asm/non_matchings/code_80071F00/func_8007963C.s +++ /dev/null @@ -1,60 +0,0 @@ -.section .late_rodata - -glabel D_800EEC38 -.float 5000.0 - -glabel D_800EEC3C -.float 0.15 - -.section .text - -glabel func_8007963C -/* 07A23C 8007963C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07A240 80079640 AFBF0024 */ sw $ra, 0x24($sp) -/* 07A244 80079644 AFB00020 */ sw $s0, 0x20($sp) -/* 07A248 80079648 0C01E47C */ jal func_800791F0 -/* 07A24C 8007964C 00808025 */ move $s0, $a0 -/* 07A250 80079650 3C050D02 */ lui $a1, %hi(gTLUTLakituCheckeredFlag) # $a1, 0xd02 -/* 07A254 80079654 3C060F08 */ lui $a2, %hi(D_0F07E350) # $a2, 0xf08 -/* 07A258 80079658 240E0038 */ li $t6, 56 -/* 07A25C 8007965C AFAE0010 */ sw $t6, 0x10($sp) -/* 07A260 80079660 24C6E350 */ addiu $a2, %lo(D_0F07E350) # addiu $a2, $a2, -0x1cb0 -/* 07A264 80079664 24A554D8 */ addiu $a1, %lo(gTLUTLakituCheckeredFlag) # addiu $a1, $a1, 0x54d8 -/* 07A268 80079668 02002025 */ move $a0, $s0 -/* 07A26C 8007966C 0C01CD11 */ jal func_80073444 -/* 07A270 80079670 24070048 */ li $a3, 72 -/* 07A274 80079674 001078C0 */ sll $t7, $s0, 3 -/* 07A278 80079678 3C01800F */ lui $at, %hi(D_800EEC38) # $at, 0x800f -/* 07A27C 8007967C 01F07823 */ subu $t7, $t7, $s0 -/* 07A280 80079680 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07A284 80079684 C420EC38 */ lwc1 $f0, %lo(D_800EEC38)($at) -/* 07A288 80079688 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07A28C 8007968C 000F7940 */ sll $t7, $t7, 5 -/* 07A290 80079690 3C198019 */ lui $t9, %hi(D_8018C028) # $t9, 0x8019 -/* 07A294 80079694 8F39C028 */ lw $t9, %lo(D_8018C028)($t9) -/* 07A298 80079698 01F81021 */ addu $v0, $t7, $t8 -/* 07A29C 8007969C 3C080D00 */ lui $t0, %hi(D_0D006730) # $t0, 0xd00 -/* 07A2A0 800796A0 25086730 */ addiu $t0, %lo(D_0D006730) # addiu $t0, $t0, 0x6730 -/* 07A2A4 800796A4 AC480074 */ sw $t0, 0x74($v0) -/* 07A2A8 800796A8 3C01800F */ lui $at, %hi(D_800EEC3C) # $at, 0x800f -/* 07A2AC 800796AC E440000C */ swc1 $f0, 0xc($v0) -/* 07A2B0 800796B0 E4400008 */ swc1 $f0, 8($v0) -/* 07A2B4 800796B4 E4400004 */ swc1 $f0, 4($v0) -/* 07A2B8 800796B8 AC590064 */ sw $t9, 0x64($v0) -/* 07A2BC 800796BC C424EC3C */ lwc1 $f4, %lo(D_800EEC3C)($at) -/* 07A2C0 800796C0 3C06800E */ lui $a2, %hi(D_800E6834) # $a2, 0x800e -/* 07A2C4 800796C4 24C66834 */ addiu $a2, %lo(D_800E6834) # addiu $a2, $a2, 0x6834 -/* 07A2C8 800796C8 02002025 */ move $a0, $s0 -/* 07A2CC 800796CC 24050002 */ li $a1, 2 -/* 07A2D0 800796D0 0C021BC4 */ jal func_80086F10 -/* 07A2D4 800796D4 E4440000 */ swc1 $f4, ($v0) -/* 07A2D8 800796D8 02002025 */ move $a0, $s0 -/* 07A2DC 800796DC 0C01C87A */ jal func_800721E8 -/* 07A2E0 800796E0 24050010 */ li $a1, 16 -/* 07A2E4 800796E4 0C01C922 */ jal func_80072488 -/* 07A2E8 800796E8 02002025 */ move $a0, $s0 -/* 07A2EC 800796EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 07A2F0 800796F0 8FB00020 */ lw $s0, 0x20($sp) -/* 07A2F4 800796F4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07A2F8 800796F8 03E00008 */ jr $ra -/* 07A2FC 800796FC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80079700.s b/asm/non_matchings/code_80071F00/func_80079700.s deleted file mode 100644 index b2c70e36a..000000000 --- a/asm/non_matchings/code_80071F00/func_80079700.s +++ /dev/null @@ -1,59 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEC40 -.word L8007979C, L80079740, L80079750, L8007976C -.word L80079794 - -.section .text - -glabel func_80079700 -/* 07A300 80079700 000470C0 */ sll $t6, $a0, 3 -/* 07A304 80079704 01C47023 */ subu $t6, $t6, $a0 -/* 07A308 80079708 000E7140 */ sll $t6, $t6, 5 -/* 07A30C 8007970C 3C0F8016 */ lui $t7, %hi(D_80165CBE) # 0x8016 -/* 07A310 80079710 01EE7821 */ addu $t7, $t7, $t6 -/* 07A314 80079714 95EF5CBE */ lhu $t7, %lo(D_80165CBE)($t7) # 0x5cbe($t7) -/* 07A318 80079718 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07A31C 8007971C AFBF001C */ sw $ra, 0x1c($sp) -/* 07A320 80079720 2DE10005 */ sltiu $at, $t7, 5 -/* 07A324 80079724 1020001D */ beqz $at, .L8007979C -/* 07A328 80079728 000F7880 */ sll $t7, $t7, 2 -/* 07A32C 8007972C 3C01800F */ lui $at, %hi(jpt_800EEC40) -/* 07A330 80079730 002F0821 */ addu $at, $at, $t7 -/* 07A334 80079734 8C2FEC40 */ lw $t7, %lo(jpt_800EEC40)($at) -/* 07A338 80079738 01E00008 */ jr $t7 -/* 07A33C 8007973C 00000000 */ nop -glabel L80079740 -/* 07A340 80079740 0C01E58F */ jal func_8007963C -/* 07A344 80079744 00000000 */ nop -/* 07A348 80079748 10000015 */ b .L800797A0 -/* 07A34C 8007974C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80079750 -/* 07A350 80079750 24050010 */ li $a1, 16 -/* 07A354 80079754 0C01C870 */ jal func_800721C0 -/* 07A358 80079758 AFA40020 */ sw $a0, 0x20($sp) -/* 07A35C 8007975C 0C01C922 */ jal func_80072488 -/* 07A360 80079760 8FA40020 */ lw $a0, 0x20($sp) -/* 07A364 80079764 1000000E */ b .L800797A0 -/* 07A368 80079768 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007976C -/* 07A36C 8007976C 24180002 */ li $t8, 2 -/* 07A370 80079770 2419FFFF */ li $t9, -1 -/* 07A374 80079774 AFB90014 */ sw $t9, 0x14($sp) -/* 07A378 80079778 AFB80010 */ sw $t8, 0x10($sp) -/* 07A37C 8007977C 00002825 */ move $a1, $zero -/* 07A380 80079780 2406001F */ li $a2, 31 -/* 07A384 80079784 0C01CB95 */ jal func_80072E54 -/* 07A388 80079788 24070001 */ li $a3, 1 -/* 07A38C 8007978C 10000004 */ b .L800797A0 -/* 07A390 80079790 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80079794 -/* 07A394 80079794 0C01C90A */ jal func_80072428 -/* 07A398 80079798 00000000 */ nop -.L8007979C: -glabel L8007979C -/* 07A39C 8007979C 8FBF001C */ lw $ra, 0x1c($sp) -.L800797A0: -/* 07A3A0 800797A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07A3A4 800797A4 03E00008 */ jr $ra -/* 07A3A8 800797A8 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800799A8.s b/asm/non_matchings/code_80071F00/func_800799A8.s deleted file mode 100644 index 5f15cae48..000000000 --- a/asm/non_matchings/code_80071F00/func_800799A8.s +++ /dev/null @@ -1,53 +0,0 @@ -.section .late_rodata - -glabel D_800EEC54 -.float 0.15 - -.section .text - -glabel func_800799A8 -/* 07A5A8 800799A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07A5AC 800799AC AFBF0024 */ sw $ra, 0x24($sp) -/* 07A5B0 800799B0 AFB00020 */ sw $s0, 0x20($sp) -/* 07A5B4 800799B4 00808025 */ move $s0, $a0 -/* 07A5B8 800799B8 0C01E47C */ jal func_800791F0 -/* 07A5BC 800799BC AFA5002C */ sw $a1, 0x2c($sp) -/* 07A5C0 800799C0 3C050D02 */ lui $a1, %hi(gTLUTLakituFishing) # $a1, 0xd02 -/* 07A5C4 800799C4 3C060F0D */ lui $a2, %hi(D_0F0CCF50) # $a2, 0xf0d -/* 07A5C8 800799C8 240E0048 */ li $t6, 72 -/* 07A5CC 800799CC AFAE0010 */ sw $t6, 0x10($sp) -/* 07A5D0 800799D0 24C6CF50 */ addiu $a2, %lo(D_0F0CCF50) # addiu $a2, $a2, -0x30b0 -/* 07A5D4 800799D4 24A55CD8 */ addiu $a1, %lo(gTLUTLakituFishing) # addiu $a1, $a1, 0x5cd8 -/* 07A5D8 800799D8 02002025 */ move $a0, $s0 -/* 07A5DC 800799DC 0C01CD11 */ jal func_80073444 -/* 07A5E0 800799E0 24070038 */ li $a3, 56 -/* 07A5E4 800799E4 001078C0 */ sll $t7, $s0, 3 -/* 07A5E8 800799E8 01F07823 */ subu $t7, $t7, $s0 -/* 07A5EC 800799EC 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07A5F0 800799F0 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07A5F4 800799F4 000F7940 */ sll $t7, $t7, 5 -/* 07A5F8 800799F8 3C190D00 */ lui $t9, %hi(D_0D005F30) # $t9, 0xd00 -/* 07A5FC 800799FC 27395F30 */ addiu $t9, %lo(D_0D005F30) # addiu $t9, $t9, 0x5f30 -/* 07A600 80079A00 01F81021 */ addu $v0, $t7, $t8 -/* 07A604 80079A04 AC590074 */ sw $t9, 0x74($v0) -/* 07A608 80079A08 3C01800F */ lui $at, %hi(D_800EEC54) # $at, 0x800f -/* 07A60C 80079A0C C424EC54 */ lwc1 $f4, %lo(D_800EEC54)($at) -/* 07A610 80079A10 02002025 */ move $a0, $s0 -/* 07A614 80079A14 0C021B9C */ jal func_80086E70 -/* 07A618 80079A18 E4440000 */ swc1 $f4, ($v0) -/* 07A61C 80079A1C 02002025 */ move $a0, $s0 -/* 07A620 80079A20 0C01C87A */ jal func_800721E8 -/* 07A624 80079A24 24050010 */ li $a1, 16 -/* 07A628 80079A28 0C01CDC8 */ jal func_80073720 -/* 07A62C 80079A2C 02002025 */ move $a0, $s0 -/* 07A630 80079A30 0C01C922 */ jal func_80072488 -/* 07A634 80079A34 02002025 */ move $a0, $s0 -/* 07A638 80079A38 3C050100 */ lui $a1, (0x0100FA28 >> 16) # lui $a1, 0x100 -/* 07A63C 80079A3C 34A5FA28 */ ori $a1, (0x0100FA28 & 0xFFFF) # ori $a1, $a1, 0xfa28 -/* 07A640 80079A40 0C0323E0 */ jal func_800C8F80 -/* 07A644 80079A44 93A4002F */ lbu $a0, 0x2f($sp) -/* 07A648 80079A48 8FBF0024 */ lw $ra, 0x24($sp) -/* 07A64C 80079A4C 8FB00020 */ lw $s0, 0x20($sp) -/* 07A650 80079A50 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07A654 80079A54 03E00008 */ jr $ra -/* 07A658 80079A58 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80079B40.s b/asm/non_matchings/code_80071F00/func_80079B40.s deleted file mode 100644 index 9292f852e..000000000 --- a/asm/non_matchings/code_80071F00/func_80079B40.s +++ /dev/null @@ -1,151 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEC58 -.word L80079D04, L80079C4C, L80079C6C, L80079C84 -.word L80079CB8, L80079CD8 - -.section .text - -glabel func_80079B40 -/* 07A740 80079B40 000578C0 */ sll $t7, $a1, 3 -/* 07A744 80079B44 01E57823 */ subu $t7, $t7, $a1 -/* 07A748 80079B48 000F7900 */ sll $t7, $t7, 4 -/* 07A74C 80079B4C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 07A750 80079B50 01E57823 */ subu $t7, $t7, $a1 -/* 07A754 80079B54 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e -/* 07A758 80079B58 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) -/* 07A75C 80079B5C 000F7880 */ sll $t7, $t7, 2 -/* 07A760 80079B60 000440C0 */ sll $t0, $a0, 3 -/* 07A764 80079B64 01E57823 */ subu $t7, $t7, $a1 -/* 07A768 80079B68 01044023 */ subu $t0, $t0, $a0 -/* 07A76C 80079B6C 3C098016 */ lui $t1, %hi(D_80165C18) # $t1, 0x8016 -/* 07A770 80079B70 000F78C0 */ sll $t7, $t7, 3 -/* 07A774 80079B74 25295C18 */ addiu $t1, %lo(D_80165C18) # addiu $t1, $t1, 0x5c18 -/* 07A778 80079B78 00084140 */ sll $t0, $t0, 5 -/* 07A77C 80079B7C 01095021 */ addu $t2, $t0, $t1 -/* 07A780 80079B80 01F8C821 */ addu $t9, $t7, $t8 -/* 07A784 80079B84 AFBF0024 */ sw $ra, 0x24($sp) -/* 07A788 80079B88 AFB00020 */ sw $s0, 0x20($sp) -/* 07A78C 80079B8C AFA5003C */ sw $a1, 0x3c($sp) -/* 07A790 80079B90 AFB90034 */ sw $t9, 0x34($sp) -/* 07A794 80079B94 AFAA002C */ sw $t2, 0x2c($sp) -/* 07A798 80079B98 854200A6 */ lh $v0, 0xa6($t2) -/* 07A79C 80079B9C 00808025 */ move $s0, $a0 -/* 07A7A0 80079BA0 24010001 */ li $at, 1 -/* 07A7A4 80079BA4 50400020 */ beql $v0, $zero, .L80079C28 -/* 07A7A8 80079BA8 8FAD002C */ lw $t5, 0x2c($sp) -/* 07A7AC 80079BAC 10410009 */ beq $v0, $at, .L80079BD4 -/* 07A7B0 80079BB0 02002025 */ move $a0, $s0 -/* 07A7B4 80079BB4 24010002 */ li $at, 2 -/* 07A7B8 80079BB8 1041000A */ beq $v0, $at, .L80079BE4 -/* 07A7BC 80079BBC 02002025 */ move $a0, $s0 -/* 07A7C0 80079BC0 24010003 */ li $at, 3 -/* 07A7C4 80079BC4 1041000F */ beq $v0, $at, .L80079C04 -/* 07A7C8 80079BC8 02002025 */ move $a0, $s0 -/* 07A7CC 80079BCC 10000016 */ b .L80079C28 -/* 07A7D0 80079BD0 8FAD002C */ lw $t5, 0x2c($sp) -.L80079BD4: -/* 07A7D4 80079BD4 0C01E66A */ jal func_800799A8 -/* 07A7D8 80079BD8 8FA5003C */ lw $a1, 0x3c($sp) -/* 07A7DC 80079BDC 10000012 */ b .L80079C28 -/* 07A7E0 80079BE0 8FAD002C */ lw $t5, 0x2c($sp) -.L80079BE4: -/* 07A7E4 80079BE4 0C01C870 */ jal func_800721C0 -/* 07A7E8 80079BE8 24050010 */ li $a1, 16 -/* 07A7EC 80079BEC 0C01CDB8 */ jal func_800736E0 -/* 07A7F0 80079BF0 02002025 */ move $a0, $s0 -/* 07A7F4 80079BF4 0C01C922 */ jal func_80072488 -/* 07A7F8 80079BF8 02002025 */ move $a0, $s0 -/* 07A7FC 80079BFC 1000000A */ b .L80079C28 -/* 07A800 80079C00 8FAD002C */ lw $t5, 0x2c($sp) -.L80079C04: -/* 07A804 80079C04 240B0002 */ li $t3, 2 -/* 07A808 80079C08 240CFFFF */ li $t4, -1 -/* 07A80C 80079C0C AFAC0014 */ sw $t4, 0x14($sp) -/* 07A810 80079C10 AFAB0010 */ sw $t3, 0x10($sp) -/* 07A814 80079C14 00002825 */ move $a1, $zero -/* 07A818 80079C18 24060003 */ li $a2, 3 -/* 07A81C 80079C1C 0C01CC2F */ jal func_800730BC -/* 07A820 80079C20 24070001 */ li $a3, 1 -/* 07A824 80079C24 8FAD002C */ lw $t5, 0x2c($sp) -.L80079C28: -/* 07A828 80079C28 91AE00D6 */ lbu $t6, 0xd6($t5) -/* 07A82C 80079C2C 2DC10006 */ sltiu $at, $t6, 6 -/* 07A830 80079C30 10200034 */ beqz $at, .L80079D04 -/* 07A834 80079C34 000E7080 */ sll $t6, $t6, 2 -/* 07A838 80079C38 3C01800F */ lui $at, %hi(jpt_800EEC58) -/* 07A83C 80079C3C 002E0821 */ addu $at, $at, $t6 -/* 07A840 80079C40 8C2EEC58 */ lw $t6, %lo(jpt_800EEC58)($at) -/* 07A844 80079C44 01C00008 */ jr $t6 -/* 07A848 80079C48 00000000 */ nop -glabel L80079C4C -/* 07A84C 80079C4C 0C021BE9 */ jal func_80086FA4 -/* 07A850 80079C50 02002025 */ move $a0, $s0 -/* 07A854 80079C54 5040002C */ beql $v0, $zero, .L80079D08 -/* 07A858 80079C58 8FA8002C */ lw $t0, 0x2c($sp) -/* 07A85C 80079C5C 0C01CD95 */ jal func_80073654 -/* 07A860 80079C60 02002025 */ move $a0, $s0 -/* 07A864 80079C64 10000028 */ b .L80079D08 -/* 07A868 80079C68 8FA8002C */ lw $t0, 0x2c($sp) -glabel L80079C6C -/* 07A86C 80079C6C 0C02421A */ jal func_80090868 -/* 07A870 80079C70 8FA40034 */ lw $a0, 0x34($sp) -/* 07A874 80079C74 0C01CD95 */ jal func_80073654 -/* 07A878 80079C78 02002025 */ move $a0, $s0 -/* 07A87C 80079C7C 10000022 */ b .L80079D08 -/* 07A880 80079C80 8FA8002C */ lw $t0, 0x2c($sp) -glabel L80079C84 -/* 07A884 80079C84 8FAF0034 */ lw $t7, 0x34($sp) -/* 07A888 80079C88 02002025 */ move $a0, $s0 -/* 07A88C 80079C8C 00002825 */ move $a1, $zero -/* 07A890 80079C90 85F800CA */ lh $t8, 0xca($t7) -/* 07A894 80079C94 33190002 */ andi $t9, $t8, 2 -/* 07A898 80079C98 5720001B */ bnel $t9, $zero, .L80079D08 -/* 07A89C 80079C9C 8FA8002C */ lw $t0, 0x2c($sp) -/* 07A8A0 80079CA0 0C021BAB */ jal func_80086EAC -/* 07A8A4 80079CA4 24060003 */ li $a2, 3 -/* 07A8A8 80079CA8 0C01CD95 */ jal func_80073654 -/* 07A8AC 80079CAC 02002025 */ move $a0, $s0 -/* 07A8B0 80079CB0 10000015 */ b .L80079D08 -/* 07A8B4 80079CB4 8FA8002C */ lw $t0, 0x2c($sp) -glabel L80079CB8 -/* 07A8B8 80079CB8 0C021BE9 */ jal func_80086FA4 -/* 07A8BC 80079CBC 02002025 */ move $a0, $s0 -/* 07A8C0 80079CC0 50400011 */ beql $v0, $zero, .L80079D08 -/* 07A8C4 80079CC4 8FA8002C */ lw $t0, 0x2c($sp) -/* 07A8C8 80079CC8 0C01CD95 */ jal func_80073654 -/* 07A8CC 80079CCC 02002025 */ move $a0, $s0 -/* 07A8D0 80079CD0 1000000D */ b .L80079D08 -/* 07A8D4 80079CD4 8FA8002C */ lw $t0, 0x2c($sp) -glabel L80079CD8 -/* 07A8D8 80079CD8 02002025 */ move $a0, $s0 -/* 07A8DC 80079CDC 0C01C8B3 */ jal func_800722CC -/* 07A8E0 80079CE0 24050001 */ li $a1, 1 -/* 07A8E4 80079CE4 3C050100 */ lui $a1, (0x0100FA28 >> 16) # lui $a1, 0x100 -/* 07A8E8 80079CE8 34A5FA28 */ ori $a1, (0x0100FA28 & 0xFFFF) # ori $a1, $a1, 0xfa28 -/* 07A8EC 80079CEC 0C032406 */ jal func_800C9018 -/* 07A8F0 80079CF0 93A4003F */ lbu $a0, 0x3f($sp) -/* 07A8F4 80079CF4 0C01C90A */ jal func_80072428 -/* 07A8F8 80079CF8 02002025 */ move $a0, $s0 -/* 07A8FC 80079CFC 0C01CDC8 */ jal func_80073720 -/* 07A900 80079D00 02002025 */ move $a0, $s0 -.L80079D04: -glabel L80079D04 -/* 07A904 80079D04 8FA8002C */ lw $t0, 0x2c($sp) -.L80079D08: -/* 07A908 80079D08 02002025 */ move $a0, $s0 -/* 07A90C 80079D0C 850900A6 */ lh $t1, 0xa6($t0) -/* 07A910 80079D10 29210002 */ slti $at, $t1, 2 -/* 07A914 80079D14 54200004 */ bnel $at, $zero, .L80079D28 -/* 07A918 80079D18 02002025 */ move $a0, $s0 -/* 07A91C 80079D1C 0C01E64F */ jal func_8007993C -/* 07A920 80079D20 8FA50034 */ lw $a1, 0x34($sp) -/* 07A924 80079D24 02002025 */ move $a0, $s0 -.L80079D28: -/* 07A928 80079D28 0C01E697 */ jal func_80079A5C -/* 07A92C 80079D2C 8FA50034 */ lw $a1, 0x34($sp) -/* 07A930 80079D30 8FBF0024 */ lw $ra, 0x24($sp) -/* 07A934 80079D34 8FB00020 */ lw $s0, 0x20($sp) -/* 07A938 80079D38 27BD0038 */ addiu $sp, $sp, 0x38 -/* 07A93C 80079D3C 03E00008 */ jr $ra -/* 07A940 80079D40 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80079D44.s b/asm/non_matchings/code_80071F00/func_80079D44.s deleted file mode 100644 index 06294b465..000000000 --- a/asm/non_matchings/code_80071F00/func_80079D44.s +++ /dev/null @@ -1,225 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEC70 -.word L80079E5C, L80079E88, L80079EAC, L80079F2C -.word L80079F40, L80079F9C, L80079FD4, L80079FE8 - -.section .text - -glabel func_80079D44 -/* 07A944 80079D44 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 07A948 80079D48 0004C8C0 */ sll $t9, $a0, 3 -/* 07A94C 80079D4C 000578C0 */ sll $t7, $a1, 3 -/* 07A950 80079D50 0324C823 */ subu $t9, $t9, $a0 -/* 07A954 80079D54 3C088016 */ lui $t0, %hi(D_80165C18) # $t0, 0x8016 -/* 07A958 80079D58 01E57823 */ subu $t7, $t7, $a1 -/* 07A95C 80079D5C 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 -/* 07A960 80079D60 0019C940 */ sll $t9, $t9, 5 -/* 07A964 80079D64 000F7900 */ sll $t7, $t7, 4 -/* 07A968 80079D68 03284821 */ addu $t1, $t9, $t0 -/* 07A96C 80079D6C AFBF0024 */ sw $ra, 0x24($sp) -/* 07A970 80079D70 AFB10020 */ sw $s1, 0x20($sp) -/* 07A974 80079D74 AFB0001C */ sw $s0, 0x1c($sp) -/* 07A978 80079D78 AFA5003C */ sw $a1, 0x3c($sp) -/* 07A97C 80079D7C 01E57823 */ subu $t7, $t7, $a1 -/* 07A980 80079D80 AFA9002C */ sw $t1, 0x2c($sp) -/* 07A984 80079D84 852200A6 */ lh $v0, 0xa6($t1) -/* 07A988 80079D88 000F7880 */ sll $t7, $t7, 2 -/* 07A98C 80079D8C 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e -/* 07A990 80079D90 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) -/* 07A994 80079D94 01E57823 */ subu $t7, $t7, $a1 -/* 07A998 80079D98 000F78C0 */ sll $t7, $t7, 3 -/* 07A99C 80079D9C 00808025 */ move $s0, $a0 -/* 07A9A0 80079DA0 10400023 */ beqz $v0, .L80079E30 -/* 07A9A4 80079DA4 01F88821 */ addu $s1, $t7, $t8 -/* 07A9A8 80079DA8 24010001 */ li $at, 1 -/* 07A9AC 80079DAC 10410009 */ beq $v0, $at, .L80079DD4 -/* 07A9B0 80079DB0 02002025 */ move $a0, $s0 -/* 07A9B4 80079DB4 24010002 */ li $at, 2 -/* 07A9B8 80079DB8 1041000A */ beq $v0, $at, .L80079DE4 -/* 07A9BC 80079DBC 02002025 */ move $a0, $s0 -/* 07A9C0 80079DC0 24010003 */ li $at, 3 -/* 07A9C4 80079DC4 10410012 */ beq $v0, $at, .L80079E10 -/* 07A9C8 80079DC8 02002025 */ move $a0, $s0 -/* 07A9CC 80079DCC 10000019 */ b .L80079E34 -/* 07A9D0 80079DD0 8FAE002C */ lw $t6, 0x2c($sp) -.L80079DD4: -/* 07A9D4 80079DD4 0C01E66A */ jal func_800799A8 -/* 07A9D8 80079DD8 8FA5003C */ lw $a1, 0x3c($sp) -/* 07A9DC 80079DDC 10000015 */ b .L80079E34 -/* 07A9E0 80079DE0 8FAE002C */ lw $t6, 0x2c($sp) -.L80079DE4: -/* 07A9E4 80079DE4 0C01C870 */ jal func_800721C0 -/* 07A9E8 80079DE8 24050010 */ li $a1, 16 -/* 07A9EC 80079DEC 0C01CDB8 */ jal func_800736E0 -/* 07A9F0 80079DF0 02002025 */ move $a0, $s0 -/* 07A9F4 80079DF4 862A00CA */ lh $t2, 0xca($s1) -/* 07A9F8 80079DF8 02002025 */ move $a0, $s0 -/* 07A9FC 80079DFC 354B0080 */ ori $t3, $t2, 0x80 -/* 07AA00 80079E00 0C01C922 */ jal func_80072488 -/* 07AA04 80079E04 A62B00CA */ sh $t3, 0xca($s1) -/* 07AA08 80079E08 1000000A */ b .L80079E34 -/* 07AA0C 80079E0C 8FAE002C */ lw $t6, 0x2c($sp) -.L80079E10: -/* 07AA10 80079E10 240C0002 */ li $t4, 2 -/* 07AA14 80079E14 240DFFFF */ li $t5, -1 -/* 07AA18 80079E18 AFAD0014 */ sw $t5, 0x14($sp) -/* 07AA1C 80079E1C AFAC0010 */ sw $t4, 0x10($sp) -/* 07AA20 80079E20 00002825 */ move $a1, $zero -/* 07AA24 80079E24 24060003 */ li $a2, 3 -/* 07AA28 80079E28 0C01CC2F */ jal func_800730BC -/* 07AA2C 80079E2C 24070001 */ li $a3, 1 -.L80079E30: -/* 07AA30 80079E30 8FAE002C */ lw $t6, 0x2c($sp) -.L80079E34: -/* 07AA34 80079E34 91CF00D6 */ lbu $t7, 0xd6($t6) -/* 07AA38 80079E38 25F8FFFF */ addiu $t8, $t7, -1 -/* 07AA3C 80079E3C 2F010008 */ sltiu $at, $t8, 8 -/* 07AA40 80079E40 10200077 */ beqz $at, .L8007A020 -/* 07AA44 80079E44 0018C080 */ sll $t8, $t8, 2 -/* 07AA48 80079E48 3C01800F */ lui $at, %hi(jpt_800EEC70) # 0x800f -/* 07AA4C 80079E4C 00380821 */ addu $at, $at, $t8 -/* 07AA50 80079E50 8C38EC70 */ lw $t8, %lo(jpt_800EEC70)($at) # -0x1390($at) -/* 07AA54 80079E54 03000008 */ jr $t8 -/* 07AA58 80079E58 00000000 */ nop -glabel L80079E5C -/* 07AA5C 80079E5C 0C021BE9 */ jal func_80086FA4 -/* 07AA60 80079E60 02002025 */ move $a0, $s0 -/* 07AA64 80079E64 1040006E */ beqz $v0, .L8007A020 -/* 07AA68 80079E68 93A4003F */ lbu $a0, 0x3f($sp) -/* 07AA6C 80079E6C 3C051900 */ lui $a1, (0x1900A055 >> 16) # lui $a1, 0x1900 -/* 07AA70 80079E70 0C032418 */ jal func_800C9060 -/* 07AA74 80079E74 34A5A055 */ ori $a1, (0x1900A055 & 0xFFFF) # ori $a1, $a1, 0xa055 -/* 07AA78 80079E78 0C01CD95 */ jal func_80073654 -/* 07AA7C 80079E7C 02002025 */ move $a0, $s0 -/* 07AA80 80079E80 10000068 */ b .L8007A024 -/* 07AA84 80079E84 8FAA002C */ lw $t2, 0x2c($sp) -glabel L80079E88 -/* 07AA88 80079E88 0C02421A */ jal func_80090868 -/* 07AA8C 80079E8C 02202025 */ move $a0, $s1 -/* 07AA90 80079E90 02002025 */ move $a0, $s0 -/* 07AA94 80079E94 0C01C8A9 */ jal func_800722A4 -/* 07AA98 80079E98 24050004 */ li $a1, 4 -/* 07AA9C 80079E9C 0C01CD95 */ jal func_80073654 -/* 07AAA0 80079EA0 02002025 */ move $a0, $s0 -/* 07AAA4 80079EA4 1000005F */ b .L8007A024 -/* 07AAA8 80079EA8 8FAA002C */ lw $t2, 0x2c($sp) -glabel L80079EAC -/* 07AAAC 80079EAC 963900F8 */ lhu $t9, 0xf8($s1) -/* 07AAB0 80079EB0 24010009 */ li $at, 9 -/* 07AAB4 80079EB4 57210012 */ bnel $t9, $at, .L80079F00 -/* 07AAB8 80079EB8 862A00CA */ lh $t2, 0xca($s1) -/* 07AABC 80079EBC 862800CA */ lh $t0, 0xca($s1) -/* 07AAC0 80079EC0 3C01403E */ li $at, 0x403E0000 # 2.968750 -/* 07AAC4 80079EC4 31090001 */ andi $t1, $t0, 1 -/* 07AAC8 80079EC8 5520000D */ bnel $t1, $zero, .L80079F00 -/* 07AACC 80079ECC 862A00CA */ lh $t2, 0xca($s1) -/* 07AAD0 80079ED0 C6260124 */ lwc1 $f6, 0x124($s1) -/* 07AAD4 80079ED4 44812800 */ mtc1 $at, $f5 -/* 07AAD8 80079ED8 44802000 */ mtc1 $zero, $f4 -/* 07AADC 80079EDC 46003221 */ cvt.d.s $f8, $f6 -/* 07AAE0 80079EE0 02002025 */ move $a0, $s0 -/* 07AAE4 80079EE4 4624403E */ c.le.d $f8, $f4 -/* 07AAE8 80079EE8 00000000 */ nop -/* 07AAEC 80079EEC 45020004 */ bc1fl .L80079F00 -/* 07AAF0 80079EF0 862A00CA */ lh $t2, 0xca($s1) -/* 07AAF4 80079EF4 0C01C8A9 */ jal func_800722A4 -/* 07AAF8 80079EF8 24050008 */ li $a1, 8 -/* 07AAFC 80079EFC 862A00CA */ lh $t2, 0xca($s1) -.L80079F00: -/* 07AB00 80079F00 02002025 */ move $a0, $s0 -/* 07AB04 80079F04 00002825 */ move $a1, $zero -/* 07AB08 80079F08 314B0002 */ andi $t3, $t2, 2 -/* 07AB0C 80079F0C 55600045 */ bnel $t3, $zero, .L8007A024 -/* 07AB10 80079F10 8FAA002C */ lw $t2, 0x2c($sp) -/* 07AB14 80079F14 0C021BAB */ jal func_80086EAC -/* 07AB18 80079F18 24060003 */ li $a2, 3 -/* 07AB1C 80079F1C 0C01CD95 */ jal func_80073654 -/* 07AB20 80079F20 02002025 */ move $a0, $s0 -/* 07AB24 80079F24 1000003F */ b .L8007A024 -/* 07AB28 80079F28 8FAA002C */ lw $t2, 0x2c($sp) -glabel L80079F2C -/* 07AB2C 80079F2C 02002025 */ move $a0, $s0 -/* 07AB30 80079F30 0C01CDD7 */ jal func_8007375C -/* 07AB34 80079F34 2405001E */ li $a1, 30 -/* 07AB38 80079F38 1000003A */ b .L8007A024 -/* 07AB3C 80079F3C 8FAA002C */ lw $t2, 0x2c($sp) -glabel L80079F40 -/* 07AB40 80079F40 862C00CA */ lh $t4, 0xca($s1) -/* 07AB44 80079F44 02002025 */ move $a0, $s0 -/* 07AB48 80079F48 24050010 */ li $a1, 16 -/* 07AB4C 80079F4C 318DFF7F */ andi $t5, $t4, 0xff7f -/* 07AB50 80079F50 0C01C8A9 */ jal func_800722A4 -/* 07AB54 80079F54 A62D00CA */ sh $t5, 0xca($s1) -/* 07AB58 80079F58 02002025 */ move $a0, $s0 -/* 07AB5C 80079F5C 0C01C8A9 */ jal func_800722A4 -/* 07AB60 80079F60 24050020 */ li $a1, 32 -/* 07AB64 80079F64 02002025 */ move $a0, $s0 -/* 07AB68 80079F68 0C01C8B3 */ jal func_800722CC -/* 07AB6C 80079F6C 24050004 */ li $a1, 4 -/* 07AB70 80079F70 02002025 */ move $a0, $s0 -/* 07AB74 80079F74 0C01C8B3 */ jal func_800722CC -/* 07AB78 80079F78 24050008 */ li $a1, 8 -/* 07AB7C 80079F7C 0C01CD95 */ jal func_80073654 -/* 07AB80 80079F80 02002025 */ move $a0, $s0 -/* 07AB84 80079F84 3C051900 */ lui $a1, (0x1900A056 >> 16) # lui $a1, 0x1900 -/* 07AB88 80079F88 34A5A056 */ ori $a1, (0x1900A056 & 0xFFFF) # ori $a1, $a1, 0xa056 -/* 07AB8C 80079F8C 0C032418 */ jal func_800C9060 -/* 07AB90 80079F90 93A4003F */ lbu $a0, 0x3f($sp) -/* 07AB94 80079F94 10000023 */ b .L8007A024 -/* 07AB98 80079F98 8FAA002C */ lw $t2, 0x2c($sp) -glabel L80079F9C -/* 07AB9C 80079F9C 02002025 */ move $a0, $s0 -/* 07ABA0 80079FA0 0C01CDD7 */ jal func_8007375C -/* 07ABA4 80079FA4 240500A0 */ li $a1, 160 -/* 07ABA8 80079FA8 1040001D */ beqz $v0, .L8007A020 -/* 07ABAC 80079FAC 02002025 */ move $a0, $s0 -/* 07ABB0 80079FB0 0C01C8B3 */ jal func_800722CC -/* 07ABB4 80079FB4 24050010 */ li $a1, 16 -/* 07ABB8 80079FB8 862E00CA */ lh $t6, 0xca($s1) -/* 07ABBC 80079FBC 31CFFFEF */ andi $t7, $t6, 0xffef -/* 07ABC0 80079FC0 A62F00CA */ sh $t7, 0xca($s1) -/* 07ABC4 80079FC4 863800CA */ lh $t8, 0xca($s1) -/* 07ABC8 80079FC8 37190020 */ ori $t9, $t8, 0x20 -/* 07ABCC 80079FCC 10000014 */ b .L8007A020 -/* 07ABD0 80079FD0 A63900CA */ sh $t9, 0xca($s1) -glabel L80079FD4 -/* 07ABD4 80079FD4 02002025 */ move $a0, $s0 -/* 07ABD8 80079FD8 0C01CDD7 */ jal func_8007375C -/* 07ABDC 80079FDC 2405003C */ li $a1, 60 -/* 07ABE0 80079FE0 10000010 */ b .L8007A024 -/* 07ABE4 80079FE4 8FAA002C */ lw $t2, 0x2c($sp) -glabel L80079FE8 -/* 07ABE8 80079FE8 0C01CDC8 */ jal func_80073720 -/* 07ABEC 80079FEC 02002025 */ move $a0, $s0 -/* 07ABF0 80079FF0 0C01C90A */ jal func_80072428 -/* 07ABF4 80079FF4 02002025 */ move $a0, $s0 -/* 07ABF8 80079FF8 862800CA */ lh $t0, 0xca($s1) -/* 07ABFC 80079FFC 02002025 */ move $a0, $s0 -/* 07AC00 8007A000 24050001 */ li $a1, 1 -/* 07AC04 8007A004 3109FFDF */ andi $t1, $t0, 0xffdf -/* 07AC08 8007A008 0C01C8B3 */ jal func_800722CC -/* 07AC0C 8007A00C A62900CA */ sh $t1, 0xca($s1) -/* 07AC10 8007A010 3C050100 */ lui $a1, (0x0100FA28 >> 16) # lui $a1, 0x100 -/* 07AC14 8007A014 34A5FA28 */ ori $a1, (0x0100FA28 & 0xFFFF) # ori $a1, $a1, 0xfa28 -/* 07AC18 8007A018 0C032406 */ jal func_800C9018 -/* 07AC1C 8007A01C 93A4003F */ lbu $a0, 0x3f($sp) -.L8007A020: -/* 07AC20 8007A020 8FAA002C */ lw $t2, 0x2c($sp) -.L8007A024: -/* 07AC24 8007A024 02002025 */ move $a0, $s0 -/* 07AC28 8007A028 854B00A6 */ lh $t3, 0xa6($t2) -/* 07AC2C 8007A02C 29610002 */ slti $at, $t3, 2 -/* 07AC30 8007A030 54200004 */ bnel $at, $zero, .L8007A044 -/* 07AC34 8007A034 02002025 */ move $a0, $s0 -/* 07AC38 8007A038 0C01E64F */ jal func_8007993C -/* 07AC3C 8007A03C 02202825 */ move $a1, $s1 -/* 07AC40 8007A040 02002025 */ move $a0, $s0 -.L8007A044: -/* 07AC44 8007A044 0C01E697 */ jal func_80079A5C -/* 07AC48 8007A048 02202825 */ move $a1, $s1 -/* 07AC4C 8007A04C 8FBF0024 */ lw $ra, 0x24($sp) -/* 07AC50 8007A050 8FB0001C */ lw $s0, 0x1c($sp) -/* 07AC54 8007A054 8FB10020 */ lw $s1, 0x20($sp) -/* 07AC58 8007A058 03E00008 */ jr $ra -/* 07AC5C 8007A05C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_8007A060.s b/asm/non_matchings/code_80071F00/func_8007A060.s deleted file mode 100644 index dbe4c3295..000000000 --- a/asm/non_matchings/code_80071F00/func_8007A060.s +++ /dev/null @@ -1,60 +0,0 @@ -.section .late_rodata - -glabel D_800EEC90 -.float 5000.0 - -glabel D_800EEC94 -.float 0.15 - -.section .text - -glabel func_8007A060 -/* 07AC60 8007A060 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07AC64 8007A064 AFBF0024 */ sw $ra, 0x24($sp) -/* 07AC68 8007A068 AFB00020 */ sw $s0, 0x20($sp) -/* 07AC6C 8007A06C 0C01E47C */ jal func_800791F0 -/* 07AC70 8007A070 00808025 */ move $s0, $a0 -/* 07AC74 8007A074 3C050D02 */ lui $a1, %hi(gTLUTLakituSecondLap) # $a1, 0xd02 -/* 07AC78 8007A078 3C060F0A */ lui $a2, %hi(D_0F09DB50) # $a2, 0xf0a -/* 07AC7C 8007A07C 240E0038 */ li $t6, 56 -/* 07AC80 8007A080 AFAE0010 */ sw $t6, 0x10($sp) -/* 07AC84 8007A084 24C6DB50 */ addiu $a2, %lo(D_0F09DB50) # addiu $a2, $a2, -0x24b0 -/* 07AC88 8007A088 24A556D8 */ addiu $a1, %lo(gTLUTLakituSecondLap) # addiu $a1, $a1, 0x56d8 -/* 07AC8C 8007A08C 02002025 */ move $a0, $s0 -/* 07AC90 8007A090 0C01CD11 */ jal func_80073444 -/* 07AC94 8007A094 24070048 */ li $a3, 72 -/* 07AC98 8007A098 001078C0 */ sll $t7, $s0, 3 -/* 07AC9C 8007A09C 3C01800F */ lui $at, %hi(D_800EEC90) # $at, 0x800f -/* 07ACA0 8007A0A0 01F07823 */ subu $t7, $t7, $s0 -/* 07ACA4 8007A0A4 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07ACA8 8007A0A8 C420EC90 */ lwc1 $f0, %lo(D_800EEC90)($at) -/* 07ACAC 8007A0AC 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07ACB0 8007A0B0 000F7940 */ sll $t7, $t7, 5 -/* 07ACB4 8007A0B4 3C198019 */ lui $t9, %hi(D_8018C028) # $t9, 0x8019 -/* 07ACB8 8007A0B8 8F39C028 */ lw $t9, %lo(D_8018C028)($t9) -/* 07ACBC 8007A0BC 01F81021 */ addu $v0, $t7, $t8 -/* 07ACC0 8007A0C0 3C080D00 */ lui $t0, %hi(D_0D006730) # $t0, 0xd00 -/* 07ACC4 8007A0C4 25086730 */ addiu $t0, %lo(D_0D006730) # addiu $t0, $t0, 0x6730 -/* 07ACC8 8007A0C8 AC480074 */ sw $t0, 0x74($v0) -/* 07ACCC 8007A0CC 3C01800F */ lui $at, %hi(D_800EEC94) # $at, 0x800f -/* 07ACD0 8007A0D0 E440000C */ swc1 $f0, 0xc($v0) -/* 07ACD4 8007A0D4 E4400008 */ swc1 $f0, 8($v0) -/* 07ACD8 8007A0D8 E4400004 */ swc1 $f0, 4($v0) -/* 07ACDC 8007A0DC AC590064 */ sw $t9, 0x64($v0) -/* 07ACE0 8007A0E0 C424EC94 */ lwc1 $f4, %lo(D_800EEC94)($at) -/* 07ACE4 8007A0E4 02002025 */ move $a0, $s0 -/* 07ACE8 8007A0E8 24050010 */ li $a1, 16 -/* 07ACEC 8007A0EC 0C01C87A */ jal func_800721E8 -/* 07ACF0 8007A0F0 E4440000 */ swc1 $f4, ($v0) -/* 07ACF4 8007A0F4 3C06800E */ lui $a2, %hi(D_800E694C) # $a2, 0x800e -/* 07ACF8 8007A0F8 24C6694C */ addiu $a2, %lo(D_800E694C) # addiu $a2, $a2, 0x694c -/* 07ACFC 8007A0FC 02002025 */ move $a0, $s0 -/* 07AD00 8007A100 0C021BC4 */ jal func_80086F10 -/* 07AD04 8007A104 24050005 */ li $a1, 5 -/* 07AD08 8007A108 0C01C922 */ jal func_80072488 -/* 07AD0C 8007A10C 02002025 */ move $a0, $s0 -/* 07AD10 8007A110 8FBF0024 */ lw $ra, 0x24($sp) -/* 07AD14 8007A114 8FB00020 */ lw $s0, 0x20($sp) -/* 07AD18 8007A118 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07AD1C 8007A11C 03E00008 */ jr $ra -/* 07AD20 8007A120 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007A124.s b/asm/non_matchings/code_80071F00/func_8007A124.s deleted file mode 100644 index d5f7cb7be..000000000 --- a/asm/non_matchings/code_80071F00/func_8007A124.s +++ /dev/null @@ -1,84 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEC98 -.word L8007A218, L8007A168, L8007A178, L8007A194 -.word L8007A1A4, L8007A1CC, L8007A1DC, L8007A204 - -.section .text - -glabel func_8007A124 -/* 07AD24 8007A124 000470C0 */ sll $t6, $a0, 3 -/* 07AD28 8007A128 01C47023 */ subu $t6, $t6, $a0 -/* 07AD2C 8007A12C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07AD30 8007A130 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07AD34 8007A134 000E7140 */ sll $t6, $t6, 5 -/* 07AD38 8007A138 01CF1021 */ addu $v0, $t6, $t7 -/* 07AD3C 8007A13C 945800A6 */ lhu $t8, 0xa6($v0) -/* 07AD40 8007A140 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07AD44 8007A144 AFBF001C */ sw $ra, 0x1c($sp) -/* 07AD48 8007A148 2F010008 */ sltiu $at, $t8, 8 -/* 07AD4C 8007A14C 10200032 */ beqz $at, .L8007A218 -/* 07AD50 8007A150 0018C080 */ sll $t8, $t8, 2 -/* 07AD54 8007A154 3C01800F */ lui $at, %hi(jpt_800EEC98) -/* 07AD58 8007A158 00380821 */ addu $at, $at, $t8 -/* 07AD5C 8007A15C 8C38EC98 */ lw $t8, %lo(jpt_800EEC98)($at) -/* 07AD60 8007A160 03000008 */ jr $t8 -/* 07AD64 8007A164 00000000 */ nop -glabel L8007A168 -/* 07AD68 8007A168 0C01E818 */ jal func_8007A060 -/* 07AD6C 8007A16C 00000000 */ nop -/* 07AD70 8007A170 1000002A */ b .L8007A21C -/* 07AD74 8007A174 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A178 -/* 07AD78 8007A178 24050010 */ li $a1, 16 -/* 07AD7C 8007A17C 0C01C870 */ jal func_800721C0 -/* 07AD80 8007A180 AFA40020 */ sw $a0, 0x20($sp) -/* 07AD84 8007A184 0C01C922 */ jal func_80072488 -/* 07AD88 8007A188 8FA40020 */ lw $a0, 0x20($sp) -/* 07AD8C 8007A18C 10000023 */ b .L8007A21C -/* 07AD90 8007A190 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A194 -/* 07AD94 8007A194 0C01C9E3 */ jal func_8007278C -/* 07AD98 8007A198 24050014 */ li $a1, 20 -/* 07AD9C 8007A19C 1000001F */ b .L8007A21C -/* 07ADA0 8007A1A0 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A1A4 -/* 07ADA4 8007A1A4 24190002 */ li $t9, 2 -/* 07ADA8 8007A1A8 24080001 */ li $t0, 1 -/* 07ADAC 8007A1AC AFA80014 */ sw $t0, 0x14($sp) -/* 07ADB0 8007A1B0 AFB90010 */ sw $t9, 0x10($sp) -/* 07ADB4 8007A1B4 00002825 */ move $a1, $zero -/* 07ADB8 8007A1B8 2406000F */ li $a2, 15 -/* 07ADBC 8007A1BC 0C01CB95 */ jal func_80072E54 -/* 07ADC0 8007A1C0 24070001 */ li $a3, 1 -/* 07ADC4 8007A1C4 10000015 */ b .L8007A21C -/* 07ADC8 8007A1C8 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A1CC -/* 07ADCC 8007A1CC 0C01C9E3 */ jal func_8007278C -/* 07ADD0 8007A1D0 2405003C */ li $a1, 60 -/* 07ADD4 8007A1D4 10000011 */ b .L8007A21C -/* 07ADD8 8007A1D8 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A1DC -/* 07ADDC 8007A1DC 24090002 */ li $t1, 2 -/* 07ADE0 8007A1E0 240A0001 */ li $t2, 1 -/* 07ADE4 8007A1E4 AFAA0014 */ sw $t2, 0x14($sp) -/* 07ADE8 8007A1E8 AFA90010 */ sw $t1, 0x10($sp) -/* 07ADEC 8007A1EC 2405000F */ li $a1, 15 -/* 07ADF0 8007A1F0 00003025 */ move $a2, $zero -/* 07ADF4 8007A1F4 0C01CBE2 */ jal func_80072F88 -/* 07ADF8 8007A1F8 24070001 */ li $a3, 1 -/* 07ADFC 8007A1FC 10000007 */ b .L8007A21C -/* 07AE00 8007A200 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A204 -/* 07AE04 8007A204 844B00AE */ lh $t3, 0xae($v0) -/* 07AE08 8007A208 55600004 */ bnel $t3, $zero, .L8007A21C -/* 07AE0C 8007A20C 8FBF001C */ lw $ra, 0x1c($sp) -/* 07AE10 8007A210 0C01C90A */ jal func_80072428 -/* 07AE14 8007A214 00000000 */ nop -.L8007A218: -glabel L8007A218 -/* 07AE18 8007A218 8FBF001C */ lw $ra, 0x1c($sp) -.L8007A21C: -/* 07AE1C 8007A21C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07AE20 8007A220 03E00008 */ jr $ra -/* 07AE24 8007A224 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007A228.s b/asm/non_matchings/code_80071F00/func_8007A228.s deleted file mode 100644 index 45e9825e7..000000000 --- a/asm/non_matchings/code_80071F00/func_8007A228.s +++ /dev/null @@ -1,60 +0,0 @@ -.section .late_rodata - -glabel D_800EECB8 -.float 5000.0 - -glabel D_800EECBC -.float 0.15 - -.section .text - -glabel func_8007A228 -/* 07AE28 8007A228 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07AE2C 8007A22C AFBF0024 */ sw $ra, 0x24($sp) -/* 07AE30 8007A230 AFB00020 */ sw $s0, 0x20($sp) -/* 07AE34 8007A234 0C01E47C */ jal func_800791F0 -/* 07AE38 8007A238 00808025 */ move $s0, $a0 -/* 07AE3C 8007A23C 3C050D02 */ lui $a1, %hi(gTLUTLakituFinalLap) # $a1, 0xd02 -/* 07AE40 8007A240 3C060F0B */ lui $a2, %hi(D_0F0AD750) # $a2, 0xf0b -/* 07AE44 8007A244 240E0038 */ li $t6, 56 -/* 07AE48 8007A248 AFAE0010 */ sw $t6, 0x10($sp) -/* 07AE4C 8007A24C 24C6D750 */ addiu $a2, %lo(D_0F0AD750) # addiu $a2, $a2, -0x28b0 -/* 07AE50 8007A250 24A558D8 */ addiu $a1, %lo(gTLUTLakituFinalLap) # addiu $a1, $a1, 0x58d8 -/* 07AE54 8007A254 02002025 */ move $a0, $s0 -/* 07AE58 8007A258 0C01CD11 */ jal func_80073444 -/* 07AE5C 8007A25C 24070048 */ li $a3, 72 -/* 07AE60 8007A260 001078C0 */ sll $t7, $s0, 3 -/* 07AE64 8007A264 3C01800F */ lui $at, %hi(D_800EECB8) # $at, 0x800f -/* 07AE68 8007A268 01F07823 */ subu $t7, $t7, $s0 -/* 07AE6C 8007A26C 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07AE70 8007A270 C420ECB8 */ lwc1 $f0, %lo(D_800EECB8)($at) -/* 07AE74 8007A274 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07AE78 8007A278 000F7940 */ sll $t7, $t7, 5 -/* 07AE7C 8007A27C 3C198019 */ lui $t9, %hi(D_8018C028) # $t9, 0x8019 -/* 07AE80 8007A280 8F39C028 */ lw $t9, %lo(D_8018C028)($t9) -/* 07AE84 8007A284 01F81021 */ addu $v0, $t7, $t8 -/* 07AE88 8007A288 3C080D00 */ lui $t0, %hi(D_0D006730) # $t0, 0xd00 -/* 07AE8C 8007A28C 25086730 */ addiu $t0, %lo(D_0D006730) # addiu $t0, $t0, 0x6730 -/* 07AE90 8007A290 AC480074 */ sw $t0, 0x74($v0) -/* 07AE94 8007A294 3C01800F */ lui $at, %hi(D_800EECBC) # $at, 0x800f -/* 07AE98 8007A298 E440000C */ swc1 $f0, 0xc($v0) -/* 07AE9C 8007A29C E4400008 */ swc1 $f0, 8($v0) -/* 07AEA0 8007A2A0 E4400004 */ swc1 $f0, 4($v0) -/* 07AEA4 8007A2A4 AC590064 */ sw $t9, 0x64($v0) -/* 07AEA8 8007A2A8 C424ECBC */ lwc1 $f4, %lo(D_800EECBC)($at) -/* 07AEAC 8007A2AC 02002025 */ move $a0, $s0 -/* 07AEB0 8007A2B0 24050010 */ li $a1, 16 -/* 07AEB4 8007A2B4 0C01C87A */ jal func_800721E8 -/* 07AEB8 8007A2B8 E4440000 */ swc1 $f4, ($v0) -/* 07AEBC 8007A2BC 3C06800E */ lui $a2, %hi(D_800E694C) # $a2, 0x800e -/* 07AEC0 8007A2C0 24C6694C */ addiu $a2, %lo(D_800E694C) # addiu $a2, $a2, 0x694c -/* 07AEC4 8007A2C4 02002025 */ move $a0, $s0 -/* 07AEC8 8007A2C8 0C021BC4 */ jal func_80086F10 -/* 07AECC 8007A2CC 24050005 */ li $a1, 5 -/* 07AED0 8007A2D0 0C01C922 */ jal func_80072488 -/* 07AED4 8007A2D4 02002025 */ move $a0, $s0 -/* 07AED8 8007A2D8 8FBF0024 */ lw $ra, 0x24($sp) -/* 07AEDC 8007A2DC 8FB00020 */ lw $s0, 0x20($sp) -/* 07AEE0 8007A2E0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07AEE4 8007A2E4 03E00008 */ jr $ra -/* 07AEE8 8007A2E8 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007A2EC.s b/asm/non_matchings/code_80071F00/func_8007A2EC.s deleted file mode 100644 index f9e27dbee..000000000 --- a/asm/non_matchings/code_80071F00/func_8007A2EC.s +++ /dev/null @@ -1,84 +0,0 @@ -.section .late_rodata - -glabel jpt_800EECC0 -.word L8007A3E0, L8007A330, L8007A340, L8007A35C -.word L8007A36C, L8007A394, L8007A3A4, L8007A3CC - -.section .text - -glabel func_8007A2EC -/* 07AEEC 8007A2EC 000470C0 */ sll $t6, $a0, 3 -/* 07AEF0 8007A2F0 01C47023 */ subu $t6, $t6, $a0 -/* 07AEF4 8007A2F4 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07AEF8 8007A2F8 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07AEFC 8007A2FC 000E7140 */ sll $t6, $t6, 5 -/* 07AF00 8007A300 01CF1021 */ addu $v0, $t6, $t7 -/* 07AF04 8007A304 945800A6 */ lhu $t8, 0xa6($v0) -/* 07AF08 8007A308 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07AF0C 8007A30C AFBF001C */ sw $ra, 0x1c($sp) -/* 07AF10 8007A310 2F010008 */ sltiu $at, $t8, 8 -/* 07AF14 8007A314 10200032 */ beqz $at, .L8007A3E0 -/* 07AF18 8007A318 0018C080 */ sll $t8, $t8, 2 -/* 07AF1C 8007A31C 3C01800F */ lui $at, %hi(jpt_800EECC0) -/* 07AF20 8007A320 00380821 */ addu $at, $at, $t8 -/* 07AF24 8007A324 8C38ECC0 */ lw $t8, %lo(jpt_800EECC0)($at) -/* 07AF28 8007A328 03000008 */ jr $t8 -/* 07AF2C 8007A32C 00000000 */ nop -glabel L8007A330 -/* 07AF30 8007A330 0C01E88A */ jal func_8007A228 -/* 07AF34 8007A334 00000000 */ nop -/* 07AF38 8007A338 1000002A */ b .L8007A3E4 -/* 07AF3C 8007A33C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A340 -/* 07AF40 8007A340 24050010 */ li $a1, 16 -/* 07AF44 8007A344 0C01C870 */ jal func_800721C0 -/* 07AF48 8007A348 AFA40020 */ sw $a0, 0x20($sp) -/* 07AF4C 8007A34C 0C01C922 */ jal func_80072488 -/* 07AF50 8007A350 8FA40020 */ lw $a0, 0x20($sp) -/* 07AF54 8007A354 10000023 */ b .L8007A3E4 -/* 07AF58 8007A358 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A35C -/* 07AF5C 8007A35C 0C01C9E3 */ jal func_8007278C -/* 07AF60 8007A360 24050014 */ li $a1, 20 -/* 07AF64 8007A364 1000001F */ b .L8007A3E4 -/* 07AF68 8007A368 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A36C -/* 07AF6C 8007A36C 24190002 */ li $t9, 2 -/* 07AF70 8007A370 24080001 */ li $t0, 1 -/* 07AF74 8007A374 AFA80014 */ sw $t0, 0x14($sp) -/* 07AF78 8007A378 AFB90010 */ sw $t9, 0x10($sp) -/* 07AF7C 8007A37C 00002825 */ move $a1, $zero -/* 07AF80 8007A380 2406000F */ li $a2, 15 -/* 07AF84 8007A384 0C01CB95 */ jal func_80072E54 -/* 07AF88 8007A388 24070001 */ li $a3, 1 -/* 07AF8C 8007A38C 10000015 */ b .L8007A3E4 -/* 07AF90 8007A390 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A394 -/* 07AF94 8007A394 0C01C9E3 */ jal func_8007278C -/* 07AF98 8007A398 2405003C */ li $a1, 60 -/* 07AF9C 8007A39C 10000011 */ b .L8007A3E4 -/* 07AFA0 8007A3A0 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A3A4 -/* 07AFA4 8007A3A4 24090002 */ li $t1, 2 -/* 07AFA8 8007A3A8 240A0001 */ li $t2, 1 -/* 07AFAC 8007A3AC AFAA0014 */ sw $t2, 0x14($sp) -/* 07AFB0 8007A3B0 AFA90010 */ sw $t1, 0x10($sp) -/* 07AFB4 8007A3B4 2405000F */ li $a1, 15 -/* 07AFB8 8007A3B8 00003025 */ move $a2, $zero -/* 07AFBC 8007A3BC 0C01CBE2 */ jal func_80072F88 -/* 07AFC0 8007A3C0 24070001 */ li $a3, 1 -/* 07AFC4 8007A3C4 10000007 */ b .L8007A3E4 -/* 07AFC8 8007A3C8 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A3CC -/* 07AFCC 8007A3CC 844B00AE */ lh $t3, 0xae($v0) -/* 07AFD0 8007A3D0 55600004 */ bnel $t3, $zero, .L8007A3E4 -/* 07AFD4 8007A3D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 07AFD8 8007A3D8 0C01C90A */ jal func_80072428 -/* 07AFDC 8007A3DC 00000000 */ nop -.L8007A3E0: -glabel L8007A3E0 -/* 07AFE0 8007A3E0 8FBF001C */ lw $ra, 0x1c($sp) -.L8007A3E4: -/* 07AFE4 8007A3E4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07AFE8 8007A3E8 03E00008 */ jr $ra -/* 07AFEC 8007A3EC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007A3F0.s b/asm/non_matchings/code_80071F00/func_8007A3F0.s deleted file mode 100644 index 6c8f5ab4e..000000000 --- a/asm/non_matchings/code_80071F00/func_8007A3F0.s +++ /dev/null @@ -1,68 +0,0 @@ -.section .late_rodata - -glabel D_800EECE0 -.float 5000.0 - -glabel D_800EECE4 -.float 0.15 - -.section .text - -glabel func_8007A3F0 -/* 07AFF0 8007A3F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 07AFF4 8007A3F4 AFBF0024 */ sw $ra, 0x24($sp) -/* 07AFF8 8007A3F8 AFB00020 */ sw $s0, 0x20($sp) -/* 07AFFC 8007A3FC 00808025 */ move $s0, $a0 -/* 07B000 8007A400 0C01E47C */ jal func_800791F0 -/* 07B004 8007A404 AFA50034 */ sw $a1, 0x34($sp) -/* 07B008 8007A408 3C050D02 */ lui $a1, %hi(gTLUTLakituReverse) # $a1, 0xd02 -/* 07B00C 8007A40C 3C060F0C */ lui $a2, %hi(D_0F0BD350) # $a2, 0xf0c -/* 07B010 8007A410 240E0038 */ li $t6, 56 -/* 07B014 8007A414 AFAE0010 */ sw $t6, 0x10($sp) -/* 07B018 8007A418 24C6D350 */ addiu $a2, %lo(D_0F0BD350) # addiu $a2, $a2, -0x2cb0 -/* 07B01C 8007A41C 24A55AD8 */ addiu $a1, %lo(gTLUTLakituReverse) # addiu $a1, $a1, 0x5ad8 -/* 07B020 8007A420 02002025 */ move $a0, $s0 -/* 07B024 8007A424 0C01CD11 */ jal func_80073444 -/* 07B028 8007A428 24070048 */ li $a3, 72 -/* 07B02C 8007A42C 001078C0 */ sll $t7, $s0, 3 -/* 07B030 8007A430 3C01800F */ lui $at, %hi(D_800EECE0) # $at, 0x800f -/* 07B034 8007A434 01F07823 */ subu $t7, $t7, $s0 -/* 07B038 8007A438 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07B03C 8007A43C C420ECE0 */ lwc1 $f0, %lo(D_800EECE0)($at) -/* 07B040 8007A440 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07B044 8007A444 000F7940 */ sll $t7, $t7, 5 -/* 07B048 8007A448 3C198019 */ lui $t9, %hi(D_8018C028) # $t9, 0x8019 -/* 07B04C 8007A44C 8F39C028 */ lw $t9, %lo(D_8018C028)($t9) -/* 07B050 8007A450 01F81021 */ addu $v0, $t7, $t8 -/* 07B054 8007A454 3C080D00 */ lui $t0, %hi(D_0D006730) # $t0, 0xd00 -/* 07B058 8007A458 25086730 */ addiu $t0, %lo(D_0D006730) # addiu $t0, $t0, 0x6730 -/* 07B05C 8007A45C AC480074 */ sw $t0, 0x74($v0) -/* 07B060 8007A460 3C01800F */ lui $at, %hi(D_800EECE4) # $at, 0x800f -/* 07B064 8007A464 E440000C */ swc1 $f0, 0xc($v0) -/* 07B068 8007A468 E4400008 */ swc1 $f0, 8($v0) -/* 07B06C 8007A46C E4400004 */ swc1 $f0, 4($v0) -/* 07B070 8007A470 AC590064 */ sw $t9, 0x64($v0) -/* 07B074 8007A474 C424ECE4 */ lwc1 $f4, %lo(D_800EECE4)($at) -/* 07B078 8007A478 AFA20028 */ sw $v0, 0x28($sp) -/* 07B07C 8007A47C 02002025 */ move $a0, $s0 -/* 07B080 8007A480 24050010 */ li $a1, 16 -/* 07B084 8007A484 0C01C87A */ jal func_800721E8 -/* 07B088 8007A488 E4440000 */ swc1 $f4, ($v0) -/* 07B08C 8007A48C 3C06800E */ lui $a2, %hi(D_800E69B0) # $a2, 0x800e -/* 07B090 8007A490 24C669B0 */ addiu $a2, %lo(D_800E69B0) # addiu $a2, $a2, 0x69b0 -/* 07B094 8007A494 02002025 */ move $a0, $s0 -/* 07B098 8007A498 0C021BC4 */ jal func_80086F10 -/* 07B09C 8007A49C 24050006 */ li $a1, 6 -/* 07B0A0 8007A4A0 8FA20028 */ lw $v0, 0x28($sp) -/* 07B0A4 8007A4A4 02002025 */ move $a0, $s0 -/* 07B0A8 8007A4A8 0C01C922 */ jal func_80072488 -/* 07B0AC 8007A4AC A04000D6 */ sb $zero, 0xd6($v0) -/* 07B0B0 8007A4B0 3C050100 */ lui $a1, (0x0100FA28 >> 16) # lui $a1, 0x100 -/* 07B0B4 8007A4B4 34A5FA28 */ ori $a1, (0x0100FA28 & 0xFFFF) # ori $a1, $a1, 0xfa28 -/* 07B0B8 8007A4B8 0C0323E0 */ jal func_800C8F80 -/* 07B0BC 8007A4BC 93A40037 */ lbu $a0, 0x37($sp) -/* 07B0C0 8007A4C0 8FBF0024 */ lw $ra, 0x24($sp) -/* 07B0C4 8007A4C4 8FB00020 */ lw $s0, 0x20($sp) -/* 07B0C8 8007A4C8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 07B0CC 8007A4CC 03E00008 */ jr $ra -/* 07B0D0 8007A4D0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007A4D4.s b/asm/non_matchings/code_80071F00/func_8007A4D4.s deleted file mode 100644 index 8968818fb..000000000 --- a/asm/non_matchings/code_80071F00/func_8007A4D4.s +++ /dev/null @@ -1,122 +0,0 @@ -.section .late_rodata - -glabel jpt_800EECE8 -.word L8007A5C0, L8007A554, L8007A568, L8007A58C -.word L8007A5B8 - -.section .text - -glabel func_8007A4D4 -/* 07B0D4 8007A4D4 000578C0 */ sll $t7, $a1, 3 -/* 07B0D8 8007A4D8 000440C0 */ sll $t0, $a0, 3 -/* 07B0DC 8007A4DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 07B0E0 8007A4E0 01E57823 */ subu $t7, $t7, $a1 -/* 07B0E4 8007A4E4 01044023 */ subu $t0, $t0, $a0 -/* 07B0E8 8007A4E8 3C098016 */ lui $t1, %hi(D_80165C18) # $t1, 0x8016 -/* 07B0EC 8007A4EC AFB0001C */ sw $s0, 0x1c($sp) -/* 07B0F0 8007A4F0 000F7900 */ sll $t7, $t7, 4 -/* 07B0F4 8007A4F4 25295C18 */ addiu $t1, %lo(D_80165C18) # addiu $t1, $t1, 0x5c18 -/* 07B0F8 8007A4F8 00084140 */ sll $t0, $t0, 5 -/* 07B0FC 8007A4FC 01E57823 */ subu $t7, $t7, $a1 -/* 07B100 8007A500 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e -/* 07B104 8007A504 01098021 */ addu $s0, $t0, $t1 -/* 07B108 8007A508 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) -/* 07B10C 8007A50C 960A00A6 */ lhu $t2, 0xa6($s0) -/* 07B110 8007A510 000F7880 */ sll $t7, $t7, 2 -/* 07B114 8007A514 01E57823 */ subu $t7, $t7, $a1 -/* 07B118 8007A518 000F78C0 */ sll $t7, $t7, 3 -/* 07B11C 8007A51C AFB10020 */ sw $s1, 0x20($sp) -/* 07B120 8007A520 01F8C821 */ addu $t9, $t7, $t8 -/* 07B124 8007A524 2D410005 */ sltiu $at, $t2, 5 -/* 07B128 8007A528 00808825 */ move $s1, $a0 -/* 07B12C 8007A52C AFBF0024 */ sw $ra, 0x24($sp) -/* 07B130 8007A530 AFA50034 */ sw $a1, 0x34($sp) -/* 07B134 8007A534 10200022 */ beqz $at, .L8007A5C0 -/* 07B138 8007A538 AFB9002C */ sw $t9, 0x2c($sp) -/* 07B13C 8007A53C 000A5080 */ sll $t2, $t2, 2 -/* 07B140 8007A540 3C01800F */ lui $at, %hi(jpt_800EECE8) -/* 07B144 8007A544 002A0821 */ addu $at, $at, $t2 -/* 07B148 8007A548 8C2AECE8 */ lw $t2, %lo(jpt_800EECE8)($at) -/* 07B14C 8007A54C 01400008 */ jr $t2 -/* 07B150 8007A550 00000000 */ nop -glabel L8007A554 -/* 07B154 8007A554 02202025 */ move $a0, $s1 -/* 07B158 8007A558 0C01E8FC */ jal func_8007A3F0 -/* 07B15C 8007A55C 8FA50034 */ lw $a1, 0x34($sp) -/* 07B160 8007A560 10000018 */ b .L8007A5C4 -/* 07B164 8007A564 920200D6 */ lbu $v0, 0xd6($s0) -glabel L8007A568 -/* 07B168 8007A568 02202025 */ move $a0, $s1 -/* 07B16C 8007A56C 0C01C870 */ jal func_800721C0 -/* 07B170 8007A570 24050010 */ li $a1, 16 -/* 07B174 8007A574 240B0001 */ li $t3, 1 -/* 07B178 8007A578 A20B00D6 */ sb $t3, 0xd6($s0) -/* 07B17C 8007A57C 0C01C922 */ jal func_80072488 -/* 07B180 8007A580 02202025 */ move $a0, $s1 -/* 07B184 8007A584 1000000F */ b .L8007A5C4 -/* 07B188 8007A588 920200D6 */ lbu $v0, 0xd6($s0) -glabel L8007A58C -/* 07B18C 8007A58C 240C0002 */ li $t4, 2 -/* 07B190 8007A590 240DFFFF */ li $t5, -1 -/* 07B194 8007A594 AFAD0014 */ sw $t5, 0x14($sp) -/* 07B198 8007A598 AFAC0010 */ sw $t4, 0x10($sp) -/* 07B19C 8007A59C 02202025 */ move $a0, $s1 -/* 07B1A0 8007A5A0 00002825 */ move $a1, $zero -/* 07B1A4 8007A5A4 2406000F */ li $a2, 15 -/* 07B1A8 8007A5A8 0C01CC2F */ jal func_800730BC -/* 07B1AC 8007A5AC 24070001 */ li $a3, 1 -/* 07B1B0 8007A5B0 10000004 */ b .L8007A5C4 -/* 07B1B4 8007A5B4 920200D6 */ lbu $v0, 0xd6($s0) -glabel L8007A5B8 -/* 07B1B8 8007A5B8 0C01C90A */ jal func_80072428 -/* 07B1BC 8007A5BC 02202025 */ move $a0, $s1 -.L8007A5C0: -glabel L8007A5C0 -/* 07B1C0 8007A5C0 920200D6 */ lbu $v0, 0xd6($s0) -.L8007A5C4: -/* 07B1C4 8007A5C4 24010001 */ li $at, 1 -/* 07B1C8 8007A5C8 10410005 */ beq $v0, $at, .L8007A5E0 -/* 07B1CC 8007A5CC 24010002 */ li $at, 2 -/* 07B1D0 8007A5D0 5041001B */ beql $v0, $at, .L8007A640 -/* 07B1D4 8007A5D4 8E0A004C */ lw $t2, 0x4c($s0) -/* 07B1D8 8007A5D8 10000020 */ b .L8007A65C -/* 07B1DC 8007A5DC 8FBF0024 */ lw $ra, 0x24($sp) -.L8007A5E0: -/* 07B1E0 8007A5E0 860E00A6 */ lh $t6, 0xa6($s0) -/* 07B1E4 8007A5E4 8FAF002C */ lw $t7, 0x2c($sp) -/* 07B1E8 8007A5E8 29C10003 */ slti $at, $t6, 3 -/* 07B1EC 8007A5EC 5420001B */ bnel $at, $zero, .L8007A65C -/* 07B1F0 8007A5F0 8FBF0024 */ lw $ra, 0x24($sp) -/* 07B1F4 8007A5F4 8DF800BC */ lw $t8, 0xbc($t7) -/* 07B1F8 8007A5F8 02202025 */ move $a0, $s1 -/* 07B1FC 8007A5FC 24050006 */ li $a1, 6 -/* 07B200 8007A600 0018CA40 */ sll $t9, $t8, 9 -/* 07B204 8007A604 07200014 */ bltz $t9, .L8007A658 -/* 07B208 8007A608 3C06800E */ lui $a2, %hi(D_800E69F4) # $a2, 0x800e -/* 07B20C 8007A60C 0C021BC4 */ jal func_80086F10 -/* 07B210 8007A610 24C669F4 */ addiu $a2, %lo(D_800E69F4) # addiu $a2, $a2, 0x69f4 -/* 07B214 8007A614 24080002 */ li $t0, 2 -/* 07B218 8007A618 24090050 */ li $t1, 80 -/* 07B21C 8007A61C 3C050100 */ lui $a1, (0x0100FA28 >> 16) # lui $a1, 0x100 -/* 07B220 8007A620 A20800D6 */ sb $t0, 0xd6($s0) -/* 07B224 8007A624 AE09004C */ sw $t1, 0x4c($s0) -/* 07B228 8007A628 34A5FA28 */ ori $a1, (0x0100FA28 & 0xFFFF) # ori $a1, $a1, 0xfa28 -/* 07B22C 8007A62C 0C032406 */ jal func_800C9018 -/* 07B230 8007A630 93A40037 */ lbu $a0, 0x37($sp) -/* 07B234 8007A634 10000009 */ b .L8007A65C -/* 07B238 8007A638 8FBF0024 */ lw $ra, 0x24($sp) -/* 07B23C 8007A63C 8E0A004C */ lw $t2, 0x4c($s0) -.L8007A640: -/* 07B240 8007A640 254BFFFF */ addiu $t3, $t2, -1 -/* 07B244 8007A644 15600004 */ bnez $t3, .L8007A658 -/* 07B248 8007A648 AE0B004C */ sw $t3, 0x4c($s0) -/* 07B24C 8007A64C 0C01C922 */ jal func_80072488 -/* 07B250 8007A650 02202025 */ move $a0, $s1 -/* 07B254 8007A654 A20000D6 */ sb $zero, 0xd6($s0) -.L8007A658: -/* 07B258 8007A658 8FBF0024 */ lw $ra, 0x24($sp) -.L8007A65C: -/* 07B25C 8007A65C 8FB0001C */ lw $s0, 0x1c($sp) -/* 07B260 8007A660 8FB10020 */ lw $s1, 0x20($sp) -/* 07B264 8007A664 03E00008 */ jr $ra -/* 07B268 8007A668 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_8007A948.s b/asm/non_matchings/code_80071F00/func_8007A948.s deleted file mode 100644 index a2e83ad1f..000000000 --- a/asm/non_matchings/code_80071F00/func_8007A948.s +++ /dev/null @@ -1,83 +0,0 @@ -.section .late_rodata - -glabel jpt_800EECFC -.word L8007AA30, L8007A9A0, L8007A9B8 -.word L8007A9D0, L8007A9E0, L8007A9F8, L8007AA10 -.word L8007AA28 - -.section .text - -glabel func_8007A948 -/* 07B548 8007A948 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07B54C 8007A94C AFB00018 */ sw $s0, 0x18($sp) -/* 07B550 8007A950 3C108018 */ lui $s0, %hi(D_80183DB8) # 0x8018 -/* 07B554 8007A954 00047080 */ sll $t6, $a0, 2 -/* 07B558 8007A958 020E8021 */ addu $s0, $s0, $t6 -/* 07B55C 8007A95C 8E103DB8 */ lw $s0, %lo(D_80183DB8)($s0) # 0x3db8($s0) -/* 07B560 8007A960 3C188016 */ lui $t8, %hi(D_80165CF0) # 0x8016 -/* 07B564 8007A964 AFBF001C */ sw $ra, 0x1c($sp) -/* 07B568 8007A968 001078C0 */ sll $t7, $s0, 3 -/* 07B56C 8007A96C 01F07823 */ subu $t7, $t7, $s0 -/* 07B570 8007A970 000F7940 */ sll $t7, $t7, 5 -/* 07B574 8007A974 030FC021 */ addu $t8, $t8, $t7 -/* 07B578 8007A978 93185CF0 */ lbu $t8, %lo(D_80165CF0)($t8) # 0x5cf0($t8) -/* 07B57C 8007A97C 00802825 */ move $a1, $a0 -/* 07B580 8007A980 2F010008 */ sltiu $at, $t8, 8 -/* 07B584 8007A984 1020002A */ beqz $at, .L8007AA30 -/* 07B588 8007A988 0018C080 */ sll $t8, $t8, 2 -/* 07B58C 8007A98C 3C01800F */ lui $at, %hi(jpt_800EECFC) # 0x800f -/* 07B590 8007A990 00380821 */ addu $at, $at, $t8 -/* 07B594 8007A994 8C38ECFC */ lw $t8, %lo(jpt_800EECFC)($at) # -0x1304($at) -/* 07B598 8007A998 03000008 */ jr $t8 -/* 07B59C 8007A99C 00000000 */ nop -glabel L8007A9A0 -/* 07B5A0 8007A9A0 0C01E4E0 */ jal func_80079380 -/* 07B5A4 8007A9A4 02002025 */ move $a0, $s0 -/* 07B5A8 8007A9A8 0C022FFF */ jal func_8008BFFC -/* 07B5AC 8007A9AC 02002025 */ move $a0, $s0 -/* 07B5B0 8007A9B0 10000020 */ b .L8007AA34 -/* 07B5B4 8007A9B4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A9B8 -/* 07B5B8 8007A9B8 0C01E5C0 */ jal func_80079700 -/* 07B5BC 8007A9BC 02002025 */ move $a0, $s0 -/* 07B5C0 8007A9C0 0C022FFF */ jal func_8008BFFC -/* 07B5C4 8007A9C4 02002025 */ move $a0, $s0 -/* 07B5C8 8007A9C8 1000001A */ b .L8007AA34 -/* 07B5CC 8007A9CC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A9D0 -/* 07B5D0 8007A9D0 0C01E6D0 */ jal func_80079B40 -/* 07B5D4 8007A9D4 02002025 */ move $a0, $s0 -/* 07B5D8 8007A9D8 10000016 */ b .L8007AA34 -/* 07B5DC 8007A9DC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A9E0 -/* 07B5E0 8007A9E0 0C01E849 */ jal func_8007A124 -/* 07B5E4 8007A9E4 02002025 */ move $a0, $s0 -/* 07B5E8 8007A9E8 0C022FFF */ jal func_8008BFFC -/* 07B5EC 8007A9EC 02002025 */ move $a0, $s0 -/* 07B5F0 8007A9F0 10000010 */ b .L8007AA34 -/* 07B5F4 8007A9F4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007A9F8 -/* 07B5F8 8007A9F8 0C01E8BB */ jal func_8007A2EC -/* 07B5FC 8007A9FC 02002025 */ move $a0, $s0 -/* 07B600 8007AA00 0C022FFF */ jal func_8008BFFC -/* 07B604 8007AA04 02002025 */ move $a0, $s0 -/* 07B608 8007AA08 1000000A */ b .L8007AA34 -/* 07B60C 8007AA0C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007AA10 -/* 07B610 8007AA10 0C01E935 */ jal func_8007A4D4 -/* 07B614 8007AA14 02002025 */ move $a0, $s0 -/* 07B618 8007AA18 0C022FFF */ jal func_8008BFFC -/* 07B61C 8007AA1C 02002025 */ move $a0, $s0 -/* 07B620 8007AA20 10000004 */ b .L8007AA34 -/* 07B624 8007AA24 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007AA28 -/* 07B628 8007AA28 0C01E751 */ jal func_80079D44 -/* 07B62C 8007AA2C 02002025 */ move $a0, $s0 -.L8007AA30: -glabel L8007AA30 -/* 07B630 8007AA30 8FBF001C */ lw $ra, 0x1c($sp) -.L8007AA34: -/* 07B634 8007AA34 8FB00018 */ lw $s0, 0x18($sp) -/* 07B638 8007AA38 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07B63C 8007AA3C 03E00008 */ jr $ra -/* 07B640 8007AA40 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007AFB0.s b/asm/non_matchings/code_80071F00/func_8007AFB0.s deleted file mode 100644 index 59facb351..000000000 --- a/asm/non_matchings/code_80071F00/func_8007AFB0.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8007AFB0 -/* 07BBB0 8007AFB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07BBB4 8007AFB4 00051080 */ sll $v0, $a1, 2 -/* 07BBB8 8007AFB8 AFA40028 */ sw $a0, 0x28($sp) -/* 07BBBC 8007AFBC AFA5002C */ sw $a1, 0x2c($sp) -/* 07BBC0 8007AFC0 3C058016 */ lui $a1, %hi(D_801643BA) # 0x8016 -/* 07BBC4 8007AFC4 3C048016 */ lui $a0, %hi(D_80164392) # 0x8016 -/* 07BBC8 8007AFC8 AFBF0014 */ sw $ra, 0x14($sp) -/* 07BBCC 8007AFCC 00822021 */ addu $a0, $a0, $v0 -/* 07BBD0 8007AFD0 00A22821 */ addu $a1, $a1, $v0 -/* 07BBD4 8007AFD4 84A543BA */ lh $a1, %lo(D_801643BA)($a1) # 0x43ba($a1) -/* 07BBD8 8007AFD8 0C01EBD0 */ jal func_8007AF40 -/* 07BBDC 8007AFDC 84844392 */ lh $a0, %lo(D_80164392)($a0) # 0x4392($a0) -/* 07BBE0 8007AFE0 8FB8002C */ lw $t8, 0x2c($sp) -/* 07BBE4 8007AFE4 3C088019 */ lui $t0, %hi(D_8018CA70) # $t0, 0x8019 -/* 07BBE8 8007AFE8 2508CA70 */ addiu $t0, %lo(D_8018CA70) # addiu $t0, $t0, -0x3590 -/* 07BBEC 8007AFEC 0018C940 */ sll $t9, $t8, 5 -/* 07BBF0 8007AFF0 0338C821 */ addu $t9, $t9, $t8 -/* 07BBF4 8007AFF4 0019C880 */ sll $t9, $t9, 2 -/* 07BBF8 8007AFF8 03281821 */ addu $v1, $t9, $t0 -/* 07BBFC 8007AFFC 90640076 */ lbu $a0, 0x76($v1) -/* 07BC00 8007B000 00022C00 */ sll $a1, $v0, 0x10 -/* 07BC04 8007B004 00057C03 */ sra $t7, $a1, 0x10 -/* 07BC08 8007B008 10800005 */ beqz $a0, .L8007B020 -/* 07BC0C 8007B00C 01E02825 */ move $a1, $t7 -/* 07BC10 8007B010 00042C00 */ sll $a1, $a0, 0x10 -/* 07BC14 8007B014 00054C03 */ sra $t1, $a1, 0x10 -/* 07BC18 8007B018 01202825 */ move $a1, $t1 -/* 07BC1C 8007B01C A0600076 */ sb $zero, 0x76($v1) -.L8007B020: -/* 07BC20 8007B020 8FA40028 */ lw $a0, 0x28($sp) -/* 07BC24 8007B024 0C01CA6D */ jal func_800729B4 -/* 07BC28 8007B028 A7A5001A */ sh $a1, 0x1a($sp) -/* 07BC2C 8007B02C 8FBF0014 */ lw $ra, 0x14($sp) -/* 07BC30 8007B030 87A2001A */ lh $v0, 0x1a($sp) -/* 07BC34 8007B034 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07BC38 8007B038 03E00008 */ jr $ra -/* 07BC3C 8007B03C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007BDE0.s b/asm/non_matchings/code_80071F00/func_8007BDE0.s deleted file mode 100644 index e35f18e3a..000000000 --- a/asm/non_matchings/code_80071F00/func_8007BDE0.s +++ /dev/null @@ -1,70 +0,0 @@ -.section .late_rodata - -glabel D_800EEE10 -.float 0.2 -.word 0x00000000 - -glabel D_800EEE18 -.double 55.0 - -.section .text - -glabel func_8007BDE0 -/* 07C9E0 8007BDE0 000470C0 */ sll $t6, $a0, 3 -/* 07C9E4 8007BDE4 01C47023 */ subu $t6, $t6, $a0 -/* 07C9E8 8007BDE8 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07C9EC 8007BDEC 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07C9F0 8007BDF0 000E7140 */ sll $t6, $t6, 5 -/* 07C9F4 8007BDF4 01CF1021 */ addu $v0, $t6, $t7 -/* 07C9F8 8007BDF8 3C190600 */ lui $t9, %hi(D_06007BA8) # $t9, 0x600 -/* 07C9FC 8007BDFC 24180001 */ li $t8, 1 -/* 07CA00 8007BE00 27397BA8 */ addiu $t9, %lo(D_06007BA8) # addiu $t9, $t9, 0x7ba8 -/* 07CA04 8007BE04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07CA08 8007BE08 A05800D5 */ sb $t8, 0xd5($v0) -/* 07CA0C 8007BE0C AC400054 */ sw $zero, 0x54($v0) -/* 07CA10 8007BE10 AC590070 */ sw $t9, 0x70($v0) -/* 07CA14 8007BE14 3C01800F */ lui $at, %hi(D_800EEE10) # $at, 0x800f -/* 07CA18 8007BE18 C424EE10 */ lwc1 $f4, %lo(D_800EEE10)($at) -/* 07CA1C 8007BE1C AFBF001C */ sw $ra, 0x1c($sp) -/* 07CA20 8007BE20 AFB00018 */ sw $s0, 0x18($sp) -/* 07CA24 8007BE24 00808025 */ move $s0, $a0 -/* 07CA28 8007BE28 0C01C922 */ jal func_80072488 -/* 07CA2C 8007BE2C E4440000 */ swc1 $f4, ($v0) -/* 07CA30 8007BE30 3C02800E */ lui $v0, %hi(D_800E634C) # $v0, 0x800e -/* 07CA34 8007BE34 2442634C */ addiu $v0, %lo(D_800E634C) # addiu $v0, $v0, 0x634c -/* 07CA38 8007BE38 84480000 */ lh $t0, ($v0) -/* 07CA3C 8007BE3C 84490002 */ lh $t1, 2($v0) -/* 07CA40 8007BE40 844A0004 */ lh $t2, 4($v0) -/* 07CA44 8007BE44 44883000 */ mtc1 $t0, $f6 -/* 07CA48 8007BE48 44894000 */ mtc1 $t1, $f8 -/* 07CA4C 8007BE4C 3C01800F */ lui $at, %hi(D_800EEE18) -/* 07CA50 8007BE50 468031A0 */ cvt.s.w $f6, $f6 -/* 07CA54 8007BE54 D430EE18 */ ldc1 $f16, %lo(D_800EEE18)($at) -/* 07CA58 8007BE58 02002025 */ move $a0, $s0 -/* 07CA5C 8007BE5C 468042A1 */ cvt.d.w $f10, $f8 -/* 07CA60 8007BE60 44053000 */ mfc1 $a1, $f6 -/* 07CA64 8007BE64 448A3000 */ mtc1 $t2, $f6 -/* 07CA68 8007BE68 46305480 */ add.d $f18, $f10, $f16 -/* 07CA6C 8007BE6C 468031A0 */ cvt.s.w $f6, $f6 -/* 07CA70 8007BE70 46209120 */ cvt.s.d $f4, $f18 -/* 07CA74 8007BE74 44073000 */ mfc1 $a3, $f6 -/* 07CA78 8007BE78 44062000 */ mfc1 $a2, $f4 -/* 07CA7C 8007BE7C 0C022DF5 */ jal func_8008B7D4 -/* 07CA80 8007BE80 00000000 */ nop -/* 07CA84 8007BE84 44800000 */ mtc1 $zero, $f0 -/* 07CA88 8007BE88 02002025 */ move $a0, $s0 -/* 07CA8C 8007BE8C 3C0641F0 */ lui $a2, 0x41f0 -/* 07CA90 8007BE90 44050000 */ mfc1 $a1, $f0 -/* 07CA94 8007BE94 44070000 */ mfc1 $a3, $f0 -/* 07CA98 8007BE98 0C022E03 */ jal func_8008B80C -/* 07CA9C 8007BE9C 00000000 */ nop -/* 07CAA0 8007BEA0 02002025 */ move $a0, $s0 -/* 07CAA4 8007BEA4 00002825 */ move $a1, $zero -/* 07CAA8 8007BEA8 24063800 */ li $a2, 14336 -/* 07CAAC 8007BEAC 0C022E22 */ jal func_8008B888 -/* 07CAB0 8007BEB0 00003825 */ move $a3, $zero -/* 07CAB4 8007BEB4 8FBF001C */ lw $ra, 0x1c($sp) -/* 07CAB8 8007BEB8 8FB00018 */ lw $s0, 0x18($sp) -/* 07CABC 8007BEBC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07CAC0 8007BEC0 03E00008 */ jr $ra -/* 07CAC4 8007BEC4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007C2F8.s b/asm/non_matchings/code_80071F00/func_8007C2F8.s deleted file mode 100644 index ded645743..000000000 --- a/asm/non_matchings/code_80071F00/func_8007C2F8.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8007C2F8 -/* 07CEF8 8007C2F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 07CEFC 8007C2FC 10800006 */ beqz $a0, .L8007C318 -/* 07CF00 8007C300 AFBF0014 */ sw $ra, 0x14($sp) -/* 07CF04 8007C304 24010001 */ li $at, 1 -/* 07CF08 8007C308 10810007 */ beq $a0, $at, .L8007C328 -/* 07CF0C 8007C30C 00000000 */ nop -/* 07CF10 8007C310 10000008 */ b .L8007C334 -/* 07CF14 8007C314 8FBF0014 */ lw $ra, 0x14($sp) -.L8007C318: -/* 07CF18 8007C318 0C01EF6A */ jal func_8007BDA8 -/* 07CF1C 8007C31C 00000000 */ nop -/* 07CF20 8007C320 10000004 */ b .L8007C334 -/* 07CF24 8007C324 8FBF0014 */ lw $ra, 0x14($sp) -.L8007C328: -/* 07CF28 8007C328 0C01F0A0 */ jal func_8007C280 -/* 07CF2C 8007C32C 00000000 */ nop -/* 07CF30 8007C330 8FBF0014 */ lw $ra, 0x14($sp) -.L8007C334: -/* 07CF34 8007C334 27BD0018 */ addiu $sp, $sp, 0x18 -/* 07CF38 8007C338 03E00008 */ jr $ra -/* 07CF3C 8007C33C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007C5B4.s b/asm/non_matchings/code_80071F00/func_8007C5B4.s deleted file mode 100644 index 2edc7a308..000000000 --- a/asm/non_matchings/code_80071F00/func_8007C5B4.s +++ /dev/null @@ -1,60 +0,0 @@ -.section .late_rodata - -glabel D_800EEEA0 -.float 0.15 - -.section .text - -glabel func_8007C5B4 -/* 07D1B4 8007C5B4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07D1B8 8007C5B8 AFBF0024 */ sw $ra, 0x24($sp) -/* 07D1BC 8007C5BC AFB10020 */ sw $s1, 0x20($sp) -/* 07D1C0 8007C5C0 3C050600 */ lui $a1, %hi(gTLUTBoo) # $a1, 0x600 -/* 07D1C4 8007C5C4 3C068016 */ lui $a2, %hi(D_80165880) # $a2, 0x8016 -/* 07D1C8 8007C5C8 240E0028 */ li $t6, 40 -/* 07D1CC 8007C5CC 00808825 */ move $s1, $a0 -/* 07D1D0 8007C5D0 AFB0001C */ sw $s0, 0x1c($sp) -/* 07D1D4 8007C5D4 AFAE0010 */ sw $t6, 0x10($sp) -/* 07D1D8 8007C5D8 8CC65880 */ lw $a2, %lo(D_80165880)($a2) -/* 07D1DC 8007C5DC 24A55C80 */ addiu $a1, %lo(gTLUTBoo) # addiu $a1, $a1, 0x5c80 -/* 07D1E0 8007C5E0 0C01CD11 */ jal func_80073444 -/* 07D1E4 8007C5E4 24070030 */ li $a3, 48 -/* 07D1E8 8007C5E8 001178C0 */ sll $t7, $s1, 3 -/* 07D1EC 8007C5EC 44800000 */ mtc1 $zero, $f0 -/* 07D1F0 8007C5F0 01F17823 */ subu $t7, $t7, $s1 -/* 07D1F4 8007C5F4 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07D1F8 8007C5F8 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07D1FC 8007C5FC 000F7940 */ sll $t7, $t7, 5 -/* 07D200 8007C600 01F88021 */ addu $s0, $t7, $t8 -/* 07D204 8007C604 02202025 */ move $a0, $s1 -/* 07D208 8007C608 24050020 */ li $a1, 32 -/* 07D20C 8007C60C E6000004 */ swc1 $f0, 4($s0) -/* 07D210 8007C610 E6000008 */ swc1 $f0, 8($s0) -/* 07D214 8007C614 0C01C870 */ jal func_800721C0 -/* 07D218 8007C618 E600000C */ swc1 $f0, 0xc($s0) -/* 07D21C 8007C61C 0C01C922 */ jal func_80072488 -/* 07D220 8007C620 02202025 */ move $a0, $s1 -/* 07D224 8007C624 A60000A0 */ sh $zero, 0xa0($s0) -/* 07D228 8007C628 0C01CE11 */ jal func_80073844 -/* 07D22C 8007C62C 02202025 */ move $a0, $s1 -/* 07D230 8007C630 3C01800F */ lui $at, %hi(D_800EEEA0) # $at, 0x800f -/* 07D234 8007C634 C424EEA0 */ lwc1 $f4, %lo(D_800EEEA0)($at) -/* 07D238 8007C638 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 07D23C 8007C63C 44813000 */ mtc1 $at, $f6 -/* 07D240 8007C640 02202025 */ move $a0, $s1 -/* 07D244 8007C644 E6040000 */ swc1 $f4, ($s0) -/* 07D248 8007C648 0C01CFF5 */ jal func_80073FD4 -/* 07D24C 8007C64C E6060034 */ swc1 $f6, 0x34($s0) -/* 07D250 8007C650 0C021BBC */ jal func_80086EF0 -/* 07D254 8007C654 02202025 */ move $a0, $s1 -/* 07D258 8007C658 02202025 */ move $a0, $s1 -/* 07D25C 8007C65C 0C01C870 */ jal func_800721C0 -/* 07D260 8007C660 24050800 */ li $a1, 2048 -/* 07D264 8007C664 8FBF0024 */ lw $ra, 0x24($sp) -/* 07D268 8007C668 34198000 */ li $t9, 32768 -/* 07D26C 8007C66C A60000B2 */ sh $zero, 0xb2($s0) -/* 07D270 8007C670 A61900B6 */ sh $t9, 0xb6($s0) -/* 07D274 8007C674 8FB0001C */ lw $s0, 0x1c($sp) -/* 07D278 8007C678 8FB10020 */ lw $s1, 0x20($sp) -/* 07D27C 8007C67C 03E00008 */ jr $ra -/* 07D280 8007C680 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_8007FF5C.s b/asm/non_matchings/code_80071F00/func_8007FF5C.s deleted file mode 100644 index ca3a02704..000000000 --- a/asm/non_matchings/code_80071F00/func_8007FF5C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8007FF5C -/* 080B5C 8007FF5C 000470C0 */ sll $t6, $a0, 3 -/* 080B60 8007FF60 01C47023 */ subu $t6, $t6, $a0 -/* 080B64 8007FF64 000E7140 */ sll $t6, $t6, 5 -/* 080B68 8007FF68 3C028016 */ lui $v0, %hi(D_80165CF5) # 0x8016 -/* 080B6C 8007FF6C 004E1021 */ addu $v0, $v0, $t6 -/* 080B70 8007FF70 90425CF5 */ lbu $v0, %lo(D_80165CF5)($v0) # 0x5cf5($v0) -/* 080B74 8007FF74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 080B78 8007FF78 24010001 */ li $at, 1 -/* 080B7C 8007FF7C 10410006 */ beq $v0, $at, .L8007FF98 -/* 080B80 8007FF80 AFBF0014 */ sw $ra, 0x14($sp) -/* 080B84 8007FF84 24010002 */ li $at, 2 -/* 080B88 8007FF88 10410007 */ beq $v0, $at, .L8007FFA8 -/* 080B8C 8007FF8C 00000000 */ nop -/* 080B90 8007FF90 10000008 */ b .L8007FFB4 -/* 080B94 8007FF94 8FBF0014 */ lw $ra, 0x14($sp) -.L8007FF98: -/* 080B98 8007FF98 0C01FED2 */ jal func_8007FB48 -/* 080B9C 8007FF9C 00000000 */ nop -/* 080BA0 8007FFA0 10000004 */ b .L8007FFB4 -/* 080BA4 8007FFA4 8FBF0014 */ lw $ra, 0x14($sp) -.L8007FFA8: -/* 080BA8 8007FFA8 0C01FFA9 */ jal func_8007FEA4 -/* 080BAC 8007FFAC 00000000 */ nop -/* 080BB0 8007FFB0 8FBF0014 */ lw $ra, 0x14($sp) -.L8007FFB4: -/* 080BB4 8007FFB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 080BB8 8007FFB8 03E00008 */ jr $ra -/* 080BBC 8007FFBC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007FFC0.s b/asm/non_matchings/code_80071F00/func_8007FFC0.s deleted file mode 100644 index e19c669cd..000000000 --- a/asm/non_matchings/code_80071F00/func_8007FFC0.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_8007FFC0 -/* 080BC0 8007FFC0 000470C0 */ sll $t6, $a0, 3 -/* 080BC4 8007FFC4 01C47023 */ subu $t6, $t6, $a0 -/* 080BC8 8007FFC8 000E7140 */ sll $t6, $t6, 5 -/* 080BCC 8007FFCC 3C028016 */ lui $v0, %hi(D_80165CBE) # 0x8016 -/* 080BD0 8007FFD0 004E1021 */ addu $v0, $v0, $t6 -/* 080BD4 8007FFD4 84425CBE */ lh $v0, %lo(D_80165CBE)($v0) # 0x5cbe($v0) -/* 080BD8 8007FFD8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 080BDC 8007FFDC AFB00018 */ sw $s0, 0x18($sp) -/* 080BE0 8007FFE0 00808025 */ move $s0, $a0 -/* 080BE4 8007FFE4 10400017 */ beqz $v0, .L80080044 -/* 080BE8 8007FFE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 080BEC 8007FFEC 24010001 */ li $at, 1 -/* 080BF0 8007FFF0 10410008 */ beq $v0, $at, .L80080014 -/* 080BF4 8007FFF4 24010003 */ li $at, 3 -/* 080BF8 8007FFF8 1041000A */ beq $v0, $at, .L80080024 -/* 080BFC 8007FFFC 02002025 */ move $a0, $s0 -/* 080C00 80080000 24010004 */ li $at, 4 -/* 080C04 80080004 1041000B */ beq $v0, $at, .L80080034 -/* 080C08 80080008 00000000 */ nop -/* 080C0C 8008000C 1000000D */ b .L80080044 -/* 080C10 80080010 00000000 */ nop -.L80080014: -/* 080C14 80080014 0C01FE82 */ jal func_8007FA08 -/* 080C18 80080018 02002025 */ move $a0, $s0 -/* 080C1C 8008001C 10000009 */ b .L80080044 -/* 080C20 80080020 00000000 */ nop -.L80080024: -/* 080C24 80080024 0C01C95A */ jal func_80072568 -/* 080C28 80080028 24050032 */ li $a1, 50 -/* 080C2C 8008002C 10000005 */ b .L80080044 -/* 080C30 80080030 00000000 */ nop -.L80080034: -/* 080C34 80080034 0C01C922 */ jal func_80072488 -/* 080C38 80080038 02002025 */ move $a0, $s0 -/* 080C3C 8008003C 0C021BF5 */ jal func_80086FD4 -/* 080C40 80080040 02002025 */ move $a0, $s0 -.L80080044: -/* 080C44 80080044 0C01F98F */ jal func_8007E63C -/* 080C48 80080048 02002025 */ move $a0, $s0 -/* 080C4C 8008004C 0C01FFD7 */ jal func_8007FF5C -/* 080C50 80080050 02002025 */ move $a0, $s0 -/* 080C54 80080054 0C022FC6 */ jal func_8008BF18 -/* 080C58 80080058 02002025 */ move $a0, $s0 -/* 080C5C 8008005C 0C01CD45 */ jal func_80073514 -/* 080C60 80080060 02002025 */ move $a0, $s0 -/* 080C64 80080064 8FBF001C */ lw $ra, 0x1c($sp) -/* 080C68 80080068 8FB00018 */ lw $s0, 0x18($sp) -/* 080C6C 8008006C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 080C70 80080070 03E00008 */ jr $ra -/* 080C74 80080074 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80083474.s b/asm/non_matchings/code_80071F00/func_80083474.s deleted file mode 100644 index 6c990831d..000000000 --- a/asm/non_matchings/code_80071F00/func_80083474.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80083474 -/* 084074 80083474 000470C0 */ sll $t6, $a0, 3 -/* 084078 80083478 01C47023 */ subu $t6, $t6, $a0 -/* 08407C 8008347C 000E7140 */ sll $t6, $t6, 5 -/* 084080 80083480 3C0F8016 */ lui $t7, %hi(D_80165CBE) # 0x8016 -/* 084084 80083484 01EE7821 */ addu $t7, $t7, $t6 -/* 084088 80083488 85EF5CBE */ lh $t7, %lo(D_80165CBE)($t7) # 0x5cbe($t7) -/* 08408C 8008348C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 084090 80083490 AFBF0014 */ sw $ra, 0x14($sp) -/* 084094 80083494 29E10002 */ slti $at, $t7, 2 -/* 084098 80083498 54200004 */ bnel $at, $zero, .L800834AC -/* 08409C 8008349C 8FBF0014 */ lw $ra, 0x14($sp) -/* 0840A0 800834A0 0C0227C9 */ jal func_80089F24 -/* 0840A4 800834A4 00000000 */ nop -/* 0840A8 800834A8 8FBF0014 */ lw $ra, 0x14($sp) -.L800834AC: -/* 0840AC 800834AC 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0840B0 800834B0 03E00008 */ jr $ra -/* 0840B4 800834B4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/gen_random_item.s b/asm/non_matchings/code_80071F00/gen_random_item.s deleted file mode 100644 index 00a11dc7d..000000000 --- a/asm/non_matchings/code_80071F00/gen_random_item.s +++ /dev/null @@ -1,113 +0,0 @@ -glabel gen_random_item -/* 07B9A8 8007ADA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07B9AC 8007ADAC AFBF0014 */ sw $ra, 0x14($sp) -/* 07B9B0 8007ADB0 AFA40020 */ sw $a0, 0x20($sp) -/* 07B9B4 8007ADB4 AFA50024 */ sw $a1, 0x24($sp) -/* 07B9B8 8007ADB8 0C0ADF8D */ jal random_int -/* 07B9BC 8007ADBC 24040064 */ li $a0, 100 -/* 07B9C0 8007ADC0 3C058016 */ lui $a1, %hi(D_801658FD) # $a1, 0x8016 -/* 07B9C4 8007ADC4 24A558FD */ addiu $a1, %lo(D_801658FD) # addiu $a1, $a1, 0x58fd -/* 07B9C8 8007ADC8 3C0F8016 */ lui $t7, %hi(D_801658FF) # $t7, 0x8016 -/* 07B9CC 8007ADCC 91EF58FF */ lbu $t7, %lo(D_801658FF)($t7) -/* 07B9D0 8007ADD0 90AE0000 */ lbu $t6, ($a1) -/* 07B9D4 8007ADD4 3C088019 */ lui $t0, %hi(gRaceFrameCounter) # $t0, 0x8019 -/* 07B9D8 8007ADD8 8D08D3FC */ lw $t0, %lo(gRaceFrameCounter)($t0) -/* 07B9DC 8007ADDC 01CFC021 */ addu $t8, $t6, $t7 -/* 07B9E0 8007ADE0 0058C821 */ addu $t9, $v0, $t8 -/* 07B9E4 8007ADE4 24010064 */ li $at, 100 -/* 07B9E8 8007ADE8 03284821 */ addu $t1, $t9, $t0 -/* 07B9EC 8007ADEC 0121001B */ divu $zero, $t1, $at -/* 07B9F0 8007ADF0 00005010 */ mfhi $t2 -/* 07B9F4 8007ADF4 A0AA0000 */ sb $t2, ($a1) -/* 07B9F8 8007ADF8 3C03800E */ lui $v1, %hi(gModeSelection) # $v1, 0x800e -/* 07B9FC 8007ADFC 8C63C53C */ lw $v1, %lo(gModeSelection)($v1) -/* 07BA00 8007AE00 24040002 */ li $a0, 2 -/* 07BA04 8007AE04 3C02800E */ lui $v0, %hi(gPlayerCountSelection1) # $v0, 0x800e -/* 07BA08 8007AE08 1483002A */ bne $a0, $v1, .L8007AEB4 -/* 07BA0C 8007AE0C 24010003 */ li $at, 3 -/* 07BA10 8007AE10 8C42C538 */ lw $v0, %lo(gPlayerCountSelection1)($v0) -/* 07BA14 8007AE14 24010003 */ li $at, 3 -/* 07BA18 8007AE18 10440008 */ beq $v0, $a0, .L8007AE3C -/* 07BA1C 8007AE1C 00000000 */ nop -/* 07BA20 8007AE20 1041000D */ beq $v0, $at, .L8007AE58 -/* 07BA24 8007AE24 3C040D01 */ lui $a0, 0xd01 -/* 07BA28 8007AE28 24010004 */ li $at, 4 -/* 07BA2C 8007AE2C 10410010 */ beq $v0, $at, .L8007AE70 -/* 07BA30 8007AE30 3C040D01 */ lui $a0, 0xd01 -/* 07BA34 8007AE34 10000014 */ b .L8007AE88 -/* 07BA38 8007AE38 87AB0022 */ lh $t3, 0x22($sp) -.L8007AE3C: -/* 07BA3C 8007AE3C 3C040D01 */ lui $a0, %hi(D_0D008790) # $a0, 0xd01 -/* 07BA40 8007AE40 0C0A9EF5 */ jal segmented_to_virtual -/* 07BA44 8007AE44 24848790 */ addiu $a0, %lo(D_0D008790) # addiu $a0, $a0, -0x7870 -/* 07BA48 8007AE48 3C058016 */ lui $a1, %hi(D_801658FD) # $a1, 0x8016 -/* 07BA4C 8007AE4C AFA20018 */ sw $v0, 0x18($sp) -/* 07BA50 8007AE50 1000000C */ b .L8007AE84 -/* 07BA54 8007AE54 24A558FD */ addiu $a1, %lo(D_801658FD) # addiu $a1, $a1, 0x58fd -.L8007AE58: -/* 07BA58 8007AE58 0C0A9EF5 */ jal segmented_to_virtual -/* 07BA5C 8007AE5C 24848858 */ addiu $a0, $a0, -0x77a8 -/* 07BA60 8007AE60 3C058016 */ lui $a1, %hi(D_801658FD) # $a1, 0x8016 -/* 07BA64 8007AE64 AFA20018 */ sw $v0, 0x18($sp) -/* 07BA68 8007AE68 10000006 */ b .L8007AE84 -/* 07BA6C 8007AE6C 24A558FD */ addiu $a1, %lo(D_801658FD) # addiu $a1, $a1, 0x58fd -.L8007AE70: -/* 07BA70 8007AE70 0C0A9EF5 */ jal segmented_to_virtual -/* 07BA74 8007AE74 24848984 */ addiu $a0, $a0, -0x767c -/* 07BA78 8007AE78 3C058016 */ lui $a1, %hi(D_801658FD) # $a1, 0x8016 -/* 07BA7C 8007AE7C AFA20018 */ sw $v0, 0x18($sp) -/* 07BA80 8007AE80 24A558FD */ addiu $a1, %lo(D_801658FD) # addiu $a1, $a1, 0x58fd -.L8007AE84: -/* 07BA84 8007AE84 87AB0022 */ lh $t3, 0x22($sp) -.L8007AE88: -/* 07BA88 8007AE88 8FAD0018 */ lw $t5, 0x18($sp) -/* 07BA8C 8007AE8C 90AF0000 */ lbu $t7, ($a1) -/* 07BA90 8007AE90 000B6080 */ sll $t4, $t3, 2 -/* 07BA94 8007AE94 018B6023 */ subu $t4, $t4, $t3 -/* 07BA98 8007AE98 000C60C0 */ sll $t4, $t4, 3 -/* 07BA9C 8007AE9C 018B6021 */ addu $t4, $t4, $t3 -/* 07BAA0 8007AEA0 000C6080 */ sll $t4, $t4, 2 -/* 07BAA4 8007AEA4 018D7021 */ addu $t6, $t4, $t5 -/* 07BAA8 8007AEA8 01CFC021 */ addu $t8, $t6, $t7 -/* 07BAAC 8007AEAC 1000001F */ b .L8007AF2C -/* 07BAB0 8007AEB0 93030000 */ lbu $v1, ($t8) -.L8007AEB4: -/* 07BAB4 8007AEB4 14610009 */ bne $v1, $at, .L8007AEDC -/* 07BAB8 8007AEB8 87A90026 */ lh $t1, 0x26($sp) -/* 07BABC 8007AEBC 3C040D01 */ lui $a0, %hi(D_0D008B14) # $a0, 0xd01 -/* 07BAC0 8007AEC0 0C0A9EF5 */ jal segmented_to_virtual -/* 07BAC4 8007AEC4 24848B14 */ addiu $a0, %lo(D_0D008B14) # addiu $a0, $a0, -0x74ec -/* 07BAC8 8007AEC8 3C198016 */ lui $t9, %hi(D_801658FD) # $t9, 0x8016 -/* 07BACC 8007AECC 933958FD */ lbu $t9, %lo(D_801658FD)($t9) -/* 07BAD0 8007AED0 03224021 */ addu $t0, $t9, $v0 -/* 07BAD4 8007AED4 10000015 */ b .L8007AF2C -/* 07BAD8 8007AED8 91030000 */ lbu $v1, ($t0) -.L8007AEDC: -/* 07BADC 8007AEDC 15200006 */ bnez $t1, .L8007AEF8 -/* 07BAE0 8007AEE0 3C040D01 */ lui $a0, 0xd01 -/* 07BAE4 8007AEE4 3C040D01 */ lui $a0, %hi(D_0D008150) # $a0, 0xd01 -/* 07BAE8 8007AEE8 0C0A9EF5 */ jal segmented_to_virtual -/* 07BAEC 8007AEEC 24848150 */ addiu $a0, %lo(D_0D008150) # addiu $a0, $a0, -0x7eb0 -/* 07BAF0 8007AEF0 10000004 */ b .L8007AF04 -/* 07BAF4 8007AEF4 87AA0022 */ lh $t2, 0x22($sp) -.L8007AEF8: -/* 07BAF8 8007AEF8 0C0A9EF5 */ jal segmented_to_virtual -/* 07BAFC 8007AEFC 24848470 */ addiu $a0, $a0, -0x7b90 -/* 07BB00 8007AF00 87AA0022 */ lh $t2, 0x22($sp) -.L8007AF04: -/* 07BB04 8007AF04 3C0D8016 */ lui $t5, %hi(D_801658FD) # $t5, 0x8016 -/* 07BB08 8007AF08 91AD58FD */ lbu $t5, %lo(D_801658FD)($t5) -/* 07BB0C 8007AF0C 000A5880 */ sll $t3, $t2, 2 -/* 07BB10 8007AF10 016A5823 */ subu $t3, $t3, $t2 -/* 07BB14 8007AF14 000B58C0 */ sll $t3, $t3, 3 -/* 07BB18 8007AF18 016A5821 */ addu $t3, $t3, $t2 -/* 07BB1C 8007AF1C 000B5880 */ sll $t3, $t3, 2 -/* 07BB20 8007AF20 01626021 */ addu $t4, $t3, $v0 -/* 07BB24 8007AF24 018D7021 */ addu $t6, $t4, $t5 -/* 07BB28 8007AF28 91C30000 */ lbu $v1, ($t6) -.L8007AF2C: -/* 07BB2C 8007AF2C 8FBF0014 */ lw $ra, 0x14($sp) -/* 07BB30 8007AF30 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07BB34 8007AF34 00601025 */ move $v0, $v1 -/* 07BB38 8007AF38 03E00008 */ jr $ra -/* 07BB3C 8007AF3C 00000000 */ nop diff --git a/assets.json b/assets.json index 4ee0d053a..ee87e63cd 100644 --- a/assets.json +++ b/assets.json @@ -12143,9 +12143,6 @@ "textures/common/132B50_06A58.i4.png": {"meta":{"dims":[16,16]}, "offsets": {"us":["0x132B50", "0x06A58"]}}, "textures/common/132B50_06AD8.ia8.png": {"meta":{"dims":[32,32]}, "offsets": {"us":["0x132B50", "0x06AD8"]}}, "textures/common/tlut/132B50_06EF8.rgba16.ci4.png": {"meta":{"dims":[128,32], "pal":"0x06ED8"}, "offsets": {"us":["0x132B50", "0x06EF8"]}}, -"textures/common/132B50_08150.ia8.png": {"meta":{"dims":[100,8]}, "offsets": {"us":["0x132B50", "0x08150"]}}, -"textures/common/132B50_08470.ia8.png": {"meta":{"dims":[100,8]}, "offsets": {"us":["0x132B50", "0x08470"]}}, -"textures/common/132B50_08790.ia8.png": {"meta":{"dims":[100,10]}, "offsets": {"us":["0x132B50", "0x08790"]}}, "textures/common/132B50_09958.i4.png": {"meta":{"dims":[64,96]}, "offsets": {"us":["0x132B50", "0x09958"]}}, "textures/common/132B50_0A558.i4.png": {"meta":{"dims":[64,32]}, "offsets": {"us":["0x132B50", "0x0A558"]}}, "textures/common/132B50_0A958.rgba16.png": {"meta":{"dims":[32,8]}, "offsets": {"us":["0x132B50", "0x0A958"]}}, diff --git a/include/common_structs.h b/include/common_structs.h index 9d289d95a..5c2753f4d 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -516,7 +516,7 @@ typedef struct { /* 0x73 */ s8 blinkState; /* 0x74 */ s8 unk_74; /* 0x75 */ s8 unk_75; - /* 0x76 */ s8 itemOverride; // Something related to item generation. If non-zero, it determines the item you get + /* 0x76 */ u8 itemOverride; // Something related to item generation. If non-zero, it determines the item you get /* 0x77 */ s8 unk_77; // 0x78 to 0x7F appear to be some type of "state" trackers for the lap and timer text during a race start // When a race starts those texts (and their afterimages) slide in and "bounce" a bit. These states control the bouncing (somehow) diff --git a/include/sounds.h b/include/sounds.h index 99eda334b..c37210e22 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -113,4 +113,4 @@ -#endif // SOUNDS_H \ No newline at end of file +#endif // SOUNDS_H diff --git a/src/audio/external.c b/src/audio/external.c index 27a85c2c5..802102509 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -4238,16 +4238,21 @@ block_4: GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8F80.s") #endif -#ifdef MIPS_TO_C +#ifdef NON_MATCHING //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_800C5578(void *, s32); // extern -extern ? D_800E9F7C; +//void func_800C5578(void *, s32); // extern -void func_800C9018(s32 arg0) { - s32 temp_a2; +typedef struct { + s32 unk0[0x3C]; +} UnkStruct_800E9F7C; - temp_a2 = arg0 & 0xFF; - func_800C5578((temp_a2 * 0x3C) + &D_800E9F7C, temp_a2); +extern UnkStruct_800E9F7C D_800E9F7C[]; + +void func_800C9018(u8 arg0, s32 arg1) { + //s32 temp_a2; + + //temp_a2 = arg0; + func_800C5578(D_800E9F7C->unk0[arg0], arg1); } #else GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9018.s") diff --git a/src/code_80027D00.c b/src/code_80027D00.c index 1332993df..b3b919d4d 100644 --- a/src/code_80027D00.c +++ b/src/code_80027D00.c @@ -1843,7 +1843,7 @@ void func_8002B308(Player *player, s8 arg1, s8 arg2) { if ((player->statusEffects & 0x01000000) == 0x01000000) { func_8008EAE0(player, arg1); } - if ((player->statusEffects & 0x800000) == 0x800000) { + if ((player->statusEffects & 0x00800000) == 0x00800000) { func_8008EC88(player, arg1); } if ((player->statusEffects & 0x8000) == 0x8000) { diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 734398596..171eccf1b 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -828,14 +828,14 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80059820.s") void func_800598D4(s32 arg0) { struct Controller *controller = &gControllerOne[arg0]; - if ((controller->button & 0x8000) != 0) { - D_801658FF++; + if ((controller->button & A_BUTTON) != 0) { + gControllerRandom++; } - if ((controller->button & 0x4000) != 0) { - D_801658FF++; + if ((controller->button & B_BUTTON) != 0) { + gControllerRandom++; } - if ((controller->button & 0x10) != 0) { - D_801658FF++; + if ((controller->button & R_TRIG) != 0) { + gControllerRandom++; } } @@ -8287,8 +8287,8 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80069DB8.s") #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800652D4(f32 *, s16 *, f32); /* extern */ -extern u32 D_8018D49C; +//? func_800652D4(f32 *, s16 *, f32); /* extern */ +//extern u32 D_8018D49C; void func_8006A01C(Player *player, s32 arg1, s16 arg2, s8 arg3) { f32 sp5C; @@ -8297,83 +8297,77 @@ void func_8006A01C(Player *player, s32 arg1, s16 arg2, s8 arg3) { s16 sp50; s16 sp4E; s16 sp4C; - Gfx *sp2C; - Gfx *sp28; - Gfx *temp_v0_10; - Gfx *temp_v0_11; - Gfx *temp_v0_12; - Gfx *temp_v0_13; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_4; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - Gfx *temp_v0_8; - Gfx *temp_v0_9; - void *temp_v0; - - temp_v0 = player + (arg2 * 0x48); + UnkPlayerStruct258 *temp_v0 = &player->unk_258[arg2]; // + (arg2 * 0x48); if (player->unk_258[arg2].unk_01C == 1) { - sp54 = temp_v0->unk528; - sp58 = temp_v0->unk52C; + sp54 = player->unk_258[arg2].unk_028; + sp58 = player->unk_258[arg2].unk_02C; sp4C = 0; - sp5C = temp_v0->unk530; + sp5C = player->unk_258[arg2].unk_030; sp50 = 0; sp4E = player->unk_048[arg3]; - func_800652D4(&sp54, &sp4C, temp_v0->unk534 * player->unk_224); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x06000000; - temp_v0_2->words.w1 = (u32) D_0D008D58; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w1 = 0; - temp_v0_3->words.w0 = 0xBA000E02; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w0 = 0xFD700000; - temp_v0_4->words.w1 = D_8018D49C; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w1 = 0x07080200; - temp_v0_5->words.w0 = 0xF5700000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w1 = 0; - temp_v0_6->words.w0 = 0xE6000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w1 = 0x070FF200; - temp_v0_7->words.w0 = 0xF3000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->words.w1 = 0; - temp_v0_8->words.w0 = 0xE7000000; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - sp2C = temp_v0_9; - temp_v0_9->words.w0 = 0xF5700800; - temp_v0_9->words.w1 = 0x00080200; - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - sp28 = temp_v0_10; - temp_v0_10->words.w1 = 0x0003C03C; - temp_v0_10->words.w0 = 0xF2000000; - func_8004B35C(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF); - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->words.w0 = 0xB900031D; - temp_v0_11->words.w1 = 0x00504B50; - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->words.w1 = (u32) D_0D008B78; - temp_v0_12->words.w0 = 0x0400103F; - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->words.w0 = 0x06000000; - temp_v0_13->words.w1 = (u32) D_0D008DA0; - D_80164AF0 += 1; + func_800652D4(&sp54, &sp4C, player->unk_258[arg2].unk_034 * player->unk_224); + + gSPDisplayList(gDisplayListHead++, D_0D008D58); + gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); + gDPLoadTextureBlock(gDisplayListHead++, D_8018D49C, G_IM_FMT_IA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + func_8004B35C(0xFF, 0xFF, 0xFF, 0xFF); + gDPSetRenderMode(gDisplayListHead++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); + gSPVertex(gDisplayListHead++, D_0D008B78, 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D008DA0); + D_80164AF0++; + + + + // temp_v0_2 = gDisplayListHead; + // gDisplayListHead = temp_v0_2 + 8; + // temp_v0_2->words.w0 = 0x06000000; + // temp_v0_2->words.w1 = (u32) D_0D008D58; + // temp_v0_3 = gDisplayListHead; + // gDisplayListHead = temp_v0_3 + 8; + // temp_v0_3->words.w1 = 0; + // temp_v0_3->words.w0 = 0xBA000E02; + // temp_v0_4 = gDisplayListHead; + // gDisplayListHead = temp_v0_4 + 8; + // temp_v0_4->words.w0 = 0xFD700000; + // temp_v0_4->words.w1 = D_8018D49C; + // temp_v0_5 = gDisplayListHead; + // gDisplayListHead = temp_v0_5 + 8; + // temp_v0_5->words.w1 = 0x07080200; + // temp_v0_5->words.w0 = 0xF5700000; + // temp_v0_6 = gDisplayListHead; + // gDisplayListHead = temp_v0_6 + 8; + // temp_v0_6->words.w1 = 0; + // temp_v0_6->words.w0 = 0xE6000000; + // temp_v0_7 = gDisplayListHead; + // gDisplayListHead = temp_v0_7 + 8; + // temp_v0_7->words.w1 = 0x070FF200; + // temp_v0_7->words.w0 = 0xF3000000; + // temp_v0_8 = gDisplayListHead; + // gDisplayListHead = temp_v0_8 + 8; + // temp_v0_8->words.w1 = 0; + // temp_v0_8->words.w0 = 0xE7000000; + // temp_v0_9 = gDisplayListHead; + // gDisplayListHead = temp_v0_9 + 8; + // sp2C = temp_v0_9; + // temp_v0_9->words.w0 = 0xF5700800; + // temp_v0_9->words.w1 = 0x00080200; + // temp_v0_10 = gDisplayListHead; + // gDisplayListHead = temp_v0_10 + 8; + // sp28 = temp_v0_10; + // temp_v0_10->words.w1 = 0x0003C03C; + // temp_v0_10->words.w0 = 0xF2000000; + // temp_v0_11 = gDisplayListHead; + // gDisplayListHead = temp_v0_11 + 8; + // temp_v0_11->words.w0 = 0xB900031D; + // temp_v0_11->words.w1 = 0x00504B50; + // temp_v0_12 = gDisplayListHead; + // gDisplayListHead = temp_v0_12 + 8; + // temp_v0_12->words.w1 = (u32) D_0D008B78; + // temp_v0_12->words.w0 = 0x0400103F; + // temp_v0_13 = gDisplayListHead; + // gDisplayListHead = temp_v0_13 + 8; + // temp_v0_13->words.w0 = 0x06000000; + // temp_v0_13->words.w1 = (u32) D_0D008DA0; } } #else diff --git a/src/code_80057C60.h b/src/code_80057C60.h index 431adf4dc..661110d7f 100644 --- a/src/code_80057C60.h +++ b/src/code_80057C60.h @@ -218,7 +218,7 @@ extern s8 D_801657F0; extern s8 D_80165800; extern s8 D_80165801; extern s8 D_801657B0; -extern u8 D_801658FF; +extern u8 gControllerRandom; extern struct Controller *gControllerOne; extern s32 D_8018D214; extern s32 D_8018D2C8[]; diff --git a/src/code_80071F00.c b/src/code_80071F00.c index c461a3546..59c966f5f 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -2,6 +2,7 @@ #include #include #include +#include "memory.h" #include "camera.h" #include "math_util.h" #include "math_util_2.h" @@ -13,6 +14,35 @@ #include "code_80086E70.h" #include "common_textures.h" #include "audio/external.h" +#include "sounds.h" +#include + +extern s32 D_8018D1F0; + +typedef struct { + s16 unk[0x70]; +} UnkStruct_80165CBE; + +extern UnkStruct_80165CBE D_80165CBE[]; + +typedef struct { + u8 unk[0xE0]; +} UnkStruct_80165CF5; + +extern UnkStruct_80165CF5 D_80165CF5[]; + +typedef struct { + f32 unk[0x38]; +} UnkStruct_80165C40; + +extern UnkStruct_80165C40 D_80165C40[]; + +typedef struct { + s16 unk[0x70]; +} UnkStruct_80165CB4; + +extern UnkStruct_80165CB4 D_80165CB4[]; + s32 find_unused_obj_index(s32* arg0) { s32 temp_v0; @@ -97,25 +127,15 @@ void func_80072100(s32 *arg0) { func_80071F6C(arg0); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc void func_80072120(s32 *arg0, s32 arg1) { - s32 *var_s1; s32 var_s0; + s32 i; - var_s1 = arg0; - var_s0 = 0; - if (arg1 > 0) { - do { - func_800721E8(*var_s1, 0x00600000); - var_s0 += 1; - var_s1 += 4; - } while (var_s0 != arg1); + for (i = 0; i < arg1; i++) { + func_800721E8(*arg0, 0x00600000); + arg0++; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80072120.s") -#endif void func_80072180(void) { if (gModeSelection == TIME_TRIALS) { @@ -357,35 +377,22 @@ void func_800729D0(s32 arg0, s32 arg1) { D_80165C18[arg0].unk_0A4 = arg1; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_8018D2A4; -extern s32 D_8018D2BC; -s16 gCurrentCourseId; /* unable to generate initializer */ - void func_800729EC(s32 arg0) { - s8 temp_v1; - struct_8018CA70_entry *var_v0; + u32 temp_v1 = 1; + s32 i; start_race(); func_80072488(arg0); D_8018D2BC = 1; D_8018D2A4 = 1; + if (gCurrentCourseId != 4) { - temp_v1 = D_8018EDF3; - var_v0 = D_8018CA70; - if (temp_v1 > 0) { - do { - var_v0 += 0x84; - var_v0->unk-3 = 1; - } while ((u32) var_v0 < (u32) &D_8018CA70[temp_v1]); + for (i = 0; i < D_8018EDF3; i++) { + D_8018CA70[i].unk_81 = temp_v1; } } func_8005AB20(); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800729EC.s") -#endif UNUSED void func_80072A78(s32 arg0, s32 arg1) { D_80165C18[arg0].unk_0D2 = arg1; @@ -1153,17 +1160,9 @@ void func_80074510(uintptr_t devAddr, void * vaddr, size_t nbytes) { D_8018D224 = 1; } -#ifdef NON_MATCHING - -extern s8 _other_texturesSegmentRomStart[]; - -void func_80074574(s32 arg0, u8 *arg1, u16 arg2, u16 arg3) { - if (1); - func_80074510(&_other_texturesSegmentRomStart[arg0 & 0xFFFFFF], (void *) (arg2 * arg3), arg3); +void func_80074574(s32 arg0, void *arg1, u16 arg2, u16 arg3) { + func_80074510(&_other_texturesSegmentRomStart[SEGMENT_OFFSET(arg0)], arg1, arg2 * arg3); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80074574.s") -#endif void func_800745C8(s32 arg0, s32 arg1) { s32 phi_a1; @@ -1225,47 +1224,31 @@ s32 func_80074790(s32 arg0, s32 arg1) { return (D_80165C18[arg0].unk_0D9 * D_80165C18[arg0].unk_0DA * phi_a2) + arg1; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80074574(s32, s32, u8, u8); /* extern */ - void func_800747F0(s32 objectIndex, s32 arg1) { s32 sp24; - struct_80165C18_entry *sp1C; - s8 temp_v0; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - temp_v0 = temp_v1->unk_0D2; - if (temp_v0 != temp_v1->unk_0D3) { - sp1C = temp_v1; - sp24 = (temp_v0 * temp_v1->unk_0D9 * temp_v1->unk_0DA) + temp_v1->unk_06C; - func_80074574(sp24, func_80074790(objectIndex, arg1), temp_v1->unk_0D9, temp_v1->unk_0DA); - temp_v1->unk_0D3 = temp_v1->unk_0D2; + if (D_80165C18[objectIndex].unk_0D2 != D_80165C18[objectIndex].unk_0D3) { + sp24 = D_80165C18[objectIndex].unk_06C + (D_80165C18[objectIndex].unk_0D9 * D_80165C18[objectIndex].unk_0DA * D_80165C18[objectIndex].unk_0D2); + func_80074574(sp24, (void *) func_80074790(objectIndex, arg1), D_80165C18[objectIndex].unk_0D9, D_80165C18[objectIndex].unk_0DA); + D_80165C18[objectIndex].unk_0D3 = D_80165C18[objectIndex].unk_0D2; func_80074478(objectIndex); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800747F0.s") -#endif void func_80074894(s32 arg0, s32 arg1) { - func_800747F0(arg0); + func_800747F0(arg0, arg1); func_800745C8(arg0, arg1); } void func_800748C4(s32 arg0, s32 arg1) { - func_800747F0(arg0); + func_800747F0(arg0, arg1); func_8007466C(arg0, arg1); } void func_800748F4(s32 arg0, s32 arg1) { - func_800747F0(arg0); + func_800747F0(arg0, arg1); func_80074704(arg0, arg1); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc struct _struct_D_800E6F30_0x3 { /* 0x0 */ u8 unk0; /* inferred */ /* 0x1 */ u8 unk1; /* inferred */ @@ -1278,32 +1261,36 @@ struct _struct_D_800E6F48_0x3 { /* 0x2 */ u8 unk2; /* inferred */ }; /* size = 0x3 */ -void func_8008B80C(s32, ?, ?, ?); /* extern */ +//void func_8008B80C(s32, ?, ?, ?); /* extern */ +extern u16 D_80165748; extern s16 D_80165718; extern s16 D_80165720; extern s16 D_80165728; -extern f32 D_8018D01C; -static struct _struct_D_800E6F30_0x3 D_800E6F30[8] = { - { 0xC8, 1, 0 }, - { 0, 0x70, 1 }, - { 0x10, 0x79, 0x51 }, - { 0, 0x59, 0x70 }, - { 0x70, 0x55, 0 }, - { 0x7A, 0x7E, 0 }, - { 0x77, 0x2C, 0x24 }, - { 0x30, 0x14, 0x58 }, -}; -static struct _struct_D_800E6F48_0x3 D_800E6F48[8] = { - { 0xDC, 0, 0 }, - { 0, 0x8C, 6 }, - { 0, 0, 0x51 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, -}; -s16 gCurrentCourseId; /* unable to generate initializer */ + +extern struct _struct_D_800E6F30_0x3 D_800E6F30[8]; +extern struct _struct_D_800E6F30_0x3 D_800E6F48[8]; + +//extern f32 D_8018D01C; +// static struct _struct_D_800E6F30_0x3 D_800E6F30[8] = { +// { 0xC8, 1, 0 }, +// { 0, 0x70, 1 }, +// { 0x10, 0x79, 0x51 }, +// { 0, 0x59, 0x70 }, +// { 0x70, 0x55, 0 }, +// { 0x7A, 0x7E, 0 }, +// { 0x77, 0x2C, 0x24 }, +// { 0x30, 0x14, 0x58 }, +// }; +// static struct _struct_D_800E6F48_0x3 D_800E6F48[8] = { +// { 0xDC, 0, 0 }, +// { 0, 0x8C, 6 }, +// { 0, 0, 0x51 }, +// { 0, 0, 0 }, +// { 0, 0, 0 }, +// { 0, 0, 0 }, +// { 0, 0, 0 }, +// { 0, 0, 0 }, +// }; void func_80074924(s32 objectIndex) { s32 sp2C; @@ -1322,7 +1309,7 @@ void func_80074924(s32 objectIndex) { switch (temp_v0) { /* irregular */ case 0: sp2C = random_int(0x00C8U); - sp28 = random_int((u16) D_80165748); + sp28 = random_int(D_80165748); sp24 = random_int(0x0096U); sp20 = random_int(0x2000U); temp_s0->unk_010[0] = (f32) ((((f64) D_80165718 + 100.0) - (f64) sp2C) * (f64) D_8018D01C); @@ -1331,7 +1318,7 @@ void func_80074924(s32 objectIndex) { break; case 7: sp2C = random_int(0x0168U); - sp28 = random_int((u16) D_80165748); + sp28 = random_int(D_80165748); sp24 = random_int(0x00B4U); sp20 = random_int(0x2000U); temp_s0->unk_010[0] = (f32) ((((f64) D_80165718 + 180.0) - (f64) sp2C) * (f64) D_8018D01C); @@ -1340,7 +1327,7 @@ void func_80074924(s32 objectIndex) { break; case 8: sp2C = random_int(0x012CU); - sp28 = random_int((u16) D_80165748); + sp28 = random_int(D_80165748); sp24 = random_int(0x0096U); sp20 = random_int(0x2000U); temp_s0->unk_010[0] = (f32) ((((f64) D_80165718 + 150.0) - (f64) sp2C) * (f64) D_8018D01C); @@ -1350,20 +1337,20 @@ void func_80074924(s32 objectIndex) { } func_8008B80C(objectIndex, 0, 0, 0); if (D_8018EDF3 == 1) { - temp_s0->unk_03C = (f32) (((f64) (f32) (sp2C % 4) * 0.25) + 0.8); + temp_s0->unk_038[1] = (f32) (((f64) (f32) (sp2C % 4) * 0.25) + 0.8); } else { - temp_s0->unk_03C = (f32) (((f64) (f32) (sp2C % 3) * 0.2) + 0.4); + temp_s0->unk_038[1] = (f32) (((f64) (f32) (sp2C % 3) * 0.2) + 0.4); } temp_a0 = sp2C % 8; temp_v0_2 = &D_800E6F30[temp_a0]; temp_v1 = &D_800E6F48[temp_a0]; - temp_s0->unk_084[6] = sp20 - 0x1000; temp_s0->unk_084[0] = (s16) temp_v0_2->unk0; temp_s0->unk_084[1] = (s16) temp_v0_2->unk1; temp_s0->unk_084[2] = (s16) temp_v0_2->unk2; temp_s0->unk_084[3] = (s16) temp_v1->unk0; temp_s0->unk_084[4] = (s16) temp_v1->unk1; temp_s0->unk_084[5] = (s16) temp_v1->unk2; + temp_s0->unk_084[6] = sp20 - 0x1000; if (sp2C & 1) { temp_s0->unk_084[7] = (sp20 / 32) + 0x100; } else { @@ -1372,9 +1359,6 @@ void func_80074924(s32 objectIndex) { temp_s0->unk_0A0 = 0x00E6; func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80074924.s") -#endif void func_80074D94(s32 arg0) { if (D_80165C18[arg0].unk_0AE == 1) { @@ -2073,44 +2057,40 @@ s32 func_80076828(Vec3s arg0, s32 arg1) { return temp_v0; } -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-25-2022 -s16 D_800E5740[0][3]; /* unable to generate initializer */ -s16 D_800E579C[0][3]; /* unable to generate initializer */ -s16 D_800E57F8[0][3]; /* unable to generate initializer */ +extern s16 D_800E5740[1]; //[15][3]; /* unable to generate initializer */ +extern s16 D_800E579C[1]; //[15][3]; /* unable to generate initializer */ +extern s16 D_800E57F8[1]; //[15][3]; /* unable to generate initializer */ void func_80076884(s32 arg0) { + s32 pad[2]; + s32 i; s16 *var_s2; - s32 var_s0; u16 temp_v0; - temp_v0 = random_int(0x000FU); - switch (arg0) { /* irregular */ - default: - var_s2 = sp28; + switch (arg0) + { + case 0: + var_s2 = *(&D_800E5740 + temp_v0 * 3); break; - case 0: - var_s2 = D_800E5740[temp_v0]; + + case 1: + var_s2 = *(&D_800E579C + temp_v0 * 3); break; - case 1: - var_s2 = D_800E579C[temp_v0]; - break; - case 2: - var_s2 = D_800E57F8[temp_v0]; + + case 2: + var_s2 = *(&D_800E57F8 + temp_v0 * 3); break; + } - var_s0 = 0; -loop_8: - var_s0 += 1; - if (func_80076828(var_s2, var_s0) != -1) { - if (var_s0 != 1) { - goto loop_8; + + for (i = 0; i < 1; i++) + { + if (func_80076828(var_s2, i) == (-1)) + { + break; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076884.s") -#endif void func_80076958(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -2129,28 +2109,27 @@ void func_800769D8(s32 objectIndex) { temp_s0 = &D_80165C18[objectIndex]; switch (temp_s0->unk_0A6) { - case 1: - func_80076958(objectIndex); - break; - case 2: - if (func_8007278C(objectIndex, temp_s0->unk_048) != 0) { - func_80086E70(objectIndex); - } - break; - case 3: - f32_step_towards(&temp_s0->unk_000, 2.0f, 0.05f); - s16_step_towards(&temp_s0->unk_0A4, 0, 0x0018); - if ((temp_s0->unk_0AE >= 2) && (func_80073B00(objectIndex, &temp_s0->unk_0A0, 0x000000FF, 0x00000050, 0x00000020, 0, 0) != 0)) { - func_80072488(objectIndex); - } - break; - case 4: - func_80072428(objectIndex); - func_80086F60(objectIndex); - break; - case 0: - default: - break; + case 0: + break; + case 1: + func_80076958(objectIndex); + break; + case 2: + if (func_8007278C(objectIndex, temp_s0->unk_048) != 0) { + func_80086E70(objectIndex); + } + break; + case 3: + f32_step_towards(&temp_s0->unk_000, 2.0f, 0.05f); + s16_step_towards(&temp_s0->unk_0A4, 0, 0x0018); + if ((temp_s0->unk_0AE >= 2) && (func_80073B00(objectIndex, &temp_s0->unk_0A0, 0x000000FF, 0x00000050, 0x00000020, 0, 0) != 0)) { + func_80072488(objectIndex); + } + break; + case 4: + func_80072428(objectIndex); + func_80086F60(objectIndex); + break; } } @@ -2238,20 +2217,20 @@ void func_80076DC4(s32 objectIndex) { void func_80076E14(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0A6) { - case 1: - func_80076DC4(objectIndex); - break; - case 2: - if ((D_80165C18[objectIndex].unk_0AE >= 2) && (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0x000000FF, 0x00000050, 0x00000020, 0, 0) != 0)) { - func_80072488(objectIndex); - } - break; - case 0: - break; - case 3: - func_80072428(objectIndex); - func_80086F60(objectIndex); - break; + case 1: + func_80076DC4(objectIndex); + break; + case 2: + if ((D_80165C18[objectIndex].unk_0AE >= 2) && (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0x000000FF, 0x00000050, 0x00000020, 0, 0) != 0)) { + func_80072488(objectIndex); + } + break; + case 0: + break; + case 3: + func_80072428(objectIndex); + func_80086F60(objectIndex); + break; } } @@ -2281,35 +2260,28 @@ void func_80076F2C(void) { } } } - -#ifdef NON_MATCHING -// Non matching due to some register differences surrounding the accessing of D_800E6788 -extern Vec3s D_800E6788[8]; /* unable to generate initializer */ - + +extern s16 D_800E6788[1]; // todo: fix this extern void func_80076FEC(s32 objectIndex, s32 flameIndex) { - struct_80165C18_entry *temp_v0; - func_800723A4(objectIndex, 3); - temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_0D5 = 0x0B; - temp_v0->unk_064 = D_0D02BC58; - temp_v0->unk_06C = D_0D02BC58; - temp_v0->unk_000 = 0.8f; - temp_v0->unk_010[0] = D_800E6788[flameIndex][0] * D_8018D01C; - temp_v0->unk_010[1] = D_800E6788[flameIndex][1]; - temp_v0->unk_010[2] = D_800E6788[flameIndex][2]; - temp_v0->unk_034 = 0.0f; - temp_v0->unk_0A4 = 0x00FF; - temp_v0->unk_0A2 = 0x00FF; - temp_v0->unk_0A0 = 0x00FF; - func_8008B8BC(objectIndex, 0U, 0U, 0U); - // The permuter found this slightly better match, but still no full match - //func_8008B8BC(objectIndex ^ 0, 0U, 0U, 0U); - func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); + + D_80165C18[objectIndex].unk_0D5 = 0xB; + D_80165C18[objectIndex].unk_064 = D_0D02BC58; + D_80165C18[objectIndex].unk_06C = D_0D02BC58; + D_80165C18[0, objectIndex].unk_000 = 0.8f; + + // Mixing arr + offset and array access... Why? + // todo: ifdef this to proper array access. + D_80165C18[objectIndex].unk_010[0] = (f32)(intptr_t)(*(&D_800E6788 + flameIndex * 3)[0]) * D_8018D01C; + D_80165C18[objectIndex].unk_010[1] = (f32)(intptr_t)(*(&D_800E6788 + flameIndex * 3)[1]); + D_80165C18[objectIndex].unk_010[2] = (f32)(intptr_t)(*(&D_800E6788 + flameIndex * 3)[2]); + D_80165C18[objectIndex].unk_034 = 0; + D_80165C18[objectIndex].unk_0A4 = 255; + D_80165C18[objectIndex].unk_0A2 = 255; + D_80165C18[objectIndex].unk_0A0 = 255; + func_8008B8BC(objectIndex, 0, 0, 0); + func_8008B80C(objectIndex, 0, 0, 0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076FEC.s") -#endif void func_800770F0(s32 arg0) { s32 temp_v0; @@ -2320,84 +2292,54 @@ void func_800770F0(s32 arg0) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8005C674(s8, s16 *, s16 *, s16 *); /* extern */ - void func_80077138(s32 objectIndex, Vec3f arg1, s32 arg2) { - s8 sp37; - s16 sp34; - s16 sp32; - s16 sp30; - f64 var_f10; - f64 var_f4; - s32 temp_v0; - s32 temp_v0_2; s8 temp_v0_3; - s8 temp_v0_4; - struct_80165C18_entry *temp_s0; - u16 temp_v1; + Vec3s sp30; func_800723A4(objectIndex, arg2); - temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_0D5 = 0x0C; - temp_s0->unk_000 = 0.05f; - func_8008B7D4(objectIndex, arg1->unk0, arg1->unk4, arg1->unk8); + D_80165C18[objectIndex].unk_0D5 = 0x0C; + D_80165C18[objectIndex].unk_000 = 0.05f; + func_8008B7D4(objectIndex, arg1[0], arg1[1], arg1[2]); func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); - switch (arg2) { /* irregular */ - case 0: - temp_s0->unk_038[1] = -1.0f; - temp_v0 = random_int(0x004BU); - var_f10 = (f64) temp_v0; - if (temp_v0 < 0) { - var_f10 += 4294967296.0; - } - temp_s0->unk_034 = (f32) ((var_f10 * 0.01) + 0.25); - temp_s0->unk_0BE[1] = random_int(0x0040U) << 0xA; - func_8008751C(objectIndex); - temp_s0->unk_084[5] = 0x001E; - break; - case 1: - temp_s0->unk_038[1] = 1.5f; - temp_v0_2 = random_int(0x0064U); - var_f4 = (f64) temp_v0_2; - if (temp_v0_2 < 0) { - var_f4 += 4294967296.0; - } - temp_s0->unk_034 = (f32) ((var_f4 * 0.01) + 0.5); - temp_s0->unk_0BE[1] = random_int(0x0040U) << 0xA; - func_8008751C(objectIndex); - temp_s0->unk_084[5] = 0x0032; - break; + switch (arg2) { + case 0: + D_80165C18[objectIndex].unk_038[1] = -1.0f; + D_80165C18[objectIndex].unk_034 = (f32) ((random_int(0x004BU) * 0.01) + 0.25); + D_80165C18[objectIndex].unk_0BE[1] = random_int(0x0040U) << 0xA; + func_8008751C(objectIndex); + D_80165C18[objectIndex].unk_084[5] = 0x001E; + break; + case 1: + D_80165C18[objectIndex].unk_038[1] = 1.5f; + D_80165C18[objectIndex].unk_034 = (f32) ((random_int(0x0064U) * 0.01) + 0.5); + D_80165C18[objectIndex].unk_0BE[1] = random_int(0x0040U) << 0xA; + func_8008751C(objectIndex); + D_80165C18[objectIndex].unk_084[5] = 0x0032; + break; } temp_v0_3 = random_int(0x000CU); if (temp_v0_3 < 9) { - func_8005C674(temp_v0_3, &sp34, &sp32, &sp30); - temp_s0->unk_048 = 0; - temp_s0->unk_084[0] = sp34; - temp_s0->unk_084[1] = sp32; - temp_s0->unk_084[2] = sp30; + func_8005C674(temp_v0_3, &sp30[2], &sp30[1], &sp30); + D_80165C18[objectIndex].unk_048 = 0; + D_80165C18[objectIndex].unk_084[0] = sp30[2]; + D_80165C18[objectIndex].unk_084[1] = sp30[1]; + D_80165C18[objectIndex].unk_084[2] = sp30[0]; } else { - temp_v0_4 = random_int(3U); - sp37 = temp_v0_4; - func_8005C6B4(temp_v0_4, &sp34, &sp32, &sp30); - temp_s0->unk_048 = 1; - temp_s0->unk_084[0] = sp34; - temp_s0->unk_084[1] = sp32; - temp_s0->unk_084[2] = sp30; - temp_s0->unk_084[4] = (s16) sp37; + temp_v0_3 = random_int(3U); + func_8005C6B4(temp_v0_3, &sp30[2], &sp30[1], &sp30); + D_80165C18[objectIndex].unk_084[0] = sp30[2]; + D_80165C18[objectIndex].unk_084[1] = sp30[1]; + D_80165C18[objectIndex].unk_084[2] = sp30[0]; + D_80165C18[objectIndex].unk_084[4] = temp_v0_3; + D_80165C18[objectIndex].unk_048 = 1; } - temp_s0->unk_0A0 = 0x00FF; - temp_v1 = temp_s0->unk_0BE[1]; - temp_s0->unk_084[3] = random_int(0x0800U) + 0x400; - if (((s32) temp_v1 < 0x3000) || ((s32) temp_v1 >= 0xB001)) { - temp_s0->unk_084[3] = -temp_s0->unk_084[3]; + D_80165C18[objectIndex].unk_0A0 = 0x00FF; + D_80165C18[objectIndex].unk_084[3] = random_int(0x0800U) + 0x400; + if ((D_80165C18[objectIndex].unk_0BE[1] < 0x3000) || (D_80165C18[objectIndex].unk_0BE[1] >= 0xB001)) { + D_80165C18[objectIndex].unk_084[3] = -D_80165C18[objectIndex].unk_084[3]; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077138.s") -#endif void func_800773D8(s32 arg0, s32 arg1) { s32 temp_v0 = func_80072044(D_8018C630, &D_80183E5C, 0x80); @@ -2418,18 +2360,18 @@ void func_80077450(s32 objectIndex) { s16 sp38; switch (D_80165C18[objectIndex].unk_0A6) { - case 0: - break; - case 1: - func_80077428(objectIndex); - break; - case 2: - f32_step_up_towards(&D_80165C18[objectIndex].unk_000, 0.1f, 0.01f); - if ((D_80165C18[objectIndex].unk_004[1] <= D_80165C18[objectIndex].unk_084[5]) && (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0x000000FF, 0, 0x00000010, 0, 0) != 0)) { - func_80086F60(objectIndex); - func_80072428(objectIndex); - } - break; + case 0: + break; + case 1: + func_80077428(objectIndex); + break; + case 2: + f32_step_up_towards(&D_80165C18[objectIndex].unk_000, 0.1f, 0.01f); + if ((D_80165C18[objectIndex].unk_004[1] <= D_80165C18[objectIndex].unk_084[5]) && (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0x000000FF, 0, 0x00000010, 0, 0) != 0)) { + func_80086F60(objectIndex); + func_80072428(objectIndex); + } + break; } if (D_80165C18[objectIndex].unk_048 != 0) { D_80165C18[objectIndex].unk_084[4] = (s16) ((s32) (D_80165C18[objectIndex].unk_084[4] + 1) % 3); @@ -2491,26 +2433,26 @@ void func_80077700(s32 objectIndex, Vec3f arg1, s32 arg2) { D_80165C18[objectIndex].unk_000 = 0.1f; D_80165C18[objectIndex].unk_044 = arg1[1]; switch (gCurrentCourseId) { - case COURSE_MARIO_RACEWAY: - func_8008BD14(objectIndex, arg1[0], arg1[1] + 25.0, arg1[2], 0x00000014, 0x0000001E, 0x00000014); - D_80165C18[objectIndex].unk_034 = 1.5f; - D_80165C18[objectIndex].unk_038[1] = 1.5f; - break; - case COURSE_YOSHI_VALLEY: - func_8008BD14(objectIndex, arg1[0], arg1[1] + 25.0, arg1[2], 0x00000014, 0x0000001E, 0x00000014); - D_80165C18[objectIndex].unk_034 = 2.0f; - D_80165C18[objectIndex].unk_038[1] = 2.0f; - break; - case COURSE_ROYAL_RACEWAY: - func_8008BD14(objectIndex, arg1[0], arg1[1] + 30.0, arg1[2], 0x00000010, 0x00000028, 0x00000010); - D_80165C18[objectIndex].unk_034 = 2.0f; - D_80165C18[objectIndex].unk_038[1] = 2.0f; - break; - case COURSE_LUIGI_RACEWAY: - func_8008BD14(objectIndex, arg1[0], arg1[1] + 25.0, arg1[2], 0x00000014, 0x0000001E, 0x00000014); - D_80165C18[objectIndex].unk_034 = 1.5f; - D_80165C18[objectIndex].unk_038[1] = 1.0f; - break; + case COURSE_MARIO_RACEWAY: + func_8008BD14(objectIndex, arg1[0], arg1[1] + 25.0, arg1[2], 0x00000014, 0x0000001E, 0x00000014); + D_80165C18[objectIndex].unk_034 = 1.5f; + D_80165C18[objectIndex].unk_038[1] = 1.5f; + break; + case COURSE_YOSHI_VALLEY: + func_8008BD14(objectIndex, arg1[0], arg1[1] + 25.0, arg1[2], 0x00000014, 0x0000001E, 0x00000014); + D_80165C18[objectIndex].unk_034 = 2.0f; + D_80165C18[objectIndex].unk_038[1] = 2.0f; + break; + case COURSE_ROYAL_RACEWAY: + func_8008BD14(objectIndex, arg1[0], arg1[1] + 30.0, arg1[2], 0x00000010, 0x00000028, 0x00000010); + D_80165C18[objectIndex].unk_034 = 2.0f; + D_80165C18[objectIndex].unk_038[1] = 2.0f; + break; + case COURSE_LUIGI_RACEWAY: + func_8008BD14(objectIndex, arg1[0], arg1[1] + 25.0, arg1[2], 0x00000014, 0x0000001E, 0x00000014); + D_80165C18[objectIndex].unk_034 = 1.5f; + D_80165C18[objectIndex].unk_038[1] = 1.0f; + break; } temp_s0 = random_int(0x0010U) << 0xC; sp3E = random_int(0x0010U) << 0xC; @@ -2547,32 +2489,32 @@ void func_80077B3C(s32 objectIndex) { temp_v1 = &D_80165C18[objectIndex]; switch (temp_v1->unk_0A6) { - case 1: - func_80077B14(objectIndex); - break; - case 2: - if (temp_v1->unk_0AE == 0) { - func_80072488(objectIndex); - } - break; - case 0: - break; - case 3: - func_80072428(objectIndex); - break; + case 0: + break; + case 1: + func_80077B14(objectIndex); + break; + case 2: + if (temp_v1->unk_0AE == 0) { + func_80072488(objectIndex); + } + break; + case 3: + func_80072428(objectIndex); + break; } } void func_80077BCC(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { - case 1: - func_80087E08(objectIndex, D_80165C18[objectIndex].unk_038[1], 0.2f, D_80165C18[objectIndex].unk_034, (s16) (s32) D_80165C18[objectIndex].unk_0BE[1], 0x0000000A); - break; - case 2: - if (func_80087B84(objectIndex, 0.4f, D_80165C18[objectIndex].unk_044) != 0) { - func_80086F60(objectIndex); - } - break; + case 1: + func_80087E08(objectIndex, D_80165C18[objectIndex].unk_038[1], 0.2f, D_80165C18[objectIndex].unk_034, (s16) (s32) D_80165C18[objectIndex].unk_0BE[1], 0x0000000A); + break; + case 2: + if (func_80087B84(objectIndex, 0.4f, D_80165C18[objectIndex].unk_044) != 0) { + func_80086F60(objectIndex); + } + break; } func_8008BF18(objectIndex); D_80165C18[objectIndex].unk_0B2[0] += 0x1000; @@ -2653,95 +2595,63 @@ void func_80077E20(s32 objectIndex) { func_80072488(objectIndex); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80165C40; extern f32 D_8018D1E8; extern s16 D_8018D208; extern s16 D_8018D210; extern s16 D_8018D218; -void func_80077EB8(s32 objectIndex, s32 arg1, Camera *camera) { +void func_80077EB8(s32 objectIndex, u16 arg1, Camera *camera) { s16 temp_v0; temp_v0 = camera->rot[1] - arg1; if ((temp_v0 >= D_8018D210) || (D_8018D208 >= temp_v0)) { - *(&D_80165C40 + (objectIndex * 0xE0)) = (f32) D_8018D218 + (D_8018D1E8 * (f32) temp_v0); + D_80165C40[objectIndex].unk[0] = D_8018D218 + (D_8018D1E8 * (f32) temp_v0); func_800721C0(objectIndex, 0x00000010); return; } func_800721E8(objectIndex, 0x00000010); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077EB8.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80077EB8(s32, u16, Camera *, Camera *); /* extern */ void func_80077F64(s32 objectIndex, Camera *camera) { - f64 var_f6; - s16 temp_v0; - s32 temp_v0_2; - struct_80165C18_entry *temp_s0; - temp_s0 = &D_80165C18[objectIndex]; - temp_v0 = temp_s0->unk_0AE; - switch (temp_v0) { /* irregular */ - case 1: - temp_s0->unk_0BE[1] = (random_int(0x4000U) + camera->rot[1]) - 0x2000; - func_8008BAB4(objectIndex, 0x00B4, 0x0014U); - temp_v0_2 = random_int(0x0064U); - var_f6 = (f64) temp_v0_2; - if (temp_v0_2 < 0) { - var_f6 += 4294967296.0; - } - temp_s0->unk_028[0] = 0.0f; - temp_s0->unk_028[1] = 0.0f; - temp_s0->unk_038[1] = (f32) (-0.75 - (f64) (f32) (var_f6 * 0.01)); - func_80086FD4(objectIndex); - return; - case 2: - func_80077EB8(objectIndex, temp_s0->unk_0BE[1], camera, camera); - func_800877C4(objectIndex); - func_8008BF18(objectIndex); - func_8008BFC0(objectIndex); - if (temp_s0->unk_004[1] <= 0.0f) { + f64 rand; + + switch (D_80165C18[objectIndex].unk_0AE) { /* irregular */ + case 1: + D_80165C18[objectIndex].unk_0BE[1] = (camera->rot[1] + random_int(0x4000U)) - 0x2000; + func_8008BAB4(objectIndex, 0x00B4, 0x0014U); + rand = random_int(0x0064U); + + D_80165C18[objectIndex].unk_038[1] = (f32) (-0.75 - (f64) (f32) (rand * 0.01)); + D_80165C18[objectIndex].unk_028[0] = 0.0f; + D_80165C18[objectIndex].unk_028[1] = 0.0f; func_80086FD4(objectIndex); return; - } - case 0: - return; - case 3: - func_80086F60(objectIndex); - break; + case 2: + func_80077EB8(objectIndex, D_80165C18[objectIndex].unk_0BE[1], camera); + func_800877C4(objectIndex); + func_8008BF18(objectIndex); + func_8008BFC0(objectIndex); + if (D_80165C18[objectIndex].unk_004[1] <= 0.0f) { + func_80086FD4(objectIndex); + return; + } + case 0: + return; + case 3: + func_80086F60(objectIndex); + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077F64.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80077E20(); /* extern */ -void func_80077F64(); /* extern */ - -void func_800780CC(s32 objectIndex) { - struct_80165C18_entry *sp18; - s16 temp_v0; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - temp_v0 = temp_v1->unk_0A6; - switch (temp_v0) { /* irregular */ +void func_800780CC(s32 objectIndex, Camera *camera) { + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ case 1: - func_80077E20(); + func_80077E20(objectIndex); return; case 2: - sp18 = temp_v1; - func_80077F64(); - if (temp_v1->unk_0AE == 0) { + func_80077F64(objectIndex, camera); + if (D_80165C18[objectIndex].unk_0AE == 0) { func_80072488(objectIndex); return; } @@ -2752,47 +2662,21 @@ void func_800780CC(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800780CC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80077D5C(); // extern -void func_800780CC(s32, ?); // extern -extern struct_80165C18_entry D_80165C18; -extern ? D_8018CC80; extern s32 D_8018D1F0; -void func_80078170(s32 arg0, ? arg1) { - s32 temp_a0; - s32 temp_s1; - s32 temp_v0; +void func_80078170(s32 arg0, s32 arg1) { s32 *phi_s0; - s32 phi_s1; - s32 phi_v0; + s32 i; func_80077D5C(); - temp_v0 = D_8018D1F0; - phi_s1 = 0; - phi_v0 = temp_v0; - if (temp_v0 > 0) { - phi_s0 = (arg0 * 4) + &D_8018CC80; - do { - temp_a0 = *phi_s0; - if ((&D_80165C18 + (temp_a0 * 0xE0))->unkA6 != 0) { - func_800780CC(temp_a0, arg1); - phi_v0 = D_8018D1F0; - } - temp_s1 = phi_s1 + 1; - phi_s0 += 4; - phi_s1 = temp_s1; - } while (temp_s1 < phi_v0); + for (i = 0; i < D_8018D1F0; i++) { + phi_s0 = &D_8018CC80[arg0 + i]; + if (D_80165C18[*phi_s0].unk_0A6 != 0) { + func_800780CC(*phi_s0, arg1); + } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078170.s") -#endif void func_80078220(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -2915,75 +2799,64 @@ void func_80078838(void) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80165CB4; extern f32 D_8018D1E8; extern s16 D_8018D208; extern s16 D_8018D210; extern s16 D_8018D218; -void func_800788F8(s32 objectIndex, s32 arg1, Camera *camera) { +void func_800788F8(s32 objectIndex, u16 rot, Camera *camera) { s16 temp_v0; - temp_v0 = camera->rot[1] + arg1; + temp_v0 = camera->rot[1] + rot; if ((temp_v0 >= D_8018D210) && (D_8018D208 >= temp_v0)) { - *(&D_80165CB4 + (objectIndex * 0xE0)) = (s16) (s32) ((f32) D_8018D218 + (D_8018D1E8 * (f32) temp_v0)); + D_80165CB4[objectIndex].unk[0] = (D_8018D218 + (D_8018D1E8 * temp_v0)); func_800721C0(objectIndex, 0x00000010); return; } func_800721E8(objectIndex, 0x00000010); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800788F8.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_800788F8(s32, u16, ?); // extern -extern ? D_8018CC80; -extern s32 D_8018D1F0; +//void func_800788F8(s32, u16, ?); // extern +//extern ? D_8018CC80; +//extern s32 D_8018D1F0; -void func_800789AC(s32 arg0, ? arg1, s32 arg2) { - s32 temp_s0; - s32 *phi_s1; - s32 phi_s0; +void func_800789AC(s32 arg0, Camera *arg1, Vec3s *arg2) { + //s32 temp_s0; + //s32 *phi_s1; + s32 i; - phi_s0 = 0; - if (D_8018D1F0 > 0) { - phi_s1 = (arg0 * 4) + &D_8018CC80; - do { - func_800788F8(*phi_s1, *((phi_s0 * 8) + arg2), arg1); - temp_s0 = phi_s0 + 1; - phi_s1 += 4; - phi_s0 = temp_s0; - } while (temp_s0 < D_8018D1F0); + //phi_s1 = &D_8018CC80[arg0]; + for (i = 0; i < D_8018D1F0; i++) { + func_800788F8(D_8018CC80[arg0 + i], arg2[0][i], arg1); + //*phi_s1 += 4; } + + // if (D_8018D1F0 > 0) { + // phi_s1 = (arg0 * 4) + &D_8018CC80; + // do { + // func_800788F8(*phi_s1, *((phi_s0 * 8) + arg2), arg1); + // temp_s0 = phi_s0 + 1; + // phi_s1 += 4; + // phi_s0 = temp_s0; + // } while (temp_s0 < D_8018D1F0); + // } } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800789AC.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800788F8(s32, u16, Camera *); /* extern */ -extern ? D_8018CC80; -extern s32 D_8018D1F0; +void func_80078A44(s32 arg0, Camera *camera, s32 rot) { + s32 temp_s0; + s32 i; -void func_80078A44(s32 arg0, Camera *camera, s32 arg2) { - s32 *var_s4; - s32 temp_s0; - u32 temp_hi; - u32 var_s3; + for (i = 0; i < D_8018D1F0; i++, arg0++) { + temp_s0 = D_8018CC80[arg0]; - var_s3 = 0; - if (D_8018D1F0 > 0) { - var_s4 = (arg0 * 4) + &D_8018CC80; - do { - temp_s0 = *var_s4; - func_800788F8(temp_s0, *((var_s3 * 8) + arg2), camera); - temp_hi = var_s3 % 5U; - switch (temp_hi) { + // i * 8 + func_800788F8(temp_s0, *(u16 *)((i << 3) + rot), camera); + switch (i % 5U) { case 0: func_80073CB0(temp_s0, &D_80165C18[temp_s0].unk_0A0, 0x00000028, 0x000000B4, 0x000000FF, 0, -1); break; @@ -2999,123 +2872,107 @@ void func_80078A44(s32 arg0, Camera *camera, s32 arg2) { case 4: func_80073CB0(temp_s0, &D_80165C18[temp_s0].unk_0A0, 0x0000005A, 0x00000080, 0x000000FF, 0, -1); break; - } - var_s3 += 1; - var_s4 += 4; - } while ((s32) var_s3 < D_8018D1F0); + } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078A44.s") -#endif UNUSED void func_80078C68() { } -#ifdef MIPS_TO_C -//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -void func_80078170(s32, s32, s32); /* extern */ -void func_800789AC(s32, s32, ? *); /* extern */ -void func_80078A44(s32, s32, ? *); /* extern */ -static ? D_800E6A38; /* unable to generate initializer; const */ -static ? D_800E6AA8; /* unable to generate initializer; const */ -static ? D_800E6B00; /* unable to generate initializer; const */ -static ? D_800E6B38; /* unable to generate initializer; const */ -static ? D_800E6BA8; /* unable to generate initializer; const */ -static ? D_800E6C10; /* unable to generate initializer; const */ -static ? D_800E6C80; /* unable to generate initializer; const */ -static ? D_800E6DE0; /* unable to generate initializer; const */ -u16 gCurrentCourseId; /* unable to generate initializer */ +extern s32 D_800E6A38; /* unable to generate initializer; const */ +extern s32 D_800E6AA8; /* unable to generate initializer; const */ +extern s32 D_800E6B00; /* unable to generate initializer; const */ +extern s32 D_800E6B38; /* unable to generate initializer; const */ +extern s32 D_800E6BA8; /* unable to generate initializer; const */ +extern s32 D_800E6C10; /* unable to generate initializer; const */ +extern s32 D_800E6C80; /* unable to generate initializer; const */ +extern s32 D_800E6DE0; /* unable to generate initializer; const */ -void func_80078C70(u32 arg0) { +extern s16 D_8018D200; +extern s32 D_8018D1F0; +extern s16 D_8018D208; +extern s16 D_8018D210; +extern f32 D_8018D1E8; +extern s16 D_8018D218; + +void func_80078C70(s32 arg0) { s32 sp1C; - s32 sp18; - s16 temp_v0; - s32 temp_v1; - u16 temp_t4; + s32 camera; if (D_801657C8 == 0) { switch (arg0) { /* switch 1 */ case 0: /* switch 1 */ sp1C = 0; - sp18 = camera1; + camera = camera1; D_8018D200 = D_80150130[0] + 40.0f; break; case 1: /* switch 1 */ sp1C = 0; - sp18 = camera1; + camera = camera1; D_8018D200 = D_80150130[0] + 40.0f; break; case 2: /* switch 1 */ - sp18 = camera2; + camera = camera2; sp1C = D_8018D1F0; D_8018D200 = D_80150130[1] + 40.0f; break; case 3: /* switch 1 */ sp1C = 0; - sp18 = camera1; + camera = camera1; D_8018D200 = D_80150130[0] + 40.0f; break; case 4: /* switch 1 */ - sp18 = camera2; + camera = camera2; sp1C = D_8018D1F0; D_8018D200 = D_80150130[1] + 40.0f; break; } - temp_v0 = D_8018D200; - temp_t4 = gCurrentCourseId; - temp_v1 = temp_v0 / 2; - D_8018D208 = (temp_v1 * 0xB6) + 0x71C; - D_8018D210 = (-temp_v1 * 0xB6) - 0x71C; - D_8018D1E8 = 1.7578125 / temp_v0; + + D_8018D208 = ( (D_8018D200 / 2) * 0xB6) + 0x71C; + D_8018D210 = (-(D_8018D200 / 2) * 0xB6) - 0x71C; + D_8018D1E8 = 1.7578125 / D_8018D200; D_8018D218 = 0xA0; - switch (temp_t4) { /* switch 2 */ + switch (gCurrentCourseId) { /* switch 2 */ case 0: /* switch 2 */ - func_800789AC(sp1C, sp18, &D_800E6A38); - return; + func_800789AC(sp1C, camera, &D_800E6A38); + break; case 4: /* switch 2 */ - func_800789AC(sp1C, sp18, &D_800E6AA8); - return; + func_800789AC(sp1C, camera, &D_800E6AA8); + break; case 5: /* switch 2 */ - func_80078170(sp1C, sp18, 0xB6); - return; + func_80078170(sp1C, camera); + break; case 6: /* switch 2 */ - func_800789AC(sp1C, sp18, &D_800E6B00); - return; + func_800789AC(sp1C, camera, &D_800E6B00); + break; case 7: /* switch 2 */ - func_800789AC(sp1C, sp18, &D_800E6B38); - return; + func_800789AC(sp1C, camera, &D_800E6B38); + break; case 8: /* switch 2 */ - func_800789AC(sp1C, sp18, &D_800E6A38); - return; + func_800789AC(sp1C, camera, &D_800E6A38); + break; case 9: /* switch 2 */ - func_800789AC(sp1C, sp18, &D_800E6AA8); - return; + func_800789AC(sp1C, camera, &D_800E6AA8); + break; case 10: /* switch 2 */ - func_80078A44(sp1C, sp18, &D_800E6C80); - return; + func_80078A44(sp1C, camera, &D_800E6C80); + break; case 11: /* switch 2 */ - func_800789AC(sp1C, sp18, &D_800E6C10); - return; + func_800789AC(sp1C, camera, &D_800E6C10); + break; case 12: /* switch 2 */ - func_800789AC(sp1C, sp18, &D_800E6BA8); - return; + func_800789AC(sp1C, camera, &D_800E6BA8); + break; case 13: /* switch 2 */ - func_80078A44(sp1C, sp18, &D_800E6C80); - return; + func_80078A44(sp1C, camera, &D_800E6C80); + break; case 14: /* switch 2 */ - func_80078A44(sp1C, sp18, &D_800E6DE0); - /* Duplicate return node #22. Try simplifying control flow for better match */ - return; + func_80078A44(sp1C, camera, &D_800E6DE0); + break; } - } else { - default: /* switch 2 */ } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078C70.s") -#endif void func_80078F64(void) { switch (gScreenModeSelection) { /* irregular */ @@ -3155,74 +3012,63 @@ void func_800790E4(s32 arg0) { func_800723A4(D_80183DB8[arg0], 6); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_80183DB8; extern s32 D_8018C028; void func_80079114(s32 objectIndex, s32 arg1, s32 arg2) { - struct_80165C18_entry *temp_v0; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - if (temp_v1->unk_0A6 >= 2) { - if ((u8) temp_v1->unk_0D8 == 1) { + s32 a; + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + if ((u8)D_80165C18[objectIndex].unk_0D8 == 1) { if (arg1 == 0) { func_80074894(objectIndex, D_8018C028); return; } - temp_v0 = &D_80165C18[D_80183DB8]; - temp_v1->unk_060 = temp_v0->unk_060; - temp_v1->unk_064 = temp_v0->unk_064; + a = D_80183DB8[0]; + D_80165C18[objectIndex].unk_060 = D_80165C18[a].unk_060; + D_80165C18[objectIndex].unk_064 = D_80165C18[a].unk_064; + if (0) { } return; } - switch (arg2) { /* irregular */ - case 0: - func_800748F4(objectIndex, D_8018C028); - return; - case 1: - func_800748C4(objectIndex, D_8018C028); - return; - case 2: - func_80074894(objectIndex, D_8018C028); - break; + switch (arg2) { + case 0: + func_800748F4(objectIndex, D_8018C028); + break; + case 1: + func_800748C4(objectIndex, D_8018C028); + break; + case 2: + func_80074894(objectIndex, D_8018C028); + break; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079114.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800C9018(u8, ?); /* extern */ -extern ? D_80165CF0; -s16 gCurrentCourseId; /* unable to generate initializer */ +extern UnkStruct_80165CF5 D_80165CF0[]; + +#ifdef NON_MATCHING void func_800791F0(s32 objectIndex, u8 playerId) { - Player *sp1C; - Player *temp_v1; - s16 var_v0; - u8 temp_v0; + //Player *sp1C; + Player *player = &gPlayerOne[playerId]; + //s16 var_v0; + //struct_80165C18_entry *temp_v0; - temp_v0 = *(&D_80165CF0 + (objectIndex * 0xE0)); - temp_v1 = &gPlayerOne[playerId]; - if ((temp_v0 != 3) && (temp_v0 != 7)) { - sp1C = temp_v1; + //temp_v0 = &D_80165CF0[objectIndex]; + if ((D_80165CF0[objectIndex].unk[0] != 3) && (D_80165CF0[objectIndex].unk[0] != 7)) { + //sp1C = temp_v1; func_800722CC(objectIndex, 1); - var_v0 = gCurrentCourseId; - if (var_v0 == 0x000C) { - temp_v1->unk_0CA &= 0xFFEF; - goto block_5; + //var_v0 = gCurrentCourseId; + if (gCurrentCourseId == 0x000C) { + player->unk_0CA &= 0xFFEF; + //goto block_5; } } else { -block_5: - var_v0 = gCurrentCourseId; +//block_5: + //var_v0 = gCurrentCourseId; } - if (var_v0 == 0x000C) { - sp1C = temp_v1; + if (gCurrentCourseId == 0x000C) { + //temp_v1 = temp_v1; func_800722CC(objectIndex, 0x00000010); - temp_v1->unk_0CA &= 0xFFDF; + player->unk_0CA &= 0xFFDF; } func_800C9018(playerId, 0x0100FA28); } @@ -3230,201 +3076,148 @@ block_5: GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800791F0.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern Vtx D_0D005EB0; -extern s32 gTLUTLakituCountdown; extern s32 D_0F05EB50; extern s16 D_801656F0; extern s32 D_8018D168; extern s32 D_8018D180; void func_800792D8(s32 objectIndex, s32 arg1) { - struct_80165C18_entry *sp24; - struct_80165C18_entry *temp_v0; - if (arg1 == 0) { D_801656F0 = 0; D_8018D168 = 0; } func_80073444(objectIndex, &gTLUTLakituCountdown, &D_0F05EB50, 0x38U, (u16) 0x00000048); - temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_074 = (s32) &D_0D005EB0; - sp24 = temp_v0; - temp_v0->unk_000 = 0.15f; + D_80165C18[objectIndex].unk_074 = (s32) &D_0D005EB0; + D_80165C18[objectIndex].unk_000 = 0.15f; func_800721E8(objectIndex, 0x00000010); func_80072488(objectIndex); - temp_v0->unk_048 = D_8018D180; + D_80165C18[objectIndex].unk_048 = D_8018D180; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800792D8.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800729EC(); /* extern */ -void func_800792D8(s32); /* extern */ -void play_sound2(?); /* extern */ extern s16 D_801656F0; extern s32 D_8018D160; extern s32 D_8018D168; -static ? D_800E67B8; /* unable to generate initializer */ +extern s32 D_800E67B8; // static void func_80079380(s32 objectIndex, s32 arg1) { - struct_80165C18_entry *sp20; - struct_80165C18_entry *temp_v1; - u16 temp_t8; - - temp_v1 = &D_80165C18[objectIndex]; - temp_t8 = (u16) temp_v1->unk_0A6; - switch (temp_t8) { - case 1: - func_800792D8(arg1); - return; - case 2: - sp20 = temp_v1; - func_8007278C(objectIndex, temp_v1->unk_048); - if ((temp_v1->unk_050 == 0x00000055) && (D_8018EDF3 == 3) && (arg1 == 0)) { - D_8018D168 = 1; - return; - } - default: - return; - case 3: - func_800721C0(objectIndex, 0x00000010); - func_80086F10(objectIndex, 1, (s32) &D_800E67B8); - func_80072488(objectIndex); - return; - case 4: - if ((func_8007278C(objectIndex, 0x0000001E) != 0) && (D_8018EDF3 != 3) && (arg1 == 0)) { - D_8018D168 = 1; - return; - } - break; - case 5: - func_8007278C(objectIndex, 0x0000001E); - return; - case 6: - func_80072E54(objectIndex, 1, 7, 1, 2, 0); - return; - case 7: - sp20 = temp_v1; - if (func_8007278C(objectIndex, 0x00000014) != 0) { - temp_v1->unk_068 += 0x200; - if (arg1 == 0) { + s32 pad; + switch (D_80165C18[objectIndex].unk_0A6) { + case 0: + break; + case 1: + func_800792D8(objectIndex, arg1); + break; + case 2: + func_8007278C(objectIndex, D_80165C18[objectIndex].unk_048); + if ((D_80165C18[objectIndex].unk_050 == 0x00000055) && (D_8018EDF3 == 3) && (arg1 == 0)) { + D_8018D168 = 1; + } + break; + case 3: + func_800721C0(objectIndex, 0x00000010); + func_80086F10(objectIndex, 1, (s32) &D_800E67B8); + func_80072488(objectIndex); + break; + case 4: + if ((func_8007278C(objectIndex, 0x0000001E) != 0) && (D_8018EDF3 != 3) && (arg1 == 0)) { + D_8018D168 = 1; + } + break; + case 5: + func_8007278C(objectIndex, 0x0000001E); + break; + case 6: + func_80072E54(objectIndex, 1, 7, 1, 2, 0); + break; + case 7: + if (func_8007278C(objectIndex, 0x00000014) != 0) { + D_80165C18[objectIndex].unk_068 += 0x80; + if (arg1 == 0) { + play_sound2(SOUND_ACTION_COUNTDOWN_LIGHT); + } + } + break; + case 8: + func_80072E54(objectIndex, 8, 0x0000000F, 1, 6, 0); + break; + case 9: + if ((func_8007278C(objectIndex, 8) != 0) && (arg1 == 0)) { play_sound2(SOUND_ACTION_COUNTDOWN_LIGHT); - return; } - } - break; - case 8: - func_80072E54(objectIndex, 8, 0x0000000F, 1, 6, 0); - return; - case 9: - if ((func_8007278C(objectIndex, 8) != 0) && (arg1 == 0)) { - play_sound2(SOUND_ACTION_COUNTDOWN_LIGHT); - return; - } - break; - case 10: - if ((func_80072E54(objectIndex, 0x00000010, 0x00000017, 1, 6, 0) != 0) && (arg1 == 0)) { - D_801656F0 = 1; - return; - } - break; - case 11: - sp20 = temp_v1; - if (func_8007278C(objectIndex, 8) != 0) { - temp_v1->unk_068 += 0x200; + break; + case 10: + if ((func_80072E54(objectIndex, 0x00000010, 0x00000017, 1, 6, 0) != 0) && (arg1 == 0)) { + D_801656F0 = 1; + } + break; + case 11: + if (func_8007278C(objectIndex, 8) != 0) { + D_80165C18[objectIndex].unk_068 += 0x80; + if (arg1 == 0) { + play_sound2(SOUND_ACTION_GREEN_LIGHT); + } + } + break; + case 12: + func_80072E54(objectIndex, 0x00000018, 0x0000001B, 1, 6, 0); + break; + case 13: if (arg1 == 0) { - play_sound2(SOUND_ACTION_GREEN_LIGHT); - return; + func_800729EC(objectIndex); + D_8018D160 = 1; + break; } - } - break; - case 12: - func_80072E54(objectIndex, 0x00000018, 0x0000001B, 1, 6, 0); - return; - case 13: - if (arg1 == 0) { - func_800729EC(); - D_8018D160 = 1; - return; - } - func_80072488(objectIndex); - return; - case 14: - func_8007278C(objectIndex, 0x00000078); - return; - case 15: - func_80072428(objectIndex); - break; + func_80072488(objectIndex); + break; + case 14: + func_8007278C(objectIndex, 0x00000078); + break; + case 15: + func_80072428(objectIndex); + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079380.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800791F0(); /* extern */ -void func_80086F10(s32, ?, ? *); /* extern */ -extern Vtx D_0D006730; -extern s32 gTLUTLakituCheckeredFlag; extern s32 D_0F07E350; -extern s32 *D_8018C028; -static ? D_800E6834; /* unable to generate initializer */ +extern s32 D_8018C028; +extern s32 D_800E6834; // static -void func_8007963C(s32 objectIndex) { +void func_8007963C(s32 objectIndex, s32 playerIndex) { struct_80165C18_entry *temp_v0; - func_800791F0(); + func_800791F0(objectIndex, playerIndex); func_80073444(objectIndex, &gTLUTLakituCheckeredFlag, &D_0F07E350, 0x48U, (u16) 0x00000038); temp_v0 = &D_80165C18[objectIndex]; + temp_v0->unk_064 = D_8018C028; temp_v0->unk_074 = (s32) &D_0D006730; temp_v0->unk_004[2] = 5000.0f; temp_v0->unk_004[1] = 5000.0f; temp_v0->unk_004[0] = 5000.0f; - temp_v0->unk_064 = D_8018C028; temp_v0->unk_000 = 0.15f; func_80086F10(objectIndex, 2, &D_800E6834); func_800721E8(objectIndex, 0x00000010); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007963C.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007963C(); /* extern */ -extern ? D_80165CBE; - -void func_80079700(s32 objectIndex) { - u16 temp_t7; - - temp_t7 = *(&D_80165CBE + (objectIndex * 0xE0)); - switch (temp_t7) { - case 1: - func_8007963C(); - return; - case 2: - func_800721C0(objectIndex, 0x00000010); - func_80072488(objectIndex); - return; - case 3: - func_80072E54(objectIndex, 0, 0x0000001F, 1, 2, -1); - return; - case 4: - func_80072428(objectIndex); - /* fallthrough */ - default: - return; +void func_80079700(s32 objectIndex, s32 playerIndex) { + switch (D_80165CBE[objectIndex].unk[0]) { + case 0: + break; + case 1: + func_8007963C(objectIndex, playerIndex); + break; + case 2: + func_800721C0(objectIndex, 0x00000010); + func_80072488(objectIndex); + break; + case 3: + func_80072E54(objectIndex, 0, 0x0000001F, 1, 2, -1); + break; + case 4: + func_80072428(objectIndex); + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079700.s") -#endif void func_800797AC(s32 playerId) { s32 objectIndex; @@ -3468,32 +3261,20 @@ void func_8007993C(s32 objectIndex, Player *player) { func_800722CC(objectIndex, 2); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800791F0(); /* extern */ -void func_80086E70(s32); /* extern */ -void func_800C8F80(u8, ?); /* extern */ -extern Vtx D_0D005F30; -extern s32 gTLUTLakituFishing; -extern s32 D_0F0CCF50; +extern Vtx D_0D005F30[]; +extern Gfx D_0F0CCF50[]; -void func_800799A8(s32 objectIndex, u8 arg1) { - struct_80165C18_entry *temp_v0; - - func_800791F0(); +void func_800799A8(s32 objectIndex, s32 arg1) { + func_800791F0(objectIndex, arg1); func_80073444(objectIndex, &gTLUTLakituFishing, &D_0F0CCF50, 0x38U, (u16) 0x00000048); - temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_074 = (s32) &D_0D005F30; - temp_v0->unk_000 = 0.15f; + D_80165C18[objectIndex].unk_074 = D_0D005F30; + D_80165C18[objectIndex].unk_000 = 0.15f; func_80086E70(objectIndex); func_800721E8(objectIndex, 0x00000010); func_80073720(objectIndex); func_80072488(objectIndex); - func_800C8F80(arg1, 0x0100FA28); + func_800C8F80((u8)arg1, 0x0100FA28); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800799A8.s") -#endif void func_80079A5C(s32 objectIndex, Player *player) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -3521,408 +3302,302 @@ void func_80079A5C(s32 objectIndex, Player *player) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800799A8(s32, s32); /* extern */ -void func_800C9018(u8, ?); /* extern */ - void func_80079B40(s32 objectIndex, s32 playerId) { - Player *sp34; - struct_80165C18_entry *sp2C; - s16 temp_v0; - struct_80165C18_entry *temp_t2; - u8 temp_t6; + Player *player = &gPlayerOne[playerId]; - temp_t2 = &D_80165C18[objectIndex]; - sp34 = &gPlayerOne[playerId]; - sp2C = temp_t2; - temp_v0 = temp_t2->unk_0A6; - switch (temp_v0) { /* switch 1; irregular */ - case 0: /* switch 1 */ - break; - case 1: /* switch 1 */ - func_800799A8(objectIndex, playerId); - break; - case 2: /* switch 1 */ - func_800721C0(objectIndex, 0x00000010); - func_800736E0(objectIndex); - func_80072488(objectIndex); - break; - case 3: /* switch 1 */ - func_800730BC(objectIndex, 0, 3, 1, 2, -1); - break; + switch (D_80165C18[objectIndex].unk_0A6) { /* switch 1; irregular */ + case 0: /* switch 1 */ + break; + case 1: /* switch 1 */ + func_800799A8(objectIndex, playerId); + break; + case 2: /* switch 1 */ + func_800721C0(objectIndex, 0x00000010); + func_800736E0(objectIndex); + func_80072488(objectIndex); + break; + case 3: /* switch 1 */ + func_800730BC(objectIndex, 0, 3, 1, 2, -1); + break; } - temp_t6 = sp2C->unk_0D6; - switch (temp_t6) { - case 1: - if (func_80086FA4(objectIndex) != 0) { + switch (D_80165C18[objectIndex].unk_0D6) { + case 0: + break; + case 1: + if (func_80086FA4(objectIndex) != 0) { + func_80073654(objectIndex); + } + break; + case 2: + func_80090868(player); func_80073654(objectIndex); - } - break; - case 2: - func_80090868(sp34); - func_80073654(objectIndex); - break; - case 3: - if (!(sp34->unk_0CA & 2)) { - func_80086EAC(objectIndex, 0, 3); - func_80073654(objectIndex); - } - break; - case 4: - if (func_80086FA4(objectIndex) != 0) { - func_80073654(objectIndex); - } - break; - case 5: - func_800722CC(objectIndex, 1); - func_800C9018((u8) playerId, 0x0100FA28); - func_80072428(objectIndex); - func_80073720(objectIndex); - break; + break; + case 3: + if (!(player->unk_0CA & 2)) { + func_80086EAC(objectIndex, 0, 3); + func_80073654(objectIndex); + } + break; + case 4: + if (func_80086FA4(objectIndex) != 0) { + func_80073654(objectIndex); + } + break; + case 5: + func_800722CC(objectIndex, 1); + func_800C9018((u8) playerId, 0x0100FA28); + func_80072428(objectIndex); + func_80073720(objectIndex); + break; } - if (sp2C->unk_0A6 >= 2) { - func_8007993C(objectIndex, sp34); + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + func_8007993C(objectIndex, player); } - func_80079A5C(objectIndex, sp34); + func_80079A5C(objectIndex, player); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079B40.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800799A8(s32, s32); /* extern */ -void func_800C9018(u8, ?); /* extern */ void func_80079D44(s32 objectIndex, s32 playerId) { - struct_80165C18_entry *sp2C; - Player *temp_s1; - s16 temp_v0; - struct_80165C18_entry *temp_t1; - u8 temp_t7; - temp_t1 = &D_80165C18[objectIndex]; - sp2C = temp_t1; - temp_v0 = temp_t1->unk_0A6; + Player *temp_s1; + temp_s1 = &gPlayerOne[playerId]; - switch (temp_v0) { /* switch 1; irregular */ - case 0: /* switch 1 */ - break; - case 1: /* switch 1 */ - func_800799A8(objectIndex, playerId); - break; - case 2: /* switch 1 */ - func_800721C0(objectIndex, 0x00000010); - func_800736E0(objectIndex); - temp_s1->unk_0CA |= 0x80; - func_80072488(objectIndex); - break; - case 3: /* switch 1 */ - func_800730BC(objectIndex, 0, 3, 1, 2, -1); - break; + switch (D_80165C18[objectIndex].unk_0A6) { /* switch 1; irregular */ + case 0: /* switch 1 */ + break; + case 1: /* switch 1 */ + func_800799A8(objectIndex, playerId); + break; + case 2: /* switch 1 */ + func_800721C0(objectIndex, 0x00000010); + func_800736E0(objectIndex); + temp_s1->unk_0CA |= 0x80; + func_80072488(objectIndex); + break; + case 3: /* switch 1 */ + func_800730BC(objectIndex, 0, 3, 1, 2, -1); + break; } - temp_t7 = sp2C->unk_0D6; - switch (temp_t7) { - case 1: - if (func_80086FA4(objectIndex) != 0) { - func_800C9060((u8) playerId, 0x1900A055U); + switch (D_80165C18[objectIndex].unk_0D6) { + case 1: + if (func_80086FA4(objectIndex) != 0) { + func_800C9060((u8) playerId, 0x1900A055U); + func_80073654(objectIndex); + } + break; + case 2: + func_80090868(temp_s1); + func_800722A4(objectIndex, 4); func_80073654(objectIndex); - } - break; - case 2: - func_80090868(temp_s1); - func_800722A4(objectIndex, 4); - func_80073654(objectIndex); - break; - case 3: - if ((temp_s1->unk_0F8 == 9) && !(temp_s1->unk_0CA & 1) && ((f64) temp_s1->unk_110.unk44 <= 30.0)) { - func_800722A4(objectIndex, 8); - } - if (!(temp_s1->unk_0CA & 2)) { - func_80086EAC(objectIndex, 0, 3); + break; + case 3: + if ((temp_s1->unk_0F8 == 9) && !(temp_s1->unk_0CA & 1) && ((f64) temp_s1->unk_110.unk3C[2] <= 30.0)) { + func_800722A4(objectIndex, 8); + } + if (!(temp_s1->unk_0CA & 2)) { + func_80086EAC(objectIndex, 0, 3); + func_80073654(objectIndex); + } + break; + case 4: + func_8007375C(objectIndex, 0x0000001E); + break; + case 5: + temp_s1->unk_0CA &= 0xFF7F; + func_800722A4(objectIndex, 0x00000010); + func_800722A4(objectIndex, 0x00000020); + func_800722CC(objectIndex, 4); + func_800722CC(objectIndex, 8); func_80073654(objectIndex); - } - break; - case 4: - func_8007375C(objectIndex, 0x0000001E); - break; - case 5: - temp_s1->unk_0CA &= 0xFF7F; - func_800722A4(objectIndex, 0x00000010); - func_800722A4(objectIndex, 0x00000020); - func_800722CC(objectIndex, 4); - func_800722CC(objectIndex, 8); - func_80073654(objectIndex); - func_800C9060((u8) playerId, 0x1900A056U); - break; - case 6: - if (func_8007375C(objectIndex, 0x000000A0) != 0) { - func_800722CC(objectIndex, 0x00000010); - temp_s1->unk_0CA &= 0xFFEF; - temp_s1->unk_0CA |= 0x20; - } - break; - case 7: - func_8007375C(objectIndex, 0x0000003C); - break; - case 8: - func_80073720(objectIndex); - func_80072428(objectIndex); - temp_s1->unk_0CA &= 0xFFDF; - func_800722CC(objectIndex, 1); - func_800C9018((u8) playerId, 0x0100FA28); - break; + func_800C9060((u8) playerId, 0x1900A056U); + break; + case 6: + if (func_8007375C(objectIndex, 0x000000A0) != 0) { + func_800722CC(objectIndex, 0x00000010); + temp_s1->unk_0CA &= 0xFFEF; + temp_s1->unk_0CA |= 0x20; + } + break; + case 7: + func_8007375C(objectIndex, 0x0000003C); + break; + case 8: + func_80073720(objectIndex); + func_80072428(objectIndex); + temp_s1->unk_0CA &= 0xFFDF; + func_800722CC(objectIndex, 1); + func_800C9018((u8) playerId, 0x0100FA28); + break; } - if (sp2C->unk_0A6 >= 2) { + + if (D_80165C18[objectIndex].unk_0A6 >= 2) { func_8007993C(objectIndex, temp_s1); } func_80079A5C(objectIndex, temp_s1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079D44.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800791F0(); /* extern */ -void func_80086F10(s32, ?, ? *); /* extern */ -extern Vtx D_0D006730; -extern s32 gTLUTLakituSecondLap; -extern s32 D_0F09DB50; -extern s32 *D_8018C028; -static ? D_800E694C; /* unable to generate initializer */ +extern Gfx D_0F09DB50[]; +extern s16 D_800E694C[]; -void func_8007A060(s32 objectIndex) { +void func_8007A060(s32 objectIndex, s32 playerIndex) { struct_80165C18_entry *temp_v0; - func_800791F0(); + func_800791F0(objectIndex, playerIndex); func_80073444(objectIndex, &gTLUTLakituSecondLap, &D_0F09DB50, 0x48U, (u16) 0x00000038); temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_074 = (s32) &D_0D006730; + temp_v0->unk_064 = D_8018C028; + temp_v0->unk_074 = D_0D006730; temp_v0->unk_004[2] = 5000.0f; temp_v0->unk_004[1] = 5000.0f; temp_v0->unk_004[0] = 5000.0f; - temp_v0->unk_064 = D_8018C028; temp_v0->unk_000 = 0.15f; func_800721E8(objectIndex, 0x00000010); func_80086F10(objectIndex, 5, &D_800E694C); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A060.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007A060(); /* extern */ - -void func_8007A124(s32 objectIndex) { - struct_80165C18_entry *temp_v0; - u16 temp_t8; - - temp_v0 = &D_80165C18[objectIndex]; - temp_t8 = (u16) temp_v0->unk_0A6; - switch (temp_t8) { - case 1: - func_8007A060(); - return; - case 2: - func_800721C0(objectIndex, 0x00000010); - func_80072488(objectIndex); - return; - case 3: - func_8007278C(objectIndex, 0x00000014); - return; - case 4: - func_80072E54(objectIndex, 0, 0x0000000F, 1, 2, 1); - return; - case 5: - func_8007278C(objectIndex, 0x0000003C); - return; - case 6: - func_80072F88(objectIndex, 0x0000000F, 0, 1, 2, 1); - return; - case 7: - if (temp_v0->unk_0AE == 0) { - func_80072428(objectIndex); - } - /* fallthrough */ - default: - return; +void func_8007A124(s32 objectIndex, s32 playerIndex) { + switch (D_80165C18[objectIndex].unk_0A6) { + case 0: + break; + case 1: + func_8007A060(objectIndex, playerIndex); + break; + case 2: + func_800721C0(objectIndex, 0x00000010); + func_80072488(objectIndex); + break; + case 3: + func_8007278C(objectIndex, 0x00000014); + break; + case 4: + func_80072E54(objectIndex, 0, 0x0000000F, 1, 2, 1); + break; + case 5: + func_8007278C(objectIndex, 0x0000003C); + break; + case 6: + func_80072F88(objectIndex, 0x0000000F, 0, 1, 2, 1); + break; + case 7: + if (D_80165C18[objectIndex].unk_0AE == 0) { + func_80072428(objectIndex); + } + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A124.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800791F0(); /* extern */ -void func_80086F10(s32, ?, ? *); /* extern */ -extern Vtx D_0D006730; -extern s32 gTLUTLakituFinalLap; -extern s32 D_0F0AD750; -extern s32 *D_8018C028; -static ? D_800E694C; /* unable to generate initializer */ +extern Gfx D_0F0AD750[]; -void func_8007A228(s32 objectIndex) { +void func_8007A228(s32 objectIndex, s32 playerIndex) { struct_80165C18_entry *temp_v0; - func_800791F0(); + func_800791F0(objectIndex, playerIndex); func_80073444(objectIndex, &gTLUTLakituFinalLap, &D_0F0AD750, 0x48U, (u16) 0x00000038); temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_074 = (s32) &D_0D006730; + temp_v0->unk_064 = D_8018C028; + temp_v0->unk_074 = D_0D006730; temp_v0->unk_004[2] = 5000.0f; temp_v0->unk_004[1] = 5000.0f; temp_v0->unk_004[0] = 5000.0f; - temp_v0->unk_064 = D_8018C028; temp_v0->unk_000 = 0.15f; func_800721E8(objectIndex, 0x00000010); func_80086F10(objectIndex, 5, &D_800E694C); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A228.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007A228(); /* extern */ - -void func_8007A2EC(s32 objectIndex) { - struct_80165C18_entry *temp_v0; - u16 temp_t8; - - temp_v0 = &D_80165C18[objectIndex]; - temp_t8 = (u16) temp_v0->unk_0A6; - switch (temp_t8) { - case 1: - func_8007A228(); - return; - case 2: - func_800721C0(objectIndex, 0x00000010); - func_80072488(objectIndex); - return; - case 3: - func_8007278C(objectIndex, 0x00000014); - return; - case 4: - func_80072E54(objectIndex, 0, 0x0000000F, 1, 2, 1); - return; - case 5: - func_8007278C(objectIndex, 0x0000003C); - return; - case 6: - func_80072F88(objectIndex, 0x0000000F, 0, 1, 2, 1); - return; - case 7: - if (temp_v0->unk_0AE == 0) { - func_80072428(objectIndex); - } - /* fallthrough */ - default: - return; +void func_8007A2EC(s32 objectIndex, s32 playerIndex) { + switch (D_80165C18[objectIndex].unk_0A6) { + case 0: + break; + case 1: + func_8007A228(objectIndex, playerIndex); + break; + case 2: + func_800721C0(objectIndex, 0x00000010); + func_80072488(objectIndex); + break; + case 3: + func_8007278C(objectIndex, 0x00000014); + break; + case 4: + func_80072E54(objectIndex, 0, 0x0000000F, 1, 2, 1); + break; + case 5: + func_8007278C(objectIndex, 0x0000003C); + break; + case 6: + func_80072F88(objectIndex, 0x0000000F, 0, 1, 2, 1); + break; + case 7: + if (D_80165C18[objectIndex].unk_0AE == 0) { + func_80072428(objectIndex); + } + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A2EC.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800791F0(); /* extern */ -void func_80086F10(s32, ?, ? *); /* extern */ -void func_800C8F80(u8, ?); /* extern */ -extern Vtx D_0D006730; -extern s32 gTLUTLakituReverse; -extern s32 D_0F0BD350; -extern s32 *D_8018C028; -static ? D_800E69B0; /* unable to generate initializer */ +extern Gfx D_0F0BD350[]; +extern s16 D_800E69B0[1]; // static? -void func_8007A3F0(s32 objectIndex, u8 arg1) { - struct_80165C18_entry *sp28; - struct_80165C18_entry *temp_v0; - - func_800791F0(); +void func_8007A3F0(s32 objectIndex, s32 arg1) { + f32 var = 5000.0f; + func_800791F0(objectIndex, arg1); func_80073444(objectIndex, &gTLUTLakituReverse, &D_0F0BD350, 0x48U, (u16) 0x00000038); - temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_074 = (s32) &D_0D006730; - temp_v0->unk_004[2] = 5000.0f; - temp_v0->unk_004[1] = 5000.0f; - temp_v0->unk_004[0] = 5000.0f; - temp_v0->unk_064 = D_8018C028; - sp28 = temp_v0; - temp_v0->unk_000 = 0.15f; + D_80165C18[objectIndex].unk_064 = D_8018C028; + D_80165C18[objectIndex].unk_074 = D_0D006730; + D_80165C18[objectIndex].unk_004[2] = var; + D_80165C18[objectIndex].unk_004[1] = var; + D_80165C18[objectIndex].unk_004[0] = var; + D_80165C18[objectIndex].unk_000 = 0.15f; func_800721E8(objectIndex, 0x00000010); func_80086F10(objectIndex, 6, &D_800E69B0); - temp_v0->unk_0D6 = 0; + D_80165C18[objectIndex].unk_0D6 = 0; func_80072488(objectIndex); - func_800C8F80(arg1, 0x0100FA28); + func_800C8F80((u8)arg1, 0x0100FA28); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A3F0.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007A3F0(s32, s32); /* extern */ -void func_80086F10(s32, ?, ? *); /* extern */ -void func_800C9018(u8, ?); /* extern */ -static ? D_800E69F4; /* unable to generate initializer */ +extern s16 D_800E69F4[1]; // static? void func_8007A4D4(s32 objectIndex, s32 playerId) { - Player *sp2C; - s32 temp_t3; - struct_80165C18_entry *temp_s0; - u16 temp_t2; - u8 temp_v0; + Player *sp2C = &gPlayerOne[playerId]; - temp_s0 = &D_80165C18[objectIndex]; - temp_t2 = (u16) temp_s0->unk_0A6; - sp2C = &gPlayerOne[playerId]; - switch (temp_t2) { - case 0: - break; - case 1: - func_8007A3F0(objectIndex, playerId); - break; - case 2: - func_800721C0(objectIndex, 0x00000010); - temp_s0->unk_0D6 = 1; - func_80072488(objectIndex); - break; - case 3: - func_800730BC(objectIndex, 0, 0x0000000F, 1, 2, -1); - break; - case 4: - func_80072428(objectIndex); - break; - } - temp_v0 = temp_s0->unk_0D6; - switch (temp_v0) { /* switch 1; irregular */ - case 1: /* switch 1 */ - if ((temp_s0->unk_0A6 >= 3) && ((sp2C->unk_0BC << 9) >= 0)) { - func_80086F10(objectIndex, 6, &D_800E69F4); - temp_s0->unk_0D6 = 2; - temp_s0->unk_04C = 0x00000050; - func_800C9018((u8) playerId, 0x0100FA28); - return; - } - return; - case 2: /* switch 1 */ - temp_t3 = temp_s0->unk_04C - 1; - temp_s0->unk_04C = temp_t3; - if (temp_t3 == 0) { + switch (D_80165C18[objectIndex].unk_0A6) { + case 0: + break; + case 1: + func_8007A3F0(objectIndex, playerId); + break; + case 2: + func_800721C0(objectIndex, 0x00000010); + D_80165C18[objectIndex].unk_0D6 = 1; func_80072488(objectIndex); - temp_s0->unk_0D6 = 0; - } - break; + break; + case 3: + func_800730BC(objectIndex, 0, 0x0000000F, 1, 2, -1); + break; + case 4: + func_80072428(objectIndex); + break; + } + switch (D_80165C18[objectIndex].unk_0D6) { /* switch 1; irregular */ + case 1: /* switch 1 */ + if ((D_80165C18[objectIndex].unk_0A6 >= 3) && ((sp2C->unk_0BC << 9) >= 0)) { + func_80086F10(objectIndex, 6, &D_800E69F4); + D_80165C18[objectIndex].unk_0D6 = 2; + D_80165C18[objectIndex].unk_04C = 0x00000050; + func_800C9018((u8) playerId, 0x0100FA28); + return; + } + return; + case 2: /* switch 1 */ + D_80165C18[objectIndex].unk_04C--; + if (D_80165C18[objectIndex].unk_04C == 0) { + func_80072488(objectIndex); + D_80165C18[objectIndex].unk_0D6 = 0; + } + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A4D4.s") -#endif void func_8007A66C(s32 objectIndex, Player *player, Camera *camera) { u16 temp_t8; @@ -3965,59 +3640,40 @@ void func_8007A910(s32 arg0) { func_80079860(arg0); } -#ifdef MIPS_TO_C -//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -void func_80079380(s32, s32); /* extern */ -void func_80079700(s32, s32); /* extern */ -void func_80079B40(s32, s32); /* extern */ -void func_80079D44(s32, s32); /* extern */ -void func_8007A124(s32, s32); /* extern */ -void func_8007A2EC(s32, s32); /* extern */ -void func_8007A4D4(s32, s32); /* extern */ -void func_8008BFFC(s32); /* extern */ -extern ? D_80165CF0; -extern s32 D_80183DB8; - void func_8007A948(s32 arg0) { - s32 temp_s0; - u8 temp_t8; + s32 temp_s0 = D_80183DB8[arg0]; - temp_s0 = *(&D_80183DB8 + (arg0 * 4)); - temp_t8 = *(&D_80165CF0 + (temp_s0 * 0xE0)); - switch (temp_t8) { - case 1: - func_80079380(temp_s0, arg0); - func_8008BFFC(temp_s0); - return; - case 2: - func_80079700(temp_s0, arg0); - func_8008BFFC(temp_s0); - return; - case 3: - func_80079B40(temp_s0, arg0); - return; - case 4: - func_8007A124(temp_s0, arg0); - func_8008BFFC(temp_s0); - return; - case 5: - func_8007A2EC(temp_s0, arg0); - func_8008BFFC(temp_s0); - return; - case 6: - func_8007A4D4(temp_s0, arg0); - func_8008BFFC(temp_s0); - return; - case 7: - func_80079D44(temp_s0, arg0); - /* fallthrough */ - default: - return; + switch (D_80165CF0[temp_s0].unk[0]) { + case 0: + break; + case 1: + func_80079380(temp_s0, arg0); + func_8008BFFC(temp_s0); + break; + case 2: + func_80079700(temp_s0, arg0); + func_8008BFFC(temp_s0); + break; + case 3: + func_80079B40(temp_s0, arg0); + break; + case 4: + func_8007A124(temp_s0, arg0); + func_8008BFFC(temp_s0); + break; + case 5: + func_8007A2EC(temp_s0, arg0); + func_8008BFFC(temp_s0); + break; + case 6: + func_8007A4D4(temp_s0, arg0); + func_8008BFFC(temp_s0); + break; + case 7: + func_80079D44(temp_s0, arg0); + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A948.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-27-2022 @@ -4117,59 +3773,55 @@ void func_8007AC9C(s32 playerId) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s8 D_0D008150; -extern s8 D_0D008790; -extern ? D_0D008B14; -extern u8 D_801658FD; -extern u8 D_801658FF; +//#ifdef MIPS_TO_C +extern u8 sRandomItemIndex; +extern u8 gControllerRandom; extern s32 gRaceFrameCounter; +extern s8 D_0D008B14[]; +extern s8 D_0D008470[]; +extern s8 D_0D008858[]; +extern s8 D_0D008984[]; -u8 gen_random_item(s16 arg0, s16 arg1) { - s32 sp18; - s32 temp_v0; - s32 temp_v1; - s32 var_v0; - u8 *var_a1; - u8 var_v1; +// todo: Cleanup this function to use array access and struct if possible. +u8 gen_random_item(s16 arg0, s16 arg1) +{ + u16 rand = random_int(100); + u8 *curve; + u8 randomItem; - var_a1 = &D_801658FD; - D_801658FD = (u8) ((u32) (random_int(0x0064U) + (D_801658FD + D_801658FF) + gRaceFrameCounter) % 100U); - temp_v1 = gModeSelection; - if (temp_v1 == VERSUS) { - temp_v0 = gPlayerCountSelection1; - switch (temp_v0) { /* irregular */ - case 2: - sp18 = segmented_to_virtual((u32) &D_0D008790); -block_8: - var_a1 = &D_801658FD; - break; - case 3: - sp18 = segmented_to_virtual(0x0D008858U); - goto block_8; - case 4: - sp18 = segmented_to_virtual(0x0D008984U); - goto block_8; + // sRandomItemIndex not initialized for further randomness? + sRandomItemIndex = ((u32) rand + (sRandomItemIndex + gControllerRandom) + gRaceFrameCounter) % 100U; + + if (gModeSelection == VERSUS) { + switch (gPlayerCountSelection1) { + case TWO_PLAYERS_SELECTED: + curve = segmented_to_virtual((void *) D_0D008790); + break; + case THREE_PLAYERS_SELECTED: + curve = segmented_to_virtual((void *) D_0D008858); + break; + case FOUR_PLAYERS_SELECTED: + curve = segmented_to_virtual((void *) D_0D008984); + break; } - var_v1 = *((arg0 * 0x64) + sp18 + *var_a1); - } else if (temp_v1 == BATTLE) { - var_v1 = *(D_801658FD + segmented_to_virtual((u32) &D_0D008B14)); - } else { + randomItem = *((arg0 * 100) + curve + sRandomItemIndex); + + } else if (gModeSelection == BATTLE) { + curve = segmented_to_virtual((void *) D_0D008B14); + randomItem = curve[sRandomItemIndex]; + } else { // GP Mode if (arg1 == 0) { - var_v0 = segmented_to_virtual((u32) &D_0D008150); - } else { - var_v0 = segmented_to_virtual(0x0D008470U); + curve = segmented_to_virtual((void *) D_0D008150); } - var_v1 = *((arg0 * 0x64) + var_v0 + D_801658FD); + else { + curve = segmented_to_virtual((void *) D_0D008470); + } + randomItem = *((arg0 * 100) + curve + sRandomItemIndex); } - return var_v1; + return randomItem; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/gen_random_item.s") -#endif -u8 func_8007AF40(s32 arg0, s16 arg1) { +u8 func_8007AF40(s16 arg0, s16 arg1) { return gen_random_item(arg1, 0); } @@ -4177,33 +3829,38 @@ u8 func_8007AF78(s32 arg0, s16 arg1) { return gen_random_item(arg1, 1); } -#ifdef MIPS_TO_C +//#ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80164392; -extern ? D_801643BA; + + +/** + * todo: verify that these two variables are fake ptrs. + * As seen below, they were replaced with gLapCountByPlayerId and gGPCurrentRaceRankByPlayerId + * + * Notice how matching with the two variables below required two s16s. The lapcount gets cast to s16 to match. +typedef struct { + s16 val; + s16 pad; +} a; +extern a D_80164392[]; +extern a D_801643BA[]; +*/ s16 func_8007AFB0(s32 objectIndex, s32 arg1) { - s16 sp1A; - s16 var_a1; - s32 temp_v0; - struct_8018CA70_entry *temp_v1; - u8 temp_a0; + s32 pad[3]; + s16 randomItem; - temp_v0 = arg1 * 4; - temp_v1 = &D_8018CA70[arg1]; - temp_a0 = temp_v1->unk76; - var_a1 = func_8007AF40((s32) *(&D_80164392 + temp_v0), *(&D_801643BA + temp_v0)); - if (temp_a0 != 0) { - var_a1 = (s16) temp_a0; - temp_v1->unk76 = 0U; + randomItem = (s16) func_8007AF40((s16) gLapCountByPlayerId[arg1], (s16) gGPCurrentRaceRankByPlayerId[arg1]); + + if (D_8018CA70[arg1].itemOverride != 0) { + randomItem = (s16) D_8018CA70[arg1].itemOverride; + D_8018CA70[arg1].itemOverride = 0; } - sp1A = var_a1; - func_800729B4(objectIndex, (s32) var_a1); - return sp1A; + + func_800729B4(objectIndex, (s32) randomItem); + + return randomItem; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007AFB0.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -4683,10 +4340,18 @@ void func_8007BDA8(void) { func_8008BF18(temp_a0); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_06007BA8; -static ? D_800E634C; /* unable to generate initializer */ +extern Gfx D_06007BA8[]; +// This is either 3 Vec3s as separate variables or an array of s16's or an array of vec3s. +// The other entries appear to be unused. +extern Vec3s D_800E634C[3]; // static? +// todo: import +// Vec3s D_800E634C[] = { +// 62334, 19, 65058, +// 62331, 19, 65073, +// 3896, 19, 65044, +// 0x0000, // pad +// }; + void func_8007BDE0(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -4694,16 +4359,13 @@ void func_8007BDE0(s32 objectIndex) { temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 1; temp_v0->unk_054 = 0; - temp_v0->unk_070 = (s32) &D_06007BA8; + temp_v0->unk_070 = D_06007BA8; temp_v0->unk_000 = 0.2f; func_80072488(objectIndex); - func_8008B7D4(objectIndex, (f32) D_800E634C.unk0, (f32) ((f64) D_800E634C.unk2 + 55.0), (f32) D_800E634C.unk4); + func_8008B7D4(objectIndex, (f32) D_800E634C[0][0], (f32) ((f64) D_800E634C[0][1] + 55.0), (f32) D_800E634C[0][2]); func_8008B80C(objectIndex, 0.0f, 30.0f, 0.0f); func_8008B888(objectIndex, 0U, 0x3800U, 0U); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BDE0.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -4835,18 +4497,14 @@ void func_800723A4(s32, s32); // extern void func_8007BEC8(s32); // extern void func_8007BFB0(s32); // extern extern s8 D_801658BC; -extern s16 D_80165CBE[]; -// Unsure about D_80183F28[D_80165CBE] due to m2c: -// D_80165CBE + (D_80183F28 * 0xE0) -// This could be a fake match. Apparently it didn't match at all. void func_8007C280(void) { if (D_801658BC == 1) { D_801658BC = 0; func_800723A4(D_80183F28, 0); } - if (*(&D_80165CBE[D_80183F28[0]])) { + if (D_80165CBE[D_80183F28[0]].unk[0]) { func_8007BEC8(D_80183F28); func_8007BFB0(D_80183F28); } @@ -4855,23 +4513,16 @@ void func_8007C280(void) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C280.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -? func_8007C280(); /* extern */ - void func_8007C2F8(s32 arg0) { - switch (arg0) { /* irregular */ - case 0: - func_8007BDA8(); - return; - case 1: - func_8007C280(); - return; + switch (arg0) { + case 0: + func_8007BDA8(); + break; + case 1: + func_8007C280(); + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C2F8.s") -#endif void func_8007C340(void) { func_8007CC00(); @@ -4962,15 +4613,13 @@ void func_8007C550(s32 objectIndex) { func_8007C4A4(objectIndex); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTBoo; +extern s8 gTLUTBoo[]; extern s32 *D_80165880; void func_8007C5B4(s32 objectIndex) { struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTBoo, D_80165880, 0x30U, (u16) 0x00000028); + func_80073444(objectIndex, &gTLUTBoo, D_80165880, 48, 40); temp_s0 = &D_80165C18[objectIndex]; temp_s0->unk_004[0] = 0.0f; temp_s0->unk_004[1] = 0.0f; @@ -4987,9 +4636,6 @@ void func_8007C5B4(s32 objectIndex) { temp_s0->unk_0B2[0] = 0; temp_s0->unk_0B2[2] = 0x8000; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C5B4.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -5036,57 +4682,64 @@ void func_8007C684(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C684.s") #endif -#ifdef MIPS_TO_C +#ifdef NON_MATCHING //generated by m2c commit 9841ff34ca242f5f14b2eab2b54a7a65ac47d80f extern s16 D_8018CFF0; extern s16 D_8018D048; -static ? D_800E5988; /* unable to generate initializer */ -static ? D_800E5A44; /* unable to generate initializer */ -static ? D_800E5B08; /* unable to generate initializer */ -static ? D_800E5BD4; /* unable to generate initializer */ -static ? D_800E5C90; /* unable to generate initializer */ -static s32 D_800E5D9C[5] = { - (s32) &D_800E5988, - (s32) &D_800E5A44, - (s32) &D_800E5B08, - (s32) &D_800E5BD4, - (s32) &D_800E5C90, -}; -static ? D_800E5DB0; /* unable to generate initializer */ +// static ? D_800E5988; /* unable to generate initializer */ +// static ? D_800E5A44; /* unable to generate initializer */ +// static ? D_800E5B08; /* unable to generate initializer */ +// static ? D_800E5BD4; /* unable to generate initializer */ +// static ? D_800E5C90; /* unable to generate initializer */ +// static s32 D_800E5D9C[5] = { +// (s32) &D_800E5988, +// (s32) &D_800E5A44, +// (s32) &D_800E5B08, +// (s32) &D_800E5BD4, +// (s32) &D_800E5C90, +// }; +// static ? D_800E5DB0; /* unable to generate initializer */ +extern s32 D_800E5D9C[]; +extern s32 D_800E5DB0; -void func_8007C7B4(s32 arg0, s8 arg1) { - s32 *sp40; +// Close but not yet +void func_8007C7B4(s32 arg0, s32 arg1) { + //s32 *sp40; s16 temp_s1_2; s16 temp_s4; s16 temp_s5; - s32 *var_s2; - s32 *var_s3; - s32 temp_s1; + s32 var_s2; + s32 var_s3; + s32 *temp_s1; s32 temp_v1; - struct_80165C18_entry *temp_s0; + //struct_80165C18_entry *temp_s0; + //s32 i = 0; + + temp_s1 = &D_8018BFA8[arg0]; + //sp40 = D_8018BFA8[arg0]; + var_s2 = &D_800E5D9C; - var_s3 = &D_8018BFA8[arg0]; - var_s2 = D_800E5D9C; - sp40 = var_s3; - do { - temp_s1 = *var_s3; - func_800723A4(temp_s1, 1); - temp_s0 = &D_80165C18[temp_s1]; - temp_s0->unk_0D1 = arg1; - temp_s1_2 = random_int(0x003CU) - 0x1E; - temp_s4 = random_int(0x0014U) - 0xA; - temp_s5 = random_int(0x0050U) - 0x28; - random_int(0x1000U); - temp_v1 = *var_s2; + do { //for (i = 0; i < 20; i++) { + var_s3 = *temp_s1; + //temp_s1 = *var_s3; + func_800723A4(var_s3, 1); + //temp_s0 = &D_80165C18[var_s3[i]]; + D_80165C18[var_s3].unk_0D1 = arg1; + temp_s1_2 = random_int(60) - 30; + temp_s4 = random_int(20) - 10; + temp_s5 = random_int(80) - 40; + random_int(4096); // burn a card? + temp_v1 = var_s2; var_s2 += 4; - var_s3 += 4; - temp_s0->unk_010[0] = (f32) temp_s1_2; - temp_s0->unk_080 = temp_v1; - temp_s0->unk_010[1] = (f32) temp_s4; - temp_s0->unk_010[2] = (f32) temp_s5; - } while (var_s2 != &D_800E5DB0); - func_800C9060(arg1 & 0xFF, 0x1900705AU); - if (sp40 == D_8018BFA8) { + temp_s1 += 4; + D_80165C18[var_s3].unk_010[0] = (f32)temp_s1_2; + D_80165C18[var_s3].unk_080 = var_s2; + D_80165C18[var_s3].unk_010[1] = (f32) temp_s4; + D_80165C18[var_s3].unk_010[2] = (f32) temp_s5; + } while (var_s2 != D_800E5DB0); + + func_800C9060(arg1, 0x1900705A); + if (&D_8018BFA8[arg0] == D_8018BFA8) { D_8018CFF0 = 1; return; } @@ -5132,25 +4785,30 @@ void func_8007C91C(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C91C.s") #endif +// Something looks wonky about the asm. I suspect this a function was accidentally split in half. #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc s16 func_8007C9F8(void) { - s8 temp_v0; + //s8 temp_v0; - temp_v0 = D_8018EDF3; - if (temp_v0 == 1) { + //temp_v0 = D_8018EDF3; + + + + if (D_8018EDF3 == 1) { return 0; } - if (temp_v0 == 2) { + + if (D_8018EDF3 == 2) { if (gModeSelection == GRAND_PRIX) { - if (gGPCurrentRaceRankByPlayerId->unk0 < gGPCurrentRaceRankByPlayerId->unk4) { + if (gGPCurrentRaceRankByPlayerId[0] < gGPCurrentRaceRankByPlayerId[1]) { return 0; } return 1; } - return *gGPCurrentRacePlayerIdByRank; + //return gGPCurrentRacePlayerIdByRank[0]; } - return *gGPCurrentRacePlayerIdByRank; + return gGPCurrentRacePlayerIdByRank[0]; } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C9F8.s") @@ -6708,41 +6366,20 @@ void func_8007FEA4(s32 objectIndex) { } } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8007FB48(); // extern -void func_8007FEA4(); // extern -extern ? D_80165CF5; - -void func_8007FF5C(s32 arg0) { - u8 temp_v0; - - temp_v0 = *(&D_80165CF5 + (arg0 * 0xE0)); - if (temp_v0 != 1) { - if (temp_v0 != 2) { - return; - } - func_8007FEA4(); - return; +void func_8007FF5C(s32 arg0) +{ + switch(D_80165CF5[arg0].unk[0]) { + case 1: + func_8007FB48(); + break; + case 2: + func_8007FEA4(arg0); + break; } - func_8007FB48(); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FF5C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007E63C(s32); /* extern */ -void func_8007FA08(s32); /* extern */ -void func_8007FF5C(s32); /* extern */ -extern ? D_80165CBE; void func_8007FFC0(s32 objectIndex) { - s16 temp_v0; - - temp_v0 = *(&D_80165CBE + (objectIndex * 0xE0)); - switch (temp_v0) { /* irregular */ + switch (D_80165CBE[objectIndex].unk[0]) { /* irregular */ case 0: break; case 1: @@ -6761,9 +6398,6 @@ void func_8007FFC0(s32 objectIndex) { func_8008BF18(objectIndex); func_80073514(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FFC0.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -8014,14 +7648,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008241C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8008241C(); // extern -extern ? D_80165CBE; +//void func_8008241C(); // extern +extern s16 D_80165CBE[]; void func_80082714(s32 arg0) { - s16 temp_v0; + s16 *temp_v0 = &D_80165CBE[arg0]; - temp_v0 = *(&D_80165CBE + (arg0 * 0xE0)); - if ((temp_v0 != 0) && (temp_v0 == 1)) { + if ((temp_v0[0] != 0) && (temp_v0[0] == 1)) { func_8008241C(); } } @@ -8456,19 +8089,13 @@ block_6: GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800833D0.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80089F24(); // extern -extern ? D_80165CBE; +extern UnkStruct_80165CBE D_80165CBE[]; void func_80083474(s32 arg0) { - if (*(&D_80165CBE + (arg0 * 0xE0)) >= 2) { + if (D_80165CBE[arg0].unk[0] >= 2) { func_80089F24(); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083474.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 diff --git a/src/code_80071F00.h b/src/code_80071F00.h index 545159e50..4e72e1201 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -102,7 +102,7 @@ void func_800745C8(s32, s32); void func_8007466C(s32, s32); void func_80074704(s32, s32); s32 func_80074790(s32, s32); -void func_800747F0(s32); +void func_800747F0(s32, s32); void func_80074894(s32, s32); void func_800748C4(s32, s32); void func_800748F4(s32, s32); @@ -188,7 +188,7 @@ void func_8007AA44(s32); void func_8007ABFC(s32, s32); void func_8007AC9C(s32); u8 gen_random_item(s16, s16); -u8 func_8007AF40(s32, s16); +u8 func_8007AF40(s16, s16); u8 func_8007AF78(s32, s16); void func_8007BB9C(); void func_8007BD04(s32); diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c index baa2f4525..6909f4568 100644 --- a/src/code_8008C1D0.c +++ b/src/code_8008C1D0.c @@ -1463,6 +1463,7 @@ void func_8008F650(Player* player, s8 arg1) { } } +// Star item void func_8008F778(Player* player, s8 arg1) { func_8008C354(player, arg1); @@ -1470,11 +1471,13 @@ void func_8008F778(Player* player, s8 arg1) { player->statusEffects &= ~0x2000; D_8018D930[arg1] = gCourseTimer; D_8018D900[arg1] = 1; - if (((player->unk_000 & 0x4000) == 0x4000) && ((player->unk_000 & 0x100) != 0x100)) { + + if (((player->unk_000 & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->unk_000 & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { if (D_8018D900[arg1] == 1) { func_800CA59C(arg1); D_8018D900[arg1] = 2; } + // This may be in charge of ending the star sound. Still unknown though. } else if (D_8018D900[arg1] == 1) { func_800CA984(arg1); D_8018D900[arg1] = 2; diff --git a/src/common_textures.inc.c b/src/common_textures.inc.c index 3ed1eb211..744a7fbc4 100644 --- a/src/common_textures.inc.c +++ b/src/common_textures.inc.c @@ -1746,24 +1746,249 @@ Gfx D_0D008138[] = { gsSPEndDisplayList(), }; -// 0x8150 unk data prob texture -s8 D_0D008150[] = { - #include "textures/common/132B50_08150.ia8.inc.c" +// Curve graphs for generating a random item based on player race position. +// GP Mode +u8 D_0D008150[800] = { + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, + 0x09, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, + 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x0F, 0x0F, 0x0F, 0x0F, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, + 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, + 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x0F, 0x0F, 0x0F, 0x0F, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, + 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, + 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F }; -s8 D_0D008470[] = { - #include "textures/common/132B50_08470.ia8.inc.c" +// Also GP Mode? +u8 D_0D008470[800] = { + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0B, + 0x0B, 0x0B, 0x0B, 0x0B, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0B, 0x0B, + 0x0B, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x09, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0B, 0x0B, 0x0B, + 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, + 0x09, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C }; -s8 D_0D008790[] = { - #include "textures/common/132B50_08790.ia8.inc.c" +// Versus mode two player +u8 D_0D008790[200] = { + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x0B, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, + 0x0B, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x0B, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x0B, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x0B, 0x09, 0x09, 0x09, 0x09, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x02, 0x04, 0x05, + 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, + 0x07, 0x05, 0x02, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x04, 0x05, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x02, 0x07, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x02, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x05, 0x07, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x05, 0x04, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x02, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F }; -// D_0D008858 part of 08790 -// D_0D008984 part of 08790 +// Versus mode three player +u8 D_0D008858[300] = { + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, + 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, + 0x09, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, + 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, + 0x09, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, + 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F +}; -// D_0D008B14 part of 08790 +// Versus mode four player +u8 D_0D008984[400] = { + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, + 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, + 0x09, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, + 0x0C, 0x0C, 0x0C, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, + 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x09, + 0x09, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, + 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x02, 0x02, 0x02, 0x02, + 0x02, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x09, + 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, + 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, + 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, + 0x0F, 0x0F, 0x0F, 0x0F +}; +// Battle mode +u8 D_0D008B14[100] = { + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, + 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, + 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, + 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, + 0x0B, 0x0B, 0x0B, 0x0B +}; Vtx D_0D008B78[] = { {{{ 2, 2, 0}, 0, {0, 0}, {0xff, 0xff, 0xff, 0xff}}}, diff --git a/src/hud_renderer.c b/src/hud_renderer.c index 64b6e381b..74053645d 100644 --- a/src/hud_renderer.c +++ b/src/hud_renderer.c @@ -207,52 +207,42 @@ void func_8004477C(s8 *image, s32 width, s32 height) { #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b void func_80044924(s8 *image, s32 width, s32 height) { - Gfx *temp_v0; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_4; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - s32 temp_t0; - s32 temp_t3; - s32 var_a0; + //gDPLoadTextureBlock(gDisplayListHead++, &image, G_IM_FMT_IA, G_IM_SIZ_4b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + s32 temp_t0; + s32 temp_t3; + s32 var_a0; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0xFD700000; - temp_v0->words.w1 = (u32) image; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0xF5700000; - temp_v0_2->words.w1 = 0x07080200; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0xE6000000; - temp_v0_3->words.w1 = 0; - temp_v0_4 = gDisplayListHead; - temp_t3 = ((s32) ((width * height) + 3) >> 2) - 1; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w0 = 0xF3000000; - if (temp_t3 < 0x7FF) { - var_a0 = temp_t3; - } else { - var_a0 = 0x7FF; - } - temp_t0 = width / 16; - temp_v0_4->words.w1 = ((var_a0 & 0xFFF) << 0xC) | 0x07000000 | (((s32) (temp_t0 + 0x7FF) / temp_t0) & 0xFFF); - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w0 = 0xE7000000; - temp_v0_5->words.w1 = 0; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w1 = 0x00080200; - temp_v0_6->words.w0 = ((((s32) ((width >> 1) + 7) >> 3) & 0x1FF) << 9) | 0xF5600000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w0 = 0xF2000000; - temp_v0_7->words.w1 = ((((width - 1) * 4) & 0xFFF) << 0xC) | (((height - 1) * 4) & 0xFFF); + // temp_t3 = ((s32) ((width * height) + 3) >> 2) - 1; + // temp_t0 = width / 16; + + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, image); + gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); + gDPLoadSync(gDisplayListHead++); + gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, (temp_t0 + 0x7FF) / temp_t0, temp_t3, 0); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_4b, 0, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, 0, 0); + + // // set tile + // //temp_v0_2->words.w0 = 0xF5700000; + // //temp_v0_2->words.w1 = 0x07080200; + + + // // loadblock + // //temp_v0_4->words.w0 = 0xF3000000; + // // if (temp_t3 < 0x7FF) { + // // var_a0 = temp_t3; + // // } else { + // // var_a0 = 0x7FF; + // // } + // //temp_v0_4->words.w1 = ((var_a0 & 0xFFF) << 0xC) | 0x07000000 | (((s32) (temp_t0 + 0x7FF) / temp_t0) & 0xFFF); + + // // set tile + // temp_v0_6->words.w1 = 0x00080200; + // temp_v0_6->words.w0 = ((((s32) ((width >> 1) + 7) >> 3) & 0x1FF) << 9) | 0xF5600000; + // // set tile size + // temp_v0_7->words.w0 = 0xF2000000; + // temp_v0_7->words.w1 = ((((width - 1) * 4) & 0xFFF) << 0xC) | (((height - 1) * 4) & 0xFFF); } #else GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80044924.s") diff --git a/undefined_syms.txt b/undefined_syms.txt index 809972b01..2027162a0 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -72,6 +72,10 @@ D_03007800 = 0x03007800; D_03008000 = 0x03008000; D_03008800 = 0x03008800; +D_0D008858 = 0x0D008858; +D_0D008984 = 0x0D008984; +D_0D008470 = 0x0D008470; + D_05FF8DB8 = 0x05FF8DB8; D_06000028 = 0x06000028;