From 72cf6c86a9ed4418fe45eeb7228ccafda45377b4 Mon Sep 17 00:00:00 2001 From: Tyler McGavran Date: Sun, 2 Jan 2022 00:30:23 -0500 Subject: [PATCH] Rename a function related to D_8018D9E0 and regenerate its mips_to_c disassembly (#128) * Rename a function Signed-off-by: Taggerung * Update the mips_to_c code Signed-off-by: Taggerung --- .../{func_8009E650.s => add_8018D9E0_entry.s} | 2 +- .../code_80091750/func_80091FA4.s | 16 +- .../code_80091750/func_80092688.s | 132 +- .../code_80091750/func_80094C60.s | 196 +- .../code_80091750/func_800AC324.s | 2 +- .../code_80091750/func_800ACC50.s | 2 +- .../code_80091750/func_800AD1A4.s | 4 +- .../code_80091750/func_800AF004.s | 4 +- src/code_80091750.c | 2021 +++++++++-------- 9 files changed, 1264 insertions(+), 1115 deletions(-) rename asm/non_matchings/code_80091750/{func_8009E650.s => add_8018D9E0_entry.s} (99%) diff --git a/asm/non_matchings/code_80091750/func_8009E650.s b/asm/non_matchings/code_80091750/add_8018D9E0_entry.s similarity index 99% rename from asm/non_matchings/code_80091750/func_8009E650.s rename to asm/non_matchings/code_80091750/add_8018D9E0_entry.s index d0decd386..f23e0712c 100644 --- a/asm/non_matchings/code_80091750/func_8009E650.s +++ b/asm/non_matchings/code_80091750/add_8018D9E0_entry.s @@ -1,4 +1,4 @@ -glabel func_8009E650 +glabel add_8018D9E0_entry /* 09F250 8009E650 27BDFF80 */ addiu $sp, $sp, -0x80 /* 09F254 8009E654 AFBF001C */ sw $ra, 0x1c($sp) /* 09F258 8009E658 AFA7008C */ sw $a3, 0x8c($sp) diff --git a/asm/non_matchings/code_80091750/func_80091FA4.s b/asm/non_matchings/code_80091750/func_80091FA4.s index 9fcf4f948..543058c7c 100644 --- a/asm/non_matchings/code_80091750/func_80091FA4.s +++ b/asm/non_matchings/code_80091750/func_80091FA4.s @@ -42,22 +42,22 @@ glabel func_80091FA4 /* 092C40 80092040 24040096 */ li $a0, 150 /* 092C44 80092044 24050064 */ li $a1, 100 /* 092C48 80092048 24060024 */ li $a2, 36 -/* 092C4C 8009204C 0C027994 */ jal func_8009E650 +/* 092C4C 8009204C 0C027994 */ jal add_8018D9E0_entry /* 092C50 80092050 24070001 */ li $a3, 1 /* 092C54 80092054 24040097 */ li $a0, 151 /* 092C58 80092058 24050064 */ li $a1, 100 /* 092C5C 8009205C 240600DD */ li $a2, 221 -/* 092C60 80092060 0C027994 */ jal func_8009E650 +/* 092C60 80092060 0C027994 */ jal add_8018D9E0_entry /* 092C64 80092064 24070001 */ li $a3, 1 /* 092C68 80092068 24040098 */ li $a0, 152 /* 092C6C 8009206C 00002825 */ move $a1, $zero /* 092C70 80092070 00003025 */ move $a2, $zero -/* 092C74 80092074 0C027994 */ jal func_8009E650 +/* 092C74 80092074 0C027994 */ jal add_8018D9E0_entry /* 092C78 80092078 00003825 */ move $a3, $zero /* 092C7C 8009207C 240400C7 */ li $a0, 199 /* 092C80 80092080 00002825 */ move $a1, $zero /* 092C84 80092084 00003025 */ move $a2, $zero -/* 092C88 80092088 0C027994 */ jal func_8009E650 +/* 092C88 80092088 0C027994 */ jal add_8018D9E0_entry /* 092C8C 8009208C 00003825 */ move $a3, $zero /* 092C90 80092090 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e /* 092C94 80092094 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) @@ -66,12 +66,12 @@ glabel func_80091FA4 /* 092CA0 800920A0 15C10009 */ bne $t6, $at, .L800920C8 /* 092CA4 800920A4 00002825 */ move $a1, $zero /* 092CA8 800920A8 00003025 */ move $a2, $zero -/* 092CAC 800920AC 0C027994 */ jal func_8009E650 +/* 092CAC 800920AC 0C027994 */ jal add_8018D9E0_entry /* 092CB0 800920B0 00003825 */ move $a3, $zero /* 092CB4 800920B4 2404010E */ li $a0, 270 /* 092CB8 800920B8 00002825 */ move $a1, $zero /* 092CBC 800920BC 00003025 */ move $a2, $zero -/* 092CC0 800920C0 0C027994 */ jal func_8009E650 +/* 092CC0 800920C0 0C027994 */ jal add_8018D9E0_entry /* 092CC4 800920C4 00003825 */ move $a3, $zero .L800920C8: /* 092CC8 800920C8 3C0F8016 */ lui $t7, %hi(D_8015F890) # $t7, 0x8016 @@ -85,7 +85,7 @@ glabel func_80091FA4 /* 092CE8 800920E8 17010004 */ bne $t8, $at, .L800920FC /* 092CEC 800920EC 00002825 */ move $a1, $zero /* 092CF0 800920F0 00003025 */ move $a2, $zero -/* 092CF4 800920F4 0C027994 */ jal func_8009E650 +/* 092CF4 800920F4 0C027994 */ jal add_8018D9E0_entry /* 092CF8 800920F8 00003825 */ move $a3, $zero .L800920FC: /* 092CFC 800920FC 3C198015 */ lui $t9, %hi(gControllerBits) # $t9, 0x8015 @@ -99,7 +99,7 @@ glabel func_80091FA4 /* 092D1C 8009211C 00002825 */ move $a1, $zero /* 092D20 80092120 11200003 */ beqz $t1, .L80092130 /* 092D24 80092124 00003025 */ move $a2, $zero -/* 092D28 80092128 0C027994 */ jal func_8009E650 +/* 092D28 80092128 0C027994 */ jal add_8018D9E0_entry /* 092D2C 8009212C 24070002 */ li $a3, 2 .L80092130: /* 092D30 80092130 0C02D7CC */ jal func_800B5F30 diff --git a/asm/non_matchings/code_80091750/func_80092688.s b/asm/non_matchings/code_80091750/func_80092688.s index d3a7ca947..b4ae9843a 100644 --- a/asm/non_matchings/code_80091750/func_80092688.s +++ b/asm/non_matchings/code_80091750/func_80092688.s @@ -15,7 +15,7 @@ glabel L800926B8 /* 0932B8 800926B8 240401CE */ li $a0, 462 /* 0932BC 800926BC 00002825 */ move $a1, $zero /* 0932C0 800926C0 00003025 */ move $a2, $zero -/* 0932C4 800926C4 0C027994 */ jal func_8009E650 +/* 0932C4 800926C4 0C027994 */ jal add_8018D9E0_entry /* 0932C8 800926C8 24070002 */ li $a3, 2 /* 0932CC 800926CC 10000169 */ b .L80092C74 /* 0932D0 800926D0 8FBF0014 */ lw $ra, 0x14($sp) @@ -24,12 +24,12 @@ glabel L800926D4 /* 0932D4 800926D4 24040190 */ li $a0, 400 /* 0932D8 800926D8 00002825 */ move $a1, $zero /* 0932DC 800926DC 00003025 */ move $a2, $zero -/* 0932E0 800926E0 0C027994 */ jal func_8009E650 +/* 0932E0 800926E0 0C027994 */ jal add_8018D9E0_entry /* 0932E4 800926E4 24070002 */ li $a3, 2 /* 0932E8 800926E8 24040191 */ li $a0, 401 /* 0932EC 800926EC 00002825 */ move $a1, $zero /* 0932F0 800926F0 00003025 */ move $a2, $zero -/* 0932F4 800926F4 0C027994 */ jal func_8009E650 +/* 0932F4 800926F4 0C027994 */ jal add_8018D9E0_entry /* 0932F8 800926F8 24070002 */ li $a3, 2 /* 0932FC 800926FC 1000015D */ b .L80092C74 /* 093300 80092700 8FBF0014 */ lw $ra, 0x14($sp) @@ -37,12 +37,12 @@ glabel L80092704 /* 093304 80092704 24040192 */ li $a0, 402 /* 093308 80092708 00002825 */ move $a1, $zero /* 09330C 8009270C 00003025 */ move $a2, $zero -/* 093310 80092710 0C027994 */ jal func_8009E650 +/* 093310 80092710 0C027994 */ jal add_8018D9E0_entry /* 093314 80092714 24070002 */ li $a3, 2 /* 093318 80092718 24040193 */ li $a0, 403 /* 09331C 8009271C 00002825 */ move $a1, $zero /* 093320 80092720 00003025 */ move $a2, $zero -/* 093324 80092724 0C027994 */ jal func_8009E650 +/* 093324 80092724 0C027994 */ jal add_8018D9E0_entry /* 093328 80092728 24070002 */ li $a3, 2 /* 09332C 8009272C 10000151 */ b .L80092C74 /* 093330 80092730 8FBF0014 */ lw $ra, 0x14($sp) @@ -50,12 +50,12 @@ glabel L80092734 /* 093334 80092734 24040194 */ li $a0, 404 /* 093338 80092738 00002825 */ move $a1, $zero /* 09333C 8009273C 00003025 */ move $a2, $zero -/* 093340 80092740 0C027994 */ jal func_8009E650 +/* 093340 80092740 0C027994 */ jal add_8018D9E0_entry /* 093344 80092744 24070002 */ li $a3, 2 /* 093348 80092748 24040195 */ li $a0, 405 /* 09334C 8009274C 00002825 */ move $a1, $zero /* 093350 80092750 00003025 */ move $a2, $zero -/* 093354 80092754 0C027994 */ jal func_8009E650 +/* 093354 80092754 0C027994 */ jal add_8018D9E0_entry /* 093358 80092758 24070002 */ li $a3, 2 /* 09335C 8009275C 10000145 */ b .L80092C74 /* 093360 80092760 8FBF0014 */ lw $ra, 0x14($sp) @@ -63,12 +63,12 @@ glabel L80092764 /* 093364 80092764 24040196 */ li $a0, 406 /* 093368 80092768 00002825 */ move $a1, $zero /* 09336C 8009276C 00003025 */ move $a2, $zero -/* 093370 80092770 0C027994 */ jal func_8009E650 +/* 093370 80092770 0C027994 */ jal add_8018D9E0_entry /* 093374 80092774 24070002 */ li $a3, 2 /* 093378 80092778 24040197 */ li $a0, 407 /* 09337C 8009277C 00002825 */ move $a1, $zero /* 093380 80092780 00003025 */ move $a2, $zero -/* 093384 80092784 0C027994 */ jal func_8009E650 +/* 093384 80092784 0C027994 */ jal add_8018D9E0_entry /* 093388 80092788 24070002 */ li $a3, 2 /* 09338C 8009278C 10000139 */ b .L80092C74 /* 093390 80092790 8FBF0014 */ lw $ra, 0x14($sp) @@ -76,22 +76,22 @@ glabel L80092794 /* 093394 80092794 24040198 */ li $a0, 408 /* 093398 80092798 00002825 */ move $a1, $zero /* 09339C 8009279C 00003025 */ move $a2, $zero -/* 0933A0 800927A0 0C027994 */ jal func_8009E650 +/* 0933A0 800927A0 0C027994 */ jal add_8018D9E0_entry /* 0933A4 800927A4 24070002 */ li $a3, 2 /* 0933A8 800927A8 24040199 */ li $a0, 409 /* 0933AC 800927AC 00002825 */ move $a1, $zero /* 0933B0 800927B0 00003025 */ move $a2, $zero -/* 0933B4 800927B4 0C027994 */ jal func_8009E650 +/* 0933B4 800927B4 0C027994 */ jal add_8018D9E0_entry /* 0933B8 800927B8 24070002 */ li $a3, 2 /* 0933BC 800927BC 2404019A */ li $a0, 410 /* 0933C0 800927C0 00002825 */ move $a1, $zero /* 0933C4 800927C4 00003025 */ move $a2, $zero -/* 0933C8 800927C8 0C027994 */ jal func_8009E650 +/* 0933C8 800927C8 0C027994 */ jal add_8018D9E0_entry /* 0933CC 800927CC 24070002 */ li $a3, 2 /* 0933D0 800927D0 2404019B */ li $a0, 411 /* 0933D4 800927D4 00002825 */ move $a1, $zero /* 0933D8 800927D8 00003025 */ move $a2, $zero -/* 0933DC 800927DC 0C027994 */ jal func_8009E650 +/* 0933DC 800927DC 0C027994 */ jal add_8018D9E0_entry /* 0933E0 800927E0 24070002 */ li $a3, 2 /* 0933E4 800927E4 10000123 */ b .L80092C74 /* 0933E8 800927E8 8FBF0014 */ lw $ra, 0x14($sp) @@ -99,22 +99,22 @@ glabel L800927EC /* 0933EC 800927EC 24040198 */ li $a0, 408 /* 0933F0 800927F0 00002825 */ move $a1, $zero /* 0933F4 800927F4 00003025 */ move $a2, $zero -/* 0933F8 800927F8 0C027994 */ jal func_8009E650 +/* 0933F8 800927F8 0C027994 */ jal add_8018D9E0_entry /* 0933FC 800927FC 24070002 */ li $a3, 2 /* 093400 80092800 2404019C */ li $a0, 412 /* 093404 80092804 00002825 */ move $a1, $zero /* 093408 80092808 00003025 */ move $a2, $zero -/* 09340C 8009280C 0C027994 */ jal func_8009E650 +/* 09340C 8009280C 0C027994 */ jal add_8018D9E0_entry /* 093410 80092810 24070002 */ li $a3, 2 /* 093414 80092814 2404019D */ li $a0, 413 /* 093418 80092818 00002825 */ move $a1, $zero /* 09341C 8009281C 00003025 */ move $a2, $zero -/* 093420 80092820 0C027994 */ jal func_8009E650 +/* 093420 80092820 0C027994 */ jal add_8018D9E0_entry /* 093424 80092824 24070002 */ li $a3, 2 /* 093428 80092828 2404019E */ li $a0, 414 /* 09342C 8009282C 00002825 */ move $a1, $zero /* 093430 80092830 00003025 */ move $a2, $zero -/* 093434 80092834 0C027994 */ jal func_8009E650 +/* 093434 80092834 0C027994 */ jal add_8018D9E0_entry /* 093438 80092838 24070002 */ li $a3, 2 /* 09343C 8009283C 1000010D */ b .L80092C74 /* 093440 80092840 8FBF0014 */ lw $ra, 0x14($sp) @@ -122,22 +122,22 @@ glabel L80092844 /* 093444 80092844 2404019F */ li $a0, 415 /* 093448 80092848 00002825 */ move $a1, $zero /* 09344C 8009284C 00003025 */ move $a2, $zero -/* 093450 80092850 0C027994 */ jal func_8009E650 +/* 093450 80092850 0C027994 */ jal add_8018D9E0_entry /* 093454 80092854 24070002 */ li $a3, 2 /* 093458 80092858 240401A0 */ li $a0, 416 /* 09345C 8009285C 00002825 */ move $a1, $zero /* 093460 80092860 00003025 */ move $a2, $zero -/* 093464 80092864 0C027994 */ jal func_8009E650 +/* 093464 80092864 0C027994 */ jal add_8018D9E0_entry /* 093468 80092868 24070002 */ li $a3, 2 /* 09346C 8009286C 240401A1 */ li $a0, 417 /* 093470 80092870 00002825 */ move $a1, $zero /* 093474 80092874 00003025 */ move $a2, $zero -/* 093478 80092878 0C027994 */ jal func_8009E650 +/* 093478 80092878 0C027994 */ jal add_8018D9E0_entry /* 09347C 8009287C 24070002 */ li $a3, 2 /* 093480 80092880 240401A2 */ li $a0, 418 /* 093484 80092884 00002825 */ move $a1, $zero /* 093488 80092888 00003025 */ move $a2, $zero -/* 09348C 8009288C 0C027994 */ jal func_8009E650 +/* 09348C 8009288C 0C027994 */ jal add_8018D9E0_entry /* 093490 80092890 24070002 */ li $a3, 2 /* 093494 80092894 100000F7 */ b .L80092C74 /* 093498 80092898 8FBF0014 */ lw $ra, 0x14($sp) @@ -145,12 +145,12 @@ glabel L8009289C /* 09349C 8009289C 240401A3 */ li $a0, 419 /* 0934A0 800928A0 00002825 */ move $a1, $zero /* 0934A4 800928A4 00003025 */ move $a2, $zero -/* 0934A8 800928A8 0C027994 */ jal func_8009E650 +/* 0934A8 800928A8 0C027994 */ jal add_8018D9E0_entry /* 0934AC 800928AC 24070002 */ li $a3, 2 /* 0934B0 800928B0 240401A4 */ li $a0, 420 /* 0934B4 800928B4 00002825 */ move $a1, $zero /* 0934B8 800928B8 00003025 */ move $a2, $zero -/* 0934BC 800928BC 0C027994 */ jal func_8009E650 +/* 0934BC 800928BC 0C027994 */ jal add_8018D9E0_entry /* 0934C0 800928C0 24070002 */ li $a3, 2 /* 0934C4 800928C4 100000EB */ b .L80092C74 /* 0934C8 800928C8 8FBF0014 */ lw $ra, 0x14($sp) @@ -158,27 +158,27 @@ glabel L800928CC /* 0934CC 800928CC 240401A5 */ li $a0, 421 /* 0934D0 800928D0 00002825 */ move $a1, $zero /* 0934D4 800928D4 00003025 */ move $a2, $zero -/* 0934D8 800928D8 0C027994 */ jal func_8009E650 +/* 0934D8 800928D8 0C027994 */ jal add_8018D9E0_entry /* 0934DC 800928DC 24070002 */ li $a3, 2 /* 0934E0 800928E0 240401A6 */ li $a0, 422 /* 0934E4 800928E4 00002825 */ move $a1, $zero /* 0934E8 800928E8 00003025 */ move $a2, $zero -/* 0934EC 800928EC 0C027994 */ jal func_8009E650 +/* 0934EC 800928EC 0C027994 */ jal add_8018D9E0_entry /* 0934F0 800928F0 24070002 */ li $a3, 2 /* 0934F4 800928F4 240401A7 */ li $a0, 423 /* 0934F8 800928F8 00002825 */ move $a1, $zero /* 0934FC 800928FC 00003025 */ move $a2, $zero -/* 093500 80092900 0C027994 */ jal func_8009E650 +/* 093500 80092900 0C027994 */ jal add_8018D9E0_entry /* 093504 80092904 24070002 */ li $a3, 2 /* 093508 80092908 240401A8 */ li $a0, 424 /* 09350C 8009290C 00002825 */ move $a1, $zero /* 093510 80092910 00003025 */ move $a2, $zero -/* 093514 80092914 0C027994 */ jal func_8009E650 +/* 093514 80092914 0C027994 */ jal add_8018D9E0_entry /* 093518 80092918 24070002 */ li $a3, 2 /* 09351C 8009291C 240401A9 */ li $a0, 425 /* 093520 80092920 00002825 */ move $a1, $zero /* 093524 80092924 00003025 */ move $a2, $zero -/* 093528 80092928 0C027994 */ jal func_8009E650 +/* 093528 80092928 0C027994 */ jal add_8018D9E0_entry /* 09352C 8009292C 24070002 */ li $a3, 2 /* 093530 80092930 100000D0 */ b .L80092C74 /* 093534 80092934 8FBF0014 */ lw $ra, 0x14($sp) @@ -186,27 +186,27 @@ glabel L80092938 /* 093538 80092938 240401A5 */ li $a0, 421 /* 09353C 8009293C 00002825 */ move $a1, $zero /* 093540 80092940 00003025 */ move $a2, $zero -/* 093544 80092944 0C027994 */ jal func_8009E650 +/* 093544 80092944 0C027994 */ jal add_8018D9E0_entry /* 093548 80092948 24070002 */ li $a3, 2 /* 09354C 8009294C 240401A6 */ li $a0, 422 /* 093550 80092950 00002825 */ move $a1, $zero /* 093554 80092954 00003025 */ move $a2, $zero -/* 093558 80092958 0C027994 */ jal func_8009E650 +/* 093558 80092958 0C027994 */ jal add_8018D9E0_entry /* 09355C 8009295C 24070002 */ li $a3, 2 /* 093560 80092960 240401AA */ li $a0, 426 /* 093564 80092964 00002825 */ move $a1, $zero /* 093568 80092968 00003025 */ move $a2, $zero -/* 09356C 8009296C 0C027994 */ jal func_8009E650 +/* 09356C 8009296C 0C027994 */ jal add_8018D9E0_entry /* 093570 80092970 24070002 */ li $a3, 2 /* 093574 80092974 240401AB */ li $a0, 427 /* 093578 80092978 00002825 */ move $a1, $zero /* 09357C 8009297C 00003025 */ move $a2, $zero -/* 093580 80092980 0C027994 */ jal func_8009E650 +/* 093580 80092980 0C027994 */ jal add_8018D9E0_entry /* 093584 80092984 24070002 */ li $a3, 2 /* 093588 80092988 240401AC */ li $a0, 428 /* 09358C 8009298C 00002825 */ move $a1, $zero /* 093590 80092990 00003025 */ move $a2, $zero -/* 093594 80092994 0C027994 */ jal func_8009E650 +/* 093594 80092994 0C027994 */ jal add_8018D9E0_entry /* 093598 80092998 24070002 */ li $a3, 2 /* 09359C 8009299C 100000B5 */ b .L80092C74 /* 0935A0 800929A0 8FBF0014 */ lw $ra, 0x14($sp) @@ -214,22 +214,22 @@ glabel L800929A4 /* 0935A4 800929A4 240401AD */ li $a0, 429 /* 0935A8 800929A8 00002825 */ move $a1, $zero /* 0935AC 800929AC 00003025 */ move $a2, $zero -/* 0935B0 800929B0 0C027994 */ jal func_8009E650 +/* 0935B0 800929B0 0C027994 */ jal add_8018D9E0_entry /* 0935B4 800929B4 24070002 */ li $a3, 2 /* 0935B8 800929B8 240401AE */ li $a0, 430 /* 0935BC 800929BC 00002825 */ move $a1, $zero /* 0935C0 800929C0 00003025 */ move $a2, $zero -/* 0935C4 800929C4 0C027994 */ jal func_8009E650 +/* 0935C4 800929C4 0C027994 */ jal add_8018D9E0_entry /* 0935C8 800929C8 24070002 */ li $a3, 2 /* 0935CC 800929CC 240401AF */ li $a0, 431 /* 0935D0 800929D0 00002825 */ move $a1, $zero /* 0935D4 800929D4 00003025 */ move $a2, $zero -/* 0935D8 800929D8 0C027994 */ jal func_8009E650 +/* 0935D8 800929D8 0C027994 */ jal add_8018D9E0_entry /* 0935DC 800929DC 24070002 */ li $a3, 2 /* 0935E0 800929E0 240401B0 */ li $a0, 432 /* 0935E4 800929E4 00002825 */ move $a1, $zero /* 0935E8 800929E8 00003025 */ move $a2, $zero -/* 0935EC 800929EC 0C027994 */ jal func_8009E650 +/* 0935EC 800929EC 0C027994 */ jal add_8018D9E0_entry /* 0935F0 800929F0 24070002 */ li $a3, 2 /* 0935F4 800929F4 1000009F */ b .L80092C74 /* 0935F8 800929F8 8FBF0014 */ lw $ra, 0x14($sp) @@ -237,12 +237,12 @@ glabel L800929FC /* 0935FC 800929FC 240401B1 */ li $a0, 433 /* 093600 80092A00 00002825 */ move $a1, $zero /* 093604 80092A04 00003025 */ move $a2, $zero -/* 093608 80092A08 0C027994 */ jal func_8009E650 +/* 093608 80092A08 0C027994 */ jal add_8018D9E0_entry /* 09360C 80092A0C 24070002 */ li $a3, 2 /* 093610 80092A10 240401B2 */ li $a0, 434 /* 093614 80092A14 00002825 */ move $a1, $zero /* 093618 80092A18 00003025 */ move $a2, $zero -/* 09361C 80092A1C 0C027994 */ jal func_8009E650 +/* 09361C 80092A1C 0C027994 */ jal add_8018D9E0_entry /* 093620 80092A20 24070002 */ li $a3, 2 /* 093624 80092A24 10000093 */ b .L80092C74 /* 093628 80092A28 8FBF0014 */ lw $ra, 0x14($sp) @@ -250,17 +250,17 @@ glabel L80092A2C /* 09362C 80092A2C 240401B3 */ li $a0, 435 /* 093630 80092A30 00002825 */ move $a1, $zero /* 093634 80092A34 00003025 */ move $a2, $zero -/* 093638 80092A38 0C027994 */ jal func_8009E650 +/* 093638 80092A38 0C027994 */ jal add_8018D9E0_entry /* 09363C 80092A3C 24070002 */ li $a3, 2 /* 093640 80092A40 240401B4 */ li $a0, 436 /* 093644 80092A44 00002825 */ move $a1, $zero /* 093648 80092A48 00003025 */ move $a2, $zero -/* 09364C 80092A4C 0C027994 */ jal func_8009E650 +/* 09364C 80092A4C 0C027994 */ jal add_8018D9E0_entry /* 093650 80092A50 24070002 */ li $a3, 2 /* 093654 80092A54 240401B5 */ li $a0, 437 /* 093658 80092A58 00002825 */ move $a1, $zero /* 09365C 80092A5C 00003025 */ move $a2, $zero -/* 093660 80092A60 0C027994 */ jal func_8009E650 +/* 093660 80092A60 0C027994 */ jal add_8018D9E0_entry /* 093664 80092A64 24070002 */ li $a3, 2 /* 093668 80092A68 10000082 */ b .L80092C74 /* 09366C 80092A6C 8FBF0014 */ lw $ra, 0x14($sp) @@ -268,37 +268,37 @@ glabel L80092A70 /* 093670 80092A70 240401B6 */ li $a0, 438 /* 093674 80092A74 00002825 */ move $a1, $zero /* 093678 80092A78 00003025 */ move $a2, $zero -/* 09367C 80092A7C 0C027994 */ jal func_8009E650 +/* 09367C 80092A7C 0C027994 */ jal add_8018D9E0_entry /* 093680 80092A80 24070002 */ li $a3, 2 /* 093684 80092A84 240401B7 */ li $a0, 439 /* 093688 80092A88 00002825 */ move $a1, $zero /* 09368C 80092A8C 00003025 */ move $a2, $zero -/* 093690 80092A90 0C027994 */ jal func_8009E650 +/* 093690 80092A90 0C027994 */ jal add_8018D9E0_entry /* 093694 80092A94 24070002 */ li $a3, 2 /* 093698 80092A98 240401B8 */ li $a0, 440 /* 09369C 80092A9C 00002825 */ move $a1, $zero /* 0936A0 80092AA0 00003025 */ move $a2, $zero -/* 0936A4 80092AA4 0C027994 */ jal func_8009E650 +/* 0936A4 80092AA4 0C027994 */ jal add_8018D9E0_entry /* 0936A8 80092AA8 24070002 */ li $a3, 2 /* 0936AC 80092AAC 240401B9 */ li $a0, 441 /* 0936B0 80092AB0 00002825 */ move $a1, $zero /* 0936B4 80092AB4 00003025 */ move $a2, $zero -/* 0936B8 80092AB8 0C027994 */ jal func_8009E650 +/* 0936B8 80092AB8 0C027994 */ jal add_8018D9E0_entry /* 0936BC 80092ABC 24070002 */ li $a3, 2 /* 0936C0 80092AC0 240401BA */ li $a0, 442 /* 0936C4 80092AC4 00002825 */ move $a1, $zero /* 0936C8 80092AC8 00003025 */ move $a2, $zero -/* 0936CC 80092ACC 0C027994 */ jal func_8009E650 +/* 0936CC 80092ACC 0C027994 */ jal add_8018D9E0_entry /* 0936D0 80092AD0 24070002 */ li $a3, 2 /* 0936D4 80092AD4 240401BB */ li $a0, 443 /* 0936D8 80092AD8 00002825 */ move $a1, $zero /* 0936DC 80092ADC 00003025 */ move $a2, $zero -/* 0936E0 80092AE0 0C027994 */ jal func_8009E650 +/* 0936E0 80092AE0 0C027994 */ jal add_8018D9E0_entry /* 0936E4 80092AE4 24070002 */ li $a3, 2 /* 0936E8 80092AE8 240401BC */ li $a0, 444 /* 0936EC 80092AEC 00002825 */ move $a1, $zero /* 0936F0 80092AF0 00003025 */ move $a2, $zero -/* 0936F4 80092AF4 0C027994 */ jal func_8009E650 +/* 0936F4 80092AF4 0C027994 */ jal add_8018D9E0_entry /* 0936F8 80092AF8 24070002 */ li $a3, 2 /* 0936FC 80092AFC 1000005D */ b .L80092C74 /* 093700 80092B00 8FBF0014 */ lw $ra, 0x14($sp) @@ -306,22 +306,22 @@ glabel L80092B04 /* 093704 80092B04 240401BD */ li $a0, 445 /* 093708 80092B08 00002825 */ move $a1, $zero /* 09370C 80092B0C 00003025 */ move $a2, $zero -/* 093710 80092B10 0C027994 */ jal func_8009E650 +/* 093710 80092B10 0C027994 */ jal add_8018D9E0_entry /* 093714 80092B14 24070002 */ li $a3, 2 /* 093718 80092B18 240401BE */ li $a0, 446 /* 09371C 80092B1C 00002825 */ move $a1, $zero /* 093720 80092B20 00003025 */ move $a2, $zero -/* 093724 80092B24 0C027994 */ jal func_8009E650 +/* 093724 80092B24 0C027994 */ jal add_8018D9E0_entry /* 093728 80092B28 24070002 */ li $a3, 2 /* 09372C 80092B2C 240401BF */ li $a0, 447 /* 093730 80092B30 00002825 */ move $a1, $zero /* 093734 80092B34 00003025 */ move $a2, $zero -/* 093738 80092B38 0C027994 */ jal func_8009E650 +/* 093738 80092B38 0C027994 */ jal add_8018D9E0_entry /* 09373C 80092B3C 24070002 */ li $a3, 2 /* 093740 80092B40 240401C0 */ li $a0, 448 /* 093744 80092B44 00002825 */ move $a1, $zero /* 093748 80092B48 00003025 */ move $a2, $zero -/* 09374C 80092B4C 0C027994 */ jal func_8009E650 +/* 09374C 80092B4C 0C027994 */ jal add_8018D9E0_entry /* 093750 80092B50 24070002 */ li $a3, 2 /* 093754 80092B54 10000047 */ b .L80092C74 /* 093758 80092B58 8FBF0014 */ lw $ra, 0x14($sp) @@ -329,17 +329,17 @@ glabel L80092B5C /* 09375C 80092B5C 240401C1 */ li $a0, 449 /* 093760 80092B60 00002825 */ move $a1, $zero /* 093764 80092B64 00003025 */ move $a2, $zero -/* 093768 80092B68 0C027994 */ jal func_8009E650 +/* 093768 80092B68 0C027994 */ jal add_8018D9E0_entry /* 09376C 80092B6C 24070002 */ li $a3, 2 /* 093770 80092B70 240401C2 */ li $a0, 450 /* 093774 80092B74 00002825 */ move $a1, $zero /* 093778 80092B78 00003025 */ move $a2, $zero -/* 09377C 80092B7C 0C027994 */ jal func_8009E650 +/* 09377C 80092B7C 0C027994 */ jal add_8018D9E0_entry /* 093780 80092B80 24070002 */ li $a3, 2 /* 093784 80092B84 240401C3 */ li $a0, 451 /* 093788 80092B88 00002825 */ move $a1, $zero /* 09378C 80092B8C 00003025 */ move $a2, $zero -/* 093790 80092B90 0C027994 */ jal func_8009E650 +/* 093790 80092B90 0C027994 */ jal add_8018D9E0_entry /* 093794 80092B94 24070002 */ li $a3, 2 /* 093798 80092B98 10000036 */ b .L80092C74 /* 09379C 80092B9C 8FBF0014 */ lw $ra, 0x14($sp) @@ -347,47 +347,47 @@ glabel L80092BA0 /* 0937A0 80092BA0 240401C4 */ li $a0, 452 /* 0937A4 80092BA4 00002825 */ move $a1, $zero /* 0937A8 80092BA8 00003025 */ move $a2, $zero -/* 0937AC 80092BAC 0C027994 */ jal func_8009E650 +/* 0937AC 80092BAC 0C027994 */ jal add_8018D9E0_entry /* 0937B0 80092BB0 24070002 */ li $a3, 2 /* 0937B4 80092BB4 240401C5 */ li $a0, 453 /* 0937B8 80092BB8 00002825 */ move $a1, $zero /* 0937BC 80092BBC 00003025 */ move $a2, $zero -/* 0937C0 80092BC0 0C027994 */ jal func_8009E650 +/* 0937C0 80092BC0 0C027994 */ jal add_8018D9E0_entry /* 0937C4 80092BC4 24070002 */ li $a3, 2 /* 0937C8 80092BC8 240401C6 */ li $a0, 454 /* 0937CC 80092BCC 00002825 */ move $a1, $zero /* 0937D0 80092BD0 00003025 */ move $a2, $zero -/* 0937D4 80092BD4 0C027994 */ jal func_8009E650 +/* 0937D4 80092BD4 0C027994 */ jal add_8018D9E0_entry /* 0937D8 80092BD8 24070002 */ li $a3, 2 /* 0937DC 80092BDC 240401C7 */ li $a0, 455 /* 0937E0 80092BE0 00002825 */ move $a1, $zero /* 0937E4 80092BE4 00003025 */ move $a2, $zero -/* 0937E8 80092BE8 0C027994 */ jal func_8009E650 +/* 0937E8 80092BE8 0C027994 */ jal add_8018D9E0_entry /* 0937EC 80092BEC 24070002 */ li $a3, 2 /* 0937F0 80092BF0 240401C8 */ li $a0, 456 /* 0937F4 80092BF4 00002825 */ move $a1, $zero /* 0937F8 80092BF8 00003025 */ move $a2, $zero -/* 0937FC 80092BFC 0C027994 */ jal func_8009E650 +/* 0937FC 80092BFC 0C027994 */ jal add_8018D9E0_entry /* 093800 80092C00 24070002 */ li $a3, 2 /* 093804 80092C04 240401C9 */ li $a0, 457 /* 093808 80092C08 00002825 */ move $a1, $zero /* 09380C 80092C0C 00003025 */ move $a2, $zero -/* 093810 80092C10 0C027994 */ jal func_8009E650 +/* 093810 80092C10 0C027994 */ jal add_8018D9E0_entry /* 093814 80092C14 24070002 */ li $a3, 2 /* 093818 80092C18 240401CA */ li $a0, 458 /* 09381C 80092C1C 00002825 */ move $a1, $zero /* 093820 80092C20 00003025 */ move $a2, $zero -/* 093824 80092C24 0C027994 */ jal func_8009E650 +/* 093824 80092C24 0C027994 */ jal add_8018D9E0_entry /* 093828 80092C28 24070002 */ li $a3, 2 /* 09382C 80092C2C 240401CB */ li $a0, 459 /* 093830 80092C30 00002825 */ move $a1, $zero /* 093834 80092C34 00003025 */ move $a2, $zero -/* 093838 80092C38 0C027994 */ jal func_8009E650 +/* 093838 80092C38 0C027994 */ jal add_8018D9E0_entry /* 09383C 80092C3C 24070002 */ li $a3, 2 /* 093840 80092C40 240401CC */ li $a0, 460 /* 093844 80092C44 00002825 */ move $a1, $zero /* 093848 80092C48 00003025 */ move $a2, $zero -/* 09384C 80092C4C 0C027994 */ jal func_8009E650 +/* 09384C 80092C4C 0C027994 */ jal add_8018D9E0_entry /* 093850 80092C50 24070002 */ li $a3, 2 /* 093854 80092C54 10000007 */ b .L80092C74 /* 093858 80092C58 8FBF0014 */ lw $ra, 0x14($sp) @@ -395,7 +395,7 @@ glabel L80092C5C /* 09385C 80092C5C 240401CD */ li $a0, 461 /* 093860 80092C60 00002825 */ move $a1, $zero /* 093864 80092C64 00003025 */ move $a2, $zero -/* 093868 80092C68 0C027994 */ jal func_8009E650 +/* 093868 80092C68 0C027994 */ jal add_8018D9E0_entry /* 09386C 80092C6C 24070002 */ li $a3, 2 /* 093870 80092C70 8FBF0014 */ lw $ra, 0x14($sp) .L80092C74: diff --git a/asm/non_matchings/code_80091750/func_80094C60.s b/asm/non_matchings/code_80091750/func_80094C60.s index be1df4de4..0d47e5bd7 100644 --- a/asm/non_matchings/code_80091750/func_80094C60.s +++ b/asm/non_matchings/code_80091750/func_80094C60.s @@ -36,17 +36,17 @@ glabel L80094CE4 /* 0958E4 80094CE4 24040023 */ li $a0, 35 /* 0958E8 80094CE8 00002825 */ move $a1, $zero /* 0958EC 80094CEC 00003025 */ move $a2, $zero -/* 0958F0 80094CF0 0C027994 */ jal func_8009E650 +/* 0958F0 80094CF0 0C027994 */ jal add_8018D9E0_entry /* 0958F4 80094CF4 24070002 */ li $a3, 2 /* 0958F8 80094CF8 240400F1 */ li $a0, 241 /* 0958FC 80094CFC 00002825 */ move $a1, $zero /* 095900 80094D00 00003025 */ move $a2, $zero -/* 095904 80094D04 0C027994 */ jal func_8009E650 +/* 095904 80094D04 0C027994 */ jal add_8018D9E0_entry /* 095908 80094D08 24070004 */ li $a3, 4 /* 09590C 80094D0C 240400F0 */ li $a0, 240 /* 095910 80094D10 00002825 */ move $a1, $zero /* 095914 80094D14 00003025 */ move $a2, $zero -/* 095918 80094D18 0C027994 */ jal func_8009E650 +/* 095918 80094D18 0C027994 */ jal add_8018D9E0_entry /* 09591C 80094D1C 24070002 */ li $a3, 2 /* 095920 80094D20 10000203 */ b .L80095530 /* 095924 80094D24 00000000 */ nop @@ -54,97 +54,97 @@ glabel L80094D28 /* 095928 80094D28 24040023 */ li $a0, 35 /* 09592C 80094D2C 00002825 */ move $a1, $zero /* 095930 80094D30 00003025 */ move $a2, $zero -/* 095934 80094D34 0C027994 */ jal func_8009E650 +/* 095934 80094D34 0C027994 */ jal add_8018D9E0_entry /* 095938 80094D38 24070002 */ li $a3, 2 /* 09593C 80094D3C 2404008C */ li $a0, 140 /* 095940 80094D40 00002825 */ move $a1, $zero /* 095944 80094D44 00003025 */ move $a2, $zero -/* 095948 80094D48 0C027994 */ jal func_8009E650 +/* 095948 80094D48 0C027994 */ jal add_8018D9E0_entry /* 09594C 80094D4C 24070006 */ li $a3, 6 /* 095950 80094D50 2404007C */ li $a0, 124 /* 095954 80094D54 00002825 */ move $a1, $zero /* 095958 80094D58 00003025 */ move $a2, $zero -/* 09595C 80094D5C 0C027994 */ jal func_8009E650 +/* 09595C 80094D5C 0C027994 */ jal add_8018D9E0_entry /* 095960 80094D60 24070006 */ li $a3, 6 /* 095964 80094D64 2404007D */ li $a0, 125 /* 095968 80094D68 00002825 */ move $a1, $zero /* 09596C 80094D6C 00003025 */ move $a2, $zero -/* 095970 80094D70 0C027994 */ jal func_8009E650 +/* 095970 80094D70 0C027994 */ jal add_8018D9E0_entry /* 095974 80094D74 24070006 */ li $a3, 6 /* 095978 80094D78 2404007E */ li $a0, 126 /* 09597C 80094D7C 00002825 */ move $a1, $zero /* 095980 80094D80 00003025 */ move $a2, $zero -/* 095984 80094D84 0C027994 */ jal func_8009E650 +/* 095984 80094D84 0C027994 */ jal add_8018D9E0_entry /* 095988 80094D88 24070006 */ li $a3, 6 /* 09598C 80094D8C 2404007F */ li $a0, 127 /* 095990 80094D90 00002825 */ move $a1, $zero /* 095994 80094D94 00003025 */ move $a2, $zero -/* 095998 80094D98 0C027994 */ jal func_8009E650 +/* 095998 80094D98 0C027994 */ jal add_8018D9E0_entry /* 09599C 80094D9C 24070006 */ li $a3, 6 /* 0959A0 80094DA0 24040080 */ li $a0, 128 /* 0959A4 80094DA4 00002825 */ move $a1, $zero /* 0959A8 80094DA8 00003025 */ move $a2, $zero -/* 0959AC 80094DAC 0C027994 */ jal func_8009E650 +/* 0959AC 80094DAC 0C027994 */ jal add_8018D9E0_entry /* 0959B0 80094DB0 24070006 */ li $a3, 6 /* 0959B4 80094DB4 24040081 */ li $a0, 129 /* 0959B8 80094DB8 00002825 */ move $a1, $zero /* 0959BC 80094DBC 00003025 */ move $a2, $zero -/* 0959C0 80094DC0 0C027994 */ jal func_8009E650 +/* 0959C0 80094DC0 0C027994 */ jal add_8018D9E0_entry /* 0959C4 80094DC4 24070006 */ li $a3, 6 /* 0959C8 80094DC8 24040082 */ li $a0, 130 /* 0959CC 80094DCC 00002825 */ move $a1, $zero /* 0959D0 80094DD0 00003025 */ move $a2, $zero -/* 0959D4 80094DD4 0C027994 */ jal func_8009E650 +/* 0959D4 80094DD4 0C027994 */ jal add_8018D9E0_entry /* 0959D8 80094DD8 24070006 */ li $a3, 6 /* 0959DC 80094DDC 24040083 */ li $a0, 131 /* 0959E0 80094DE0 00002825 */ move $a1, $zero /* 0959E4 80094DE4 00003025 */ move $a2, $zero -/* 0959E8 80094DE8 0C027994 */ jal func_8009E650 +/* 0959E8 80094DE8 0C027994 */ jal add_8018D9E0_entry /* 0959EC 80094DEC 24070006 */ li $a3, 6 /* 0959F0 80094DF0 24040084 */ li $a0, 132 /* 0959F4 80094DF4 00002825 */ move $a1, $zero /* 0959F8 80094DF8 00003025 */ move $a2, $zero -/* 0959FC 80094DFC 0C027994 */ jal func_8009E650 +/* 0959FC 80094DFC 0C027994 */ jal add_8018D9E0_entry /* 095A00 80094E00 24070006 */ li $a3, 6 /* 095A04 80094E04 24040085 */ li $a0, 133 /* 095A08 80094E08 00002825 */ move $a1, $zero /* 095A0C 80094E0C 00003025 */ move $a2, $zero -/* 095A10 80094E10 0C027994 */ jal func_8009E650 +/* 095A10 80094E10 0C027994 */ jal add_8018D9E0_entry /* 095A14 80094E14 24070006 */ li $a3, 6 /* 095A18 80094E18 24040086 */ li $a0, 134 /* 095A1C 80094E1C 00002825 */ move $a1, $zero /* 095A20 80094E20 00003025 */ move $a2, $zero -/* 095A24 80094E24 0C027994 */ jal func_8009E650 +/* 095A24 80094E24 0C027994 */ jal add_8018D9E0_entry /* 095A28 80094E28 24070006 */ li $a3, 6 /* 095A2C 80094E2C 24040087 */ li $a0, 135 /* 095A30 80094E30 00002825 */ move $a1, $zero /* 095A34 80094E34 00003025 */ move $a2, $zero -/* 095A38 80094E38 0C027994 */ jal func_8009E650 +/* 095A38 80094E38 0C027994 */ jal add_8018D9E0_entry /* 095A3C 80094E3C 24070006 */ li $a3, 6 /* 095A40 80094E40 24040088 */ li $a0, 136 /* 095A44 80094E44 00002825 */ move $a1, $zero /* 095A48 80094E48 00003025 */ move $a2, $zero -/* 095A4C 80094E4C 0C027994 */ jal func_8009E650 +/* 095A4C 80094E4C 0C027994 */ jal add_8018D9E0_entry /* 095A50 80094E50 24070006 */ li $a3, 6 /* 095A54 80094E54 24040089 */ li $a0, 137 /* 095A58 80094E58 00002825 */ move $a1, $zero /* 095A5C 80094E5C 00003025 */ move $a2, $zero -/* 095A60 80094E60 0C027994 */ jal func_8009E650 +/* 095A60 80094E60 0C027994 */ jal add_8018D9E0_entry /* 095A64 80094E64 24070006 */ li $a3, 6 /* 095A68 80094E68 2404008A */ li $a0, 138 /* 095A6C 80094E6C 00002825 */ move $a1, $zero /* 095A70 80094E70 00003025 */ move $a2, $zero -/* 095A74 80094E74 0C027994 */ jal func_8009E650 +/* 095A74 80094E74 0C027994 */ jal add_8018D9E0_entry /* 095A78 80094E78 24070006 */ li $a3, 6 /* 095A7C 80094E7C 2404008B */ li $a0, 139 /* 095A80 80094E80 00002825 */ move $a1, $zero /* 095A84 80094E84 00003025 */ move $a2, $zero -/* 095A88 80094E88 0C027994 */ jal func_8009E650 +/* 095A88 80094E88 0C027994 */ jal add_8018D9E0_entry /* 095A8C 80094E8C 24070006 */ li $a3, 6 /* 095A90 80094E90 2404008D */ li $a0, 141 /* 095A94 80094E94 00002825 */ move $a1, $zero /* 095A98 80094E98 00003025 */ move $a2, $zero -/* 095A9C 80094E9C 0C027994 */ jal func_8009E650 +/* 095A9C 80094E9C 0C027994 */ jal add_8018D9E0_entry /* 095AA0 80094EA0 24070008 */ li $a3, 8 /* 095AA4 80094EA4 100001A2 */ b .L80095530 /* 095AA8 80094EA8 00000000 */ nop @@ -152,27 +152,27 @@ glabel L80094EAC /* 095AAC 80094EAC 240400E6 */ li $a0, 230 /* 095AB0 80094EB0 00002825 */ move $a1, $zero /* 095AB4 80094EB4 00003025 */ move $a2, $zero -/* 095AB8 80094EB8 0C027994 */ jal func_8009E650 +/* 095AB8 80094EB8 0C027994 */ jal add_8018D9E0_entry /* 095ABC 80094EBC 24070008 */ li $a3, 8 /* 095AC0 80094EC0 240400E7 */ li $a0, 231 /* 095AC4 80094EC4 00002825 */ move $a1, $zero /* 095AC8 80094EC8 00003025 */ move $a2, $zero -/* 095ACC 80094ECC 0C027994 */ jal func_8009E650 +/* 095ACC 80094ECC 0C027994 */ jal add_8018D9E0_entry /* 095AD0 80094ED0 24070008 */ li $a3, 8 /* 095AD4 80094ED4 240400E8 */ li $a0, 232 /* 095AD8 80094ED8 00002825 */ move $a1, $zero /* 095ADC 80094EDC 00003025 */ move $a2, $zero -/* 095AE0 80094EE0 0C027994 */ jal func_8009E650 +/* 095AE0 80094EE0 0C027994 */ jal add_8018D9E0_entry /* 095AE4 80094EE4 24070008 */ li $a3, 8 /* 095AE8 80094EE8 240400E9 */ li $a0, 233 /* 095AEC 80094EEC 00002825 */ move $a1, $zero /* 095AF0 80094EF0 00003025 */ move $a2, $zero -/* 095AF4 80094EF4 0C027994 */ jal func_8009E650 +/* 095AF4 80094EF4 0C027994 */ jal add_8018D9E0_entry /* 095AF8 80094EF8 24070008 */ li $a3, 8 /* 095AFC 80094EFC 240400EA */ li $a0, 234 /* 095B00 80094F00 00002825 */ move $a1, $zero /* 095B04 80094F04 00003025 */ move $a2, $zero -/* 095B08 80094F08 0C027994 */ jal func_8009E650 +/* 095B08 80094F08 0C027994 */ jal add_8018D9E0_entry /* 095B0C 80094F0C 24070008 */ li $a3, 8 /* 095B10 80094F10 10000187 */ b .L80095530 /* 095B14 80094F14 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80094F18 /* 095B18 80094F18 240400FA */ li $a0, 250 /* 095B1C 80094F1C 00002825 */ move $a1, $zero /* 095B20 80094F20 00003025 */ move $a2, $zero -/* 095B24 80094F24 0C027994 */ jal func_8009E650 +/* 095B24 80094F24 0C027994 */ jal add_8018D9E0_entry /* 095B28 80094F28 00003825 */ move $a3, $zero /* 095B2C 80094F2C 10000180 */ b .L80095530 /* 095B30 80094F30 00000000 */ nop @@ -188,47 +188,47 @@ glabel L80094F34 /* 095B34 80094F34 240400DA */ li $a0, 218 /* 095B38 80094F38 00002825 */ move $a1, $zero /* 095B3C 80094F3C 00003025 */ move $a2, $zero -/* 095B40 80094F40 0C027994 */ jal func_8009E650 +/* 095B40 80094F40 0C027994 */ jal add_8018D9E0_entry /* 095B44 80094F44 00003825 */ move $a3, $zero /* 095B48 80094F48 240400D2 */ li $a0, 210 /* 095B4C 80094F4C 00002825 */ move $a1, $zero /* 095B50 80094F50 00003025 */ move $a2, $zero -/* 095B54 80094F54 0C027994 */ jal func_8009E650 +/* 095B54 80094F54 0C027994 */ jal add_8018D9E0_entry /* 095B58 80094F58 24070004 */ li $a3, 4 /* 095B5C 80094F5C 240400D4 */ li $a0, 212 /* 095B60 80094F60 00002825 */ move $a1, $zero /* 095B64 80094F64 00003025 */ move $a2, $zero -/* 095B68 80094F68 0C027994 */ jal func_8009E650 +/* 095B68 80094F68 0C027994 */ jal add_8018D9E0_entry /* 095B6C 80094F6C 24070006 */ li $a3, 6 /* 095B70 80094F70 240400D3 */ li $a0, 211 /* 095B74 80094F74 00002825 */ move $a1, $zero /* 095B78 80094F78 00003025 */ move $a2, $zero -/* 095B7C 80094F7C 0C027994 */ jal func_8009E650 +/* 095B7C 80094F7C 0C027994 */ jal add_8018D9E0_entry /* 095B80 80094F80 24070008 */ li $a3, 8 /* 095B84 80094F84 240400D5 */ li $a0, 213 /* 095B88 80094F88 00002825 */ move $a1, $zero /* 095B8C 80094F8C 00003025 */ move $a2, $zero -/* 095B90 80094F90 0C027994 */ jal func_8009E650 +/* 095B90 80094F90 0C027994 */ jal add_8018D9E0_entry /* 095B94 80094F94 2407000A */ li $a3, 10 /* 095B98 80094F98 240400D6 */ li $a0, 214 /* 095B9C 80094F9C 00002825 */ move $a1, $zero /* 095BA0 80094FA0 00003025 */ move $a2, $zero -/* 095BA4 80094FA4 0C027994 */ jal func_8009E650 +/* 095BA4 80094FA4 0C027994 */ jal add_8018D9E0_entry /* 095BA8 80094FA8 2407000A */ li $a3, 10 /* 095BAC 80094FAC 240400D7 */ li $a0, 215 /* 095BB0 80094FB0 00002825 */ move $a1, $zero /* 095BB4 80094FB4 00003025 */ move $a2, $zero -/* 095BB8 80094FB8 0C027994 */ jal func_8009E650 +/* 095BB8 80094FB8 0C027994 */ jal add_8018D9E0_entry /* 095BBC 80094FBC 2407000A */ li $a3, 10 /* 095BC0 80094FC0 240400D8 */ li $a0, 216 /* 095BC4 80094FC4 00002825 */ move $a1, $zero /* 095BC8 80094FC8 00003025 */ move $a2, $zero -/* 095BCC 80094FCC 0C027994 */ jal func_8009E650 +/* 095BCC 80094FCC 0C027994 */ jal add_8018D9E0_entry /* 095BD0 80094FD0 2407000A */ li $a3, 10 /* 095BD4 80094FD4 240400D9 */ li $a0, 217 /* 095BD8 80094FD8 00002825 */ move $a1, $zero /* 095BDC 80094FDC 00003025 */ move $a2, $zero -/* 095BE0 80094FE0 0C027994 */ jal func_8009E650 +/* 095BE0 80094FE0 0C027994 */ jal add_8018D9E0_entry /* 095BE4 80094FE4 2407000A */ li $a3, 10 /* 095BE8 80094FE8 10000151 */ b .L80095530 /* 095BEC 80094FEC 00000000 */ nop @@ -236,17 +236,17 @@ glabel L80094FF0 /* 095BF0 80094FF0 24040002 */ li $a0, 2 /* 095BF4 80094FF4 00002825 */ move $a1, $zero /* 095BF8 80094FF8 00003025 */ move $a2, $zero -/* 095BFC 80094FFC 0C027994 */ jal func_8009E650 +/* 095BFC 80094FFC 0C027994 */ jal add_8018D9E0_entry /* 095C00 80095000 24070004 */ li $a3, 4 /* 095C04 80095004 24040001 */ li $a0, 1 /* 095C08 80095008 00002825 */ move $a1, $zero /* 095C0C 8009500C 00003025 */ move $a2, $zero -/* 095C10 80095010 0C027994 */ jal func_8009E650 +/* 095C10 80095010 0C027994 */ jal add_8018D9E0_entry /* 095C14 80095014 00003825 */ move $a3, $zero /* 095C18 80095018 240400FB */ li $a0, 251 /* 095C1C 8009501C 00002825 */ move $a1, $zero /* 095C20 80095020 00003025 */ move $a2, $zero -/* 095C24 80095024 0C027994 */ jal func_8009E650 +/* 095C24 80095024 0C027994 */ jal add_8018D9E0_entry /* 095C28 80095028 00003825 */ move $a3, $zero /* 095C2C 8009502C 3C188015 */ lui $t8, %hi(gControllerBits) # $t8, 0x8015 /* 095C30 80095030 9318F108 */ lbu $t8, %lo(gControllerBits)($t8) @@ -258,18 +258,18 @@ glabel L80094FF0 /* 095C48 80095048 24040003 */ li $a0, 3 /* 095C4C 8009504C 00002825 */ move $a1, $zero /* 095C50 80095050 00003025 */ move $a2, $zero -/* 095C54 80095054 0C027994 */ jal func_8009E650 +/* 095C54 80095054 0C027994 */ jal add_8018D9E0_entry /* 095C58 80095058 24070002 */ li $a3, 2 /* 095C5C 8009505C 10000004 */ b .L80095070 /* 095C60 80095060 24040005 */ li $a0, 5 .L80095064: -/* 095C64 80095064 0C027994 */ jal func_8009E650 +/* 095C64 80095064 0C027994 */ jal add_8018D9E0_entry /* 095C68 80095068 24070002 */ li $a3, 2 /* 095C6C 8009506C 24040005 */ li $a0, 5 .L80095070: /* 095C70 80095070 00002825 */ move $a1, $zero /* 095C74 80095074 00003025 */ move $a2, $zero -/* 095C78 80095078 0C027994 */ jal func_8009E650 +/* 095C78 80095078 0C027994 */ jal add_8018D9E0_entry /* 095C7C 8009507C 24070006 */ li $a3, 6 /* 095C80 80095080 3C01800E */ lui $at, %hi(D_800DC51C) # $at, 0x800e /* 095C84 80095084 A420C51C */ sh $zero, %lo(D_800DC51C)($at) @@ -280,47 +280,47 @@ glabel L80095094 /* 095C94 80095094 24040023 */ li $a0, 35 /* 095C98 80095098 00002825 */ move $a1, $zero /* 095C9C 8009509C 00003025 */ move $a2, $zero -/* 095CA0 800950A0 0C027994 */ jal func_8009E650 +/* 095CA0 800950A0 0C027994 */ jal add_8018D9E0_entry /* 095CA4 800950A4 24070002 */ li $a3, 2 /* 095CA8 800950A8 2404000A */ li $a0, 10 /* 095CAC 800950AC 2405015E */ li $a1, 350 /* 095CB0 800950B0 24060011 */ li $a2, 17 -/* 095CB4 800950B4 0C027994 */ jal func_8009E650 +/* 095CB4 800950B4 0C027994 */ jal add_8018D9E0_entry /* 095CB8 800950B8 24070006 */ li $a3, 6 /* 095CBC 800950BC 2404000E */ li $a0, 14 /* 095CC0 800950C0 2405015E */ li $a1, 350 /* 095CC4 800950C4 2406003E */ li $a2, 62 -/* 095CC8 800950C8 0C027994 */ jal func_8009E650 +/* 095CC8 800950C8 0C027994 */ jal add_8018D9E0_entry /* 095CCC 800950CC 24070006 */ li $a3, 6 /* 095CD0 800950D0 2404000D */ li $a0, 13 /* 095CD4 800950D4 2405015E */ li $a1, 350 /* 095CD8 800950D8 2406003E */ li $a2, 62 -/* 095CDC 800950DC 0C027994 */ jal func_8009E650 +/* 095CDC 800950DC 0C027994 */ jal add_8018D9E0_entry /* 095CE0 800950E0 24070006 */ li $a3, 6 /* 095CE4 800950E4 2404000C */ li $a0, 12 /* 095CE8 800950E8 2405015E */ li $a1, 350 /* 095CEC 800950EC 2406003E */ li $a2, 62 -/* 095CF0 800950F0 0C027994 */ jal func_8009E650 +/* 095CF0 800950F0 0C027994 */ jal add_8018D9E0_entry /* 095CF4 800950F4 24070006 */ li $a3, 6 /* 095CF8 800950F8 2404000B */ li $a0, 11 /* 095CFC 800950FC 2405015E */ li $a1, 350 /* 095D00 80095100 2406003E */ li $a2, 62 -/* 095D04 80095104 0C027994 */ jal func_8009E650 +/* 095D04 80095104 0C027994 */ jal add_8018D9E0_entry /* 095D08 80095108 24070006 */ li $a3, 6 /* 095D0C 8009510C 2404000F */ li $a0, 15 /* 095D10 80095110 2405015E */ li $a1, 350 /* 095D14 80095114 240600C8 */ li $a2, 200 -/* 095D18 80095118 0C027994 */ jal func_8009E650 +/* 095D18 80095118 0C027994 */ jal add_8018D9E0_entry /* 095D1C 8009511C 24070006 */ li $a3, 6 /* 095D20 80095120 24040011 */ li $a0, 17 /* 095D24 80095124 2405015E */ li $a1, 350 /* 095D28 80095128 240600C8 */ li $a2, 200 -/* 095D2C 8009512C 0C027994 */ jal func_8009E650 +/* 095D2C 8009512C 0C027994 */ jal add_8018D9E0_entry /* 095D30 80095130 24070006 */ li $a3, 6 /* 095D34 80095134 24040010 */ li $a0, 16 /* 095D38 80095138 2405015E */ li $a1, 350 /* 095D3C 8009513C 240600C8 */ li $a2, 200 -/* 095D40 80095140 0C027994 */ jal func_8009E650 +/* 095D40 80095140 0C027994 */ jal add_8018D9E0_entry /* 095D44 80095144 24070006 */ li $a3, 6 /* 095D48 80095148 0C02D557 */ jal func_800B555C /* 095D4C 8009514C 00000000 */ nop @@ -328,38 +328,38 @@ glabel L80095094 /* 095D54 80095154 24040015 */ li $a0, 21 /* 095D58 80095158 00002825 */ move $a1, $zero /* 095D5C 8009515C 00003025 */ move $a2, $zero -/* 095D60 80095160 0C027994 */ jal func_8009E650 +/* 095D60 80095160 0C027994 */ jal add_8018D9E0_entry /* 095D64 80095164 24070006 */ li $a3, 6 .L80095168: /* 095D68 80095168 24040014 */ li $a0, 20 /* 095D6C 8009516C 00002825 */ move $a1, $zero /* 095D70 80095170 00003025 */ move $a2, $zero -/* 095D74 80095174 0C027994 */ jal func_8009E650 +/* 095D74 80095174 0C027994 */ jal add_8018D9E0_entry /* 095D78 80095178 24070006 */ li $a3, 6 /* 095D7C 8009517C 24040013 */ li $a0, 19 /* 095D80 80095180 00002825 */ move $a1, $zero /* 095D84 80095184 00003025 */ move $a2, $zero -/* 095D88 80095188 0C027994 */ jal func_8009E650 +/* 095D88 80095188 0C027994 */ jal add_8018D9E0_entry /* 095D8C 8009518C 24070006 */ li $a3, 6 /* 095D90 80095190 24040012 */ li $a0, 18 /* 095D94 80095194 00002825 */ move $a1, $zero /* 095D98 80095198 00003025 */ move $a2, $zero -/* 095D9C 8009519C 0C027994 */ jal func_8009E650 +/* 095D9C 8009519C 0C027994 */ jal add_8018D9E0_entry /* 095DA0 800951A0 24070006 */ li $a3, 6 /* 095DA4 800951A4 24040019 */ li $a0, 25 /* 095DA8 800951A8 00002825 */ move $a1, $zero /* 095DAC 800951AC 00003025 */ move $a2, $zero -/* 095DB0 800951B0 0C027994 */ jal func_8009E650 +/* 095DB0 800951B0 0C027994 */ jal add_8018D9E0_entry /* 095DB4 800951B4 24070006 */ li $a3, 6 /* 095DB8 800951B8 24040018 */ li $a0, 24 /* 095DBC 800951BC 00002825 */ move $a1, $zero /* 095DC0 800951C0 00003025 */ move $a2, $zero -/* 095DC4 800951C4 0C027994 */ jal func_8009E650 +/* 095DC4 800951C4 0C027994 */ jal add_8018D9E0_entry /* 095DC8 800951C8 24070006 */ li $a3, 6 /* 095DCC 800951CC 2404001B */ li $a0, 27 /* 095DD0 800951D0 00002825 */ move $a1, $zero /* 095DD4 800951D4 00003025 */ move $a2, $zero -/* 095DD8 800951D8 0C027994 */ jal func_8009E650 +/* 095DD8 800951D8 0C027994 */ jal add_8018D9E0_entry /* 095DDC 800951DC 2407000C */ li $a3, 12 /* 095DE0 800951E0 100000D3 */ b .L80095530 /* 095DE4 800951E4 00000000 */ nop @@ -367,77 +367,77 @@ glabel L800951E8 /* 095DE8 800951E8 24040024 */ li $a0, 36 /* 095DEC 800951EC 00002825 */ move $a1, $zero /* 095DF0 800951F0 00003025 */ move $a2, $zero -/* 095DF4 800951F4 0C027994 */ jal func_8009E650 +/* 095DF4 800951F4 0C027994 */ jal add_8018D9E0_entry /* 095DF8 800951F8 24070002 */ li $a3, 2 /* 095DFC 800951FC 2404002A */ li $a0, 42 /* 095E00 80095200 00002825 */ move $a1, $zero /* 095E04 80095204 00003025 */ move $a2, $zero -/* 095E08 80095208 0C027994 */ jal func_8009E650 +/* 095E08 80095208 0C027994 */ jal add_8018D9E0_entry /* 095E0C 8009520C 24070006 */ li $a3, 6 /* 095E10 80095210 24040033 */ li $a0, 51 /* 095E14 80095214 00002825 */ move $a1, $zero /* 095E18 80095218 00003025 */ move $a2, $zero -/* 095E1C 8009521C 0C027994 */ jal func_8009E650 +/* 095E1C 8009521C 0C027994 */ jal add_8018D9E0_entry /* 095E20 80095220 24070006 */ li $a3, 6 /* 095E24 80095224 2404002B */ li $a0, 43 /* 095E28 80095228 00002825 */ move $a1, $zero /* 095E2C 8009522C 00003025 */ move $a2, $zero -/* 095E30 80095230 0C027994 */ jal func_8009E650 +/* 095E30 80095230 0C027994 */ jal add_8018D9E0_entry /* 095E34 80095234 24070008 */ li $a3, 8 /* 095E38 80095238 2404002C */ li $a0, 44 /* 095E3C 8009523C 00002825 */ move $a1, $zero /* 095E40 80095240 00003025 */ move $a2, $zero -/* 095E44 80095244 0C027994 */ jal func_8009E650 +/* 095E44 80095244 0C027994 */ jal add_8018D9E0_entry /* 095E48 80095248 24070008 */ li $a3, 8 /* 095E4C 8009524C 2404002D */ li $a0, 45 /* 095E50 80095250 00002825 */ move $a1, $zero /* 095E54 80095254 00003025 */ move $a2, $zero -/* 095E58 80095258 0C027994 */ jal func_8009E650 +/* 095E58 80095258 0C027994 */ jal add_8018D9E0_entry /* 095E5C 8009525C 24070006 */ li $a3, 6 /* 095E60 80095260 2404002E */ li $a0, 46 /* 095E64 80095264 00002825 */ move $a1, $zero /* 095E68 80095268 00003025 */ move $a2, $zero -/* 095E6C 8009526C 0C027994 */ jal func_8009E650 +/* 095E6C 8009526C 0C027994 */ jal add_8018D9E0_entry /* 095E70 80095270 24070006 */ li $a3, 6 /* 095E74 80095274 2404002F */ li $a0, 47 /* 095E78 80095278 00002825 */ move $a1, $zero /* 095E7C 8009527C 00003025 */ move $a2, $zero -/* 095E80 80095280 0C027994 */ jal func_8009E650 +/* 095E80 80095280 0C027994 */ jal add_8018D9E0_entry /* 095E84 80095284 24070006 */ li $a3, 6 /* 095E88 80095288 24040030 */ li $a0, 48 /* 095E8C 8009528C 00002825 */ move $a1, $zero /* 095E90 80095290 00003025 */ move $a2, $zero -/* 095E94 80095294 0C027994 */ jal func_8009E650 +/* 095E94 80095294 0C027994 */ jal add_8018D9E0_entry /* 095E98 80095298 24070006 */ li $a3, 6 /* 095E9C 8009529C 24040031 */ li $a0, 49 /* 095EA0 800952A0 00002825 */ move $a1, $zero /* 095EA4 800952A4 00003025 */ move $a2, $zero -/* 095EA8 800952A8 0C027994 */ jal func_8009E650 +/* 095EA8 800952A8 0C027994 */ jal add_8018D9E0_entry /* 095EAC 800952AC 24070006 */ li $a3, 6 /* 095EB0 800952B0 24040032 */ li $a0, 50 /* 095EB4 800952B4 00002825 */ move $a1, $zero /* 095EB8 800952B8 00003025 */ move $a2, $zero -/* 095EBC 800952BC 0C027994 */ jal func_8009E650 +/* 095EBC 800952BC 0C027994 */ jal add_8018D9E0_entry /* 095EC0 800952C0 24070008 */ li $a3, 8 /* 095EC4 800952C4 24040034 */ li $a0, 52 /* 095EC8 800952C8 00002825 */ move $a1, $zero /* 095ECC 800952CC 00003025 */ move $a2, $zero -/* 095ED0 800952D0 0C027994 */ jal func_8009E650 +/* 095ED0 800952D0 0C027994 */ jal add_8018D9E0_entry /* 095ED4 800952D4 2407000C */ li $a3, 12 /* 095ED8 800952D8 24040035 */ li $a0, 53 /* 095EDC 800952DC 00002825 */ move $a1, $zero /* 095EE0 800952E0 00003025 */ move $a2, $zero -/* 095EE4 800952E4 0C027994 */ jal func_8009E650 +/* 095EE4 800952E4 0C027994 */ jal add_8018D9E0_entry /* 095EE8 800952E8 2407000C */ li $a3, 12 /* 095EEC 800952EC 24040036 */ li $a0, 54 /* 095EF0 800952F0 00002825 */ move $a1, $zero /* 095EF4 800952F4 00003025 */ move $a2, $zero -/* 095EF8 800952F8 0C027994 */ jal func_8009E650 +/* 095EF8 800952F8 0C027994 */ jal add_8018D9E0_entry /* 095EFC 800952FC 2407000C */ li $a3, 12 /* 095F00 80095300 24040037 */ li $a0, 55 /* 095F04 80095304 00002825 */ move $a1, $zero /* 095F08 80095308 00003025 */ move $a2, $zero -/* 095F0C 8009530C 0C027994 */ jal func_8009E650 +/* 095F0C 8009530C 0C027994 */ jal add_8018D9E0_entry /* 095F10 80095310 2407000C */ li $a3, 12 /* 095F14 80095314 10000086 */ b .L80095530 /* 095F18 80095318 00000000 */ nop @@ -445,12 +445,12 @@ glabel L8009531C /* 095F1C 8009531C 24040025 */ li $a0, 37 /* 095F20 80095320 00002825 */ move $a1, $zero /* 095F24 80095324 00003025 */ move $a2, $zero -/* 095F28 80095328 0C027994 */ jal func_8009E650 +/* 095F28 80095328 0C027994 */ jal add_8018D9E0_entry /* 095F2C 8009532C 24070002 */ li $a3, 2 /* 095F30 80095330 24040052 */ li $a0, 82 /* 095F34 80095334 00002825 */ move $a1, $zero /* 095F38 80095338 00003025 */ move $a2, $zero -/* 095F3C 8009533C 0C027994 */ jal func_8009E650 +/* 095F3C 8009533C 0C027994 */ jal add_8018D9E0_entry /* 095F40 80095340 24070006 */ li $a3, 6 /* 095F44 80095344 3C08800E */ lui $t0, %hi(gModeSelection) # $t0, 0x800e /* 095F48 80095348 8D08C53C */ lw $t0, %lo(gModeSelection)($t0) @@ -461,89 +461,89 @@ glabel L8009531C /* 095F5C 8009535C 24040053 */ li $a0, 83 /* 095F60 80095360 00002825 */ move $a1, $zero /* 095F64 80095364 00003025 */ move $a2, $zero -/* 095F68 80095368 0C027994 */ jal func_8009E650 +/* 095F68 80095368 0C027994 */ jal add_8018D9E0_entry /* 095F6C 8009536C 24070004 */ li $a3, 4 /* 095F70 80095370 24040054 */ li $a0, 84 /* 095F74 80095374 00002825 */ move $a1, $zero /* 095F78 80095378 00003025 */ move $a2, $zero -/* 095F7C 8009537C 0C027994 */ jal func_8009E650 +/* 095F7C 8009537C 0C027994 */ jal add_8018D9E0_entry /* 095F80 80095380 24070004 */ li $a3, 4 /* 095F84 80095384 24040055 */ li $a0, 85 /* 095F88 80095388 00002825 */ move $a1, $zero /* 095F8C 8009538C 00003025 */ move $a2, $zero -/* 095F90 80095390 0C027994 */ jal func_8009E650 +/* 095F90 80095390 0C027994 */ jal add_8018D9E0_entry /* 095F94 80095394 24070004 */ li $a3, 4 /* 095F98 80095398 24040056 */ li $a0, 86 /* 095F9C 8009539C 00002825 */ move $a1, $zero /* 095FA0 800953A0 00003025 */ move $a2, $zero -/* 095FA4 800953A4 0C027994 */ jal func_8009E650 +/* 095FA4 800953A4 0C027994 */ jal add_8018D9E0_entry /* 095FA8 800953A8 24070004 */ li $a3, 4 /* 095FAC 800953AC 24040058 */ li $a0, 88 /* 095FB0 800953B0 00002825 */ move $a1, $zero /* 095FB4 800953B4 00003025 */ move $a2, $zero -/* 095FB8 800953B8 0C027994 */ jal func_8009E650 +/* 095FB8 800953B8 0C027994 */ jal add_8018D9E0_entry /* 095FBC 800953BC 24070006 */ li $a3, 6 /* 095FC0 800953C0 24040059 */ li $a0, 89 /* 095FC4 800953C4 00002825 */ move $a1, $zero /* 095FC8 800953C8 00003025 */ move $a2, $zero -/* 095FCC 800953CC 0C027994 */ jal func_8009E650 +/* 095FCC 800953CC 0C027994 */ jal add_8018D9E0_entry /* 095FD0 800953D0 24070006 */ li $a3, 6 /* 095FD4 800953D4 2404005A */ li $a0, 90 /* 095FD8 800953D8 00002825 */ move $a1, $zero /* 095FDC 800953DC 00003025 */ move $a2, $zero -/* 095FE0 800953E0 0C027994 */ jal func_8009E650 +/* 095FE0 800953E0 0C027994 */ jal add_8018D9E0_entry /* 095FE4 800953E4 24070006 */ li $a3, 6 /* 095FE8 800953E8 2404005B */ li $a0, 91 /* 095FEC 800953EC 00002825 */ move $a1, $zero /* 095FF0 800953F0 00003025 */ move $a2, $zero -/* 095FF4 800953F4 0C027994 */ jal func_8009E650 +/* 095FF4 800953F4 0C027994 */ jal add_8018D9E0_entry /* 095FF8 800953F8 24070006 */ li $a3, 6 /* 095FFC 800953FC 1000000A */ b .L80095428 /* 096000 80095400 24040064 */ li $a0, 100 .L80095404: /* 096004 80095404 00003025 */ move $a2, $zero -/* 096008 80095408 0C027994 */ jal func_8009E650 +/* 096008 80095408 0C027994 */ jal add_8018D9E0_entry /* 09600C 8009540C 24070006 */ li $a3, 6 /* 096010 80095410 2404006E */ li $a0, 110 /* 096014 80095414 00002825 */ move $a1, $zero /* 096018 80095418 00003025 */ move $a2, $zero -/* 09601C 8009541C 0C027994 */ jal func_8009E650 +/* 09601C 8009541C 0C027994 */ jal add_8018D9E0_entry /* 096020 80095420 24070006 */ li $a3, 6 /* 096024 80095424 24040064 */ li $a0, 100 .L80095428: /* 096028 80095428 00002825 */ move $a1, $zero /* 09602C 8009542C 00003025 */ move $a2, $zero -/* 096030 80095430 0C027994 */ jal func_8009E650 +/* 096030 80095430 0C027994 */ jal add_8018D9E0_entry /* 096034 80095434 24070006 */ li $a3, 6 /* 096038 80095438 2404005F */ li $a0, 95 /* 09603C 8009543C 00002825 */ move $a1, $zero /* 096040 80095440 00003025 */ move $a2, $zero -/* 096044 80095444 0C027994 */ jal func_8009E650 +/* 096044 80095444 0C027994 */ jal add_8018D9E0_entry /* 096048 80095448 24070006 */ li $a3, 6 /* 09604C 8009544C 24040060 */ li $a0, 96 /* 096050 80095450 00002825 */ move $a1, $zero /* 096054 80095454 00003025 */ move $a2, $zero -/* 096058 80095458 0C027994 */ jal func_8009E650 +/* 096058 80095458 0C027994 */ jal add_8018D9E0_entry /* 09605C 8009545C 24070006 */ li $a3, 6 /* 096060 80095460 24040061 */ li $a0, 97 /* 096064 80095464 00002825 */ move $a1, $zero /* 096068 80095468 00003025 */ move $a2, $zero -/* 09606C 8009546C 0C027994 */ jal func_8009E650 +/* 09606C 8009546C 0C027994 */ jal add_8018D9E0_entry /* 096070 80095470 24070006 */ li $a3, 6 /* 096074 80095474 24040062 */ li $a0, 98 /* 096078 80095478 00002825 */ move $a1, $zero /* 09607C 8009547C 00003025 */ move $a2, $zero -/* 096080 80095480 0C027994 */ jal func_8009E650 +/* 096080 80095480 0C027994 */ jal add_8018D9E0_entry /* 096084 80095484 24070006 */ li $a3, 6 /* 096088 80095488 2404005D */ li $a0, 93 /* 09608C 8009548C 00002825 */ move $a1, $zero /* 096090 80095490 00003025 */ move $a2, $zero -/* 096094 80095494 0C027994 */ jal func_8009E650 +/* 096094 80095494 0C027994 */ jal add_8018D9E0_entry /* 096098 80095498 24070006 */ li $a3, 6 /* 09609C 8009549C 2404005E */ li $a0, 94 /* 0960A0 800954A0 00002825 */ move $a1, $zero /* 0960A4 800954A4 00003025 */ move $a2, $zero -/* 0960A8 800954A8 0C027994 */ jal func_8009E650 +/* 0960A8 800954A8 0C027994 */ jal add_8018D9E0_entry /* 0960AC 800954AC 24070008 */ li $a3, 8 /* 0960B0 800954B0 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 0960B4 800954B4 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) @@ -552,17 +552,17 @@ glabel L8009531C /* 0960C0 800954C0 14410010 */ bne $v0, $at, .L80095504 /* 0960C4 800954C4 00002825 */ move $a1, $zero /* 0960C8 800954C8 00003025 */ move $a2, $zero -/* 0960CC 800954CC 0C027994 */ jal func_8009E650 +/* 0960CC 800954CC 0C027994 */ jal add_8018D9E0_entry /* 0960D0 800954D0 24070008 */ li $a3, 8 /* 0960D4 800954D4 24040066 */ li $a0, 102 /* 0960D8 800954D8 00002825 */ move $a1, $zero /* 0960DC 800954DC 00003025 */ move $a2, $zero -/* 0960E0 800954E0 0C027994 */ jal func_8009E650 +/* 0960E0 800954E0 0C027994 */ jal add_8018D9E0_entry /* 0960E4 800954E4 24070008 */ li $a3, 8 /* 0960E8 800954E8 24040069 */ li $a0, 105 /* 0960EC 800954EC 00002825 */ move $a1, $zero /* 0960F0 800954F0 00003025 */ move $a2, $zero -/* 0960F4 800954F4 0C027994 */ jal func_8009E650 +/* 0960F4 800954F4 0C027994 */ jal add_8018D9E0_entry /* 0960F8 800954F8 24070008 */ li $a3, 8 /* 0960FC 800954FC 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 096100 80095500 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) @@ -571,12 +571,12 @@ glabel L8009531C /* 096108 80095508 24040068 */ li $a0, 104 /* 09610C 8009550C 00002825 */ move $a1, $zero /* 096110 80095510 00003025 */ move $a2, $zero -/* 096114 80095514 0C027994 */ jal func_8009E650 +/* 096114 80095514 0C027994 */ jal add_8018D9E0_entry /* 096118 80095518 24070008 */ li $a3, 8 /* 09611C 8009551C 24040067 */ li $a0, 103 /* 096120 80095520 00002825 */ move $a1, $zero /* 096124 80095524 00003025 */ move $a2, $zero -/* 096128 80095528 0C027994 */ jal func_8009E650 +/* 096128 80095528 0C027994 */ jal add_8018D9E0_entry /* 09612C 8009552C 24070005 */ li $a3, 5 .L80095530: glabel L80095530 diff --git a/asm/non_matchings/code_80091750/func_800AC324.s b/asm/non_matchings/code_80091750/func_800AC324.s index 7d6dd4356..a00e63ff2 100644 --- a/asm/non_matchings/code_80091750/func_800AC324.s +++ b/asm/non_matchings/code_80091750/func_800AC324.s @@ -56,7 +56,7 @@ glabel func_800AC324 /* 0ACFEC 800AC3EC AE0D0004 */ sw $t5, 4($s0) /* 0ACFF0 800AC3F0 00003025 */ move $a2, $zero /* 0ACFF4 800AC3F4 00003825 */ move $a3, $zero -/* 0ACFF8 800AC3F8 0C027994 */ jal func_8009E650 +/* 0ACFF8 800AC3F8 0C027994 */ jal add_8018D9E0_entry /* 0ACFFC 800AC3FC AE0E001C */ sw $t6, 0x1c($s0) /* 0AD000 800AC400 10000011 */ b .L800AC448 /* 0AD004 800AC404 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80091750/func_800ACC50.s b/asm/non_matchings/code_80091750/func_800ACC50.s index e3b00a8fd..c84acd6e6 100644 --- a/asm/non_matchings/code_80091750/func_800ACC50.s +++ b/asm/non_matchings/code_80091750/func_800ACC50.s @@ -32,7 +32,7 @@ glabel L800ACC84 /* 0AD8C0 800ACCC0 000B3E03 */ sra $a3, $t3, 0x18 /* 0AD8C4 800ACCC4 260400B1 */ addiu $a0, $s0, 0xb1 /* 0AD8C8 800ACCC8 00002825 */ move $a1, $zero -/* 0AD8CC 800ACCCC 0C027994 */ jal func_8009E650 +/* 0AD8CC 800ACCCC 0C027994 */ jal add_8018D9E0_entry /* 0AD8D0 800ACCD0 00003025 */ move $a2, $zero /* 0AD8D4 800ACCD4 3C0D8019 */ lui $t5, %hi(D_8018EDF3) # $t5, 0x8019 /* 0AD8D8 800ACCD8 81ADEDF3 */ lb $t5, %lo(D_8018EDF3)($t5) diff --git a/asm/non_matchings/code_80091750/func_800AD1A4.s b/asm/non_matchings/code_80091750/func_800AD1A4.s index 9d32adcc2..366d4112d 100644 --- a/asm/non_matchings/code_80091750/func_800AD1A4.s +++ b/asm/non_matchings/code_80091750/func_800AD1A4.s @@ -21,7 +21,7 @@ glabel L800AD1D8 /* 0ADDEC 800AD1EC 240400BB */ li $a0, 187 /* 0ADDF0 800AD1F0 00002825 */ move $a1, $zero /* 0ADDF4 800AD1F4 00003025 */ move $a2, $zero -/* 0ADDF8 800AD1F8 0C027994 */ jal func_8009E650 +/* 0ADDF8 800AD1F8 0C027994 */ jal add_8018D9E0_entry /* 0ADDFC 800AD1FC 00003825 */ move $a3, $zero /* 0ADE00 800AD200 10000035 */ b .L800AD2D8 /* 0ADE04 800AD204 8FBF001C */ lw $ra, 0x1c($sp) @@ -60,7 +60,7 @@ glabel L800AD254 /* 0ADE7C 800AD27C 00002825 */ move $a1, $zero /* 0ADE80 800AD280 00003025 */ move $a2, $zero /* 0ADE84 800AD284 00003825 */ move $a3, $zero -/* 0ADE88 800AD288 0C027994 */ jal func_8009E650 +/* 0ADE88 800AD288 0C027994 */ jal add_8018D9E0_entry /* 0ADE8C 800AD28C AE0F001C */ sw $t7, 0x1c($s0) /* 0ADE90 800AD290 10000011 */ b .L800AD2D8 /* 0ADE94 800AD294 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80091750/func_800AF004.s b/asm/non_matchings/code_80091750/func_800AF004.s index f6bcc52c2..2e3b732d6 100644 --- a/asm/non_matchings/code_80091750/func_800AF004.s +++ b/asm/non_matchings/code_80091750/func_800AF004.s @@ -44,7 +44,7 @@ glabel L800AF038 /* 0AFCA0 800AF0A0 AC6C0000 */ sw $t4, ($v1) /* 0AFCA4 800AF0A4 00002825 */ move $a1, $zero /* 0AFCA8 800AF0A8 00003025 */ move $a2, $zero -/* 0AFCAC 800AF0AC 0C027994 */ jal func_8009E650 +/* 0AFCAC 800AF0AC 0C027994 */ jal add_8018D9E0_entry /* 0AFCB0 800AF0B0 24070004 */ li $a3, 4 /* 0AFCB4 800AF0B4 10000039 */ b .L800AF19C /* 0AFCB8 800AF0B8 8FBF001C */ lw $ra, 0x1c($sp) @@ -61,7 +61,7 @@ glabel L800AF0BC /* 0AFCE0 800AF0E0 24070004 */ li $a3, 4 /* 0AFCE4 800AF0E4 27190001 */ addiu $t9, $t8, 1 /* 0AFCE8 800AF0E8 AE190004 */ sw $t9, 4($s0) -/* 0AFCEC 800AF0EC 0C027994 */ jal func_8009E650 +/* 0AFCEC 800AF0EC 0C027994 */ jal add_8018D9E0_entry /* 0AFCF0 800AF0F0 2724012B */ addiu $a0, $t9, 0x12b /* 0AFCF4 800AF0F4 10000029 */ b .L800AF19C /* 0AFCF8 800AF0F8 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/src/code_80091750.c b/src/code_80091750.c index 92ee28c80..809950ae8 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -414,7 +414,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80091EE4.s") ? func_80099110(); // extern ? func_8009A344(); // extern ? func_8009E620(); // extern -? func_8009E650(?, ?, ?, ?); // extern +? add_8018D9E0_entry(?, ?, ?, ?); // extern ? func_800B5F30(); // extern extern s32 D_8018D9B0; extern s32 D_8018D9B4; @@ -448,19 +448,19 @@ void func_80091FA4(void) { func_8009A344(); func_8009E620(); func_80092258(); - func_8009E650(0x96, 0x64, 0x24, 1); - func_8009E650(0x97, 0x64, 0xDD, 1); - func_8009E650(0x98, 0, 0, 0); - func_8009E650(0xC7, 0, 0, 0); + add_8018D9E0_entry(0x96, 0x64, 0x24, 1); + add_8018D9E0_entry(0x97, 0x64, 0xDD, 1); + add_8018D9E0_entry(0x98, 0, 0, 0); + add_8018D9E0_entry(0xC7, 0, 0, 0); if (gModeSelection == TIME_TRIALS) { - func_8009E650(0xBE, 0, 0, 0); - func_8009E650(0x10E, 0, 0, 0); + add_8018D9E0_entry(0xBE, 0, 0, 0); + add_8018D9E0_entry(0x10E, 0, 0, 0); } if ((D_8015F890 != 0) && (gModeSelection == TIME_TRIALS)) { - func_8009E650(0xBD, 0, 0, 0); + add_8018D9E0_entry(0xBD, 0, 0, 0); } if (((gControllerBits & 1) == 0) && (D_8018EE08 != 0)) { - func_8009E650(4, 0, 0, 2); + add_8018D9E0_entry(4, 0, 0, 2); } func_800B5F30(); } @@ -632,22 +632,22 @@ void func_80092500(void) { switch(gModeSelection) { case GRAND_PRIX: - func_8009E650(0xAA, 0, 0, 0); + add_8018D9E0_entry(0xAA, 0, 0, 0); break; case TIME_TRIALS: - func_8009E650(0xB9, 0, 0, 0); + add_8018D9E0_entry(0xB9, 0, 0, 0); break; } } void func_80092564(void) { - func_8009E650(0xAC, 0, 0, 0); + add_8018D9E0_entry(0xAC, 0, 0, 0); func_8005D18C(); func_8001968C(); } void func_800925A0(void) { - func_8009E650(0xAF, 0, 0, 0); + add_8018D9E0_entry(0xAF, 0, 0, 0); } #ifdef MIPS_TO_C @@ -664,21 +664,21 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800925CC.s") #endif void func_80092604(void) { - func_8009E650(0xB0, 0, 0, 0); + add_8018D9E0_entry(0xB0, 0, 0, 0); } void func_80092630(void) { - func_8009E650(0xBC, 0, 0, 0); + add_8018D9E0_entry(0xBC, 0, 0, 0); } void func_8009265C(void) { - func_8009E650(0x12B, 0, 0, 2); + add_8018D9E0_entry(0x12B, 0, 0, 2); } #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_8009E650(?, ?, ?, ?); /* extern */ +? add_8018D9E0_entry(?, ?, ?, ?); /* extern */ void func_80092688(void) { u16 temp_t6; @@ -686,108 +686,108 @@ void func_80092688(void) { temp_t6 = D_800DC5E4; switch (temp_t6) { case 0: - func_8009E650(0x1CE, 0, 0, 2); + add_8018D9E0_entry(0x1CE, 0, 0, 2); return; default: - func_8009E650(0x190, 0, 0, 2); - func_8009E650(0x191, 0, 0, 2); + add_8018D9E0_entry(0x190, 0, 0, 2); + add_8018D9E0_entry(0x191, 0, 0, 2); return; case 2: - func_8009E650(0x192, 0, 0, 2); - func_8009E650(0x193, 0, 0, 2); + add_8018D9E0_entry(0x192, 0, 0, 2); + add_8018D9E0_entry(0x193, 0, 0, 2); return; case 3: - func_8009E650(0x194, 0, 0, 2); - func_8009E650(0x195, 0, 0, 2); + add_8018D9E0_entry(0x194, 0, 0, 2); + add_8018D9E0_entry(0x195, 0, 0, 2); return; case 4: - func_8009E650(0x196, 0, 0, 2); - func_8009E650(0x197, 0, 0, 2); + add_8018D9E0_entry(0x196, 0, 0, 2); + add_8018D9E0_entry(0x197, 0, 0, 2); return; case 5: - func_8009E650(0x198, 0, 0, 2); - func_8009E650(0x199, 0, 0, 2); - func_8009E650(0x19A, 0, 0, 2); - func_8009E650(0x19B, 0, 0, 2); + add_8018D9E0_entry(0x198, 0, 0, 2); + add_8018D9E0_entry(0x199, 0, 0, 2); + add_8018D9E0_entry(0x19A, 0, 0, 2); + add_8018D9E0_entry(0x19B, 0, 0, 2); return; case 6: - func_8009E650(0x198, 0, 0, 2); - func_8009E650(0x19C, 0, 0, 2); - func_8009E650(0x19D, 0, 0, 2); - func_8009E650(0x19E, 0, 0, 2); + add_8018D9E0_entry(0x198, 0, 0, 2); + add_8018D9E0_entry(0x19C, 0, 0, 2); + add_8018D9E0_entry(0x19D, 0, 0, 2); + add_8018D9E0_entry(0x19E, 0, 0, 2); return; case 7: - func_8009E650(0x19F, 0, 0, 2); - func_8009E650(0x1A0, 0, 0, 2); - func_8009E650(0x1A1, 0, 0, 2); - func_8009E650(0x1A2, 0, 0, 2); + add_8018D9E0_entry(0x19F, 0, 0, 2); + add_8018D9E0_entry(0x1A0, 0, 0, 2); + add_8018D9E0_entry(0x1A1, 0, 0, 2); + add_8018D9E0_entry(0x1A2, 0, 0, 2); return; case 8: - func_8009E650(0x1A3, 0, 0, 2); - func_8009E650(0x1A4, 0, 0, 2); + add_8018D9E0_entry(0x1A3, 0, 0, 2); + add_8018D9E0_entry(0x1A4, 0, 0, 2); return; case 9: - func_8009E650(0x1A5, 0, 0, 2); - func_8009E650(0x1A6, 0, 0, 2); - func_8009E650(0x1A7, 0, 0, 2); - func_8009E650(0x1A8, 0, 0, 2); - func_8009E650(0x1A9, 0, 0, 2); + add_8018D9E0_entry(0x1A5, 0, 0, 2); + add_8018D9E0_entry(0x1A6, 0, 0, 2); + add_8018D9E0_entry(0x1A7, 0, 0, 2); + add_8018D9E0_entry(0x1A8, 0, 0, 2); + add_8018D9E0_entry(0x1A9, 0, 0, 2); return; case 10: - func_8009E650(0x1A5, 0, 0, 2); - func_8009E650(0x1A6, 0, 0, 2); - func_8009E650(0x1AA, 0, 0, 2); - func_8009E650(0x1AB, 0, 0, 2); - func_8009E650(0x1AC, 0, 0, 2); + add_8018D9E0_entry(0x1A5, 0, 0, 2); + add_8018D9E0_entry(0x1A6, 0, 0, 2); + add_8018D9E0_entry(0x1AA, 0, 0, 2); + add_8018D9E0_entry(0x1AB, 0, 0, 2); + add_8018D9E0_entry(0x1AC, 0, 0, 2); return; case 11: - func_8009E650(0x1AD, 0, 0, 2); - func_8009E650(0x1AE, 0, 0, 2); - func_8009E650(0x1AF, 0, 0, 2); - func_8009E650(0x1B0, 0, 0, 2); + add_8018D9E0_entry(0x1AD, 0, 0, 2); + add_8018D9E0_entry(0x1AE, 0, 0, 2); + add_8018D9E0_entry(0x1AF, 0, 0, 2); + add_8018D9E0_entry(0x1B0, 0, 0, 2); return; case 12: - func_8009E650(0x1B1, 0, 0, 2); - func_8009E650(0x1B2, 0, 0, 2); + add_8018D9E0_entry(0x1B1, 0, 0, 2); + add_8018D9E0_entry(0x1B2, 0, 0, 2); return; case 13: - func_8009E650(0x1B3, 0, 0, 2); - func_8009E650(0x1B4, 0, 0, 2); - func_8009E650(0x1B5, 0, 0, 2); + add_8018D9E0_entry(0x1B3, 0, 0, 2); + add_8018D9E0_entry(0x1B4, 0, 0, 2); + add_8018D9E0_entry(0x1B5, 0, 0, 2); return; case 14: - func_8009E650(0x1B6, 0, 0, 2); - func_8009E650(0x1B7, 0, 0, 2); - func_8009E650(0x1B8, 0, 0, 2); - func_8009E650(0x1B9, 0, 0, 2); - func_8009E650(0x1BA, 0, 0, 2); - func_8009E650(0x1BB, 0, 0, 2); - func_8009E650(0x1BC, 0, 0, 2); + add_8018D9E0_entry(0x1B6, 0, 0, 2); + add_8018D9E0_entry(0x1B7, 0, 0, 2); + add_8018D9E0_entry(0x1B8, 0, 0, 2); + add_8018D9E0_entry(0x1B9, 0, 0, 2); + add_8018D9E0_entry(0x1BA, 0, 0, 2); + add_8018D9E0_entry(0x1BB, 0, 0, 2); + add_8018D9E0_entry(0x1BC, 0, 0, 2); return; case 15: - func_8009E650(0x1BD, 0, 0, 2); - func_8009E650(0x1BE, 0, 0, 2); - func_8009E650(0x1BF, 0, 0, 2); - func_8009E650(0x1C0, 0, 0, 2); + add_8018D9E0_entry(0x1BD, 0, 0, 2); + add_8018D9E0_entry(0x1BE, 0, 0, 2); + add_8018D9E0_entry(0x1BF, 0, 0, 2); + add_8018D9E0_entry(0x1C0, 0, 0, 2); return; case 16: - func_8009E650(0x1C1, 0, 0, 2); - func_8009E650(0x1C2, 0, 0, 2); - func_8009E650(0x1C3, 0, 0, 2); + add_8018D9E0_entry(0x1C1, 0, 0, 2); + add_8018D9E0_entry(0x1C2, 0, 0, 2); + add_8018D9E0_entry(0x1C3, 0, 0, 2); return; case 17: - func_8009E650(0x1C4, 0, 0, 2); - func_8009E650(0x1C5, 0, 0, 2); - func_8009E650(0x1C6, 0, 0, 2); - func_8009E650(0x1C7, 0, 0, 2); - func_8009E650(0x1C8, 0, 0, 2); - func_8009E650(0x1C9, 0, 0, 2); - func_8009E650(0x1CA, 0, 0, 2); - func_8009E650(0x1CB, 0, 0, 2); - func_8009E650(0x1CC, 0, 0, 2); + add_8018D9E0_entry(0x1C4, 0, 0, 2); + add_8018D9E0_entry(0x1C5, 0, 0, 2); + add_8018D9E0_entry(0x1C6, 0, 0, 2); + add_8018D9E0_entry(0x1C7, 0, 0, 2); + add_8018D9E0_entry(0x1C8, 0, 0, 2); + add_8018D9E0_entry(0x1C9, 0, 0, 2); + add_8018D9E0_entry(0x1CA, 0, 0, 2); + add_8018D9E0_entry(0x1CB, 0, 0, 2); + add_8018D9E0_entry(0x1CC, 0, 0, 2); return; case 18: - func_8009E650(0x1CD, 0, 0, 2); + add_8018D9E0_entry(0x1CD, 0, 0, 2); return; } } @@ -1932,7 +1932,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80094A64.s") ? func_8009DF4C(?); /* extern */ ? func_8009DF6C(?); /* extern */ ? func_8009E620(); /* extern */ -? func_8009E650(?, ?, ?, ?); /* extern */ +? add_8018D9E0_entry(?, ?, ?, ?); /* extern */ ? func_800B3F74(u32); /* extern */ ? func_800B5F30(); /* extern */ ? func_800B6014(); /* extern */ @@ -1954,136 +1954,136 @@ void func_80094C60(void) { temp_t7 = gMenuSelection; switch (temp_t7) { case OPTIONS_MENU: - func_8009E650(0x23, 0, 0, 2); - func_8009E650(0xF1, 0, 0, 4); - func_8009E650(0xF0, 0, 0, 2); + add_8018D9E0_entry(0x23, 0, 0, 2); + add_8018D9E0_entry(0xF1, 0, 0, 4); + add_8018D9E0_entry(0xF0, 0, 0, 2); break; case DATA_MENU: - func_8009E650(0x23, 0, 0, 2); - func_8009E650(0x8C, 0, 0, 6); - func_8009E650(0x7C, 0, 0, 6); - func_8009E650(0x7D, 0, 0, 6); - func_8009E650(0x7E, 0, 0, 6); - func_8009E650(0x7F, 0, 0, 6); - func_8009E650(0x80, 0, 0, 6); - func_8009E650(0x81, 0, 0, 6); - func_8009E650(0x82, 0, 0, 6); - func_8009E650(0x83, 0, 0, 6); - func_8009E650(0x84, 0, 0, 6); - func_8009E650(0x85, 0, 0, 6); - func_8009E650(0x86, 0, 0, 6); - func_8009E650(0x87, 0, 0, 6); - func_8009E650(0x88, 0, 0, 6); - func_8009E650(0x89, 0, 0, 6); - func_8009E650(0x8A, 0, 0, 6); - func_8009E650(0x8B, 0, 0, 6); - func_8009E650(0x8D, 0, 0, 8); + add_8018D9E0_entry(0x23, 0, 0, 2); + add_8018D9E0_entry(0x8C, 0, 0, 6); + add_8018D9E0_entry(0x7C, 0, 0, 6); + add_8018D9E0_entry(0x7D, 0, 0, 6); + add_8018D9E0_entry(0x7E, 0, 0, 6); + add_8018D9E0_entry(0x7F, 0, 0, 6); + add_8018D9E0_entry(0x80, 0, 0, 6); + add_8018D9E0_entry(0x81, 0, 0, 6); + add_8018D9E0_entry(0x82, 0, 0, 6); + add_8018D9E0_entry(0x83, 0, 0, 6); + add_8018D9E0_entry(0x84, 0, 0, 6); + add_8018D9E0_entry(0x85, 0, 0, 6); + add_8018D9E0_entry(0x86, 0, 0, 6); + add_8018D9E0_entry(0x87, 0, 0, 6); + add_8018D9E0_entry(0x88, 0, 0, 6); + add_8018D9E0_entry(0x89, 0, 0, 6); + add_8018D9E0_entry(0x8A, 0, 0, 6); + add_8018D9E0_entry(0x8B, 0, 0, 6); + add_8018D9E0_entry(0x8D, 0, 0, 8); break; case COURSE_DATA_MENU: - func_8009E650(0xE6, 0, 0, 8); - func_8009E650(0xE7, 0, 0, 8); - func_8009E650(0xE8, 0, 0, 8); - func_8009E650(0xE9, 0, 0, 8); - func_8009E650(0xEA, 0, 0, 8); + add_8018D9E0_entry(0xE6, 0, 0, 8); + add_8018D9E0_entry(0xE7, 0, 0, 8); + add_8018D9E0_entry(0xE8, 0, 0, 8); + add_8018D9E0_entry(0xE9, 0, 0, 8); + add_8018D9E0_entry(0xEA, 0, 0, 8); break; case LOGO_INTRO_MENU: - func_8009E650(0xFA, 0, 0, 0); + add_8018D9E0_entry(0xFA, 0, 0, 0); break; case CONTROLLER_PAK_MENU: - func_8009E650(0xDA, 0, 0, 0); - func_8009E650(0xD2, 0, 0, 4); - func_8009E650(0xD4, 0, 0, 6); - func_8009E650(0xD3, 0, 0, 8); - func_8009E650(0xD5, 0, 0, 0xA); - func_8009E650(0xD6, 0, 0, 0xA); - func_8009E650(0xD7, 0, 0, 0xA); - func_8009E650(0xD8, 0, 0, 0xA); - func_8009E650(0xD9, 0, 0, 0xA); + add_8018D9E0_entry(0xDA, 0, 0, 0); + add_8018D9E0_entry(0xD2, 0, 0, 4); + add_8018D9E0_entry(0xD4, 0, 0, 6); + add_8018D9E0_entry(0xD3, 0, 0, 8); + add_8018D9E0_entry(0xD5, 0, 0, 0xA); + add_8018D9E0_entry(0xD6, 0, 0, 0xA); + add_8018D9E0_entry(0xD7, 0, 0, 0xA); + add_8018D9E0_entry(0xD8, 0, 0, 0xA); + add_8018D9E0_entry(0xD9, 0, 0, 0xA); break; case START_MENU: - func_8009E650(2, 0, 0, 4); - func_8009E650(1, 0, 0, 0); - func_8009E650(0xFB, 0, 0, 0); + add_8018D9E0_entry(2, 0, 0, 4); + add_8018D9E0_entry(1, 0, 0, 0); + add_8018D9E0_entry(0xFB, 0, 0, 0); if ((gControllerBits & 1) != 0) { - func_8009E650(3, 0, 0, 2); + add_8018D9E0_entry(3, 0, 0, 2); } else { - func_8009E650(4, 0, 0, 2); + add_8018D9E0_entry(4, 0, 0, 2); } - func_8009E650(5, 0, 0, 6); + add_8018D9E0_entry(5, 0, 0, 6); D_800DC51C = 0; D_8018EE08 = 0; break; case MAIN_MENU: - func_8009E650(0x23, 0, 0, 2); - func_8009E650(0xA, 0x15E, 0x11, 6); - func_8009E650(0xE, 0x15E, 0x3E, 6); - func_8009E650(0xD, 0x15E, 0x3E, 6); - func_8009E650(0xC, 0x15E, 0x3E, 6); - func_8009E650(0xB, 0x15E, 0x3E, 6); - func_8009E650(0xF, 0x15E, 0xC8, 6); - func_8009E650(0x11, 0x15E, 0xC8, 6); - func_8009E650(0x10, 0x15E, 0xC8, 6); + add_8018D9E0_entry(0x23, 0, 0, 2); + add_8018D9E0_entry(0xA, 0x15E, 0x11, 6); + add_8018D9E0_entry(0xE, 0x15E, 0x3E, 6); + add_8018D9E0_entry(0xD, 0x15E, 0x3E, 6); + add_8018D9E0_entry(0xC, 0x15E, 0x3E, 6); + add_8018D9E0_entry(0xB, 0x15E, 0x3E, 6); + add_8018D9E0_entry(0xF, 0x15E, 0xC8, 6); + add_8018D9E0_entry(0x11, 0x15E, 0xC8, 6); + add_8018D9E0_entry(0x10, 0x15E, 0xC8, 6); if (func_800B555C() != 0) { - func_8009E650(0x15, 0, 0, 6); + add_8018D9E0_entry(0x15, 0, 0, 6); } - func_8009E650(0x14, 0, 0, 6); - func_8009E650(0x13, 0, 0, 6); - func_8009E650(0x12, 0, 0, 6); - func_8009E650(0x19, 0, 0, 6); - func_8009E650(0x18, 0, 0, 6); - func_8009E650(0x1B, 0, 0, 0xC); + add_8018D9E0_entry(0x14, 0, 0, 6); + add_8018D9E0_entry(0x13, 0, 0, 6); + add_8018D9E0_entry(0x12, 0, 0, 6); + add_8018D9E0_entry(0x19, 0, 0, 6); + add_8018D9E0_entry(0x18, 0, 0, 6); + add_8018D9E0_entry(0x1B, 0, 0, 0xC); break; case PLAYER_SELECT_MENU: - func_8009E650(0x24, 0, 0, 2); - func_8009E650(0x2A, 0, 0, 6); - func_8009E650(0x33, 0, 0, 6); - func_8009E650(0x2B, 0, 0, 8); - func_8009E650(0x2C, 0, 0, 8); - func_8009E650(0x2D, 0, 0, 6); - func_8009E650(0x2E, 0, 0, 6); - func_8009E650(0x2F, 0, 0, 6); - func_8009E650(0x30, 0, 0, 6); - func_8009E650(0x31, 0, 0, 6); - func_8009E650(0x32, 0, 0, 8); - func_8009E650(0x34, 0, 0, 0xC); - func_8009E650(0x35, 0, 0, 0xC); - func_8009E650(0x36, 0, 0, 0xC); - func_8009E650(0x37, 0, 0, 0xC); + add_8018D9E0_entry(0x24, 0, 0, 2); + add_8018D9E0_entry(0x2A, 0, 0, 6); + add_8018D9E0_entry(0x33, 0, 0, 6); + add_8018D9E0_entry(0x2B, 0, 0, 8); + add_8018D9E0_entry(0x2C, 0, 0, 8); + add_8018D9E0_entry(0x2D, 0, 0, 6); + add_8018D9E0_entry(0x2E, 0, 0, 6); + add_8018D9E0_entry(0x2F, 0, 0, 6); + add_8018D9E0_entry(0x30, 0, 0, 6); + add_8018D9E0_entry(0x31, 0, 0, 6); + add_8018D9E0_entry(0x32, 0, 0, 8); + add_8018D9E0_entry(0x34, 0, 0, 0xC); + add_8018D9E0_entry(0x35, 0, 0, 0xC); + add_8018D9E0_entry(0x36, 0, 0, 0xC); + add_8018D9E0_entry(0x37, 0, 0, 0xC); break; case COURSE_SELECT_MENU: - func_8009E650(0x25, 0, 0, 2); - func_8009E650(0x52, 0, 0, 6); + add_8018D9E0_entry(0x25, 0, 0, 2); + add_8018D9E0_entry(0x52, 0, 0, 6); if (gModeSelection != BATTLE) { - func_8009E650(0x53, 0, 0, 4); - func_8009E650(0x54, 0, 0, 4); - func_8009E650(0x55, 0, 0, 4); - func_8009E650(0x56, 0, 0, 4); - func_8009E650(0x58, 0, 0, 6); - func_8009E650(0x59, 0, 0, 6); - func_8009E650(0x5A, 0, 0, 6); - func_8009E650(0x5B, 0, 0, 6); + add_8018D9E0_entry(0x53, 0, 0, 4); + add_8018D9E0_entry(0x54, 0, 0, 4); + add_8018D9E0_entry(0x55, 0, 0, 4); + add_8018D9E0_entry(0x56, 0, 0, 4); + add_8018D9E0_entry(0x58, 0, 0, 6); + add_8018D9E0_entry(0x59, 0, 0, 6); + add_8018D9E0_entry(0x5A, 0, 0, 6); + add_8018D9E0_entry(0x5B, 0, 0, 6); } else { - func_8009E650(0x5C, 0, 0, 6); - func_8009E650(0x6E, 0, 0, 6); + add_8018D9E0_entry(0x5C, 0, 0, 6); + add_8018D9E0_entry(0x6E, 0, 0, 6); } - func_8009E650(0x64, 0, 0, 6); - func_8009E650(0x5F, 0, 0, 6); - func_8009E650(0x60, 0, 0, 6); - func_8009E650(0x61, 0, 0, 6); - func_8009E650(0x62, 0, 0, 6); - func_8009E650(0x5D, 0, 0, 6); - func_8009E650(0x5E, 0, 0, 8); + add_8018D9E0_entry(0x64, 0, 0, 6); + add_8018D9E0_entry(0x5F, 0, 0, 6); + add_8018D9E0_entry(0x60, 0, 0, 6); + add_8018D9E0_entry(0x61, 0, 0, 6); + add_8018D9E0_entry(0x62, 0, 0, 6); + add_8018D9E0_entry(0x5D, 0, 0, 6); + add_8018D9E0_entry(0x5E, 0, 0, 8); temp_v0 = gModeSelection; phi_v0 = temp_v0; if (temp_v0 == TIME_TRIALS) { - func_8009E650(0x65, 0, 0, 8); - func_8009E650(0x66, 0, 0, 8); - func_8009E650(0x69, 0, 0, 8); + add_8018D9E0_entry(0x65, 0, 0, 8); + add_8018D9E0_entry(0x66, 0, 0, 8); + add_8018D9E0_entry(0x69, 0, 0, 8); phi_v0 = gModeSelection; } if (phi_v0 == GRAND_PRIX) { - func_8009E650(0x68, 0, 0, 8); - func_8009E650(0x67, 0, 0, 5); + add_8018D9E0_entry(0x68, 0, 0, 8); + add_8018D9E0_entry(0x67, 0, 0, 5); } break; } @@ -7522,381 +7522,555 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E620.s") #endif #ifdef MIPS_TO_C -//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 +//generated by mips_to_c commit 5bd751fca3befef73d6a2e20d84a88cc918a77fe +struct _struct_D_800E8234_0x8 { + /* 0x0 */ u32 unk0; /* inferred */ + /* 0x4 */ struct _struct_D_800E8234_0x8 unk4; /* inferred */ +}; /* size = 0x8 */ + +s32 func_800051C4(); /* extern */ ? func_8006EE44(s8); /* extern */ ? func_8006EF60(); /* extern */ ? func_80099184(? *, s8); /* extern */ ? func_800996BC(? *, ?, s8); /* extern */ +s32 func_8009A374(void *); /* extern */ +s32 func_8009A478(void *, s32); /* extern */ ? func_8009B0A4(?, ?); /* extern */ ? func_8009B538(?, ?, u16, u16, s32); /* extern */ s32 func_8009B8C4(? *); /* extern */ ? func_8009B954(? *); /* extern */ ? func_8009B998(); /* extern */ s32 *func_8009BA74(s32 *, ? *, s32, s32); /* extern */ +s32 func_800B5020(s32, s8, s8); /* extern */ +s32 func_800B5218(); /* extern */ +s32 func_800B54C0(s8, s32, s8); /* extern */ +s32 func_800B555C(s8); /* extern */ ? func_800B559C(s32); /* extern */ +s32 func_800B5B94(); /* extern */ ? func_800B6708(); /* extern */ s32 random_int(?, s8); /* extern */ -void *segmented_to_virtual(segment_address_t); /* extern */ -void *segmented_to_virtual_dupe(segment_address_t); /* extern */ +extern ? D_020014C8; +extern ? D_02001540; +extern ? D_0200157C; +extern ? D_020015A4; +extern ? D_020015CC; +extern ? D_02001630; +extern ? D_02001658; +extern ? D_0200184C; +extern ? D_02001874; +extern ? D_0200198C; +extern ? D_0200199C; +extern ? D_020019AC; +extern ? D_020019BC; +extern ? D_020019CC; +extern ? D_020019DC; +extern ? D_02001B2C; +extern ? D_02001B54; +extern ? D_02001B7C; +extern ? D_02001BA4; +extern ? D_02001BCC; +extern ? D_02001BF4; +extern ? D_02001C1C; +extern ? D_02001C44; +extern ? D_02001C6C; +extern ? D_02001C94; +extern ? D_02001CBC; +extern ? D_02001CE4; +extern ? D_02001D0C; +extern ? D_02001D34; +extern ? D_02001D5C; +extern ? D_02001D84; +extern ? D_02001DAC; +extern ? D_02001DD4; +extern ? D_02001DFC; +extern ? D_02001E24; +extern ? D_02001E64; +extern ? D_02001E74; +extern ? D_02001E84; +extern ? D_02001E94; +extern ? D_02001EA4; +extern ? D_02001EB4; +extern ? D_02001EC4; +extern ? D_02001ED4; +extern ? D_02001EE4; +extern ? D_02001EF4; +extern ? D_02001F04; +extern ? D_02001F14; +extern ? D_02001F24; +extern ? D_02001F34; +extern ? D_02001F44; +extern ? D_02001F54; +extern ? D_02001F64; +extern ? D_02001F74; +extern ? D_02001F84; +extern ? D_02001F94; +extern ? D_02001FA4; +extern ? D_020020BC; +extern ? D_020020CC; +extern ? D_020020DC; +extern ? D_02003594; +extern ? D_020035BC; +extern ? D_020035E4; +extern ? D_0200360C; +extern ? D_02003634; +extern ? D_0200365C; +extern ? D_02003684; +extern ? D_020036AC; +extern ? D_020036D4; +extern ? D_020036FC; +extern ? D_02003724; +extern ? D_0200374C; +extern ? D_02003774; +extern ? D_0200379C; +extern ? D_020037C4; +extern ? D_020037EC; +extern ? D_02003814; +extern ? D_0200383C; +extern ? D_02003864; +extern ? D_0200388C; +extern ? D_020038B4; +extern ? D_020038DC; +extern ? D_02003904; +extern ? D_0200392C; +extern ? D_02003954; +extern ? D_0200397C; +extern ? D_020039A4; +extern ? D_020039CC; +extern ? D_02003A1C; +extern ? D_02003A44; +extern ? D_02003A6C; +extern ? D_02003A94; +extern ? D_02003ABC; +extern ? D_02003AE4; +extern ? D_02003B0C; +extern ? D_02003B34; +extern ? D_02003B5C; +extern ? D_02003B84; +extern ? D_02003BAC; +extern ? D_02003BFC; +extern ? D_02003C24; +extern ? D_02003C4C; +extern ? D_02003C74; +extern ? D_02003C9C; +extern ? D_02003CC4; +extern ? D_02003CEC; +extern ? D_02003D14; +extern ? D_02003D3C; +extern ? D_02003D64; +extern ? D_02003D8C; +extern ? D_02003DB4; +extern ? D_02003DDC; +extern ? D_02003E04; +extern ? D_02003E2C; +extern ? D_02003E54; +extern ? D_02003E7C; +extern ? D_02003EA4; +extern ? D_02003ECC; +extern ? D_02003EF4; +extern ? D_02003F1C; +extern ? D_02003F44; +extern ? D_02003F6C; +extern ? D_02003F94; +extern ? D_02003FE4; +extern ? D_0200400C; +extern ? D_02004034; +extern ? D_0200405C; +extern ? D_02004084; +extern ? D_020040AC; +extern ? D_020040D4; +extern ? D_020040FC; +extern ? D_02004124; +extern ? D_0200414C; +extern ? D_02004174; +extern ? D_0200419C; +extern ? D_020041C4; +extern ? D_020041EC; +extern ? D_02004214; +extern ? D_0200423C; +extern ? D_02004264; +extern ? D_0200428C; +extern ? D_020042B4; +extern ? D_020042DC; +extern ? D_02004304; +extern ? D_0200432C; +extern ? D_02004354; +extern ? D_0200437C; +extern ? D_020043A4; +extern ? D_020043CC; +extern ? D_020043F4; +extern ? D_0200441C; +extern ? D_02004444; +extern ? D_0200446C; +extern ? D_02004494; +extern ? D_020044BC; +extern ? D_020044E4; +extern ? D_0200450C; +extern ? D_02004534; +extern ? D_0200455C; +extern ? D_02004598; +extern ? D_020045C0; +extern ? D_020045E8; +extern ? D_02004610; +extern ? D_02004638; +extern ? D_020048F4; +extern ? D_0200491C; +extern ? D_02004944; +extern ? D_0200496C; +extern ? D_02004994; +extern ? D_020049BC; +extern ? D_020049E4; +extern ? D_02004A0C; +extern ? D_02004A34; +extern ? D_02004B4C; +extern ? D_02004B74; +extern ? D_02004EA8; +extern ? D_02004ED0; +extern ? D_02004EF8; +extern ? D_02004F20; +extern ? D_02004F48; +extern ? D_02004F70; +extern ? D_02004F98; +extern ? D_02004FC0; +extern ? D_02004FE8; +extern ? D_02005010; +extern ? D_02005038; +extern ? D_02005060; +extern ? D_02005088; +extern ? D_020050B0; +extern ? D_020050D8; +extern ? D_02005100; +extern ? D_02005128; +extern ? D_02005150; +extern ? D_02005178; +extern ? D_020051A0; +extern ? D_02006708; +extern ? D_020068E0; +extern ? D_020068F0; +extern ? D_02006AC8; +extern ? D_02006AD8; +extern ? D_02006CB0; +extern ? D_02006CC0; +extern ? D_02006E98; +extern ? D_02006EA8; +extern ? D_02007080; +extern ? D_02007090; +extern ? D_02007270; +extern ? D_02007280; +extern ? D_02007458; +extern ? D_02007468; +extern ? D_02007640; +extern s32 D_800DC5E8; +extern u16 D_80162DD4; extern ? D_801640F4; -extern ? D_8018D9E0; +extern s32 D_8018CA78; +extern s32 D_8018E110; +extern s32 *D_8018E75C; +extern s8 D_8018ED90; +extern s32 D_8018ED94; +extern s32 D_8018EDC0; +extern f32 D_8018EDC4; +extern f32 D_8018EDC8; +extern f32 D_8018EDCC; +extern f32 D_8018EDD0; +extern f32 D_8018EDD4; +extern f32 D_8018EDD8; +extern f32 D_8018EDDC; extern ? D_8018EE10; extern ? D_802874D8; +extern s8 gCupCourseSelection; +extern u8 gSoundMode; extern ? gTexture7ED50C; -static ? D_02000000; /* unable to generate initializer */ -static ? D_02000028; /* unable to generate initializer */ -static ? D_02000050; /* unable to generate initializer */ -static ? D_02000078; /* unable to generate initializer */ -static ? D_020000A0; /* unable to generate initializer */ -static ? D_020000C8; /* unable to generate initializer */ -static ? D_020000F0; /* unable to generate initializer */ -static ? D_02000118; /* unable to generate initializer */ -static ? D_02000140; /* unable to generate initializer */ -static ? D_02000168; /* unable to generate initializer */ -static ? D_02000190; /* unable to generate initializer */ -static ? D_020001B8; /* unable to generate initializer */ -static ? D_020001E0; /* unable to generate initializer */ -static ? D_02000208; /* unable to generate initializer */ -static ? D_02000230; /* unable to generate initializer */ -static ? D_02000258; /* unable to generate initializer */ -static ? D_02000280; /* unable to generate initializer */ -static ? D_020002A8; /* unable to generate initializer */ -static ? D_020002D0; /* unable to generate initializer */ -static ? D_020002F8; /* unable to generate initializer */ -static ? D_02000320; /* unable to generate initializer */ -static ? D_02000348; /* unable to generate initializer */ -static ? D_02000370; /* unable to generate initializer */ -static ? D_02000398; /* unable to generate initializer */ -static ? D_020003C0; /* unable to generate initializer */ -static ? D_020003E8; /* unable to generate initializer */ -static ? D_02000410; /* unable to generate initializer */ -static ? D_02000438; /* unable to generate initializer */ -static ? D_02000460; /* unable to generate initializer */ -static ? D_02000488; /* unable to generate initializer */ -static ? D_020004B0; /* unable to generate initializer */ -static ? D_020004D8; /* unable to generate initializer */ -static ? D_02000500; /* unable to generate initializer */ -static ? D_02000528; /* unable to generate initializer */ -static ? D_02000550; /* unable to generate initializer */ -static ? D_02000578; /* unable to generate initializer */ -static ? D_020005A0; /* unable to generate initializer */ -static ? D_020005C8; /* unable to generate initializer */ -static ? D_020005F0; /* unable to generate initializer */ -static ? D_02000618; /* unable to generate initializer */ -static ? D_02000640; /* unable to generate initializer */ -static ? D_02000668; /* unable to generate initializer */ -static ? D_02000690; /* unable to generate initializer */ -static ? D_020006B8; /* unable to generate initializer */ -static ? D_020006E0; /* unable to generate initializer */ -static ? D_02000708; /* unable to generate initializer */ -static ? D_02000730; /* unable to generate initializer */ -static ? D_02000758; /* unable to generate initializer */ -static ? D_02000780; /* unable to generate initializer */ -static ? D_020007A8; /* unable to generate initializer */ -static ? D_020007D0; /* unable to generate initializer */ -static ? D_020007F8; /* unable to generate initializer */ -static ? D_02000820; /* unable to generate initializer */ -static ? D_02000848; /* unable to generate initializer */ -static ? D_02000870; /* unable to generate initializer */ -static ? D_02000898; /* unable to generate initializer */ -static ? D_020008C0; /* unable to generate initializer */ -static ? D_020008E8; /* unable to generate initializer */ -static ? D_02000910; /* unable to generate initializer */ -static ? D_02000938; /* unable to generate initializer */ -static ? D_02000960; /* unable to generate initializer */ -static ? D_02000988; /* unable to generate initializer */ -static ? D_020009B0; /* unable to generate initializer */ -static ? D_020009D8; /* unable to generate initializer */ -static ? D_02000A00; /* unable to generate initializer */ -static ? D_02000A28; /* unable to generate initializer */ -static ? D_02000A50; /* unable to generate initializer */ -static ? D_02000A78; /* unable to generate initializer */ -static ? D_02000AA0; /* unable to generate initializer */ -static ? D_02000AC8; /* unable to generate initializer */ -static ? D_02000AF0; /* unable to generate initializer */ -static ? D_02000B18; /* unable to generate initializer */ -static ? D_02000B40; /* unable to generate initializer */ -static ? D_02000B68; /* unable to generate initializer */ -static ? D_02000B90; /* unable to generate initializer */ -static ? D_02000BB8; /* unable to generate initializer */ -static ? D_02000BE0; /* unable to generate initializer */ -static ? D_02000C08; /* unable to generate initializer */ -static ? D_02000C30; /* unable to generate initializer */ -static ? D_02000C58; /* unable to generate initializer */ -static ? D_02000C80; /* unable to generate initializer */ -static ? D_02000CA8; /* unable to generate initializer */ -static ? D_02000CD0; /* unable to generate initializer */ -static ? D_02000CF8; /* unable to generate initializer */ -static ? D_02000D20; /* unable to generate initializer */ -static ? D_02000D48; /* unable to generate initializer */ -static ? D_02000D70; /* unable to generate initializer */ -static ? D_02000D98; /* unable to generate initializer */ -static ? D_02000DC0; /* unable to generate initializer */ -static ? D_02000DE8; /* unable to generate initializer */ -static ? D_02000E10; /* unable to generate initializer */ -static ? D_02000E38; /* unable to generate initializer */ -static ? D_02000E60; /* unable to generate initializer */ -static ? D_02000E88; /* unable to generate initializer */ -static ? D_02000EB0; /* unable to generate initializer */ -static ? D_02000ED8; /* unable to generate initializer */ -static ? D_02000F00; /* unable to generate initializer */ -static ? D_02000F28; /* unable to generate initializer */ -static ? D_02000F50; /* unable to generate initializer */ -static ? D_02000F78; /* unable to generate initializer */ -static ? D_02000FA0; /* unable to generate initializer */ -static ? D_02000FC8; /* unable to generate initializer */ -static ? D_02000FF0; /* unable to generate initializer */ -static ? D_02001018; /* unable to generate initializer */ -static ? D_02001040; /* unable to generate initializer */ -static ? D_02001068; /* unable to generate initializer */ -static ? D_02001090; /* unable to generate initializer */ -static ? D_020010B8; /* unable to generate initializer */ -static ? D_020014C8; /* unable to generate initializer */ -static ? D_02001540; /* unable to generate initializer */ -static ? D_0200157C; /* unable to generate initializer */ -static ? D_020015A4; /* unable to generate initializer */ -static ? D_020015CC; /* unable to generate initializer */ -static ? D_02001630; /* unable to generate initializer */ -static ? D_02001658; /* unable to generate initializer */ -static ? D_020016BC; /* unable to generate initializer */ -static ? D_020016E4; /* unable to generate initializer */ -static ? D_0200170C; /* unable to generate initializer */ -static ? D_02001734; /* unable to generate initializer */ -static ? D_0200175C; /* unable to generate initializer */ -static ? D_02001784; /* unable to generate initializer */ -static ? D_020017AC; /* unable to generate initializer */ -static ? D_020017D4; /* unable to generate initializer */ -static ? D_020017FC; /* unable to generate initializer */ -static ? D_02001824; /* unable to generate initializer */ -static ? D_0200184C; /* unable to generate initializer */ -static ? D_02001874; /* unable to generate initializer */ -static ? D_0200198C; /* unable to generate initializer */ -static ? D_0200199C; /* unable to generate initializer */ -static ? D_020019AC; /* unable to generate initializer */ -static ? D_020019BC; /* unable to generate initializer */ -static ? D_020019CC; /* unable to generate initializer */ -static ? D_020019DC; /* unable to generate initializer */ -static void D_02001FA4; /* unable to generate initializer */ -static ? D_020045E8; /* unable to generate initializer */ -static ? D_02004610; /* unable to generate initializer */ -static void D_02004638; /* unable to generate initializer */ -static void D_02004A0C; /* unable to generate initializer */ -static void D_02004A34; /* unable to generate initializer */ -static ? D_02004B4C; /* unable to generate initializer */ -static ? D_02004B74; /* unable to generate initializer */ -static ? D_800E7248; /* unable to generate initializer; const */ +extern s8 gTimeTrialDataCourseIndex; +static struct _struct_D_800E7248_0x8 D_800E7248[0]; /* unable to generate initializer; const */ static ? D_800E7268; /* unable to generate initializer; const */ -static ? D_800E74E8; /* unable to generate initializer; const */ -static void *D_800E7AF8[0x6C] = { - &D_02000000, - &D_02000028, - &D_02000050, - &D_02000078, - &D_020000A0, - &D_020000C8, - &D_020000F0, - &D_02000118, - &D_02000140, - &D_02000168, - &D_02000190, - &D_020001B8, - &D_020001E0, - &D_02000208, - &D_02000230, - &D_02000258, - &D_02000280, - &D_020002A8, - &D_020002D0, - &D_020002F8, - &D_02000320, - &D_02000348, - &D_02000370, - &D_02000398, - &D_020003C0, - &D_020003E8, - &D_02000410, - &D_02000438, - &D_02000460, - &D_02000488, - &D_020004B0, - &D_020004D8, - &D_02000500, - &D_02000528, - &D_02000550, - &D_02000578, - &D_020005A0, - &D_020005C8, - &D_020005F0, - &D_02000618, - &D_02000640, - &D_02000668, - &D_02000690, - &D_020006B8, - &D_020006E0, - &D_02000708, - &D_02000730, - &D_02000758, - &D_02000780, - &D_020007A8, - &D_020007D0, - &D_020007F8, - &D_02000820, - &D_02000848, - &D_02000870, - &D_02000898, - &D_020008C0, - &D_020008E8, - &D_02000910, - &D_02000938, - &D_02000960, - &D_02000988, - &D_020009B0, - &D_020009D8, - &D_02000A00, - &D_02000A28, - &D_02000A50, - &D_02000A78, - &D_02000AA0, - &D_02000AC8, - &D_02000AF0, - &D_02000B18, - &D_02000B40, - &D_02000B68, - &D_02000B90, - &D_02000BB8, - &D_02000BE0, - &D_02000C08, - &D_02000C30, - &D_02000C58, - &D_02000C80, - &D_02000CA8, - &D_02000CD0, - &D_02000CF8, - &D_02000D20, - &D_02000D48, - &D_02000D70, - &D_02000D98, - &D_02000DC0, - &D_02000DE8, - &D_02000E10, - &D_02000E38, - &D_02000E60, - &D_02000E88, - &D_02000EB0, - &D_02000ED8, - &D_02000F00, - &D_02000F28, - &D_02000F50, - &D_02000F78, - &D_02000FA0, - &D_02000FC8, - &D_02000FF0, - &D_02001018, - &D_02001040, - &D_02001068, - &D_02001090, - &D_020010B8, -}; /* const */ +static struct _struct_D_800E74E8_0x8 D_800E74E8[0]; /* unable to generate initializer; const */ +static struct _struct_D_800E8234_0x8 D_800E7AF8[0x36]; /* unable to generate initializer; const */ static ? D_800E7CA8; /* unable to generate initializer; const */ -static void *D_800E7D0C[0xA] = { - &D_020016BC, - &D_020016E4, - &D_0200170C, - &D_02001734, - &D_0200175C, - &D_02001784, - &D_020017AC, - &D_020017D4, - &D_020017FC, - &D_02001824, +static struct _struct_D_800E8234_0x8 D_800E7D0C[5]; /* unable to generate initializer; const */ +static u32 D_800E7D34[6] = { + (u32) &D_0200198C, + (u32) &D_0200199C, + (u32) &D_020019AC, + (u32) &D_020019BC, + (u32) &D_020019CC, + (u32) &D_020019DC, }; /* const */ -static ? *D_800E7D34[6] = { - &D_0200198C, - &D_0200199C, - &D_020019AC, - &D_020019BC, - &D_020019CC, - &D_020019DC, -}; /* const */ -static ? D_800E7D4C; /* unable to generate initializer; const */ +static ? *D_800E7D4C[2] = { &D_02004598, &D_020045C0 }; /* const */ static ? D_800E7D54; /* unable to generate initializer; const */ -static ? D_800E7D74; /* unable to generate initializer; const */ -static ? D_800E7DC4; /* unable to generate initializer; const */ +static u32 D_800E7D74[0x14] = { + (u32) &D_02001B2C, + (u32) &D_02001B54, + (u32) &D_02001B7C, + (u32) &D_02001BA4, + (u32) &D_02001BCC, + (u32) &D_02001BF4, + (u32) &D_02001C1C, + (u32) &D_02001C44, + (u32) &D_02001C6C, + (u32) &D_02001C94, + (u32) &D_02001CBC, + (u32) &D_02001CE4, + (u32) &D_02001D0C, + (u32) &D_02001D34, + (u32) &D_02001D5C, + (u32) &D_02001D84, + (u32) &D_02001DAC, + (u32) &D_02001DD4, + (u32) &D_02001DFC, + (u32) &D_02001E24, +}; /* const */ +static u32 D_800E7DC4[0x17] = { + (u32) &D_02004EA8, + (u32) &D_02004ED0, + (u32) &D_02004EF8, + (u32) &D_02004F20, + (u32) &D_02004F48, + (u32) &D_02004F70, + (u32) &D_02004F98, + (u32) &D_02004FC0, + (u32) &D_02004FE8, + (u32) &D_02005010, + (u32) &D_02005038, + (u32) &D_02005060, + (u32) &D_02005088, + (u32) &D_020050B0, + (u32) &D_020050D8, + (u32) &D_02005100, + (u32) &D_02005128, + (u32) &D_02005150, + (u32) &D_02005178, + (u32) &D_020051A0, + (u32) &D_020020BC, + (u32) &D_020020CC, + (u32) &D_020020DC, +}; /* const */ static ? D_800E7E20; /* unable to generate initializer; const */ -static ? D_800E7E34; /* unable to generate initializer; const */ +static u32 D_800E7E34[0x14] = { + (u32) &D_02001E64, + (u32) &D_02001E74, + (u32) &D_02001E84, + (u32) &D_02001E94, + (u32) &D_02001EA4, + (u32) &D_02001EB4, + (u32) &D_02001EC4, + (u32) &D_02001ED4, + (u32) &D_02001EE4, + (u32) &D_02001EF4, + (u32) &D_02001F04, + (u32) &D_02001F14, + (u32) &D_02001F24, + (u32) &D_02001F34, + (u32) &D_02001F44, + (u32) &D_02001F54, + (u32) &D_02001F64, + (u32) &D_02001F74, + (u32) &D_02001F84, + (u32) &D_02001F94, +}; /* const */ static ? D_800E7FF0; /* unable to generate initializer; const */ -static ? D_800E80A0; /* unable to generate initializer; const */ -static ? D_800E8114; /* unable to generate initializer; const */ -static ? D_800E817C; /* unable to generate initializer; const */ -static ? D_800E81E4; /* unable to generate initializer; const */ -static ? D_800E822C; /* unable to generate initializer; const */ -static ? D_800E8234; /* unable to generate initializer; const */ -static ? D_800E8274; /* unable to generate initializer; const */ -static ? D_800E8294; /* unable to generate initializer; const */ -static ? D_800E8320; /* unable to generate initializer; const */ -static ? D_800E8420; /* unable to generate initializer; const */ +static u32 D_800E80A0[0x1D] = { + (u32) &D_02003594, + (u32) &D_02003BFC, + (u32) &D_020035BC, + (u32) &D_02003C24, + (u32) &D_020035E4, + (u32) &D_02003C4C, + (u32) &D_0200360C, + (u32) &D_02003C74, + (u32) &D_02003634, + (u32) &D_02003C9C, + (u32) &D_0200365C, + (u32) &D_02003CC4, + (u32) &D_02003684, + (u32) &D_02003CEC, + (u32) &D_020036AC, + (u32) &D_02003D14, + (u32) &D_020036D4, + (u32) &D_02003D3C, + (u32) &D_020036FC, + (u32) &D_02003D64, + (u32) &D_02003724, + (u32) &D_02003D8C, + (u32) &D_02004034, + (u32) &D_0200374C, + (u32) &D_02003DB4, + (u32) &D_02003774, + (u32) &D_02003DDC, + (u32) &D_0200379C, + (u32) &D_02003E04, +}; /* const */ +static u32 D_800E8114[0x18] = { + (u32) &D_020037C4, + (u32) &D_020037EC, + (u32) &D_02003814, + (u32) &D_0200383C, + (u32) &D_02003864, + (u32) &D_0200388C, + (u32) &D_02003E2C, + (u32) &D_02003EF4, + (u32) &D_020038B4, + (u32) &D_02003E54, + (u32) &D_02003F1C, + (u32) &D_020038DC, + (u32) &D_02003E7C, + (u32) &D_02003F44, + (u32) &D_02003904, + (u32) &D_02003EA4, + (u32) &D_02003F6C, + (u32) &D_0200392C, + (u32) &D_02003ECC, + (u32) &D_02003F94, + (u32) &D_02003954, + (u32) &D_0200397C, + (u32) &D_020039A4, + (u32) &D_020039CC, +}; /* const */ +static u32 D_800E817C[0x1A] = { + (u32) &D_02003A1C, + (u32) &D_02003FE4, + (u32) &D_02003A44, + (u32) &D_0200400C, + (u32) &D_02003A6C, + (u32) &D_02003A94, + (u32) &D_02003ABC, + (u32) &D_02003AE4, + (u32) &D_02003B0C, + (u32) &D_02003B34, + (u32) &D_02003B5C, + (u32) &D_02003B84, + (u32) &D_02003BAC, + (u32) &D_0200405C, + (u32) &D_02004084, + (u32) &D_020040AC, + (u32) &D_020040D4, + (u32) &D_020040FC, + (u32) &D_020043CC, + (u32) &D_02004444, + (u32) &D_0200437C, + (u32) &D_020043F4, + (u32) &D_02004124, + (u32) &D_0200414C, + (u32) &D_02004174, + (u32) &D_0200419C, +}; /* const */ +static u32 D_800E81E4[0x12] = { + (u32) &D_020041C4, + (u32) &D_020041EC, + (u32) &D_02004214, + (u32) &D_0200423C, + (u32) &D_02004264, + (u32) &D_0200428C, + (u32) &D_020042B4, + (u32) &D_020042DC, + (u32) &D_02004354, + (u32) &D_020043A4, + (u32) &D_0200441C, + (u32) &D_0200446C, + (u32) &D_02004494, + (u32) &D_020044BC, + (u32) &D_02004304, + (u32) &D_0200432C, + (u32) &D_020044E4, + (u32) &D_0200450C, +}; /* const */ +static u32 D_800E822C[2] = { (u32) &D_02004534, (u32) &D_0200455C }; /* const */ +static struct _struct_D_800E8234_0x8 D_800E8234[3]; /* unable to generate initializer; const */ +static u32 D_800E8274[8] = { + (u32) &D_020048F4, + (u32) &D_0200491C, + (u32) &D_02004944, + (u32) &D_0200496C, + (u32) &D_020049BC, + (u32) &D_02004994, + (u32) &D_020049E4, + (u32) &D_02004A34, +}; /* const */ +static u32 D_800E8294[8] = { + (u32) &D_020048F4, + (u32) &D_0200491C, + (u32) &D_02004944, + (u32) &D_0200496C, + (u32) &D_020049BC, + (u32) &D_02004994, + (u32) &D_020049E4, + (u32) &D_02004A34, +}; /* const */ +static u32 D_800E8320[8] = { + (u32) &D_02006708, + (u32) &D_020068F0, + (u32) &D_02006CC0, + (u32) &D_02006EA8, + (u32) &D_02007090, + (u32) &D_02007280, + (u32) &D_02007468, + (u32) &D_02006AD8, +}; /* const */ +static u32 D_800E8420[8] = { + (u32) &D_020068E0, + (u32) &D_02006AC8, + (u32) &D_02006E98, + (u32) &D_02007080, + (u32) &D_02007270, + (u32) &D_02007458, + (u32) &D_02007640, + (u32) &D_02006CB0, +}; /* const */ static ? D_800E85F7; /* unable to generate initializer; const */ static s8 D_800E86A8 = 0; /* const */ static ? D_800EFD64; /* unable to generate initializer; const */ -static ? gCupCourseOrder; /* unable to generate initializer; const */ +s16 gCupCourseOrder[5][4]; /* unable to generate initializer; const */ -void func_8009E650(s32 arg0, s32 arg1, s32 arg2, s8 arg3) { - void *sp7C; +void add_8018D9E0_entry(s32 type, s32 column, s32 row, s8 priority) { + struct_8018D9E0_entry *sp7C; s32 *sp6C; s32 sp3C; - void **sp24; + struct _struct_D_800E8234_0x8 *sp24; /* compiler-managed */ s32 sp20; s32 *temp_v0_2; s32 *temp_v1_10; - s32 *temp_v1_11; - s32 *temp_v1_12; + s32 *temp_v1_2; + s32 *temp_v1_3; s32 *temp_v1_4; s32 *temp_v1_5; s32 *temp_v1_6; s32 *temp_v1_7; s32 *temp_v1_8; s32 *temp_v1_9; - s32 temp_a3; s32 temp_t8; s32 temp_t9; s32 temp_v0; - s32 temp_v0_4; - s32 temp_v0_5; s32 temp_v0_6; s32 temp_v0_7; - s32 temp_v1; - s32 temp_v1_14; - s32 temp_v1_15; - s32 temp_v1_16; - s32 temp_v1_2; + s32 temp_v0_8; + s32 temp_v0_9; + s32 temp_v1_12; s8 temp_a1; s8 temp_a1_2; - s8 temp_t7; - s8 temp_v0_8; - void **temp_v0_10; - void **temp_v1_13; - void **temp_v1_3; - void *temp_v0_3; - void *temp_v0_9; - ? *phi_ra; + s8 temp_v0_10; + struct _struct_D_800E7248_0x8 *temp_v0_5; + struct _struct_D_800E74E8_0x8 *temp_v0_3; + struct _struct_D_800E8234_0x8 *temp_v0_4; + struct _struct_D_800E8234_0x8 *temp_v1; + struct _struct_D_800E8234_0x8 *temp_v1_11; + struct_8018D9E0_entry *phi_ra; s32 phi_v0; s32 phi_v0_2; s32 phi_v1; - ? *phi_a0; - void **phi_v1_2; - void **phi_v1_3; - s8 phi_v1_4; + u32 phi_a0; + struct _struct_D_800E8234_0x8 *phi_v1_2; + struct _struct_D_800E8234_0x8 *phi_v1_3; + u8 phi_v1_4; s32 phi_v1_5; - void **phi_a2; - ? *phi_a0_2; + struct _struct_D_800E8234_0x8 *phi_a2; + u32 phi_a0_2; - phi_ra = &D_8018D9E0; + phi_ra = D_8018D9E0; phi_v0 = 0; phi_v0_2 = 0; loop_1: temp_v0 = phi_v0 + 1; phi_v0 = temp_v0; - if (phi_ra->unk0 != 0) { + if (phi_ra->type != 0) { if (temp_v0 >= 0x21) { loop_3: goto loop_3; @@ -7906,447 +8080,422 @@ loop_3: } phi_ra->unk4 = 0; phi_ra->unk8 = 0; - phi_ra->unkC = arg1; - phi_ra->unk10 = arg2; - phi_ra->unk14 = arg3; - phi_ra->unk15 = 1; + phi_ra->column = column; + phi_ra->row = row; + phi_ra->priority = priority; + phi_ra->visible = 1; phi_ra->unk1C = 0; phi_ra->unk20 = 0; - phi_ra->unk0 = arg0; - phi_v1_4 = 1; - if (arg0 >= 0xFC) { - if (arg0 >= 0x131) { - switch (arg0); /* switch 1; jump table: jpt_800F1160 */ - /* Duplicate return node #87. Try simplifying control flow for better match */ + phi_ra->type = type; + phi_v1_4 = 1U; + switch (type) { /* irregular */ + case 0xFA: + D_8018ED94 = 0; + D_800E8530 = 0.0f; + D_800E8534 = 3.0f; + D_8018EDC0 = 0x9C4; + D_8018EDC8 = 0.0f; + D_8018EDCC = -270.0f; + D_8018EDD0 = 0.0f; + D_8018EDD4 = 0.0f; + D_8018EDD8 = 0.0f; + D_8018EDDC = 0.0f; + D_8018EDC4 = 3.0f; + phi_ra->unk1C = -1; + phi_ra->unk20 = (s32) 1U; + return; + case 0xFB: + D_8018EDC0 = 0x708; + D_8018EDC8 = -51.0f; + D_8018EDCC = -12.0f; + D_8018EDD0 = -18.0f; + D_8018EDD4 = -270.0f; + D_8018EDD8 = 750.0f; + D_8018EDDC = 0.0f; + D_8018EDC4 = 1.0f; + phi_ra->unk1C = -1; + phi_ra->unk20 = (s32) 1U; + return; + case 0xD2: + sp7C = phi_ra; + func_800996BC(&D_020014C8, 0, priority); + func_8009B954(&D_020014C8); + D_8018E75C = func_8009BA74(D_8018E75C, &D_020014C8, phi_ra->column, phi_ra->row); + func_8009B998(); + return; + case 0xD3: + sp7C = phi_ra; + func_800996BC(&D_02001540, 0, priority); + func_8009B954(&D_02001540); + D_8018E75C = func_8009BA74(D_8018E75C, &D_02001540, phi_ra->column, phi_ra->row); + func_8009B998(); + return; + case 0xD4: + sp7C = phi_ra; + func_800996BC(&D_0200157C, 0, priority); + func_80099184(&D_02001874); + phi_ra->row = 0x69; + phi_v1_2 = D_800E7AF8; + do { + sp24 = phi_v1_2; + func_80099184(segmented_to_virtual(phi_v1_2->unk0)); + temp_v1 = &phi_v1_2->unk4; + phi_v1_2 = temp_v1; + } while (temp_v1 != D_800E7D0C); + return; + case 0xD5: + sp7C = phi_ra; + func_80099184(&D_020015A4, priority); + func_8009B954(&D_020015A4); + temp_v0_2 = func_8009BA74(D_8018E75C, &D_020015A4, phi_ra->column, phi_ra->row); + D_8018E75C = temp_v0_2; + D_8018E75C = temp_v0_2 + 8; + *temp_v0_2 = 0xFD700000; + sp6C = temp_v0_2; + sp6C->unk4 = func_8009B8C4(&gTexture7ED50C); + temp_v1_2 = D_8018E75C; + D_8018E75C = temp_v1_2 + 8; + temp_v1_2->unk0 = 0xF5700000; + temp_v1_2->unk4 = 0x07080200; + temp_v1_3 = D_8018E75C; + D_8018E75C = temp_v1_3 + 8; + temp_v1_3->unk4 = 0; + temp_v1_3->unk0 = 0xE6000000; + temp_v1_4 = D_8018E75C; + D_8018E75C = temp_v1_4 + 8; + temp_v1_4->unk4 = 0x074FF020; + temp_v1_4->unk0 = 0xF3000000; + temp_v1_5 = D_8018E75C; + D_8018E75C = temp_v1_5 + 8; + temp_v1_5->unk4 = 0; + temp_v1_5->unk0 = 0xE7000000; + temp_v1_6 = D_8018E75C; + D_8018E75C = temp_v1_6 + 8; + temp_v1_6->unk0 = 0xF5708000; + temp_v1_6->unk4 = 0x80200; + temp_v1_7 = D_8018E75C; + D_8018E75C = temp_v1_7 + 8; + temp_v1_7->unk0 = 0xF2000000; + temp_v1_7->unk4 = 0x3FC010; + temp_v1_8 = D_8018E75C; + D_8018E75C = temp_v1_8 + 8; + temp_v1_8->unk4 = 0x802C0; + temp_v1_8->unk0 = 0xE44802D4; + temp_v1_9 = D_8018E75C; + D_8018E75C = temp_v1_9 + 8; + temp_v1_9->unk4 = 0x80; + temp_v1_9->unk0 = 0xB3000000; + temp_v1_10 = D_8018E75C; + D_8018E75C = temp_v1_10 + 8; + temp_v1_10->unk0 = 0xB2000000; + temp_v1_10->unk4 = 0x0400FC00; + sp7C = phi_ra; + func_8009B998(); + func_80099184(&D_020015CC); + func_8009B954(&D_020015CC); + D_8018E75C = func_8009BA74(D_8018E75C, &D_020015CC, phi_ra->column, phi_ra->row); + func_8009B998(); + func_80099184(&D_02001630); + func_8009B954(&D_02001630); + D_8018E75C = func_8009BA74(D_8018E75C, &D_02001630, phi_ra->column, phi_ra->row); + func_8009B998(); + func_80099184(&D_02001658); + func_8009B954(&D_02001658); + D_8018E75C = func_8009BA74(D_8018E75C, &D_02001658, phi_ra->column, phi_ra->row); + func_8009B998(); + return; + case 0xD6: + sp7C = phi_ra; + phi_ra->D_8018DEE0_index = func_8009A374(segmented_to_virtual_dupe(*D_800E7D34)); + return; + case 0xD7: + phi_v1_3 = D_800E7D0C; + do { + sp24 = phi_v1_3; + func_80099184(segmented_to_virtual(phi_v1_3->unk0)); + temp_v1_11 = &phi_v1_3->unk4; + phi_v1_3 = temp_v1_11; + } while (temp_v1_11 != D_800E7D34); + return; + case 0xD8: + case 0xD9: + func_80099184(&D_0200184C, priority); + return; + case 0x1: + func_800996BC(D_800E7D4C[func_800B555C(priority)], 0); + return; + case 0x2: + func_8006EE44(priority); + D_8018E110 += 0x10000; + func_80099184(&D_020045E8); + return; + case 0x3: + func_80099184(&D_02004610, priority); + return; + case 0x23: + case 0x24: + case 0x25: + func_800996BC(D_800E7D4C[func_800B555C(priority)], 0); + func_800996BC(&D_02004B74, 0); + func_8009B0A4(0, 0x19); + temp_v0_3 = &D_800E74E8[type]; + func_8009B538(0, 0x12C00, temp_v0_3->unk-118, temp_v0_3->unk-116, (s32) temp_v0_3->unk-114); + return; + case 0xF: + phi_ra->unk1C = 0x20; + /* fallthrough */ + case 0xA: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + func_800996BC(segmented_to_virtual(D_800E822C[type]), 0); + return; + case 0xB: + case 0xC: + case 0xD: + case 0xE: + temp_v0_4 = &D_800E8234[type]; + sp24 = temp_v0_4; + func_800996BC(segmented_to_virtual(temp_v0_4->unk-58), 0); + func_80099184(segmented_to_virtual(sp24->unk-54)); + return; + case 0x2A: + func_800996BC(&D_02004B4C, 0, priority); + return; + case 0x33: + sp7C = phi_ra; + func_800996BC(&D_02004B74, 0, priority); + phi_ra->unk1C = 0x20; + return; + case 0x34: + case 0x35: + case 0x36: + case 0x37: + func_80099184(segmented_to_virtual(D_800E81E4[type])); + return; + case 0x2B: + case 0x2C: + case 0x2D: + case 0x2E: + case 0x2F: + case 0x30: + case 0x31: + case 0x32: + sp7C = phi_ra; + sp24 = type * 4; + phi_ra->D_8018DEE0_index = func_8009A374(segmented_to_virtual_dupe(D_800E8274[type])); + func_800996BC(segmented_to_virtual(*(&D_800E7CA8 + sp24)), 0); + return; + case 0xA0: + case 0xA1: + sp7C = phi_ra; + phi_ra->D_8018DEE0_index = func_8009A374(segmented_to_virtual_dupe(D_800E80A0[type])); + return; + case 0x5D: + phi_ra->unk1C = 0x20; + /* fallthrough */ + case 0x52: + case 0x53: + case 0x54: + case 0x55: + case 0x56: + case 0x58: + case 0x59: + case 0x5A: + case 0x5B: + case 0x5C: + func_800996BC(segmented_to_virtual(D_800E817C[type]), 0); + return; + case 0x5F: + case 0x60: + case 0x61: + case 0x62: + sp7C = phi_ra; + phi_ra->D_8018DEE0_index = func_8009A374(segmented_to_virtual_dupe(D_800E7E34[*(gCupCourseOrder - 0xBE + (phi_ra->type * 2))])); + return; + case 0x5E: + sp7C = phi_ra; + phi_ra->unk20 = random_int(4, priority) + 2; + return; + case 0x65: + case 0x66: + temp_v0_5 = &D_800E7248[type]; + phi_ra->column = (s32) temp_v0_5->unk-328; + phi_ra->row = (s32) temp_v0_5->unk-326; + return; + case 0x67: + phi_ra->unk1C = (s32) gCupSelection; + sp7C = phi_ra; + temp_v0_6 = func_800B54C0(gCupSelection, gCCSelection, priority); + temp_v1_12 = temp_v0_6; + phi_ra->unk20 = temp_v0_6; + phi_ra->D_8018DEE0_index = func_8009A374(segmented_to_virtual_dupe(*(&D_800E7E20 + ((((s32) gCCSelection / 2) * 0x10) + -(s32) (temp_v1_12 * 4))))); + phi_ra->column = (s32) D_800E7268.unk0; + phi_ra->row = (s32) D_800E7268.unk2; + return; + case 0x68: + sp7C = phi_ra; + func_800996BC(segmented_to_virtual(D_800E8294[gCCSelection]), 0); + phi_ra->column = 0x37; + phi_ra->row = 0xC3; + return; + case 0x69: + func_800996BC(segmented_to_virtual((u32) &D_02004A0C), 0); + if (func_800B5B94() == 0) { + func_800B6708(); return; } - if (arg0 != 0x130) { + D_8018EE10.unk4 = 0; + D_8018EE10.unk84 = 0; + return; + case 0x78: + case 0x79: + case 0x7A: + case 0x7B: + func_800996BC(segmented_to_virtual(D_800E8114[type]), 0); + return; + case 0x8C: + func_800996BC(segmented_to_virtual((u32) &D_02004A34), 0); + if (func_800B5B94() == 0) { + func_800B6708(); return; } - temp_a1 = *(&D_800EFD64 + D_802874D8.unk1E); - if (D_802874D8.unk1D >= 3) { + D_8018EE10.unk4 = 0; + D_8018EE10.unk84 = 0; + return; + case 0x8D: + func_80099184(segmented_to_virtual((u32) &D_02001FA4)); + return; + case 0x7C: + case 0x7D: + case 0x7E: + case 0x7F: + case 0x80: + case 0x81: + case 0x82: + case 0x83: + case 0x84: + case 0x85: + case 0x86: + case 0x87: + case 0x88: + case 0x89: + case 0x8A: + case 0x8B: + sp7C = phi_ra; + temp_v0_7 = phi_ra->type - 0x7C; + func_800996BC(segmented_to_virtual(D_800E7D74[*(gCupCourseOrder + (((temp_v0_7 / 4) * 8) + ((temp_v0_7 % 4) * 2)))]), -1); + temp_v0_8 = phi_ra->type - 0x7C; + func_800996BC(segmented_to_virtual(D_800E7DC4[*(gCupCourseOrder + (((temp_v0_8 / 4) * 8) + ((temp_v0_8 % 4) * 2)))]), 0); + func_800996BC(segmented_to_virtual((u32) &D_02004A0C), 0); + return; + case 0xB1: + case 0xB2: + case 0xB3: + case 0xB4: + temp_v0_9 = gModeSelection; + temp_a1 = *(&D_800EFD64 + *(&D_800E85F7 + type)); + phi_v1_4 = 0U; + if (temp_v0_9 != 2) { + if (temp_v0_9 != 3) { + phi_a2 = (struct _struct_D_800E8234_0x8 *) (type * 4); + } else { + temp_t8 = type * 4; + phi_a2 = (struct _struct_D_800E8234_0x8 *) temp_t8; + phi_a2 = (struct _struct_D_800E8234_0x8 *) temp_t8; + if (type != (D_800DC5E8 + 0xB1)) { + + } + } + } else { + temp_t9 = type * 4; + phi_a2 = (struct _struct_D_800E8234_0x8 *) temp_t9; + phi_a2 = (struct _struct_D_800E8234_0x8 *) temp_t9; + if (*(&D_801640F4 + temp_t9) != 0) { + + } + } + if (phi_v1_4 != 0) { + phi_v1_5 = temp_a1 * 4; + phi_a0_2 = D_800E8420[temp_a1]; + } else { + phi_v1_5 = temp_a1 * 4; + phi_a0_2 = D_800E8320[temp_a1]; + } + sp7C = phi_ra; + sp20 = phi_v1_5; + sp24 = phi_a2; + sp3C = type - 0xB1; + phi_ra->D_8018DEE0_index = func_8009A478(segmented_to_virtual_dupe(phi_a0_2), sp3C); + func_800996BC(segmented_to_virtual(*(&D_800E7D54 + phi_v1_5)), 0); + func_80099184(segmented_to_virtual(*(&D_800E7FF0 + phi_a2))); + return; + case 0xBB: + sp7C = phi_ra; + phi_ra->unk1C = func_800B5020(D_8018CA78, D_800E86A8, priority); + phi_ra->unk20 = func_800B5218(); + if (D_80162DD4 != 1) { + sp7C = phi_ra; + if (func_800051C4() >= 0x3C01) { + D_80162DD4 = 1; + } + } + if ((phi_ra->unk1C == 0) || (phi_ra->unk20 != 0)) { + func_800B559C((gCupSelection * 4) + gCupCourseSelection); + return; + } + return; + case 0xE6: + temp_v0_10 = gTimeTrialDataCourseIndex; + sp7C = phi_ra; + phi_ra->D_8018DEE0_index = func_8009A374(segmented_to_virtual_dupe(D_800E7E34[*(gCupCourseOrder + ((((s32) temp_v0_10 / 4) * 8) + (((s32) temp_v0_10 % 4) * 2)))])); + phi_ra->unk1C = (s32) gTimeTrialDataCourseIndex; + func_800996BC(segmented_to_virtual((u32) &D_02004A0C), 0); + func_8006EF60(); + if (func_800B5B94() == 0) { + func_800B6708(); + return; + } + D_8018EE10.unk4 = 0; + D_8018EE10.unk84 = 0; + return; + case 0xF0: + phi_ra->unk4 = (s32) gSoundMode; + return; + case 0xF1: + func_800996BC(segmented_to_virtual((u32) &D_02004638), 0); + return; + case 0xBE: + D_8018ED90 = 0; + return; + case 0x130: + temp_a1_2 = *(&D_800EFD64 + D_802874D8.unk1E); + if ((s32) D_802874D8.unk1D >= 3) { phi_v0_2 = 1; } - temp_v1 = temp_a1 * 4; - phi_v1 = temp_v1; + phi_v1 = temp_a1_2 * 4; if (phi_v0_2 != 0) { - temp_v1_2 = temp_a1 * 4; - phi_v1 = temp_v1_2; - phi_a0 = *(&D_800E8420 + temp_v1_2); + phi_v1 = temp_a1_2 * 4; + phi_a0 = D_800E8420[temp_a1_2]; } else { - phi_a0 = *(&D_800E8320 + temp_v1); + phi_a0 = D_800E8320[temp_a1_2]; } sp7C = phi_ra; sp20 = phi_v1; - phi_ra->unk18 = func_8009A478(segmented_to_virtual_dupe(phi_a0), 0); + phi_ra->D_8018DEE0_index = func_8009A478(segmented_to_virtual_dupe(phi_a0), 0); func_800996BC(segmented_to_virtual(*(&D_800E7D54 + phi_v1)), 0); - /* Duplicate return node #87. Try simplifying control flow for better match */ - return; - } - if (arg0 >= 0x38) { - switch (arg0) { /* switch 2 */ - case 0xFA: /* switch 2 */ - D_8018ED94 = 0; - D_800E8530 = 0.0f; - D_800E8534 = 3.0f; - D_8018EDC0 = 0x9C4; - D_8018EDC8 = 0.0f; - D_8018EDCC = -270.0f; - D_8018EDD0 = 0.0f; - D_8018EDD4 = 0.0f; - D_8018EDD8 = 0.0f; - D_8018EDDC = 0.0f; - D_8018EDC4 = 3.0f; - phi_ra->unk1C = -1; - phi_ra->unk20 = 1; - return; - case 0xFB: /* switch 2 */ - D_8018EDC0 = 0x708; - D_8018EDC8 = -51.0f; - D_8018EDCC = -12.0f; - D_8018EDD0 = -18.0f; - D_8018EDD4 = -270.0f; - D_8018EDD8 = 750.0f; - D_8018EDDC = 0.0f; - D_8018EDC4 = 1.0f; - phi_ra->unk1C = -1; - phi_ra->unk20 = 1; - return; - case 0xD2: /* switch 2 */ - sp7C = phi_ra; - func_800996BC(&D_020014C8, 0, arg3); - func_8009B954(&D_020014C8); - D_8018E75C = func_8009BA74(D_8018E75C, &D_020014C8, phi_ra->unkC, phi_ra->unk10); - func_8009B998(); - return; - case 0xD3: /* switch 2 */ - sp7C = phi_ra; - func_800996BC(&D_02001540, 0, arg3); - func_8009B954(&D_02001540); - D_8018E75C = func_8009BA74(D_8018E75C, &D_02001540, phi_ra->unkC, phi_ra->unk10); - func_8009B998(); - return; - case 0xD4: /* switch 2 */ - sp7C = phi_ra; - func_800996BC(&D_0200157C, 0, arg3); - func_80099184(&D_02001874); - phi_ra->unk10 = 0x69; - phi_v1_2 = D_800E7AF8; - do { - sp24 = phi_v1_2; - func_80099184(segmented_to_virtual(*phi_v1_2)); - temp_v1_3 = phi_v1_2 + 4; - phi_v1_2 = temp_v1_3; - } while (temp_v1_3 != D_800E7D0C); - return; - case 0xD5: /* switch 2 */ - sp7C = phi_ra; - func_80099184(&D_020015A4, arg3); - func_8009B954(&D_020015A4); - temp_v0_2 = func_8009BA74(D_8018E75C, &D_020015A4, phi_ra->unkC, phi_ra->unk10); - D_8018E75C = temp_v0_2; - D_8018E75C = temp_v0_2 + 8; - *temp_v0_2 = -0x2900000; - sp6C = temp_v0_2; - sp6C->unk4 = func_8009B8C4(&gTexture7ED50C); - temp_v1_4 = D_8018E75C; - D_8018E75C = temp_v1_4 + 8; - temp_v1_4->unk0 = -0xA900000; - temp_v1_4->unk4 = 0x7080200; - temp_v1_5 = D_8018E75C; - D_8018E75C = temp_v1_5 + 8; - temp_v1_5->unk4 = 0; - temp_v1_5->unk0 = -0x1A000000; - temp_v1_6 = D_8018E75C; - D_8018E75C = temp_v1_6 + 8; - temp_v1_6->unk4 = 0x74FF020; - temp_v1_6->unk0 = -0xD000000; - temp_v1_7 = D_8018E75C; - D_8018E75C = temp_v1_7 + 8; - temp_v1_7->unk4 = 0; - temp_v1_7->unk0 = -0x19000000; - temp_v1_8 = D_8018E75C; - D_8018E75C = temp_v1_8 + 8; - temp_v1_8->unk0 = -0xA8F8000; - temp_v1_8->unk4 = 0x80200; - temp_v1_9 = D_8018E75C; - D_8018E75C = temp_v1_9 + 8; - temp_v1_9->unk0 = -0xE000000; - temp_v1_9->unk4 = 0x3FC010; - temp_v1_10 = D_8018E75C; - D_8018E75C = temp_v1_10 + 8; - temp_v1_10->unk4 = 0x802C0; - temp_v1_10->unk0 = -0x1BB7FD2C; - temp_v1_11 = D_8018E75C; - D_8018E75C = temp_v1_11 + 8; - temp_v1_11->unk4 = 0x80; - temp_v1_11->unk0 = 0xB3000000; - temp_v1_12 = D_8018E75C; - D_8018E75C = temp_v1_12 + 8; - temp_v1_12->unk0 = 0xB2000000; - temp_v1_12->unk4 = 0x400FC00; - sp7C = phi_ra; - func_8009B998(); - func_80099184(&D_020015CC); - func_8009B954(&D_020015CC); - D_8018E75C = func_8009BA74(D_8018E75C, &D_020015CC, phi_ra->unkC, phi_ra->unk10); - func_8009B998(); - func_80099184(&D_02001630); - func_8009B954(&D_02001630); - D_8018E75C = func_8009BA74(D_8018E75C, &D_02001630, phi_ra->unkC, phi_ra->unk10); - func_8009B998(); - func_80099184(&D_02001658); - func_8009B954(&D_02001658); - D_8018E75C = func_8009BA74(D_8018E75C, &D_02001658, phi_ra->unkC, phi_ra->unk10); - func_8009B998(); - return; - case 0xD6: /* switch 2 */ - sp7C = phi_ra; - phi_ra->unk18 = func_8009A374(segmented_to_virtual_dupe(*D_800E7D34)); - return; - case 0xD7: /* switch 2 */ - phi_v1_3 = D_800E7D0C; - do { - sp24 = phi_v1_3; - func_80099184(segmented_to_virtual(*phi_v1_3)); - temp_v1_13 = phi_v1_3 + 4; - phi_v1_3 = temp_v1_13; - } while (temp_v1_13 != D_800E7D34); - return; - case 0xD8: /* switch 2 */ - case 0xD9: /* switch 2 */ - func_80099184(&D_0200184C, arg3); - return; - case 0xA0: /* switch 2 */ - case 0xA1: /* switch 2 */ - sp7C = phi_ra; - phi_ra->unk18 = func_8009A374(segmented_to_virtual_dupe(*(&D_800E80A0 + (arg0 * 4)))); - return; - case 0x5D: /* switch 2 */ - phi_ra->unk1C = 0x20; - /* fallthrough */ - case 0x52: /* switch 2 */ - case 0x53: /* switch 2 */ - case 0x54: /* switch 2 */ - case 0x55: /* switch 2 */ - case 0x56: /* switch 2 */ - case 0x58: /* switch 2 */ - case 0x59: /* switch 2 */ - case 0x5A: /* switch 2 */ - case 0x5B: /* switch 2 */ - case 0x5C: /* switch 2 */ - func_800996BC(segmented_to_virtual(*(&D_800E817C + (arg0 * 4))), 0); - return; - case 0x5F: /* switch 2 */ - case 0x60: /* switch 2 */ - case 0x61: /* switch 2 */ - case 0x62: /* switch 2 */ - sp7C = phi_ra; - phi_ra->unk18 = func_8009A374(segmented_to_virtual_dupe(*(&D_800E7E34 + (*(&gCupCourseOrder - 0xBE + (phi_ra->unk0 * 2)) * 4)))); - return; - case 0x5E: /* switch 2 */ - sp7C = phi_ra; - phi_ra->unk20 = random_int(4, arg3) + 2; - return; - case 0x65: /* switch 2 */ - case 0x66: /* switch 2 */ - temp_v0_3 = (arg0 * 8) + &D_800E7248; - phi_ra->unkC = temp_v0_3->unk-328; - phi_ra->unk10 = temp_v0_3->unk-326; - return; - case 0x67: /* switch 2 */ - phi_ra->unk1C = gCupSelection; - sp7C = phi_ra; - temp_v0_4 = func_800B54C0(gCupSelection, gCCSelection, arg2); - temp_v1_14 = temp_v0_4; - phi_ra->unk20 = temp_v0_4; - phi_ra->unk18 = func_8009A374(segmented_to_virtual_dupe(*(&D_800E7E20 + (((gCCSelection / 2) * 0x10) + -(temp_v1_14 * 4))))); - phi_ra->unkC = D_800E7268.unk0; - phi_ra->unk10 = D_800E7268.unk2; - return; - case 0x68: /* switch 2 */ - sp7C = phi_ra; - func_800996BC(segmented_to_virtual(*(&D_800E8294 + (gCCSelection * 4))), 0); - phi_ra->unkC = 0x37; - phi_ra->unk10 = 0xC3; - return; - case 0x69: /* switch 2 */ - func_800996BC(segmented_to_virtual(&D_02004A0C), 0); - if (func_800B5B94() == 0) { - func_800B6708(); - return; - } - D_8018EE10.unk4 = 0; - D_8018EE10.unk84 = 0; - return; - case 0x78: /* switch 2 */ - case 0x79: /* switch 2 */ - case 0x7A: /* switch 2 */ - case 0x7B: /* switch 2 */ - func_800996BC(segmented_to_virtual(*(&D_800E8114 + (arg0 * 4))), 0); - return; - case 0x8C: /* switch 2 */ - func_800996BC(segmented_to_virtual(&D_02004A34), 0); - if (func_800B5B94() == 0) { - func_800B6708(); - return; - } - D_8018EE10.unk4 = 0; - D_8018EE10.unk84 = 0; - return; - case 0x8D: /* switch 2 */ - func_80099184(segmented_to_virtual(&D_02001FA4)); - return; - case 0x7C: /* switch 2 */ - case 0x7D: /* switch 2 */ - case 0x7E: /* switch 2 */ - case 0x7F: /* switch 2 */ - case 0x80: /* switch 2 */ - case 0x81: /* switch 2 */ - case 0x82: /* switch 2 */ - case 0x83: /* switch 2 */ - case 0x84: /* switch 2 */ - case 0x85: /* switch 2 */ - case 0x86: /* switch 2 */ - case 0x87: /* switch 2 */ - case 0x88: /* switch 2 */ - case 0x89: /* switch 2 */ - case 0x8A: /* switch 2 */ - case 0x8B: /* switch 2 */ - sp7C = phi_ra; - temp_v0_5 = phi_ra->unk0 - 0x7C; - func_800996BC(segmented_to_virtual(*(&D_800E7D74 + (*(&gCupCourseOrder + (((temp_v0_5 / 4) * 8) + ((temp_v0_5 % 4) * 2))) * 4))), -1); - temp_v0_6 = phi_ra->unk0 - 0x7C; - func_800996BC(segmented_to_virtual(*(&D_800E7DC4 + (*(&gCupCourseOrder + (((temp_v0_6 / 4) * 8) + ((temp_v0_6 % 4) * 2))) * 4))), 0); - func_800996BC(segmented_to_virtual(&D_02004A0C), 0); - return; - case 0xB1: /* switch 2 */ - case 0xB2: /* switch 2 */ - case 0xB3: /* switch 2 */ - case 0xB4: /* switch 2 */ - temp_v0_7 = gModeSelection; - temp_a1_2 = *(&D_800EFD64 + *(&D_800E85F7 + arg0)); - temp_a3 = arg0 - 0xB1; - phi_v1_4 = 0; - if (temp_v0_7 != VERSUS) { - if (temp_v0_7 != BATTLE) { - phi_a2 = arg0 * 4; - } else { - temp_t8 = arg0 * 4; - phi_a2 = temp_t8; - phi_a2 = temp_t8; - if (arg0 != (D_800DC5E8 + 0xB1)) { - goto block_63; - } - } - } else { - temp_t9 = arg0 * 4; - phi_a2 = temp_t9; - phi_a2 = temp_t9; - if (*(&D_801640F4 + temp_t9) != 0) { -block_63: - } - } - if (phi_v1_4 != 0) { - temp_v1_15 = temp_a1_2 * 4; - phi_v1_5 = temp_v1_15; - phi_a0_2 = *(&D_800E8420 + temp_v1_15); - } else { - temp_v1_16 = temp_a1_2 * 4; - phi_v1_5 = temp_v1_16; - phi_a0_2 = *(&D_800E8320 + temp_v1_16); - } - sp7C = phi_ra; - sp20 = phi_v1_5; - sp24 = phi_a2; - sp3C = temp_a3; - phi_ra->unk18 = func_8009A478(segmented_to_virtual_dupe(phi_a0_2), sp3C); - func_800996BC(segmented_to_virtual(*(&D_800E7D54 + phi_v1_5)), 0); - func_80099184(segmented_to_virtual(*(&D_800E7FF0 + phi_a2))); - return; - case 0xBB: /* switch 2 */ - sp7C = phi_ra; - phi_ra->unk1C = func_800B5020(D_8018CA78, D_800E86A8, arg2); - phi_ra->unk20 = func_800B5218(); - if (D_80162DD4 != 1) { - sp7C = phi_ra; - if (func_800051C4() >= 0x3C01) { - D_80162DD4 = 1; - } - } - if ((phi_ra->unk1C == 0) || (phi_ra->unk20 != 0)) { - func_800B559C((gCupSelection * 4) + gCupCourseSelection); - return; - } - /* Duplicate return node #87. Try simplifying control flow for better match */ - return; - case 0xE6: /* switch 2 */ - temp_v0_8 = gTimeTrialDataCourseIndex; - sp7C = phi_ra; - phi_ra->unk18 = func_8009A374(segmented_to_virtual_dupe(*(&D_800E7E34 + (*(&gCupCourseOrder + (((temp_v0_8 / 4) * 8) + ((temp_v0_8 % 4) * 2))) * 4)))); - phi_ra->unk1C = gTimeTrialDataCourseIndex; - func_800996BC(segmented_to_virtual(&D_02004A0C), 0); - func_8006EF60(); - if (func_800B5B94() == 0) { - func_800B6708(); - return; - } - D_8018EE10.unk4 = 0; - D_8018EE10.unk84 = 0; - return; - case 0xF0: /* switch 2 */ - phi_ra->unk4 = gSoundMode; - return; - case 0xF1: /* switch 2 */ - func_800996BC(segmented_to_virtual(&D_02004638), 0); - return; - case 0xBE: /* switch 2 */ - D_8018ED90 = 0; - return; - } - } else { - switch (arg0) { /* switch 3 */ - case 0x1: /* switch 3 */ - func_800996BC(*(&D_800E7D4C + (func_800B555C(arg0) * 4)), 0); - return; - case 0x2: /* switch 3 */ - func_8006EE44(arg3); - D_8018E110 += 0x10000; - func_80099184(&D_020045E8); - return; - case 0x3: /* switch 3 */ - func_80099184(&D_02004610, arg3); - return; - case 0x23: /* switch 3 */ - case 0x24: /* switch 3 */ - case 0x25: /* switch 3 */ - func_800996BC(*(&D_800E7D4C + (func_800B555C(arg0) * 4)), 0); - func_800996BC(&D_02004B74, 0); - func_8009B0A4(0, 0x19); - temp_v0_9 = (arg0 * 8) + &D_800E74E8; - func_8009B538(0, 0x12C00, temp_v0_9->unk-118, temp_v0_9->unk-116, temp_v0_9->unk-114); - return; - case 0xF: /* switch 3 */ - phi_ra->unk1C = 0x20; - /* fallthrough */ - case 0xA: /* switch 3 */ - case 0x10: /* switch 3 */ - case 0x11: /* switch 3 */ - case 0x12: /* switch 3 */ - case 0x13: /* switch 3 */ - case 0x14: /* switch 3 */ - case 0x15: /* switch 3 */ - case 0x16: /* switch 3 */ - case 0x17: /* switch 3 */ - case 0x18: /* switch 3 */ - case 0x19: /* switch 3 */ - func_800996BC(segmented_to_virtual(*(&D_800E822C + (arg0 * 4))), 0); - return; - case 0xB: /* switch 3 */ - case 0xC: /* switch 3 */ - case 0xD: /* switch 3 */ - case 0xE: /* switch 3 */ - temp_v0_10 = (arg0 * 8) + &D_800E8234; - sp24 = temp_v0_10; - func_800996BC(segmented_to_virtual(temp_v0_10->unk-58), 0); - func_80099184(segmented_to_virtual(sp24->unk-54)); - return; - case 0x2A: /* switch 3 */ - func_800996BC(&D_02004B4C, 0, arg3); - return; - case 0x33: /* switch 3 */ - sp7C = phi_ra; - func_800996BC(&D_02004B74, 0, arg3); - phi_ra->unk1C = 0x20; - return; - case 0x34: /* switch 3 */ - case 0x35: /* switch 3 */ - case 0x36: /* switch 3 */ - case 0x37: /* switch 3 */ - func_80099184(segmented_to_virtual(*(&D_800E81E4 + (arg0 * 4)))); - return; - case 0x2B: /* switch 3 */ - case 0x2C: /* switch 3 */ - case 0x2D: /* switch 3 */ - case 0x2E: /* switch 3 */ - case 0x2F: /* switch 3 */ - case 0x30: /* switch 3 */ - case 0x31: /* switch 3 */ - case 0x32: /* switch 3 */ - sp7C = phi_ra; - temp_t7 = arg0 * 4; - sp24 = temp_t7; - phi_ra->unk18 = func_8009A374(segmented_to_virtual_dupe(*(&D_800E8274 + temp_t7))); - func_800996BC(segmented_to_virtual(*(&D_800E7CA8 + sp24)), 0); - return; - default: /* switch 3 */ - default: /* switch 2 */ - return; - } + break; } } #else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E650.s") +GLOBAL_ASM("asm/non_matchings/code_80091750/add_8018D9E0_entry.s") #endif #ifdef MIPS_TO_C @@ -15938,7 +16087,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AC300.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800921B4(); // extern -? func_8009E650(?, ?, ?, ?); // extern +? add_8018D9E0_entry(?, ?, ?, ?); // extern ? func_800A9208(void *, ?); // extern extern s32 D_800DDB24; extern s8 D_8018D9D8; @@ -15974,7 +16123,7 @@ void func_800AC324(void *arg0) { if (((D_8018D9D8 != 0) || (temp_t1 >= 0x5B)) && (D_800DDB24 != 0)) { arg0->unk4 = 3; arg0->unk1C = arg0->unkC; - func_8009E650(0xAB, 0, 0, 0); + add_8018D9E0_entry(0xAB, 0, 0, 0); return; } // Duplicate return node #17. Try simplifying control flow for better match @@ -16405,7 +16554,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ACA14.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 ? func_8009DFE0(?, void *); /* extern */ -? func_8009E650(s32, ?, ?, s8); /* extern */ +? add_8018D9E0_entry(s32, ?, ?, s8); /* extern */ void *func_800AAEF4(?, void *); /* extern */ ? play_sound2(?, void *); /* extern */ @@ -16439,7 +16588,7 @@ void func_800ACC50(void *arg0) { temp_a1->unk1C = temp_t8; if ((temp_t8 >= 0x65) && (temp_a1->unk4 = 1, temp_a1->unk1C = 0, phi_s0 = 0, (D_8018EDF3 > 0))) { do { - func_8009E650(phi_s0 + 0xB1, 0, 0, 5 - phi_s0); + add_8018D9E0_entry(phi_s0 + 0xB1, 0, 0, 5 - phi_s0); temp_s0 = phi_s0 + 1; phi_s0 = temp_s0; } while (temp_s0 < D_8018EDF3); @@ -16639,7 +16788,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ACF40.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 ? func_800921B4(); /* extern */ -? func_8009E650(?, ?, ?, ?); /* extern */ +? add_8018D9E0_entry(?, ?, ?, ?); /* extern */ ? func_800A9208(void *, ?); /* extern */ void func_800AD1A4(void *arg0) { @@ -16653,7 +16802,7 @@ void func_800AD1A4(void *arg0) { arg0->unkC = 0x14A; arg0->unk4 = 1; func_800921B4(); - func_8009E650(0xBB, 0, 0, 0); + add_8018D9E0_entry(0xBB, 0, 0, 0); return; case 1: func_800A9208(arg0, 0xA0); @@ -16678,7 +16827,7 @@ void func_800AD1A4(void *arg0) { func_800921B4(); arg0->unk4 = 4; arg0->unk1C = arg0->unkC; - func_8009E650(0xBA, 0, 0, 0); + add_8018D9E0_entry(0xBA, 0, 0, 0); return; } /* Duplicate return node #14. Try simplifying control flow for better match */ @@ -17714,7 +17863,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AEF74.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 ? func_8009DFE0(?); /* extern */ -? func_8009E650(s32, ?, ?, ?); /* extern */ +? add_8018D9E0_entry(s32, ?, ?, ?); /* extern */ ? func_800CA330(?); /* extern */ ? func_800CA388(?); /* extern */ ? play_sound2(?); /* extern */ @@ -17737,7 +17886,7 @@ void func_800AF004(void *arg0) { arg0->unk4 = 1; gCupSelection = gCupSelection % 4; gCCSelection = gCCSelection % 4; - func_8009E650(0x12C, 0, 0, 4); + add_8018D9E0_entry(0x12C, 0, 0, 4); return; } default: @@ -17752,7 +17901,7 @@ void func_800AF004(void *arg0) { arg0->unk1C = 0; temp_t9 = arg0->unk4 + 1; arg0->unk4 = temp_t9; - func_8009E650(temp_t9 + 0x12B, 0, 0, 4); + add_8018D9E0_entry(temp_t9 + 0x12B, 0, 0, 4); return; } /* Duplicate return node #13. Try simplifying control flow for better match */