From 9885f71c09e9295c77e8f633f19a8b4a6e1b447a Mon Sep 17 00:00:00 2001 From: Faris Awan Date: Wed, 15 May 2024 22:25:04 -0400 Subject: [PATCH] re-split ovl1_10 to uncover newly discovered thread --- asm/non_matchings/ovl1/ovl1_1/func_800A377C.s | 4 +- .../ovl1/ovl1_10/func_800BA788.s | 100 --- .../ovl1/ovl1_10/func_800BA90C.s | 69 -- .../ovl1/ovl1_10/func_800BAA04.s | 30 - .../ovl1/ovl1_10/func_800BAA64.s | 40 - .../ovl1/ovl1_10/func_800BAAE4.s | 41 - .../ovl1/ovl1_10/func_800BAB68.s | 49 -- .../ovl1/ovl1_10/func_800BAC0C.s | 72 -- .../ovl1/ovl1_10/func_800BAD0C.s | 116 --- .../ovl1/ovl1_10/func_800BAEB0.s | 55 -- .../ovl1/ovl1_10/func_800BAF50.s | 71 -- .../ovl1/ovl1_10/func_800BB028.s | 28 - .../ovl1/ovl1_10/func_800BB08C.s | 46 - .../ovl1/ovl1_10/func_800BB12C.s | 33 - .../ovl1/ovl1_10/func_800BB198.s | 52 -- .../ovl1/ovl1_10/func_800BB24C.s | 75 -- .../ovl1/ovl1_10/func_800BB364.s | 15 - .../ovl1/ovl1_10/func_800BB394.s | 14 - .../ovl1/ovl1_10/func_800BB3C0.s | 15 - .../ovl1/ovl1_10/func_800BB3F0.s | 13 - .../ovl1/ovl1_10/func_800BB418.s | 13 - .../ovl1/ovl1_10/func_800BB440.s | 13 - .../ovl1/ovl1_10/func_800BB468.s | 15 - .../ovl1/ovl1_10/func_800BB498.s | 12 - .../ovl1/ovl1_10/func_800BB4BC.s | 13 - asm/non_matchings/ovl1/ovl1_10/ovl1_10/0.s | 112 +++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/1.s | 81 ++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/10.s | 27 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/11.s | 45 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/12.s | 32 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/13.s | 51 ++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/14.s | 74 ++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/15.s | 14 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/16.s | 13 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/17.s | 14 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/18.s | 12 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/19.s | 12 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/2.s | 29 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/20.s | 12 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/21.s | 14 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/22.s | 11 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/23.s | 12 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/3.s | 49 ++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/4.s | 40 + asm/non_matchings/ovl1/ovl1_10/ovl1_10/5.s | 48 ++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/6.s | 86 ++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/7.s | 115 +++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/8.s | 48 ++ asm/non_matchings/ovl1/ovl1_10/ovl1_10/9.s | 62 ++ .../ovl1/ovl1_10/ovl1_10/jtbl_800D68E0.s | 6 + .../ovl1/ovl1_10/ovl1_10/jtbl_800D68F4.s | 6 + .../ovl1/ovl1_10/ovl1_10/jtbl_800D6908.s | 6 + .../ovl1/ovl1_10/ovl1_10/jtbl_800D691C.s | 7 + asm/ovl11/ovl11_2.s | 1 - data/ovl1/kirby.066630.5.c | 22 - kirby.us.ld | 17 +- src/ovl1/ovl1_10.c | 791 +++++++++++++++++- tools/temp_tools/ugh2.txt | 654 +++++++++++++++ unnamed_syms.txt | 9 - 59 files changed, 2473 insertions(+), 1063 deletions(-) delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BA788.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BA90C.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BAA04.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BAA64.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BAAE4.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BAB68.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BAC0C.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BAD0C.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BAEB0.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BAF50.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB028.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB08C.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB12C.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB198.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB24C.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB364.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB394.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB3C0.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB3F0.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB418.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB440.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB468.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB498.s delete mode 100644 asm/non_matchings/ovl1/ovl1_10/func_800BB4BC.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/0.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/1.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/10.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/11.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/12.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/13.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/14.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/15.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/16.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/17.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/18.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/19.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/2.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/20.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/21.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/22.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/23.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/3.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/4.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/5.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/6.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/7.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/8.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/9.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D68E0.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D68F4.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D6908.s create mode 100644 asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D691C.s create mode 100644 tools/temp_tools/ugh2.txt diff --git a/asm/non_matchings/ovl1/ovl1_1/func_800A377C.s b/asm/non_matchings/ovl1/ovl1_1/func_800A377C.s index 67d28566..7477d6f6 100644 --- a/asm/non_matchings/ovl1/ovl1_1/func_800A377C.s +++ b/asm/non_matchings/ovl1/ovl1_1/func_800A377C.s @@ -227,7 +227,7 @@ glabel L800A39D4_ovl1 /* 04BC30 800A39E0 00000000 */ nop /* 04BC34 800A39E4 0C02E1F8 */ jal func_800B87E0 /* 04BC38 800A39E8 00000000 */ nop -/* 04BC3C 800A39EC 0C056012 */ jal func_80158048_ovl1 +/* 04BC3C 800A39EC 0C056012 */ jal func_80158048_ovl4 /* 04BC40 800A39F0 00000000 */ nop /* 04BC44 800A39F4 0C02E2B5 */ jal func_800B8AD4 /* 04BC48 800A39F8 8E240000 */ lw $a0, ($s1) @@ -297,7 +297,7 @@ glabel L800A3AE0_ovl1 /* 04BD34 800A3AE4 00000000 */ nop /* 04BD38 800A3AE8 0C028B5A */ jal func_800A2D68 /* 04BD3C 800A3AEC 00000000 */ nop -/* 04BD40 800A3AF0 0C0554C7 */ jal func_8015531C_ovl1 +/* 04BD40 800A3AF0 0C0554C7 */ jal func_8015531C_ovl4 /* 04BD44 800A3AF4 00000000 */ nop /* 04BD48 800A3AF8 3C0A800D */ lui $t2, %hi(D_800D6B78) # $t2, 0x800d /* 04BD4C 800A3AFC 8D4A6B78 */ lw $t2, %lo(D_800D6B78)($t2) diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BA788.s b/asm/non_matchings/ovl1/ovl1_10/func_800BA788.s deleted file mode 100644 index 27e23818..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BA788.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_800BA788 -/* 0629F0 800BA7A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0629F4 800BA7A4 AFBF002C */ sw $ra, 0x2c($sp) -/* 0629F8 800BA7A8 AFB40028 */ sw $s4, 0x28($sp) -/* 0629FC 800BA7AC AFB30024 */ sw $s3, 0x24($sp) -/* 062A00 800BA7B0 AFB20020 */ sw $s2, 0x20($sp) -/* 062A04 800BA7B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 062A08 800BA7B8 AFB00018 */ sw $s0, 0x18($sp) -/* 062A0C 800BA7BC 94A70002 */ lhu $a3, 2($a1) -/* 062A10 800BA7C0 00A08025 */ move $s0, $a1 -/* 062A14 800BA7C4 00808825 */ move $s1, $a0 -/* 062A18 800BA7C8 14E00048 */ bnez $a3, .L800BA8EC_ovl1 -/* 062A1C 800BA7CC 00C09025 */ move $s2, $a2 -/* 062A20 800BA7D0 3C13800D */ lui $s3, %hi(D_800D5238) # $s3, 0x800d -/* 062A24 800BA7D4 26735238 */ addiu $s3, %lo(D_800D5238) # addiu $s3, $s3, 0x5238 -/* 062A28 800BA7D8 24140001 */ li $s4, 1 -/* 062A2C 800BA7DC 8E020010 */ lw $v0, 0x10($s0) -.L800BA7E0_ovl1: -/* 062A30 800BA7E0 94430000 */ lhu $v1, ($v0) -/* 062A34 800BA7E4 00037342 */ srl $t6, $v1, 0xd -/* 062A38 800BA7E8 2DC10005 */ sltiu $at, $t6, 5 -/* 062A3C 800BA7EC 1020003D */ beqz $at, .L800BA8E4_ovl1 -/* 062A40 800BA7F0 000E7080 */ sll $t6, $t6, 2 -/* 062A44 800BA7F4 3C01800D */ lui $at, %hi(D_800D68E0) -/* 062A48 800BA7F8 002E0821 */ addu $at, $at, $t6 -/* 062A4C 800BA7FC 8C2E68E0 */ lw $t6, %lo(D_800D68E0)($at) -/* 062A50 800BA800 01C00008 */ jr $t6 -/* 062A54 800BA804 00000000 */ nop -/* 062A58 800BA808 920F0000 */ lbu $t7, ($s0) -/* 062A5C 800BA80C 96070002 */ lhu $a3, 2($s0) -/* 062A60 800BA810 000FC080 */ sll $t8, $t7, 2 -/* 062A64 800BA814 0278C821 */ addu $t9, $s3, $t8 -/* 062A68 800BA818 8F280000 */ lw $t0, ($t9) -/* 062A6C 800BA81C 10000031 */ b .L800BA8E4_ovl1 -/* 062A70 800BA820 AE080010 */ sw $t0, 0x10($s0) -/* 062A74 800BA824 30691FFF */ andi $t1, $v1, 0x1fff -/* 062A78 800BA828 244A0002 */ addiu $t2, $v0, 2 -/* 062A7C 800BA82C A6090002 */ sh $t1, 2($s0) -/* 062A80 800BA830 AE0A0010 */ sw $t2, 0x10($s0) -/* 062A84 800BA834 922B0000 */ lbu $t3, ($s1) -/* 062A88 800BA838 15600007 */ bnez $t3, .L800BA858_ovl1 -/* 062A8C 800BA83C 00000000 */ nop -/* 062A90 800BA840 0C0011FC */ jal func_800047F0_ovl1 -/* 062A94 800BA844 02402025 */ move $a0, $s2 -/* 062A98 800BA848 0C0011EC */ jal func_800047B0_ovl1 -/* 062A9C 800BA84C 02402025 */ move $a0, $s2 -/* 062AA0 800BA850 A2140001 */ sb $s4, 1($s0) -/* 062AA4 800BA854 A2340000 */ sb $s4, ($s1) -.L800BA858_ovl1: -/* 062AA8 800BA858 10000022 */ b .L800BA8E4_ovl1 -/* 062AAC 800BA85C 96070002 */ lhu $a3, 2($s0) -/* 062AB0 800BA860 306D1FFF */ andi $t5, $v1, 0x1fff -/* 062AB4 800BA864 244E0002 */ addiu $t6, $v0, 2 -/* 062AB8 800BA868 A60D0002 */ sh $t5, 2($s0) -/* 062ABC 800BA86C AE0E0010 */ sw $t6, 0x10($s0) -/* 062AC0 800BA870 922F0000 */ lbu $t7, ($s1) -/* 062AC4 800BA874 11E00005 */ beqz $t7, .L800BA88C_ovl1 -/* 062AC8 800BA878 00000000 */ nop -/* 062ACC 800BA87C 0C0011F4 */ jal func_800047D0_ovl1 -/* 062AD0 800BA880 02402025 */ move $a0, $s2 -/* 062AD4 800BA884 A2000001 */ sb $zero, 1($s0) -/* 062AD8 800BA888 A2200000 */ sb $zero, ($s1) -.L800BA88C_ovl1: -/* 062ADC 800BA88C 10000015 */ b .L800BA8E4_ovl1 -/* 062AE0 800BA890 96070002 */ lhu $a3, 2($s0) -/* 062AE4 800BA894 30791FFF */ andi $t9, $v1, 0x1fff -/* 062AE8 800BA898 24480002 */ addiu $t0, $v0, 2 -/* 062AEC 800BA89C A6190004 */ sh $t9, 4($s0) -/* 062AF0 800BA8A0 AE080010 */ sw $t0, 0x10($s0) -/* 062AF4 800BA8A4 AE08000C */ sw $t0, 0xc($s0) -/* 062AF8 800BA8A8 1000000E */ b .L800BA8E4_ovl1 -/* 062AFC 800BA8AC 96070002 */ lhu $a3, 2($s0) -/* 062B00 800BA8B0 960A0004 */ lhu $t2, 4($s0) -/* 062B04 800BA8B4 254BFFFF */ addiu $t3, $t2, -1 -/* 062B08 800BA8B8 316CFFFF */ andi $t4, $t3, 0xffff -/* 062B0C 800BA8BC 11800005 */ beqz $t4, .L800BA8D4_ovl1 -/* 062B10 800BA8C0 A60B0004 */ sh $t3, 4($s0) -/* 062B14 800BA8C4 8E0D000C */ lw $t5, 0xc($s0) -/* 062B18 800BA8C8 96070002 */ lhu $a3, 2($s0) -/* 062B1C 800BA8CC 10000005 */ b .L800BA8E4_ovl1 -/* 062B20 800BA8D0 AE0D0010 */ sw $t5, 0x10($s0) -.L800BA8D4_ovl1: -/* 062B24 800BA8D4 8E0E0010 */ lw $t6, 0x10($s0) -/* 062B28 800BA8D8 96070002 */ lhu $a3, 2($s0) -/* 062B2C 800BA8DC 25CF0002 */ addiu $t7, $t6, 2 -/* 062B30 800BA8E0 AE0F0010 */ sw $t7, 0x10($s0) -.L800BA8E4_ovl1: -/* 062B34 800BA8E4 50E0FFBE */ beql $a3, $zero, .L800BA7E0_ovl1 -/* 062B38 800BA8E8 8E020010 */ lw $v0, 0x10($s0) -.L800BA8EC_ovl1: -/* 062B3C 800BA8EC 8FBF002C */ lw $ra, 0x2c($sp) -/* 062B40 800BA8F0 8FB00018 */ lw $s0, 0x18($sp) -/* 062B44 800BA8F4 8FB1001C */ lw $s1, 0x1c($sp) -/* 062B48 800BA8F8 8FB20020 */ lw $s2, 0x20($sp) -/* 062B4C 800BA8FC 8FB30024 */ lw $s3, 0x24($sp) -/* 062B50 800BA900 8FB40028 */ lw $s4, 0x28($sp) -/* 062B54 800BA904 03E00008 */ jr $ra -/* 062B58 800BA908 27BD0030 */ addiu $sp, $sp, 0x30 -.type func_800BA788, @function -.size func_800BA788, . - func_800BA788 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BA90C.s b/asm/non_matchings/ovl1/ovl1_10/func_800BA90C.s deleted file mode 100644 index 8f3c832a..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BA90C.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_800BA90C -/* 062B5C 800BA90C AFA40000 */ sw $a0, ($sp) -/* 062B60 800BA910 94A20002 */ lhu $v0, 2($a1) -/* 062B64 800BA914 3C06800D */ lui $a2, %hi(D_800D5238) # $a2, 0x800d -/* 062B68 800BA918 24C65238 */ addiu $a2, %lo(D_800D5238) # addiu $a2, $a2, 0x5238 -/* 062B6C 800BA91C 14400037 */ bnez $v0, .L800BA9FC_ovl1 -/* 062B70 800BA920 24070001 */ li $a3, 1 -/* 062B74 800BA924 8CA30010 */ lw $v1, 0x10($a1) -.L800BA928_ovl1: -/* 062B78 800BA928 94640000 */ lhu $a0, ($v1) -/* 062B7C 800BA92C 00047342 */ srl $t6, $a0, 0xd -/* 062B80 800BA930 2DC10005 */ sltiu $at, $t6, 5 -/* 062B84 800BA934 1020002F */ beqz $at, .L800BA9F4_ovl1 -/* 062B88 800BA938 000E7080 */ sll $t6, $t6, 2 -/* 062B8C 800BA93C 3C01800D */ lui $at, %hi(D_800D68F4) -/* 062B90 800BA940 002E0821 */ addu $at, $at, $t6 -/* 062B94 800BA944 8C2E68F4 */ lw $t6, %lo(D_800D68F4)($at) -/* 062B98 800BA948 01C00008 */ jr $t6 -/* 062B9C 800BA94C 00000000 */ nop -/* 062BA0 800BA950 90AF0000 */ lbu $t7, ($a1) -/* 062BA4 800BA954 94A20002 */ lhu $v0, 2($a1) -/* 062BA8 800BA958 000FC080 */ sll $t8, $t7, 2 -/* 062BAC 800BA95C 00D8C821 */ addu $t9, $a2, $t8 -/* 062BB0 800BA960 8F280000 */ lw $t0, ($t9) -/* 062BB4 800BA964 10000023 */ b .L800BA9F4_ovl1 -/* 062BB8 800BA968 ACA80010 */ sw $t0, 0x10($a1) -/* 062BBC 800BA96C 30891FFF */ andi $t1, $a0, 0x1fff -/* 062BC0 800BA970 246A0002 */ addiu $t2, $v1, 2 -/* 062BC4 800BA974 A4A90002 */ sh $t1, 2($a1) -/* 062BC8 800BA978 ACAA0010 */ sw $t2, 0x10($a1) -/* 062BCC 800BA97C A0A70001 */ sb $a3, 1($a1) -/* 062BD0 800BA980 1000001C */ b .L800BA9F4_ovl1 -/* 062BD4 800BA984 3122FFFF */ andi $v0, $t1, 0xffff -/* 062BD8 800BA988 308B1FFF */ andi $t3, $a0, 0x1fff -/* 062BDC 800BA98C 246C0002 */ addiu $t4, $v1, 2 -/* 062BE0 800BA990 A4AB0002 */ sh $t3, 2($a1) -/* 062BE4 800BA994 ACAC0010 */ sw $t4, 0x10($a1) -/* 062BE8 800BA998 A0A00001 */ sb $zero, 1($a1) -/* 062BEC 800BA99C 10000015 */ b .L800BA9F4_ovl1 -/* 062BF0 800BA9A0 3162FFFF */ andi $v0, $t3, 0xffff -/* 062BF4 800BA9A4 308D1FFF */ andi $t5, $a0, 0x1fff -/* 062BF8 800BA9A8 246E0002 */ addiu $t6, $v1, 2 -/* 062BFC 800BA9AC A4AD0004 */ sh $t5, 4($a1) -/* 062C00 800BA9B0 ACAE0010 */ sw $t6, 0x10($a1) -/* 062C04 800BA9B4 ACAE000C */ sw $t6, 0xc($a1) -/* 062C08 800BA9B8 1000000E */ b .L800BA9F4_ovl1 -/* 062C0C 800BA9BC 94A20002 */ lhu $v0, 2($a1) -/* 062C10 800BA9C0 94B80004 */ lhu $t8, 4($a1) -/* 062C14 800BA9C4 2719FFFF */ addiu $t9, $t8, -1 -/* 062C18 800BA9C8 3328FFFF */ andi $t0, $t9, 0xffff -/* 062C1C 800BA9CC 11000005 */ beqz $t0, .L800BA9E4_ovl1 -/* 062C20 800BA9D0 A4B90004 */ sh $t9, 4($a1) -/* 062C24 800BA9D4 8CA9000C */ lw $t1, 0xc($a1) -/* 062C28 800BA9D8 94A20002 */ lhu $v0, 2($a1) -/* 062C2C 800BA9DC 10000005 */ b .L800BA9F4_ovl1 -/* 062C30 800BA9E0 ACA90010 */ sw $t1, 0x10($a1) -.L800BA9E4_ovl1: -/* 062C34 800BA9E4 8CAA0010 */ lw $t2, 0x10($a1) -/* 062C38 800BA9E8 94A20002 */ lhu $v0, 2($a1) -/* 062C3C 800BA9EC 254B0002 */ addiu $t3, $t2, 2 -/* 062C40 800BA9F0 ACAB0010 */ sw $t3, 0x10($a1) -.L800BA9F4_ovl1: -/* 062C44 800BA9F4 5040FFCC */ beql $v0, $zero, .L800BA928_ovl1 -/* 062C48 800BA9F8 8CA30010 */ lw $v1, 0x10($a1) -.L800BA9FC_ovl1: -/* 062C4C 800BA9FC 03E00008 */ jr $ra -/* 062C50 800BAA00 00000000 */ nop -.type func_800BA90C, @function -.size func_800BA90C, . - func_800BA90C diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BAA04.s b/asm/non_matchings/ovl1/ovl1_10/func_800BAA04.s deleted file mode 100644 index 32886f6f..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BAA04.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800BAA04 -/* 062C54 800BAA04 8C8E0004 */ lw $t6, 4($a0) -/* 062C58 800BAA08 8CA30004 */ lw $v1, 4($a1) -/* 062C5C 800BAA0C 8CAF0000 */ lw $t7, ($a1) -/* 062C60 800BAA10 8DC20008 */ lw $v0, 8($t6) -/* 062C64 800BAA14 10600011 */ beqz $v1, .L800BAA5C_ovl1 -/* 062C68 800BAA18 ADE00010 */ sw $zero, 0x10($t7) -/* 062C6C 800BAA1C 8CA60008 */ lw $a2, 8($a1) -/* 062C70 800BAA20 8CD80004 */ lw $t8, 4($a2) -/* 062C74 800BAA24 57000005 */ bnezl $t8, .L800BAA3C_ovl1 -/* 062C78 800BAA28 ACC30004 */ sw $v1, 4($a2) -/* 062C7C 800BAA2C 8CB90004 */ lw $t9, 4($a1) -/* 062C80 800BAA30 10000004 */ b .L800BAA44_ovl1 -/* 062C84 800BAA34 AC990004 */ sw $t9, 4($a0) -/* 062C88 800BAA38 ACC30004 */ sw $v1, 4($a2) -.L800BAA3C_ovl1: -/* 062C8C 800BAA3C 8CA80008 */ lw $t0, 8($a1) -/* 062C90 800BAA40 AC680008 */ sw $t0, 8($v1) -.L800BAA44_ovl1: -/* 062C94 800BAA44 8C490004 */ lw $t1, 4($v0) -/* 062C98 800BAA48 ACA90004 */ sw $t1, 4($a1) -/* 062C9C 800BAA4C AC450004 */ sw $a1, 4($v0) -/* 062CA0 800BAA50 ACA20008 */ sw $v0, 8($a1) -/* 062CA4 800BAA54 8C8A0004 */ lw $t2, 4($a0) -/* 062CA8 800BAA58 AD450008 */ sw $a1, 8($t2) -.L800BAA5C_ovl1: -/* 062CAC 800BAA5C 03E00008 */ jr $ra -/* 062CB0 800BAA60 00000000 */ nop -.type func_800BAA04, @function -.size func_800BAA04, . - func_800BAA04 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BAA64.s b/asm/non_matchings/ovl1/ovl1_10/func_800BAA64.s deleted file mode 100644 index 65d9cf24..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BAA64.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_800BAA64 -/* 062CB4 800BAA64 94830002 */ lhu $v1, 2($a0) -/* 062CB8 800BAA68 8C820010 */ lw $v0, 0x10($a0) -/* 062CBC 800BAA6C 24050001 */ li $a1, 1 -/* 062CC0 800BAA70 5460001A */ bnezl $v1, .L800BAADC_ovl1 -/* 062CC4 800BAA74 00001025 */ move $v0, $zero -/* 062CC8 800BAA78 944E0000 */ lhu $t6, ($v0) -.L800BAA7C_ovl1: -/* 062CCC 800BAA7C 000E7B42 */ srl $t7, $t6, 0xd -/* 062CD0 800BAA80 2DE10005 */ sltiu $at, $t7, 5 -/* 062CD4 800BAA84 10200012 */ beqz $at, .L800BAAD0_ovl1 -/* 062CD8 800BAA88 000F7880 */ sll $t7, $t7, 2 -/* 062CDC 800BAA8C 3C01800D */ lui $at, %hi(D_800D6908) -/* 062CE0 800BAA90 002F0821 */ addu $at, $at, $t7 -/* 062CE4 800BAA94 8C2F6908 */ lw $t7, %lo(D_800D6908)($at) -/* 062CE8 800BAA98 01E00008 */ jr $t7 -/* 062CEC 800BAA9C 00000000 */ nop -/* 062CF0 800BAAA0 03E00008 */ jr $ra -/* 062CF4 800BAAA4 24020001 */ li $v0, 1 -.type func_800BAA64, @function - -/* 062CF8 800BAAA8 10000009 */ b .L800BAAD0_ovl1 -/* 062CFC 800BAAAC 24030001 */ li $v1, 1 -/* 062D00 800BAAB0 10000007 */ b .L800BAAD0_ovl1 -/* 062D04 800BAAB4 24420002 */ addiu $v0, $v0, 2 -/* 062D08 800BAAB8 94980004 */ lhu $t8, 4($a0) -/* 062D0C 800BAABC 54B80004 */ bnel $a1, $t8, .L800BAAD0_ovl1 -/* 062D10 800BAAC0 8C82000C */ lw $v0, 0xc($a0) -/* 062D14 800BAAC4 10000002 */ b .L800BAAD0_ovl1 -/* 062D18 800BAAC8 24420002 */ addiu $v0, $v0, 2 -/* 062D1C 800BAACC 8C82000C */ lw $v0, 0xc($a0) -.L800BAAD0_ovl1: -/* 062D20 800BAAD0 5060FFEA */ beql $v1, $zero, .L800BAA7C_ovl1 -/* 062D24 800BAAD4 944E0000 */ lhu $t6, ($v0) -/* 062D28 800BAAD8 00001025 */ move $v0, $zero -.L800BAADC_ovl1: -/* 062D2C 800BAADC 03E00008 */ jr $ra -/* 062D30 800BAAE0 00000000 */ nop -.type func_800BAA64, @function -.size func_800BAA64, . - func_800BAA64 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BAAE4.s b/asm/non_matchings/ovl1/ovl1_10/func_800BAAE4.s deleted file mode 100644 index f1826ccb..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BAAE4.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800BAAE4 -/* 062D34 800BAAE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 062D38 800BAAE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 062D3C 800BAAEC AFB10018 */ sw $s1, 0x18($sp) -/* 062D40 800BAAF0 AFB00014 */ sw $s0, 0x14($sp) -/* 062D44 800BAAF4 8C900004 */ lw $s0, 4($a0) -/* 062D48 800BAAF8 00808825 */ move $s1, $a0 -/* 062D4C 800BAAFC 52000016 */ beql $s0, $zero, .L800BAB58_ovl1 -/* 062D50 800BAB00 8FBF001C */ lw $ra, 0x1c($sp) -/* 062D54 800BAB04 8E040000 */ lw $a0, ($s0) -.L800BAB08_ovl1: -/* 062D58 800BAB08 8C8E0010 */ lw $t6, 0x10($a0) -/* 062D5C 800BAB0C 51C00012 */ beql $t6, $zero, .L800BAB58_ovl1 -/* 062D60 800BAB10 8FBF001C */ lw $ra, 0x1c($sp) -/* 062D64 800BAB14 8C820008 */ lw $v0, 8($a0) -/* 062D68 800BAB18 50400007 */ beql $v0, $zero, .L800BAB38_ovl1 -/* 062D6C 800BAB1C 02202025 */ move $a0, $s1 -/* 062D70 800BAB20 0443000A */ bgezl $v0, .L800BAB4C_ovl1 -/* 062D74 800BAB24 8E100004 */ lw $s0, 4($s0) -/* 062D78 800BAB28 0C02EA99 */ jal func_800BAA64 -/* 062D7C 800BAB2C 00000000 */ nop -/* 062D80 800BAB30 10400005 */ beqz $v0, .L800BAB48_ovl1 -/* 062D84 800BAB34 02202025 */ move $a0, $s1 -.L800BAB38_ovl1: -/* 062D88 800BAB38 0C02EA81 */ jal func_800BAA04 -/* 062D8C 800BAB3C 02002825 */ move $a1, $s0 -/* 062D90 800BAB40 10000002 */ b .L800BAB4C_ovl1 -/* 062D94 800BAB44 8E300004 */ lw $s0, 4($s1) -.L800BAB48_ovl1: -/* 062D98 800BAB48 8E100004 */ lw $s0, 4($s0) -.L800BAB4C_ovl1: -/* 062D9C 800BAB4C 5600FFEE */ bnezl $s0, .L800BAB08_ovl1 -/* 062DA0 800BAB50 8E040000 */ lw $a0, ($s0) -/* 062DA4 800BAB54 8FBF001C */ lw $ra, 0x1c($sp) -.L800BAB58_ovl1: -/* 062DA8 800BAB58 8FB00014 */ lw $s0, 0x14($sp) -/* 062DAC 800BAB5C 8FB10018 */ lw $s1, 0x18($sp) -/* 062DB0 800BAB60 03E00008 */ jr $ra -/* 062DB4 800BAB64 27BD0020 */ addiu $sp, $sp, 0x20 -.type func_800BAAE4, @function -.size func_800BAAE4, . - func_800BAAE4 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BAB68.s b/asm/non_matchings/ovl1/ovl1_10/func_800BAB68.s deleted file mode 100644 index ede1ce32..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BAB68.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800BAB68 -/* 062DB8 800BAB68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 062DBC 800BAB6C AFBF0014 */ sw $ra, 0x14($sp) -/* 062DC0 800BAB70 8CAE0010 */ lw $t6, 0x10($a1) -/* 062DC4 800BAB74 00803825 */ move $a3, $a0 -/* 062DC8 800BAB78 00C02025 */ move $a0, $a2 -/* 062DCC 800BAB7C 55C0000E */ bnezl $t6, .L800BABB8_ovl1 -/* 062DD0 800BAB80 90E20000 */ lbu $v0, ($a3) -/* 062DD4 800BAB84 AFA60020 */ sw $a2, 0x20($sp) -/* 062DD8 800BAB88 0C0011FC */ jal func_800047F0_ovl1 -/* 062DDC 800BAB8C AFA70018 */ sw $a3, 0x18($sp) -/* 062DE0 800BAB90 0C0011F4 */ jal func_800047D0_ovl1 -/* 062DE4 800BAB94 8FA40020 */ lw $a0, 0x20($sp) -/* 062DE8 800BAB98 8FA70018 */ lw $a3, 0x18($sp) -/* 062DEC 800BAB9C 90EF0000 */ lbu $t7, ($a3) -/* 062DF0 800BABA0 11E00002 */ beqz $t7, .L800BABAC_ovl1 -/* 062DF4 800BABA4 00000000 */ nop -/* 062DF8 800BABA8 A0E00000 */ sb $zero, ($a3) -.L800BABAC_ovl1: -/* 062DFC 800BABAC 10000013 */ b .L800BABFC_ovl1 -/* 062E00 800BABB0 24020001 */ li $v0, 1 -/* 062E04 800BABB4 90E20000 */ lbu $v0, ($a3) -.L800BABB8_ovl1: -/* 062E08 800BABB8 90B80001 */ lbu $t8, 1($a1) -/* 062E0C 800BABBC 5302000F */ beql $t8, $v0, .L800BABFC_ovl1 -/* 062E10 800BABC0 00001025 */ move $v0, $zero -/* 062E14 800BABC4 10400007 */ beqz $v0, .L800BABE4_ovl1 -/* 062E18 800BABC8 00C02025 */ move $a0, $a2 -/* 062E1C 800BABCC 00C02025 */ move $a0, $a2 -/* 062E20 800BABD0 0C0011F4 */ jal func_800047D0_ovl1 -/* 062E24 800BABD4 AFA70018 */ sw $a3, 0x18($sp) -/* 062E28 800BABD8 8FA70018 */ lw $a3, 0x18($sp) -/* 062E2C 800BABDC 10000006 */ b .L800BABF8_ovl1 -/* 062E30 800BABE0 A0E00000 */ sb $zero, ($a3) -.L800BABE4_ovl1: -/* 062E34 800BABE4 0C0011EC */ jal func_800047B0_ovl1 -/* 062E38 800BABE8 AFA70018 */ sw $a3, 0x18($sp) -/* 062E3C 800BABEC 8FA70018 */ lw $a3, 0x18($sp) -/* 062E40 800BABF0 24190001 */ li $t9, 1 -/* 062E44 800BABF4 A0F90000 */ sb $t9, ($a3) -.L800BABF8_ovl1: -/* 062E48 800BABF8 00001025 */ move $v0, $zero -.L800BABFC_ovl1: -/* 062E4C 800BABFC 8FBF0014 */ lw $ra, 0x14($sp) -/* 062E50 800BAC00 27BD0018 */ addiu $sp, $sp, 0x18 -/* 062E54 800BAC04 03E00008 */ jr $ra -/* 062E58 800BAC08 00000000 */ nop -.type func_800BAB68, @function -.size func_800BAB68, . - func_800BAB68 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BAC0C.s b/asm/non_matchings/ovl1/ovl1_10/func_800BAC0C.s deleted file mode 100644 index f33d4af9..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BAC0C.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_800BAC0C -/* 062E5C 800BAC0C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 062E60 800BAC10 AFBF0024 */ sw $ra, 0x24($sp) -/* 062E64 800BAC14 AFB20020 */ sw $s2, 0x20($sp) -/* 062E68 800BAC18 AFB1001C */ sw $s1, 0x1c($sp) -/* 062E6C 800BAC1C AFB00018 */ sw $s0, 0x18($sp) -/* 062E70 800BAC20 8C8E0000 */ lw $t6, ($a0) -/* 062E74 800BAC24 00809025 */ move $s2, $a0 -/* 062E78 800BAC28 2DC10006 */ sltiu $at, $t6, 6 -/* 062E7C 800BAC2C 1020002B */ beqz $at, .L800BACDC_ovl1 -/* 062E80 800BAC30 000E7080 */ sll $t6, $t6, 2 -/* 062E84 800BAC34 3C01800D */ lui $at, %hi(D_800D691C) -/* 062E88 800BAC38 002E0821 */ addu $at, $at, $t6 -/* 062E8C 800BAC3C 8C2E691C */ lw $t6, %lo(D_800D691C)($at) -/* 062E90 800BAC40 01C00008 */ jr $t6 -/* 062E94 800BAC44 00000000 */ nop -/* 062E98 800BAC48 8E44000C */ lw $a0, 0xc($s2) -/* 062E9C 800BAC4C 8E450010 */ lw $a1, 0x10($s2) -/* 062EA0 800BAC50 0C02EC23 */ jal func_800BB08C -/* 062EA4 800BAC54 8E460014 */ lw $a2, 0x14($s2) -/* 062EA8 800BAC58 10000021 */ b .L800BACE0_ovl1 -/* 062EAC 800BAC5C 8E440008 */ lw $a0, 8($s2) -/* 062EB0 800BAC60 8E44000C */ lw $a0, 0xc($s2) -/* 062EB4 800BAC64 0C02EC66 */ jal func_800BB198 -/* 062EB8 800BAC68 8E450010 */ lw $a1, 0x10($s2) -/* 062EBC 800BAC6C 1000001C */ b .L800BACE0_ovl1 -/* 062EC0 800BAC70 8E440008 */ lw $a0, 8($s2) -/* 062EC4 800BAC74 0C02EC4B */ jal func_800BB12C -/* 062EC8 800BAC78 8E44000C */ lw $a0, 0xc($s2) -/* 062ECC 800BAC7C 10000018 */ b .L800BACE0_ovl1 -/* 062ED0 800BAC80 8E440008 */ lw $a0, 8($s2) -/* 062ED4 800BAC84 00008025 */ move $s0, $zero -/* 062ED8 800BAC88 24110004 */ li $s1, 4 -.L800BAC8C_ovl1: -/* 062EDC 800BAC8C 0C02EC4B */ jal func_800BB12C -/* 062EE0 800BAC90 02002025 */ move $a0, $s0 -/* 062EE4 800BAC94 26100001 */ addiu $s0, $s0, 1 -/* 062EE8 800BAC98 1611FFFC */ bne $s0, $s1, .L800BAC8C_ovl1 -/* 062EEC 800BAC9C 00000000 */ nop -/* 062EF0 800BACA0 1000000F */ b .L800BACE0_ovl1 -/* 062EF4 800BACA4 8E440008 */ lw $a0, 8($s2) -/* 062EF8 800BACA8 240F0001 */ li $t7, 1 -/* 062EFC 800BACAC 3C01800F */ lui $at, %hi(D_800ED4C0) # $at, 0x800f -/* 062F00 800BACB0 1000000A */ b .L800BACDC_ovl1 -/* 062F04 800BACB4 AC2FD4C0 */ sw $t7, %lo(D_800ED4C0)($at) -/* 062F08 800BACB8 3C01800F */ lui $at, %hi(D_800ED4C0) # $at, 0x800f -/* 062F0C 800BACBC AC20D4C0 */ sw $zero, %lo(D_800ED4C0)($at) -/* 062F10 800BACC0 00008025 */ move $s0, $zero -/* 062F14 800BACC4 24110004 */ li $s1, 4 -.L800BACC8_ovl1: -/* 062F18 800BACC8 0C02EC4B */ jal func_800BB12C -/* 062F1C 800BACCC 02002025 */ move $a0, $s0 -/* 062F20 800BACD0 26100001 */ addiu $s0, $s0, 1 -/* 062F24 800BACD4 1611FFFC */ bne $s0, $s1, .L800BACC8_ovl1 -/* 062F28 800BACD8 00000000 */ nop -.L800BACDC_ovl1: -/* 062F2C 800BACDC 8E440008 */ lw $a0, 8($s2) -.L800BACE0_ovl1: -/* 062F30 800BACE0 00003025 */ move $a2, $zero -/* 062F34 800BACE4 50800004 */ beql $a0, $zero, .L800BACF8_ovl1 -/* 062F38 800BACE8 8FBF0024 */ lw $ra, 0x24($sp) -/* 062F3C 800BACEC 0C00B4BC */ jal osSendMesg -/* 062F40 800BACF0 8E450004 */ lw $a1, 4($s2) -/* 062F44 800BACF4 8FBF0024 */ lw $ra, 0x24($sp) -.L800BACF8_ovl1: -/* 062F48 800BACF8 8FB00018 */ lw $s0, 0x18($sp) -/* 062F4C 800BACFC 8FB1001C */ lw $s1, 0x1c($sp) -/* 062F50 800BAD00 8FB20020 */ lw $s2, 0x20($sp) -/* 062F54 800BAD04 03E00008 */ jr $ra -/* 062F58 800BAD08 27BD0028 */ addiu $sp, $sp, 0x28 -.type func_800BAC0C, @function -.size func_800BAC0C, . - func_800BAC0C diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BAD0C.s b/asm/non_matchings/ovl1/ovl1_10/func_800BAD0C.s deleted file mode 100644 index dc51379c..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BAD0C.s +++ /dev/null @@ -1,116 +0,0 @@ -glabel func_800BAD0C -/* 062F5C 800BAD0C 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 062F60 800BAD10 AFBE0038 */ sw $fp, 0x38($sp) -/* 062F64 800BAD14 3C1E800F */ lui $fp, %hi(D_800ED4C8) # $fp, 0x800f -/* 062F68 800BAD18 27DED4C8 */ addiu $fp, %lo(D_800ED4C8) # addiu $fp, $fp, -0x2b38 -/* 062F6C 800BAD1C AFBF003C */ sw $ra, 0x3c($sp) -/* 062F70 800BAD20 AFA40080 */ sw $a0, 0x80($sp) -/* 062F74 800BAD24 AFB70034 */ sw $s7, 0x34($sp) -/* 062F78 800BAD28 AFB60030 */ sw $s6, 0x30($sp) -/* 062F7C 800BAD2C AFB5002C */ sw $s5, 0x2c($sp) -/* 062F80 800BAD30 AFB40028 */ sw $s4, 0x28($sp) -/* 062F84 800BAD34 AFB30024 */ sw $s3, 0x24($sp) -/* 062F88 800BAD38 AFB20020 */ sw $s2, 0x20($sp) -/* 062F8C 800BAD3C AFB1001C */ sw $s1, 0x1c($sp) -/* 062F90 800BAD40 AFB00018 */ sw $s0, 0x18($sp) -/* 062F94 800BAD44 27A40078 */ addiu $a0, $sp, 0x78 -/* 062F98 800BAD48 03C02825 */ move $a1, $fp -/* 062F9C 800BAD4C 27A60058 */ addiu $a2, $sp, 0x58 -/* 062FA0 800BAD50 0C00027A */ jal func_800009E8_ovl1 -/* 062FA4 800BAD54 24070008 */ li $a3, 8 -/* 062FA8 800BAD58 3C17800F */ lui $s7, %hi(D_800ED4A0) # $s7, 0x800f -/* 062FAC 800BAD5C 26F7D4A0 */ addiu $s7, %lo(D_800ED4A0) # addiu $s7, $s7, -0x2b60 -/* 062FB0 800BAD60 24160001 */ li $s6, 1 -/* 062FB4 800BAD64 27B50054 */ addiu $s5, $sp, 0x54 -/* 062FB8 800BAD68 24140004 */ li $s4, 4 -/* 062FBC 800BAD6C 03C02025 */ move $a0, $fp -.L800BAD70_ovl1: -/* 062FC0 800BAD70 02A02825 */ move $a1, $s5 -/* 062FC4 800BAD74 0C00B540 */ jal osRecvMesg -/* 062FC8 800BAD78 02C03025 */ move $a2, $s6 -/* 062FCC 800BAD7C 8FA40054 */ lw $a0, 0x54($sp) -/* 062FD0 800BAD80 00009825 */ move $s3, $zero -/* 062FD4 800BAD84 02E09025 */ move $s2, $s7 -/* 062FD8 800BAD88 14960033 */ bne $a0, $s6, .L800BAE58_ovl1 -/* 062FDC 800BAD8C 00000000 */ nop -.L800BAD90_ovl1: -/* 062FE0 800BAD90 8E510004 */ lw $s1, 4($s2) -/* 062FE4 800BAD94 8E2E0000 */ lw $t6, ($s1) -/* 062FE8 800BAD98 8DCF0010 */ lw $t7, 0x10($t6) -/* 062FEC 800BAD9C 51E0002A */ beql $t7, $zero, .L800BAE48_ovl1 -/* 062FF0 800BADA0 26730001 */ addiu $s3, $s3, 1 -/* 062FF4 800BADA4 0C02EAB9 */ jal func_800BAAE4 -/* 062FF8 800BADA8 02402025 */ move $a0, $s2 -/* 062FFC 800BADAC 8E510004 */ lw $s1, 4($s2) -/* 063000 800BADB0 02402025 */ move $a0, $s2 -/* 063004 800BADB4 02603025 */ move $a2, $s3 -/* 063008 800BADB8 8E300000 */ lw $s0, ($s1) -/* 06300C 800BADBC 0C02EADA */ jal func_800BAB68 -/* 063010 800BADC0 02002825 */ move $a1, $s0 -/* 063014 800BADC4 1440001F */ bnez $v0, .L800BAE44_ovl1 -/* 063018 800BADC8 02402025 */ move $a0, $s2 -/* 06301C 800BADCC 02002825 */ move $a1, $s0 -/* 063020 800BADD0 0C02E9E8 */ jal func_800BA7A0 -/* 063024 800BADD4 02603025 */ move $a2, $s3 -/* 063028 800BADD8 96180002 */ lhu $t8, 2($s0) -/* 06302C 800BADDC 8E020008 */ lw $v0, 8($s0) -/* 063030 800BADE0 2719FFFF */ addiu $t9, $t8, -1 -/* 063034 800BADE4 18400003 */ blez $v0, .L800BADF4_ovl1 -/* 063038 800BADE8 A6190002 */ sh $t9, 2($s0) -/* 06303C 800BADEC 2448FFFF */ addiu $t0, $v0, -1 -/* 063040 800BADF0 AE080008 */ sw $t0, 8($s0) -.L800BADF4_ovl1: -/* 063044 800BADF4 8E310004 */ lw $s1, 4($s1) -/* 063048 800BADF8 52200013 */ beql $s1, $zero, .L800BAE48_ovl1 -/* 06304C 800BADFC 26730001 */ addiu $s3, $s3, 1 -/* 063050 800BAE00 8E300000 */ lw $s0, ($s1) -.L800BAE04_ovl1: -/* 063054 800BAE04 02402025 */ move $a0, $s2 -/* 063058 800BAE08 8E090010 */ lw $t1, 0x10($s0) -/* 06305C 800BAE0C 5120000E */ beql $t1, $zero, .L800BAE48_ovl1 -/* 063060 800BAE10 26730001 */ addiu $s3, $s3, 1 -/* 063064 800BAE14 0C02EA43 */ jal func_800BA90C -/* 063068 800BAE18 02002825 */ move $a1, $s0 -/* 06306C 800BAE1C 960A0002 */ lhu $t2, 2($s0) -/* 063070 800BAE20 8E020008 */ lw $v0, 8($s0) -/* 063074 800BAE24 254BFFFF */ addiu $t3, $t2, -1 -/* 063078 800BAE28 18400003 */ blez $v0, .L800BAE38_ovl1 -/* 06307C 800BAE2C A60B0002 */ sh $t3, 2($s0) -/* 063080 800BAE30 244CFFFF */ addiu $t4, $v0, -1 -/* 063084 800BAE34 AE0C0008 */ sw $t4, 8($s0) -.L800BAE38_ovl1: -/* 063088 800BAE38 8E310004 */ lw $s1, 4($s1) -/* 06308C 800BAE3C 5620FFF1 */ bnezl $s1, .L800BAE04_ovl1 -/* 063090 800BAE40 8E300000 */ lw $s0, ($s1) -.L800BAE44_ovl1: -/* 063094 800BAE44 26730001 */ addiu $s3, $s3, 1 -.L800BAE48_ovl1: -/* 063098 800BAE48 1674FFD1 */ bne $s3, $s4, .L800BAD90_ovl1 -/* 06309C 800BAE4C 26520008 */ addiu $s2, $s2, 8 -/* 0630A0 800BAE50 1000FFC7 */ b .L800BAD70_ovl1 -/* 0630A4 800BAE54 03C02025 */ move $a0, $fp -.L800BAE58_ovl1: -/* 0630A8 800BAE58 0C02EB03 */ jal func_800BAC0C -/* 0630AC 800BAE5C 00000000 */ nop -/* 0630B0 800BAE60 1000FFC3 */ b .L800BAD70_ovl1 -/* 0630B4 800BAE64 03C02025 */ move $a0, $fp -/* 0630B8 800BAE68 00000000 */ nop -/* 0630BC 800BAE6C 00000000 */ nop -/* 0630C0 800BAE70 00000000 */ nop -/* 0630C4 800BAE74 00000000 */ nop -/* 0630C8 800BAE78 00000000 */ nop -/* 0630CC 800BAE7C 00000000 */ nop -/* 0630D0 800BAE80 8FBF003C */ lw $ra, 0x3c($sp) -/* 0630D4 800BAE84 8FB00018 */ lw $s0, 0x18($sp) -/* 0630D8 800BAE88 8FB1001C */ lw $s1, 0x1c($sp) -/* 0630DC 800BAE8C 8FB20020 */ lw $s2, 0x20($sp) -/* 0630E0 800BAE90 8FB30024 */ lw $s3, 0x24($sp) -/* 0630E4 800BAE94 8FB40028 */ lw $s4, 0x28($sp) -/* 0630E8 800BAE98 8FB5002C */ lw $s5, 0x2c($sp) -/* 0630EC 800BAE9C 8FB60030 */ lw $s6, 0x30($sp) -/* 0630F0 800BAEA0 8FB70034 */ lw $s7, 0x34($sp) -/* 0630F4 800BAEA4 8FBE0038 */ lw $fp, 0x38($sp) -/* 0630F8 800BAEA8 03E00008 */ jr $ra -/* 0630FC 800BAEAC 27BD0080 */ addiu $sp, $sp, 0x80 -.type func_800BAD0C, @function -.size func_800BAD0C, . - func_800BAD0C diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BAEB0.s b/asm/non_matchings/ovl1/ovl1_10/func_800BAEB0.s deleted file mode 100644 index 34fe2b09..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BAEB0.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_800BAEB0 -/* 063100 800BAEB0 8C820004 */ lw $v0, 4($a0) -/* 063104 800BAEB4 50400024 */ beql $v0, $zero, .L800BAF48_ovl1 -/* 063108 800BAEB8 00001025 */ move $v0, $zero -/* 06310C 800BAEBC 8C430000 */ lw $v1, ($v0) -.L800BAEC0_ovl1: -/* 063110 800BAEC0 1060001B */ beqz $v1, .L800BAF30_ovl1 -/* 063114 800BAEC4 00000000 */ nop -/* 063118 800BAEC8 8C6E0010 */ lw $t6, 0x10($v1) -/* 06311C 800BAECC 00602025 */ move $a0, $v1 -/* 063120 800BAED0 51C0001A */ beql $t6, $zero, .L800BAF3C_ovl1 -/* 063124 800BAED4 8C420004 */ lw $v0, 4($v0) -/* 063128 800BAED8 906F0000 */ lbu $t7, ($v1) -/* 06312C 800BAEDC 54AF0017 */ bnel $a1, $t7, .L800BAF3C_ovl1 -/* 063130 800BAEE0 8C420004 */ lw $v0, 4($v0) -/* 063134 800BAEE4 50C0000A */ beql $a2, $zero, .L800BAF10_ovl1 -/* 063138 800BAEE8 0005C880 */ sll $t9, $a1, 2 -/* 06313C 800BAEEC 8C630008 */ lw $v1, 8($v1) -/* 063140 800BAEF0 18600011 */ blez $v1, .L800BAF38_ovl1 -/* 063144 800BAEF4 0066082A */ slt $at, $v1, $a2 -/* 063148 800BAEF8 50200010 */ beql $at, $zero, .L800BAF3C_ovl1 -/* 06314C 800BAEFC 8C420004 */ lw $v0, 4($v0) -/* 063150 800BAF00 AC860008 */ sw $a2, 8($a0) -/* 063154 800BAF04 03E00008 */ jr $ra -/* 063158 800BAF08 24020001 */ li $v0, 1 -.type func_800BAEB0, @function - -/* 06315C 800BAF0C 0005C880 */ sll $t9, $a1, 2 -.L800BAF10_ovl1: -/* 063160 800BAF10 3C08800D */ lui $t0, %hi(D_800D5238) -/* 063164 800BAF14 A4800004 */ sh $zero, 4($a0) -/* 063168 800BAF18 A4800002 */ sh $zero, 2($a0) -/* 06316C 800BAF1C 01194021 */ addu $t0, $t0, $t9 -/* 063170 800BAF20 8D085238 */ lw $t0, %lo(D_800D5238)($t0) -/* 063174 800BAF24 24020001 */ li $v0, 1 -/* 063178 800BAF28 03E00008 */ jr $ra -/* 06317C 800BAF2C AC880010 */ sw $t0, 0x10($a0) -.type func_800BAEB0, @function - -.L800BAF30_ovl1: -/* 063180 800BAF30 03E00008 */ jr $ra -/* 063184 800BAF34 00001025 */ move $v0, $zero -.type func_800BAEB0, @function - -.L800BAF38_ovl1: -/* 063188 800BAF38 8C420004 */ lw $v0, 4($v0) -.L800BAF3C_ovl1: -/* 06318C 800BAF3C 5440FFE0 */ bnezl $v0, .L800BAEC0_ovl1 -/* 063190 800BAF40 8C430000 */ lw $v1, ($v0) -/* 063194 800BAF44 00001025 */ move $v0, $zero -.L800BAF48_ovl1: -/* 063198 800BAF48 03E00008 */ jr $ra -/* 06319C 800BAF4C 00000000 */ nop -.type func_800BAEB0, @function -.size func_800BAEB0, . - func_800BAEB0 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BAF50.s b/asm/non_matchings/ovl1/ovl1_10/func_800BAF50.s deleted file mode 100644 index b6955a9a..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BAF50.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_800BAF50 -/* 0631A0 800BAF50 8C820004 */ lw $v0, 4($a0) -/* 0631A4 800BAF54 00A03825 */ move $a3, $a1 -/* 0631A8 800BAF58 3C08800D */ lui $t0, %hi(D_800D5274) # $t0, 0x800d -/* 0631AC 800BAF5C 8C430008 */ lw $v1, 8($v0) -/* 0631B0 800BAF60 1040002E */ beqz $v0, .L800BB01C_ovl1 -/* 0631B4 800BAF64 00403025 */ move $a2, $v0 -/* 0631B8 800BAF68 25085274 */ addiu $t0, %lo(D_800D5274) # addiu $t0, $t0, 0x5274 -/* 0631BC 800BAF6C 8CC50000 */ lw $a1, ($a2) -.L800BAF70_ovl1: -/* 0631C0 800BAF70 8CAE0010 */ lw $t6, 0x10($a1) -/* 0631C4 800BAF74 11C00024 */ beqz $t6, .L800BB008_ovl1 -/* 0631C8 800BAF78 00000000 */ nop -/* 0631CC 800BAF7C 90B90000 */ lbu $t9, ($a1) -/* 0631D0 800BAF80 01077821 */ addu $t7, $t0, $a3 -/* 0631D4 800BAF84 91F80000 */ lbu $t8, ($t7) -/* 0631D8 800BAF88 01194821 */ addu $t1, $t0, $t9 -/* 0631DC 800BAF8C 912A0000 */ lbu $t2, ($t1) -/* 0631E0 800BAF90 030A082A */ slt $at, $t8, $t2 -/* 0631E4 800BAF94 5420001F */ bnezl $at, .L800BB014_ovl1 -/* 0631E8 800BAF98 8CC60004 */ lw $a2, 4($a2) -/* 0631EC 800BAF9C 14C20009 */ bne $a2, $v0, .L800BAFC4_ovl1 -/* 0631F0 800BAFA0 00000000 */ nop -/* 0631F4 800BAFA4 8C6B0004 */ lw $t3, 4($v1) -/* 0631F8 800BAFA8 8C6C0008 */ lw $t4, 8($v1) -/* 0631FC 800BAFAC AD8B0004 */ sw $t3, 4($t4) -/* 063200 800BAFB0 AC830004 */ sw $v1, 4($a0) -/* 063204 800BAFB4 AC660004 */ sw $a2, 4($v1) -/* 063208 800BAFB8 ACC30008 */ sw $v1, 8($a2) -/* 06320C 800BAFBC 03E00008 */ jr $ra -/* 063210 800BAFC0 8C620000 */ lw $v0, ($v1) -.type func_800BAF50, @function - -.L800BAFC4_ovl1: -/* 063214 800BAFC4 10C3000E */ beq $a2, $v1, .L800BB000_ovl1 -/* 063218 800BAFC8 00000000 */ nop -/* 06321C 800BAFCC 8C6D0004 */ lw $t5, 4($v1) -/* 063220 800BAFD0 8C6E0008 */ lw $t6, 8($v1) -/* 063224 800BAFD4 ADCD0004 */ sw $t5, 4($t6) -/* 063228 800BAFD8 8C6F0008 */ lw $t7, 8($v1) -/* 06322C 800BAFDC 8C990004 */ lw $t9, 4($a0) -/* 063230 800BAFE0 AF2F0008 */ sw $t7, 8($t9) -/* 063234 800BAFE4 8CC90008 */ lw $t1, 8($a2) -/* 063238 800BAFE8 AC690008 */ sw $t1, 8($v1) -/* 06323C 800BAFEC AD230004 */ sw $v1, 4($t1) -/* 063240 800BAFF0 AC660004 */ sw $a2, 4($v1) -/* 063244 800BAFF4 ACC30008 */ sw $v1, 8($a2) -/* 063248 800BAFF8 03E00008 */ jr $ra -/* 06324C 800BAFFC 8C620000 */ lw $v0, ($v1) -.type func_800BAF50, @function - -.L800BB000_ovl1: -/* 063250 800BB000 03E00008 */ jr $ra -/* 063254 800BB004 8C620000 */ lw $v0, ($v1) -.type func_800BAF50, @function - -.L800BB008_ovl1: -/* 063258 800BB008 03E00008 */ jr $ra -/* 06325C 800BB00C 00A01025 */ move $v0, $a1 -.type func_800BAF50, @function - -/* 063260 800BB010 8CC60004 */ lw $a2, 4($a2) -.L800BB014_ovl1: -/* 063264 800BB014 54C0FFD6 */ bnezl $a2, .L800BAF70_ovl1 -/* 063268 800BB018 8CC50000 */ lw $a1, ($a2) -.L800BB01C_ovl1: -/* 06326C 800BB01C 00001025 */ move $v0, $zero -/* 063270 800BB020 03E00008 */ jr $ra -/* 063274 800BB024 00000000 */ nop -.type func_800BAF50, @function -.size func_800BAF50, . - func_800BAF50 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB028.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB028.s deleted file mode 100644 index 5a32f03e..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB028.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_800BB028 -/* 063278 800BB028 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 06327C 800BB02C AFBF0014 */ sw $ra, 0x14($sp) -/* 063280 800BB030 00803825 */ move $a3, $a0 -/* 063284 800BB034 AFA70038 */ sw $a3, 0x38($sp) -/* 063288 800BB038 27A4001C */ addiu $a0, $sp, 0x1c -/* 06328C 800BB03C 27A50034 */ addiu $a1, $sp, 0x34 -/* 063290 800BB040 0C00CEB8 */ jal osCreateMesgQueue -/* 063294 800BB044 24060001 */ li $a2, 1 -/* 063298 800BB048 8FA50038 */ lw $a1, 0x38($sp) -/* 06329C 800BB04C 240E0001 */ li $t6, 1 -/* 0632A0 800BB050 27AF001C */ addiu $t7, $sp, 0x1c -/* 0632A4 800BB054 3C04800F */ lui $a0, %hi(D_800ED4C8) # $a0, 0x800f -/* 0632A8 800BB058 2484D4C8 */ addiu $a0, %lo(D_800ED4C8) # addiu $a0, $a0, -0x2b38 -/* 0632AC 800BB05C 00003025 */ move $a2, $zero -/* 0632B0 800BB060 ACAE0004 */ sw $t6, 4($a1) -/* 0632B4 800BB064 0C00B4BC */ jal osSendMesg -/* 0632B8 800BB068 ACAF0008 */ sw $t7, 8($a1) -/* 0632BC 800BB06C 27A4001C */ addiu $a0, $sp, 0x1c -/* 0632C0 800BB070 00002825 */ move $a1, $zero -/* 0632C4 800BB074 0C00B540 */ jal osRecvMesg -/* 0632C8 800BB078 24060001 */ li $a2, 1 -/* 0632CC 800BB07C 8FBF0014 */ lw $ra, 0x14($sp) -/* 0632D0 800BB080 27BD0038 */ addiu $sp, $sp, 0x38 -/* 0632D4 800BB084 03E00008 */ jr $ra -/* 0632D8 800BB088 00000000 */ nop -.type func_800BB028, @function -.size func_800BB028, . - func_800BB028 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB08C.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB08C.s deleted file mode 100644 index 057b2198..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB08C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_800BB08C -/* 0632DC 800BB08C 3C0E800F */ lui $t6, %hi(D_800ED4C0) # $t6, 0x800f -/* 0632E0 800BB090 8DCED4C0 */ lw $t6, %lo(D_800ED4C0)($t6) -/* 0632E4 800BB094 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0632E8 800BB098 AFBF0014 */ sw $ra, 0x14($sp) -/* 0632EC 800BB09C AFA5002C */ sw $a1, 0x2c($sp) -/* 0632F0 800BB0A0 11C0001E */ beqz $t6, .L800BB11C_ovl1 -/* 0632F4 800BB0A4 AFA60030 */ sw $a2, 0x30($sp) -/* 0632F8 800BB0A8 3C18800F */ lui $t8, %hi(D_800ED4A0) # $t8, 0x800f -/* 0632FC 800BB0AC 2718D4A0 */ addiu $t8, %lo(D_800ED4A0) # addiu $t8, $t8, -0x2b60 -/* 063300 800BB0B0 000478C0 */ sll $t7, $a0, 3 -/* 063304 800BB0B4 01F82021 */ addu $a0, $t7, $t8 -/* 063308 800BB0B8 0C02EBAC */ jal func_800BAEB0 -/* 06330C 800BB0BC AFA4001C */ sw $a0, 0x1c($sp) -/* 063310 800BB0C0 14400016 */ bnez $v0, .L800BB11C_ovl1 -/* 063314 800BB0C4 8FA4001C */ lw $a0, 0x1c($sp) -/* 063318 800BB0C8 0C02EBD4 */ jal func_800BAF50 -/* 06331C 800BB0CC 8FA5002C */ lw $a1, 0x2c($sp) -/* 063320 800BB0D0 10400012 */ beqz $v0, .L800BB11C_ovl1 -/* 063324 800BB0D4 8FA30030 */ lw $v1, 0x30($sp) -/* 063328 800BB0D8 14600003 */ bnez $v1, .L800BB0E8_ovl1 -/* 06332C 800BB0DC 2419FFFF */ li $t9, -1 -/* 063330 800BB0E0 10000002 */ b .L800BB0EC_ovl1 -/* 063334 800BB0E4 AC590008 */ sw $t9, 8($v0) -.L800BB0E8_ovl1: -/* 063338 800BB0E8 AC430008 */ sw $v1, 8($v0) -.L800BB0EC_ovl1: -/* 06333C 800BB0EC 8FA8002C */ lw $t0, 0x2c($sp) -/* 063340 800BB0F0 A0400001 */ sb $zero, 1($v0) -/* 063344 800BB0F4 A4400002 */ sh $zero, 2($v0) -/* 063348 800BB0F8 A4400004 */ sh $zero, 4($v0) -/* 06334C 800BB0FC AC40000C */ sw $zero, 0xc($v0) -/* 063350 800BB100 A0480000 */ sb $t0, ($v0) -/* 063354 800BB104 8FAA002C */ lw $t2, 0x2c($sp) -/* 063358 800BB108 3C0C800D */ lui $t4, %hi(D_800D5238) -/* 06335C 800BB10C 000A5880 */ sll $t3, $t2, 2 -/* 063360 800BB110 018B6021 */ addu $t4, $t4, $t3 -/* 063364 800BB114 8D8C5238 */ lw $t4, %lo(D_800D5238)($t4) -/* 063368 800BB118 AC4C0010 */ sw $t4, 0x10($v0) -.L800BB11C_ovl1: -/* 06336C 800BB11C 8FBF0014 */ lw $ra, 0x14($sp) -/* 063370 800BB120 27BD0028 */ addiu $sp, $sp, 0x28 -/* 063374 800BB124 03E00008 */ jr $ra -/* 063378 800BB128 00000000 */ nop -.type func_800BB08C, @function -.size func_800BB08C, . - func_800BB08C diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB12C.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB12C.s deleted file mode 100644 index 07bcf601..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB12C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_800BB12C -/* 06337C 800BB12C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 063380 800BB130 AFBF0014 */ sw $ra, 0x14($sp) -/* 063384 800BB134 0C0011FC */ jal func_800047F0_ovl1 -/* 063388 800BB138 AFA40018 */ sw $a0, 0x18($sp) -/* 06338C 800BB13C 0C0011F4 */ jal func_800047D0_ovl1 -/* 063390 800BB140 8FA40018 */ lw $a0, 0x18($sp) -/* 063394 800BB144 8FAE0018 */ lw $t6, 0x18($sp) -/* 063398 800BB148 3C18800F */ lui $t8, %hi(D_800ED4A0) # $t8, 0x800f -/* 06339C 800BB14C 2718D4A0 */ addiu $t8, %lo(D_800ED4A0) # addiu $t8, $t8, -0x2b60 -/* 0633A0 800BB150 000E78C0 */ sll $t7, $t6, 3 -/* 0633A4 800BB154 01F81821 */ addu $v1, $t7, $t8 -/* 0633A8 800BB158 90790000 */ lbu $t9, ($v1) -/* 0633AC 800BB15C 53200003 */ beql $t9, $zero, .L800BB16C_ovl1 -/* 0633B0 800BB160 8C620004 */ lw $v0, 4($v1) -/* 0633B4 800BB164 A0600000 */ sb $zero, ($v1) -/* 0633B8 800BB168 8C620004 */ lw $v0, 4($v1) -.L800BB16C_ovl1: -/* 0633BC 800BB16C 50400007 */ beql $v0, $zero, .L800BB18C_ovl1 -/* 0633C0 800BB170 8FBF0014 */ lw $ra, 0x14($sp) -/* 0633C4 800BB174 8C480000 */ lw $t0, ($v0) -.L800BB178_ovl1: -/* 0633C8 800BB178 AD000010 */ sw $zero, 0x10($t0) -/* 0633CC 800BB17C 8C420004 */ lw $v0, 4($v0) -/* 0633D0 800BB180 5440FFFD */ bnezl $v0, .L800BB178_ovl1 -/* 0633D4 800BB184 8C480000 */ lw $t0, ($v0) -/* 0633D8 800BB188 8FBF0014 */ lw $ra, 0x14($sp) -.L800BB18C_ovl1: -/* 0633DC 800BB18C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0633E0 800BB190 03E00008 */ jr $ra -/* 0633E4 800BB194 00000000 */ nop -.type func_800BB12C, @function -.size func_800BB12C, . - func_800BB12C diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB198.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB198.s deleted file mode 100644 index f1038ffb..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB198.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_800BB198 -/* 0633E8 800BB198 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0633EC 800BB19C 3C18800F */ lui $t8, %hi(D_800ED4A0) # $t8, 0x800f -/* 0633F0 800BB1A0 AFB1001C */ sw $s1, 0x1c($sp) -/* 0633F4 800BB1A4 2718D4A0 */ addiu $t8, %lo(D_800ED4A0) # addiu $t8, $t8, -0x2b60 -/* 0633F8 800BB1A8 000478C0 */ sll $t7, $a0, 3 -/* 0633FC 800BB1AC 01F88821 */ addu $s1, $t7, $t8 -/* 063400 800BB1B0 8E230004 */ lw $v1, 4($s1) -/* 063404 800BB1B4 AFBF0024 */ sw $ra, 0x24($sp) -/* 063408 800BB1B8 AFB20020 */ sw $s2, 0x20($sp) -/* 06340C 800BB1BC AFB00018 */ sw $s0, 0x18($sp) -/* 063410 800BB1C0 AFA40028 */ sw $a0, 0x28($sp) -/* 063414 800BB1C4 8C790000 */ lw $t9, ($v1) -/* 063418 800BB1C8 00A09025 */ move $s2, $a1 -/* 06341C 800BB1CC 00608025 */ move $s0, $v1 -/* 063420 800BB1D0 8F280010 */ lw $t0, 0x10($t9) -/* 063424 800BB1D4 51000018 */ beql $t0, $zero, .L800BB238_ovl1 -/* 063428 800BB1D8 8FBF0024 */ lw $ra, 0x24($sp) -/* 06342C 800BB1DC 50600012 */ beql $v1, $zero, .L800BB228_ovl1 -/* 063430 800BB1E0 02202025 */ move $a0, $s1 -/* 063434 800BB1E4 8E020000 */ lw $v0, ($s0) -.L800BB1E8_ovl1: -/* 063438 800BB1E8 02202025 */ move $a0, $s1 -/* 06343C 800BB1EC 8C490010 */ lw $t1, 0x10($v0) -/* 063440 800BB1F0 5120000D */ beql $t1, $zero, .L800BB228_ovl1 -/* 063444 800BB1F4 02202025 */ move $a0, $s1 -/* 063448 800BB1F8 904A0000 */ lbu $t2, ($v0) -/* 06344C 800BB1FC 564A0007 */ bnel $s2, $t2, .L800BB21C_ovl1 -/* 063450 800BB200 8E100004 */ lw $s0, 4($s0) -/* 063454 800BB204 0C02EA81 */ jal func_800BAA04 -/* 063458 800BB208 02002825 */ move $a1, $s0 -/* 06345C 800BB20C 8E230004 */ lw $v1, 4($s1) -/* 063460 800BB210 10000002 */ b .L800BB21C_ovl1 -/* 063464 800BB214 00608025 */ move $s0, $v1 -/* 063468 800BB218 8E100004 */ lw $s0, 4($s0) -.L800BB21C_ovl1: -/* 06346C 800BB21C 5600FFF2 */ bnezl $s0, .L800BB1E8_ovl1 -/* 063470 800BB220 8E020000 */ lw $v0, ($s0) -/* 063474 800BB224 02202025 */ move $a0, $s1 -.L800BB228_ovl1: -/* 063478 800BB228 8C650000 */ lw $a1, ($v1) -/* 06347C 800BB22C 0C02EADA */ jal func_800BAB68 -/* 063480 800BB230 8FA60028 */ lw $a2, 0x28($sp) -/* 063484 800BB234 8FBF0024 */ lw $ra, 0x24($sp) -.L800BB238_ovl1: -/* 063488 800BB238 8FB00018 */ lw $s0, 0x18($sp) -/* 06348C 800BB23C 8FB1001C */ lw $s1, 0x1c($sp) -/* 063490 800BB240 8FB20020 */ lw $s2, 0x20($sp) -/* 063494 800BB244 03E00008 */ jr $ra -/* 063498 800BB248 27BD0028 */ addiu $sp, $sp, 0x28 -.type func_800BB198, @function -.size func_800BB198, . - func_800BB198 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB24C.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB24C.s deleted file mode 100644 index f05fc408..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB24C.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_800BB24C -/* 06349C 800BB24C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0634A0 800BB250 3C09800F */ lui $t1, %hi(D_800ED4A0) # $t1, 0x800f -/* 0634A4 800BB254 3C08800F */ lui $t0, %hi(D_800ED410) # $t0, 0x800f -/* 0634A8 800BB258 3C07800F */ lui $a3, %hi(D_800ED320) # $a3, 0x800f -/* 0634AC 800BB25C 3C0A800F */ lui $t2, %hi(D_800ED410) # $t2, 0x800f -/* 0634B0 800BB260 AFBF001C */ sw $ra, 0x1c($sp) -/* 0634B4 800BB264 254AD410 */ addiu $t2, %lo(D_800ED410) # addiu $t2, $t2, -0x2bf0 -/* 0634B8 800BB268 24E7D320 */ addiu $a3, %lo(D_800ED320) # addiu $a3, $a3, -0x2ce0 -/* 0634BC 800BB26C 2508D410 */ addiu $t0, %lo(D_800ED410) # addiu $t0, $t0, -0x2bf0 -/* 0634C0 800BB270 2529D4A0 */ addiu $t1, %lo(D_800ED4A0) # addiu $t1, $t1, -0x2b60 -/* 0634C4 800BB274 24060003 */ li $a2, 3 -.L800BB278_ovl1: -/* 0634C8 800BB278 A1200000 */ sb $zero, ($t1) -/* 0634CC 800BB27C AD280004 */ sw $t0, 4($t1) -/* 0634D0 800BB280 01001025 */ move $v0, $t0 -/* 0634D4 800BB284 AD070000 */ sw $a3, ($t0) -/* 0634D8 800BB288 00E01825 */ move $v1, $a3 -/* 0634DC 800BB28C ACE0000C */ sw $zero, 0xc($a3) -/* 0634E0 800BB290 ACE00010 */ sw $zero, 0x10($a3) -/* 0634E4 800BB294 01002025 */ move $a0, $t0 -/* 0634E8 800BB298 24050001 */ li $a1, 1 -.L800BB29C_ovl1: -/* 0634EC 800BB29C 2442000C */ addiu $v0, $v0, 0xc -/* 0634F0 800BB2A0 AC820004 */ sw $v0, 4($a0) -/* 0634F4 800BB2A4 24630014 */ addiu $v1, $v1, 0x14 -/* 0634F8 800BB2A8 AC430000 */ sw $v1, ($v0) -/* 0634FC 800BB2AC AC60000C */ sw $zero, 0xc($v1) -/* 063500 800BB2B0 AC600010 */ sw $zero, 0x10($v1) -/* 063504 800BB2B4 24A50001 */ addiu $a1, $a1, 1 -/* 063508 800BB2B8 AC440008 */ sw $a0, 8($v0) -/* 06350C 800BB2BC 14A6FFF7 */ bne $a1, $a2, .L800BB29C_ovl1 -/* 063510 800BB2C0 00402025 */ move $a0, $v0 -/* 063514 800BB2C4 AC400004 */ sw $zero, 4($v0) -/* 063518 800BB2C8 8D2E0004 */ lw $t6, 4($t1) -/* 06351C 800BB2CC 24E7003C */ addiu $a3, $a3, 0x3c -/* 063520 800BB2D0 25080024 */ addiu $t0, $t0, 0x24 -/* 063524 800BB2D4 25290008 */ addiu $t1, $t1, 8 -/* 063528 800BB2D8 14EAFFE7 */ bne $a3, $t2, .L800BB278_ovl1 -/* 06352C 800BB2DC ADC20008 */ sw $v0, 8($t6) -/* 063530 800BB2E0 240F0001 */ li $t7, 1 -/* 063534 800BB2E4 3C01800F */ lui $at, %hi(D_800ED4C0) # $at, 0x800f -/* 063538 800BB2E8 3C188005 */ lui $t8, %hi(D_80048E9C) # $t8, 0x8005 -/* 06353C 800BB2EC 83188E9C */ lb $t8, %lo(D_80048E9C)($t8) -/* 063540 800BB2F0 AC2FD4C0 */ sw $t7, %lo(D_800ED4C0)($at) -/* 063544 800BB2F4 3C19800F */ lui $t9, %hi(D_800ED320) # $t9, 0x800f -/* 063548 800BB2F8 3C01800F */ lui $at, %hi(D_800ED4C4) # $at, 0x800f -/* 06354C 800BB2FC 2739D320 */ addiu $t9, %lo(D_800ED320) # addiu $t9, $t9, -0x2ce0 -/* 063550 800BB300 3C04800F */ lui $a0, %hi(D_800ECD70) # $a0, 0x800f -/* 063554 800BB304 3C0505F5 */ lui $a1, (0x05F5E100 >> 16) # lui $a1, 0x5f5 -/* 063558 800BB308 3C06800C */ lui $a2, %hi(func_800BAD0C) # $a2, 0x800c -/* 06355C 800BB30C 240B0034 */ li $t3, 52 -/* 063560 800BB310 AFAB0014 */ sw $t3, 0x14($sp) -/* 063564 800BB314 24C6AD0C */ addiu $a2, %lo(func_800BAD0C) # addiu $a2, $a2, -0x52f4 -/* 063568 800BB318 34A5E100 */ ori $a1, (0x05F5E100 & 0xFFFF) # ori $a1, $a1, 0xe100 -/* 06356C 800BB31C 2484CD70 */ addiu $a0, %lo(D_800ECD70) # addiu $a0, $a0, -0x3290 -/* 063570 800BB320 AFB90010 */ sw $t9, 0x10($sp) -/* 063574 800BB324 00003825 */ move $a3, $zero -/* 063578 800BB328 0C00BEF8 */ jal osCreateThread -/* 06357C 800BB32C AC38D4C4 */ sw $t8, %lo(D_800ED4C4)($at) -/* 063580 800BB330 3C0DFEDC */ lui $t5, (0xFEDCBA98 >> 16) # lui $t5, 0xfedc -/* 063584 800BB334 35ADBA98 */ ori $t5, (0xFEDCBA98 & 0xFFFF) # ori $t5, $t5, 0xba98 -/* 063588 800BB338 240C0000 */ li $t4, 0 -/* 06358C 800BB33C 3C01800F */ lui $at, %hi(D_800ECF5C) # $at, 0x800f -/* 063590 800BB340 3C04800F */ lui $a0, %hi(D_800ECD70) # $a0, 0x800f -/* 063594 800BB344 AC2CCF58 */ sw $t4, %lo(D_800ECF58)($at) -/* 063598 800BB348 AC2DCF5C */ sw $t5, %lo(D_800ECF5C)($at) -/* 06359C 800BB34C 0C00E334 */ jal osStartThread -/* 0635A0 800BB350 2484CD70 */ addiu $a0, %lo(D_800ECD70) # addiu $a0, $a0, -0x3290 -/* 0635A4 800BB354 8FBF001C */ lw $ra, 0x1c($sp) -/* 0635A8 800BB358 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0635AC 800BB35C 03E00008 */ jr $ra -/* 0635B0 800BB360 00000000 */ nop -.type func_800BB24C, @function -.size func_800BB24C, . - func_800BB24C diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB364.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB364.s deleted file mode 100644 index de10b99d..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB364.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800BB364 -/* 0635B4 800BB364 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0635B8 800BB368 AFBF0014 */ sw $ra, 0x14($sp) -/* 0635BC 800BB36C AFA40024 */ sw $a0, 0x24($sp) -/* 0635C0 800BB370 AFA00018 */ sw $zero, 0x18($sp) -/* 0635C4 800BB374 AFA50028 */ sw $a1, 0x28($sp) -/* 0635C8 800BB378 AFA6002C */ sw $a2, 0x2c($sp) -/* 0635CC 800BB37C 0C02EC0A */ jal func_800BB028 -/* 0635D0 800BB380 27A40018 */ addiu $a0, $sp, 0x18 -/* 0635D4 800BB384 8FBF0014 */ lw $ra, 0x14($sp) -/* 0635D8 800BB388 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0635DC 800BB38C 03E00008 */ jr $ra -/* 0635E0 800BB390 00000000 */ nop -.type func_800BB364, @function -.size func_800BB364, . - func_800BB364 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB394.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB394.s deleted file mode 100644 index 1fccf5f8..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB394.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800BB394 -/* 0635E4 800BB394 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0635E8 800BB398 AFBF0014 */ sw $ra, 0x14($sp) -/* 0635EC 800BB39C 240E0001 */ li $t6, 1 -/* 0635F0 800BB3A0 AFA40024 */ sw $a0, 0x24($sp) -/* 0635F4 800BB3A4 AFAE0018 */ sw $t6, 0x18($sp) -/* 0635F8 800BB3A8 0C02EC0A */ jal func_800BB028 -/* 0635FC 800BB3AC 27A40018 */ addiu $a0, $sp, 0x18 -/* 063600 800BB3B0 8FBF0014 */ lw $ra, 0x14($sp) -/* 063604 800BB3B4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 063608 800BB3B8 03E00008 */ jr $ra -/* 06360C 800BB3BC 00000000 */ nop -.type func_800BB394, @function -.size func_800BB394, . - func_800BB394 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB3C0.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB3C0.s deleted file mode 100644 index ec4667b0..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB3C0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800BB3C0 -/* 063610 800BB3C0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 063614 800BB3C4 AFBF0014 */ sw $ra, 0x14($sp) -/* 063618 800BB3C8 240E0002 */ li $t6, 2 -/* 06361C 800BB3CC AFA40028 */ sw $a0, 0x28($sp) -/* 063620 800BB3D0 AFAE001C */ sw $t6, 0x1c($sp) -/* 063624 800BB3D4 AFA5002C */ sw $a1, 0x2c($sp) -/* 063628 800BB3D8 0C02EC0A */ jal func_800BB028 -/* 06362C 800BB3DC 27A4001C */ addiu $a0, $sp, 0x1c -/* 063630 800BB3E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 063634 800BB3E4 27BD0030 */ addiu $sp, $sp, 0x30 -/* 063638 800BB3E8 03E00008 */ jr $ra -/* 06363C 800BB3EC 00000000 */ nop -.type func_800BB3C0, @function -.size func_800BB3C0, . - func_800BB3C0 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB3F0.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB3F0.s deleted file mode 100644 index 66d1e7ee..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB3F0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800BB3F0 -/* 063640 800BB3F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 063644 800BB3F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 063648 800BB3F8 240E0003 */ li $t6, 3 -/* 06364C 800BB3FC AFAE001C */ sw $t6, 0x1c($sp) -/* 063650 800BB400 0C02EC0A */ jal func_800BB028 -/* 063654 800BB404 27A4001C */ addiu $a0, $sp, 0x1c -/* 063658 800BB408 8FBF0014 */ lw $ra, 0x14($sp) -/* 06365C 800BB40C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 063660 800BB410 03E00008 */ jr $ra -/* 063664 800BB414 00000000 */ nop -.type func_800BB3F0, @function -.size func_800BB3F0, . - func_800BB3F0 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB418.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB418.s deleted file mode 100644 index 627fc281..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB418.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800BB418 -/* 063668 800BB418 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 06366C 800BB41C AFBF0014 */ sw $ra, 0x14($sp) -/* 063670 800BB420 240E0004 */ li $t6, 4 -/* 063674 800BB424 AFAE001C */ sw $t6, 0x1c($sp) -/* 063678 800BB428 0C02EC0A */ jal func_800BB028 -/* 06367C 800BB42C 27A4001C */ addiu $a0, $sp, 0x1c -/* 063680 800BB430 8FBF0014 */ lw $ra, 0x14($sp) -/* 063684 800BB434 27BD0028 */ addiu $sp, $sp, 0x28 -/* 063688 800BB438 03E00008 */ jr $ra -/* 06368C 800BB43C 00000000 */ nop -.type func_800BB418, @function -.size func_800BB418, . - func_800BB418 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB440.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB440.s deleted file mode 100644 index 1f402804..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB440.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800BB440 -/* 063690 800BB440 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 063694 800BB444 AFBF0014 */ sw $ra, 0x14($sp) -/* 063698 800BB448 240E0005 */ li $t6, 5 -/* 06369C 800BB44C AFAE001C */ sw $t6, 0x1c($sp) -/* 0636A0 800BB450 0C02EC0A */ jal func_800BB028 -/* 0636A4 800BB454 27A4001C */ addiu $a0, $sp, 0x1c -/* 0636A8 800BB458 8FBF0014 */ lw $ra, 0x14($sp) -/* 0636AC 800BB45C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0636B0 800BB460 03E00008 */ jr $ra -/* 0636B4 800BB464 00000000 */ nop -.type func_800BB440, @function -.size func_800BB440, . - func_800BB440 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB468.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB468.s deleted file mode 100644 index 7400c906..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB468.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_800BB468 -/* 0636B8 800BB468 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0636BC 800BB46C 00A03025 */ move $a2, $a1 -/* 0636C0 800BB470 00802825 */ move $a1, $a0 -/* 0636C4 800BB474 AFA40018 */ sw $a0, 0x18($sp) -/* 0636C8 800BB478 AFBF0014 */ sw $ra, 0x14($sp) -/* 0636CC 800BB47C 3C04800F */ lui $a0, %hi(D_800ED4C4) # $a0, 0x800f -/* 0636D0 800BB480 0C02ECD9 */ jal func_800BB364 -/* 0636D4 800BB484 8C84D4C4 */ lw $a0, %lo(D_800ED4C4)($a0) -/* 0636D8 800BB488 8FBF0014 */ lw $ra, 0x14($sp) -/* 0636DC 800BB48C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0636E0 800BB490 03E00008 */ jr $ra -/* 0636E4 800BB494 00000000 */ nop -.type func_800BB468, @function -.size func_800BB468, . - func_800BB468 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB498.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB498.s deleted file mode 100644 index ae901769..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB498.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800BB498 -/* 0636E8 800BB498 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0636EC 800BB49C AFBF0014 */ sw $ra, 0x14($sp) -/* 0636F0 800BB4A0 3C04800F */ lui $a0, %hi(D_800ED4C4) # $a0, 0x800f -/* 0636F4 800BB4A4 0C02ECE5 */ jal func_800BB394 -/* 0636F8 800BB4A8 8C84D4C4 */ lw $a0, %lo(D_800ED4C4)($a0) -/* 0636FC 800BB4AC 8FBF0014 */ lw $ra, 0x14($sp) -/* 063700 800BB4B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 063704 800BB4B4 03E00008 */ jr $ra -/* 063708 800BB4B8 00000000 */ nop -.type func_800BB498, @function -.size func_800BB498, . - func_800BB498 diff --git a/asm/non_matchings/ovl1/ovl1_10/func_800BB4BC.s b/asm/non_matchings/ovl1/ovl1_10/func_800BB4BC.s deleted file mode 100644 index 9450733d..00000000 --- a/asm/non_matchings/ovl1/ovl1_10/func_800BB4BC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800BB4BC -/* 06370C 800BB4BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 063710 800BB4C0 00802825 */ move $a1, $a0 -/* 063714 800BB4C4 AFBF0014 */ sw $ra, 0x14($sp) -/* 063718 800BB4C8 3C04800F */ lui $a0, %hi(D_800ED4C4) # $a0, 0x800f -/* 06371C 800BB4CC 0C02ECF0 */ jal func_800BB3C0 -/* 063720 800BB4D0 8C84D4C4 */ lw $a0, %lo(D_800ED4C4)($a0) -/* 063724 800BB4D4 8FBF0014 */ lw $ra, 0x14($sp) -/* 063728 800BB4D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06372C 800BB4DC 03E00008 */ jr $ra -/* 063730 800BB4E0 00000000 */ nop -.type func_800BB4BC, @function -.size func_800BB4BC, . - func_800BB4BC diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/0.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/0.s new file mode 100644 index 00000000..19b1e0d9 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/0.s @@ -0,0 +1,112 @@ +glabel func_800BA7A0 # 0 +/* 0629F0 800BA7A0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 0629F4 800BA7A4 AFBF002C */ sw $ra, 0x2C($sp) +/* 0629F8 800BA7A8 AFB40028 */ sw $s4, 0x28($sp) +/* 0629FC 800BA7AC AFB30024 */ sw $s3, 0x24($sp) +/* 062A00 800BA7B0 AFB20020 */ sw $s2, 0x20($sp) +/* 062A04 800BA7B4 AFB1001C */ sw $s1, 0x1C($sp) +/* 062A08 800BA7B8 AFB00018 */ sw $s0, 0x18($sp) +/* 062A0C 800BA7BC 94A70002 */ lhu $a3, 0x2($a1) +/* 062A10 800BA7C0 00A08025 */ move $s0, $a1 +/* 062A14 800BA7C4 00808825 */ move $s1, $a0 +/* 062A18 800BA7C8 14E00048 */ bnez $a3, L800BA8EC +/* 062A1C 800BA7CC 00C09025 */ move $s2, $a2 +/* 062A20 800BA7D0 3C13800D */ lui $s3, %hi(D_800D5238) +/* 062A24 800BA7D4 26735238 */ addiu $s3, $s3, %lo(D_800D5238) +/* 062A28 800BA7D8 24140001 */ addiu $s4, $zero, 0x1 +/* 062A2C 800BA7DC 8E020010 */ lw $v0, 0x10($s0) +glabel L800BA7E0 +/* 062A30 800BA7E0 94430000 */ lhu $v1, 0x0($v0) +/* 062A34 800BA7E4 00037342 */ srl $t6, $v1, 13 +/* 062A38 800BA7E8 2DC10005 */ sltiu $at, $t6, 0x5 +/* 062A3C 800BA7EC 1020003D */ beqz $at, L800BA8E4 +/* 062A40 800BA7F0 000E7080 */ sll $t6, $t6, 2 +/* 062A44 800BA7F4 3C01800D */ lui $at, %hi(jtbl_800D68E0) +/* 062A48 800BA7F8 002E0821 */ addu $at, $at, $t6 +/* 062A4C 800BA7FC 8C2E68E0 */ lw $t6, %lo(jtbl_800D68E0)($at) +/* 062A50 800BA800 01C00008 */ jr $t6 +/* 062A54 800BA804 00000000 */ nop +glabel L800BA808 +/* 062A58 800BA808 920F0000 */ lbu $t7, 0x0($s0) +/* 062A5C 800BA80C 96070002 */ lhu $a3, 0x2($s0) +/* 062A60 800BA810 000FC080 */ sll $t8, $t7, 2 +/* 062A64 800BA814 0278C821 */ addu $t9, $s3, $t8 +/* 062A68 800BA818 8F280000 */ lw $t0, 0x0($t9) +/* 062A6C 800BA81C 10000031 */ b L800BA8E4 +/* 062A70 800BA820 AE080010 */ sw $t0, 0x10($s0) +glabel L800BA824 +/* 062A74 800BA824 30691FFF */ andi $t1, $v1, 0x1FFF +/* 062A78 800BA828 244A0002 */ addiu $t2, $v0, 0x2 +/* 062A7C 800BA82C A6090002 */ sh $t1, 0x2($s0) +/* 062A80 800BA830 AE0A0010 */ sw $t2, 0x10($s0) +/* 062A84 800BA834 922B0000 */ lbu $t3, 0x0($s1) +/* 062A88 800BA838 15600007 */ bnez $t3, L800BA858 +/* 062A8C 800BA83C 00000000 */ nop +/* 062A90 800BA840 0C0011FC */ jal func_800047F0 +/* 062A94 800BA844 02402025 */ move $a0, $s2 +/* 062A98 800BA848 0C0011EC */ jal func_800047B0 +/* 062A9C 800BA84C 02402025 */ move $a0, $s2 +/* 062AA0 800BA850 A2140001 */ sb $s4, 0x1($s0) +/* 062AA4 800BA854 A2340000 */ sb $s4, 0x0($s1) +glabel L800BA858 +/* 062AA8 800BA858 10000022 */ b L800BA8E4 +/* 062AAC 800BA85C 96070002 */ lhu $a3, 0x2($s0) +glabel L800BA860 +/* 062AB0 800BA860 306D1FFF */ andi $t5, $v1, 0x1FFF +/* 062AB4 800BA864 244E0002 */ addiu $t6, $v0, 0x2 +/* 062AB8 800BA868 A60D0002 */ sh $t5, 0x2($s0) +/* 062ABC 800BA86C AE0E0010 */ sw $t6, 0x10($s0) +/* 062AC0 800BA870 922F0000 */ lbu $t7, 0x0($s1) +/* 062AC4 800BA874 11E00005 */ beqz $t7, L800BA88C +/* 062AC8 800BA878 00000000 */ nop +/* 062ACC 800BA87C 0C0011F4 */ jal func_800047D0 +/* 062AD0 800BA880 02402025 */ move $a0, $s2 +/* 062AD4 800BA884 A2000001 */ sb $zero, 0x1($s0) +/* 062AD8 800BA888 A2200000 */ sb $zero, 0x0($s1) +glabel L800BA88C +/* 062ADC 800BA88C 10000015 */ b L800BA8E4 +/* 062AE0 800BA890 96070002 */ lhu $a3, 0x2($s0) +glabel L800BA894 +/* 062AE4 800BA894 30791FFF */ andi $t9, $v1, 0x1FFF +/* 062AE8 800BA898 24480002 */ addiu $t0, $v0, 0x2 +/* 062AEC 800BA89C A6190004 */ sh $t9, 0x4($s0) +/* 062AF0 800BA8A0 AE080010 */ sw $t0, 0x10($s0) +/* 062AF4 800BA8A4 AE08000C */ sw $t0, 0xC($s0) +/* 062AF8 800BA8A8 1000000E */ b L800BA8E4 +/* 062AFC 800BA8AC 96070002 */ lhu $a3, 0x2($s0) +glabel L800BA8B0 +/* 062B00 800BA8B0 960A0004 */ lhu $t2, 0x4($s0) +/* 062B04 800BA8B4 254BFFFF */ addiu $t3, $t2, -0x1 +/* 062B08 800BA8B8 316CFFFF */ andi $t4, $t3, 0xFFFF +/* 062B0C 800BA8BC 11800005 */ beqz $t4, L800BA8D4 +/* 062B10 800BA8C0 A60B0004 */ sh $t3, 0x4($s0) +/* 062B14 800BA8C4 8E0D000C */ lw $t5, 0xC($s0) +/* 062B18 800BA8C8 96070002 */ lhu $a3, 0x2($s0) +/* 062B1C 800BA8CC 10000005 */ b L800BA8E4 +/* 062B20 800BA8D0 AE0D0010 */ sw $t5, 0x10($s0) +glabel L800BA8D4 +/* 062B24 800BA8D4 8E0E0010 */ lw $t6, 0x10($s0) +/* 062B28 800BA8D8 96070002 */ lhu $a3, 0x2($s0) +/* 062B2C 800BA8DC 25CF0002 */ addiu $t7, $t6, 0x2 +/* 062B30 800BA8E0 AE0F0010 */ sw $t7, 0x10($s0) +glabel L800BA8E4 +/* 062B34 800BA8E4 50E0FFBE */ beql $a3, $zero, L800BA7E0 +/* 062B38 800BA8E8 8E020010 */ lw $v0, 0x10($s0) +glabel L800BA8EC +/* 062B3C 800BA8EC 8FBF002C */ lw $ra, 0x2C($sp) +/* 062B40 800BA8F0 8FB00018 */ lw $s0, 0x18($sp) +/* 062B44 800BA8F4 8FB1001C */ lw $s1, 0x1C($sp) +/* 062B48 800BA8F8 8FB20020 */ lw $s2, 0x20($sp) +/* 062B4C 800BA8FC 8FB30024 */ lw $s3, 0x24($sp) +/* 062B50 800BA900 8FB40028 */ lw $s4, 0x28($sp) +/* 062B54 800BA904 03E00008 */ jr $ra +/* 062B58 800BA908 27BD0030 */ addiu $sp, $sp, 0x30 +.size func_800BA7A0, . - func_800BA7A0 + +.late_rodata +glabel jtbl_800D68E0 +.word L800BA808 +.word L800BA824 +.word L800BA860 +.word L800BA894 +.word L800BA8B0 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/1.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/1.s new file mode 100644 index 00000000..abfef029 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/1.s @@ -0,0 +1,81 @@ +glabel func_800BA90C # 1 +/* 062B5C 800BA90C AFA40000 */ sw $a0, 0x0($sp) +/* 062B60 800BA910 94A20002 */ lhu $v0, 0x2($a1) +/* 062B64 800BA914 3C06800D */ lui $a2, %hi(D_800D5238) +/* 062B68 800BA918 24C65238 */ addiu $a2, $a2, %lo(D_800D5238) +/* 062B6C 800BA91C 14400037 */ bnez $v0, L800BA9FC +/* 062B70 800BA920 24070001 */ addiu $a3, $zero, 0x1 +/* 062B74 800BA924 8CA30010 */ lw $v1, 0x10($a1) +glabel L800BA928 +/* 062B78 800BA928 94640000 */ lhu $a0, 0x0($v1) +/* 062B7C 800BA92C 00047342 */ srl $t6, $a0, 13 +/* 062B80 800BA930 2DC10005 */ sltiu $at, $t6, 0x5 +/* 062B84 800BA934 1020002F */ beqz $at, L800BA9F4 +/* 062B88 800BA938 000E7080 */ sll $t6, $t6, 2 +/* 062B8C 800BA93C 3C01800D */ lui $at, %hi(jtbl_800D68F4) +/* 062B90 800BA940 002E0821 */ addu $at, $at, $t6 +/* 062B94 800BA944 8C2E68F4 */ lw $t6, %lo(jtbl_800D68F4)($at) +/* 062B98 800BA948 01C00008 */ jr $t6 +/* 062B9C 800BA94C 00000000 */ nop +glabel L800BA950 +/* 062BA0 800BA950 90AF0000 */ lbu $t7, 0x0($a1) +/* 062BA4 800BA954 94A20002 */ lhu $v0, 0x2($a1) +/* 062BA8 800BA958 000FC080 */ sll $t8, $t7, 2 +/* 062BAC 800BA95C 00D8C821 */ addu $t9, $a2, $t8 +/* 062BB0 800BA960 8F280000 */ lw $t0, 0x0($t9) +/* 062BB4 800BA964 10000023 */ b L800BA9F4 +/* 062BB8 800BA968 ACA80010 */ sw $t0, 0x10($a1) +glabel L800BA96C +/* 062BBC 800BA96C 30891FFF */ andi $t1, $a0, 0x1FFF +/* 062BC0 800BA970 246A0002 */ addiu $t2, $v1, 0x2 +/* 062BC4 800BA974 A4A90002 */ sh $t1, 0x2($a1) +/* 062BC8 800BA978 ACAA0010 */ sw $t2, 0x10($a1) +/* 062BCC 800BA97C A0A70001 */ sb $a3, 0x1($a1) +/* 062BD0 800BA980 1000001C */ b L800BA9F4 +/* 062BD4 800BA984 3122FFFF */ andi $v0, $t1, 0xFFFF +glabel L800BA988 +/* 062BD8 800BA988 308B1FFF */ andi $t3, $a0, 0x1FFF +/* 062BDC 800BA98C 246C0002 */ addiu $t4, $v1, 0x2 +/* 062BE0 800BA990 A4AB0002 */ sh $t3, 0x2($a1) +/* 062BE4 800BA994 ACAC0010 */ sw $t4, 0x10($a1) +/* 062BE8 800BA998 A0A00001 */ sb $zero, 0x1($a1) +/* 062BEC 800BA99C 10000015 */ b L800BA9F4 +/* 062BF0 800BA9A0 3162FFFF */ andi $v0, $t3, 0xFFFF +glabel L800BA9A4 +/* 062BF4 800BA9A4 308D1FFF */ andi $t5, $a0, 0x1FFF +/* 062BF8 800BA9A8 246E0002 */ addiu $t6, $v1, 0x2 +/* 062BFC 800BA9AC A4AD0004 */ sh $t5, 0x4($a1) +/* 062C00 800BA9B0 ACAE0010 */ sw $t6, 0x10($a1) +/* 062C04 800BA9B4 ACAE000C */ sw $t6, 0xC($a1) +/* 062C08 800BA9B8 1000000E */ b L800BA9F4 +/* 062C0C 800BA9BC 94A20002 */ lhu $v0, 0x2($a1) +glabel L800BA9C0 +/* 062C10 800BA9C0 94B80004 */ lhu $t8, 0x4($a1) +/* 062C14 800BA9C4 2719FFFF */ addiu $t9, $t8, -0x1 +/* 062C18 800BA9C8 3328FFFF */ andi $t0, $t9, 0xFFFF +/* 062C1C 800BA9CC 11000005 */ beqz $t0, L800BA9E4 +/* 062C20 800BA9D0 A4B90004 */ sh $t9, 0x4($a1) +/* 062C24 800BA9D4 8CA9000C */ lw $t1, 0xC($a1) +/* 062C28 800BA9D8 94A20002 */ lhu $v0, 0x2($a1) +/* 062C2C 800BA9DC 10000005 */ b L800BA9F4 +/* 062C30 800BA9E0 ACA90010 */ sw $t1, 0x10($a1) +glabel L800BA9E4 +/* 062C34 800BA9E4 8CAA0010 */ lw $t2, 0x10($a1) +/* 062C38 800BA9E8 94A20002 */ lhu $v0, 0x2($a1) +/* 062C3C 800BA9EC 254B0002 */ addiu $t3, $t2, 0x2 +/* 062C40 800BA9F0 ACAB0010 */ sw $t3, 0x10($a1) +glabel L800BA9F4 +/* 062C44 800BA9F4 5040FFCC */ beql $v0, $zero, L800BA928 +/* 062C48 800BA9F8 8CA30010 */ lw $v1, 0x10($a1) +glabel L800BA9FC +/* 062C4C 800BA9FC 03E00008 */ jr $ra +/* 062C50 800BAA00 00000000 */ nop +.size func_800BA90C, . - func_800BA90C + +.late_rodata +glabel jtbl_800D68F4 +.word L800BA950 +.word L800BA96C +.word L800BA988 +.word L800BA9A4 +.word L800BA9C0 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/10.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/10.s new file mode 100644 index 00000000..551b3010 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/10.s @@ -0,0 +1,27 @@ +glabel func_800BB028 # 10 +/* 063278 800BB028 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 06327C 800BB02C AFBF0014 */ sw $ra, 0x14($sp) +/* 063280 800BB030 00803825 */ move $a3, $a0 +/* 063284 800BB034 AFA70038 */ sw $a3, 0x38($sp) +/* 063288 800BB038 27A4001C */ addiu $a0, $sp, 0x1C +/* 06328C 800BB03C 27A50034 */ addiu $a1, $sp, 0x34 +/* 063290 800BB040 0C00CEB8 */ jal osCreateMesgQueue +/* 063294 800BB044 24060001 */ addiu $a2, $zero, 0x1 +/* 063298 800BB048 8FA50038 */ lw $a1, 0x38($sp) +/* 06329C 800BB04C 240E0001 */ addiu $t6, $zero, 0x1 +/* 0632A0 800BB050 27AF001C */ addiu $t7, $sp, 0x1C +/* 0632A4 800BB054 3C04800F */ lui $a0, %hi(D_800ED4C8) +/* 0632A8 800BB058 2484D4C8 */ addiu $a0, $a0, %lo(D_800ED4C8) +/* 0632AC 800BB05C 00003025 */ move $a2, $zero +/* 0632B0 800BB060 ACAE0004 */ sw $t6, 0x4($a1) +/* 0632B4 800BB064 0C00B4BC */ jal osSendMesg +/* 0632B8 800BB068 ACAF0008 */ sw $t7, 0x8($a1) +/* 0632BC 800BB06C 27A4001C */ addiu $a0, $sp, 0x1C +/* 0632C0 800BB070 00002825 */ move $a1, $zero +/* 0632C4 800BB074 0C00B540 */ jal osRecvMesg +/* 0632C8 800BB078 24060001 */ addiu $a2, $zero, 0x1 +/* 0632CC 800BB07C 8FBF0014 */ lw $ra, 0x14($sp) +/* 0632D0 800BB080 27BD0038 */ addiu $sp, $sp, 0x38 +/* 0632D4 800BB084 03E00008 */ jr $ra +/* 0632D8 800BB088 00000000 */ nop +.size func_800BB028, . - func_800BB028 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/11.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/11.s new file mode 100644 index 00000000..318ea7bb --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/11.s @@ -0,0 +1,45 @@ +glabel func_800BB08C # 11 +/* 0632DC 800BB08C 3C0E800F */ lui $t6, %hi(D_800ED4C0) +/* 0632E0 800BB090 8DCED4C0 */ lw $t6, %lo(D_800ED4C0)($t6) +/* 0632E4 800BB094 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 0632E8 800BB098 AFBF0014 */ sw $ra, 0x14($sp) +/* 0632EC 800BB09C AFA5002C */ sw $a1, 0x2C($sp) +/* 0632F0 800BB0A0 11C0001E */ beqz $t6, L800BB11C +/* 0632F4 800BB0A4 AFA60030 */ sw $a2, 0x30($sp) +/* 0632F8 800BB0A8 3C18800F */ lui $t8, %hi(D_800ED4A0) +/* 0632FC 800BB0AC 2718D4A0 */ addiu $t8, $t8, %lo(D_800ED4A0) +/* 063300 800BB0B0 000478C0 */ sll $t7, $a0, 3 +/* 063304 800BB0B4 01F82021 */ addu $a0, $t7, $t8 +/* 063308 800BB0B8 0C02EBAC */ jal func_800BAEB0 +/* 06330C 800BB0BC AFA4001C */ sw $a0, 0x1C($sp) +/* 063310 800BB0C0 14400016 */ bnez $v0, L800BB11C +/* 063314 800BB0C4 8FA4001C */ lw $a0, 0x1C($sp) +/* 063318 800BB0C8 0C02EBD4 */ jal func_800BAF50 +/* 06331C 800BB0CC 8FA5002C */ lw $a1, 0x2C($sp) +/* 063320 800BB0D0 10400012 */ beqz $v0, L800BB11C +/* 063324 800BB0D4 8FA30030 */ lw $v1, 0x30($sp) +/* 063328 800BB0D8 14600003 */ bnez $v1, L800BB0E8 +/* 06332C 800BB0DC 2419FFFF */ addiu $t9, $zero, -0x1 +/* 063330 800BB0E0 10000002 */ b L800BB0EC +/* 063334 800BB0E4 AC590008 */ sw $t9, 0x8($v0) +glabel L800BB0E8 +/* 063338 800BB0E8 AC430008 */ sw $v1, 0x8($v0) +glabel L800BB0EC +/* 06333C 800BB0EC 8FA8002C */ lw $t0, 0x2C($sp) +/* 063340 800BB0F0 A0400001 */ sb $zero, 0x1($v0) +/* 063344 800BB0F4 A4400002 */ sh $zero, 0x2($v0) +/* 063348 800BB0F8 A4400004 */ sh $zero, 0x4($v0) +/* 06334C 800BB0FC AC40000C */ sw $zero, 0xC($v0) +/* 063350 800BB100 A0480000 */ sb $t0, 0x0($v0) +/* 063354 800BB104 8FAA002C */ lw $t2, 0x2C($sp) +/* 063358 800BB108 3C0C800D */ lui $t4, %hi(D_800D5238) +/* 06335C 800BB10C 000A5880 */ sll $t3, $t2, 2 +/* 063360 800BB110 018B6021 */ addu $t4, $t4, $t3 +/* 063364 800BB114 8D8C5238 */ lw $t4, %lo(D_800D5238)($t4) +/* 063368 800BB118 AC4C0010 */ sw $t4, 0x10($v0) +glabel L800BB11C +/* 06336C 800BB11C 8FBF0014 */ lw $ra, 0x14($sp) +/* 063370 800BB120 27BD0028 */ addiu $sp, $sp, 0x28 +/* 063374 800BB124 03E00008 */ jr $ra +/* 063378 800BB128 00000000 */ nop +.size func_800BB08C, . - func_800BB08C diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/12.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/12.s new file mode 100644 index 00000000..99f5be14 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/12.s @@ -0,0 +1,32 @@ +glabel func_800BB12C # 12 +/* 06337C 800BB12C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 063380 800BB130 AFBF0014 */ sw $ra, 0x14($sp) +/* 063384 800BB134 0C0011FC */ jal func_800047F0 +/* 063388 800BB138 AFA40018 */ sw $a0, 0x18($sp) +/* 06338C 800BB13C 0C0011F4 */ jal func_800047D0 +/* 063390 800BB140 8FA40018 */ lw $a0, 0x18($sp) +/* 063394 800BB144 8FAE0018 */ lw $t6, 0x18($sp) +/* 063398 800BB148 3C18800F */ lui $t8, %hi(D_800ED4A0) +/* 06339C 800BB14C 2718D4A0 */ addiu $t8, $t8, %lo(D_800ED4A0) +/* 0633A0 800BB150 000E78C0 */ sll $t7, $t6, 3 +/* 0633A4 800BB154 01F81821 */ addu $v1, $t7, $t8 +/* 0633A8 800BB158 90790000 */ lbu $t9, 0x0($v1) +/* 0633AC 800BB15C 53200003 */ beql $t9, $zero, L800BB16C +/* 0633B0 800BB160 8C620004 */ lw $v0, 0x4($v1) +/* 0633B4 800BB164 A0600000 */ sb $zero, 0x0($v1) +/* 0633B8 800BB168 8C620004 */ lw $v0, 0x4($v1) +glabel L800BB16C +/* 0633BC 800BB16C 50400007 */ beql $v0, $zero, L800BB18C +/* 0633C0 800BB170 8FBF0014 */ lw $ra, 0x14($sp) +/* 0633C4 800BB174 8C480000 */ lw $t0, 0x0($v0) +glabel L800BB178 +/* 0633C8 800BB178 AD000010 */ sw $zero, 0x10($t0) +/* 0633CC 800BB17C 8C420004 */ lw $v0, 0x4($v0) +/* 0633D0 800BB180 5440FFFD */ bnel $v0, $zero, L800BB178 +/* 0633D4 800BB184 8C480000 */ lw $t0, 0x0($v0) +/* 0633D8 800BB188 8FBF0014 */ lw $ra, 0x14($sp) +glabel L800BB18C +/* 0633DC 800BB18C 27BD0018 */ addiu $sp, $sp, 0x18 +/* 0633E0 800BB190 03E00008 */ jr $ra +/* 0633E4 800BB194 00000000 */ nop +.size func_800BB12C, . - func_800BB12C diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/13.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/13.s new file mode 100644 index 00000000..6518f209 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/13.s @@ -0,0 +1,51 @@ +glabel func_800BB198 # 13 +/* 0633E8 800BB198 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 0633EC 800BB19C 3C18800F */ lui $t8, %hi(D_800ED4A0) +/* 0633F0 800BB1A0 AFB1001C */ sw $s1, 0x1C($sp) +/* 0633F4 800BB1A4 2718D4A0 */ addiu $t8, $t8, %lo(D_800ED4A0) +/* 0633F8 800BB1A8 000478C0 */ sll $t7, $a0, 3 +/* 0633FC 800BB1AC 01F88821 */ addu $s1, $t7, $t8 +/* 063400 800BB1B0 8E230004 */ lw $v1, 0x4($s1) +/* 063404 800BB1B4 AFBF0024 */ sw $ra, 0x24($sp) +/* 063408 800BB1B8 AFB20020 */ sw $s2, 0x20($sp) +/* 06340C 800BB1BC AFB00018 */ sw $s0, 0x18($sp) +/* 063410 800BB1C0 AFA40028 */ sw $a0, 0x28($sp) +/* 063414 800BB1C4 8C790000 */ lw $t9, 0x0($v1) +/* 063418 800BB1C8 00A09025 */ move $s2, $a1 +/* 06341C 800BB1CC 00608025 */ move $s0, $v1 +/* 063420 800BB1D0 8F280010 */ lw $t0, 0x10($t9) +/* 063424 800BB1D4 51000018 */ beql $t0, $zero, L800BB238 +/* 063428 800BB1D8 8FBF0024 */ lw $ra, 0x24($sp) +/* 06342C 800BB1DC 50600012 */ beql $v1, $zero, L800BB228 +/* 063430 800BB1E0 02202025 */ move $a0, $s1 +/* 063434 800BB1E4 8E020000 */ lw $v0, 0x0($s0) +glabel L800BB1E8 +/* 063438 800BB1E8 02202025 */ move $a0, $s1 +/* 06343C 800BB1EC 8C490010 */ lw $t1, 0x10($v0) +/* 063440 800BB1F0 5120000D */ beql $t1, $zero, L800BB228 +/* 063444 800BB1F4 02202025 */ move $a0, $s1 +/* 063448 800BB1F8 904A0000 */ lbu $t2, 0x0($v0) +/* 06344C 800BB1FC 564A0007 */ bnel $s2, $t2, L800BB21C +/* 063450 800BB200 8E100004 */ lw $s0, 0x4($s0) +/* 063454 800BB204 0C02EA81 */ jal func_800BAA04 +/* 063458 800BB208 02002825 */ move $a1, $s0 +/* 06345C 800BB20C 8E230004 */ lw $v1, 0x4($s1) +/* 063460 800BB210 10000002 */ b L800BB21C +/* 063464 800BB214 00608025 */ move $s0, $v1 +/* 063468 800BB218 8E100004 */ lw $s0, 0x4($s0) +glabel L800BB21C +/* 06346C 800BB21C 5600FFF2 */ bnel $s0, $zero, L800BB1E8 +/* 063470 800BB220 8E020000 */ lw $v0, 0x0($s0) +/* 063474 800BB224 02202025 */ move $a0, $s1 +glabel L800BB228 +/* 063478 800BB228 8C650000 */ lw $a1, 0x0($v1) +/* 06347C 800BB22C 0C02EADA */ jal func_800BAB68 +/* 063480 800BB230 8FA60028 */ lw $a2, 0x28($sp) +/* 063484 800BB234 8FBF0024 */ lw $ra, 0x24($sp) +glabel L800BB238 +/* 063488 800BB238 8FB00018 */ lw $s0, 0x18($sp) +/* 06348C 800BB23C 8FB1001C */ lw $s1, 0x1C($sp) +/* 063490 800BB240 8FB20020 */ lw $s2, 0x20($sp) +/* 063494 800BB244 03E00008 */ jr $ra +/* 063498 800BB248 27BD0028 */ addiu $sp, $sp, 0x28 +.size func_800BB198, . - func_800BB198 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/14.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/14.s new file mode 100644 index 00000000..5476511b --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/14.s @@ -0,0 +1,74 @@ +glabel func_800BB24C # 14 +/* 06349C 800BB24C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 0634A0 800BB250 3C09800F */ lui $t1, %hi(D_800ED4A0) +/* 0634A4 800BB254 3C08800F */ lui $t0, %hi(D_800ED410) +/* 0634A8 800BB258 3C07800F */ lui $a3, %hi(D_800ED320) +/* 0634AC 800BB25C 3C0A800F */ lui $t2, %hi(D_800ED410) +/* 0634B0 800BB260 AFBF001C */ sw $ra, 0x1C($sp) +/* 0634B4 800BB264 254AD410 */ addiu $t2, $t2, %lo(D_800ED410) +/* 0634B8 800BB268 24E7D320 */ addiu $a3, $a3, %lo(D_800ED320) +/* 0634BC 800BB26C 2508D410 */ addiu $t0, $t0, %lo(D_800ED410) +/* 0634C0 800BB270 2529D4A0 */ addiu $t1, $t1, %lo(D_800ED4A0) +/* 0634C4 800BB274 24060003 */ addiu $a2, $zero, 0x3 +glabel L800BB278 +/* 0634C8 800BB278 A1200000 */ sb $zero, 0x0($t1) +/* 0634CC 800BB27C AD280004 */ sw $t0, 0x4($t1) +/* 0634D0 800BB280 01001025 */ move $v0, $t0 +/* 0634D4 800BB284 AD070000 */ sw $a3, 0x0($t0) +/* 0634D8 800BB288 00E01825 */ move $v1, $a3 +/* 0634DC 800BB28C ACE0000C */ sw $zero, 0xC($a3) +/* 0634E0 800BB290 ACE00010 */ sw $zero, 0x10($a3) +/* 0634E4 800BB294 01002025 */ move $a0, $t0 +/* 0634E8 800BB298 24050001 */ addiu $a1, $zero, 0x1 +glabel L800BB29C +/* 0634EC 800BB29C 2442000C */ addiu $v0, $v0, 0xC +/* 0634F0 800BB2A0 AC820004 */ sw $v0, 0x4($a0) +/* 0634F4 800BB2A4 24630014 */ addiu $v1, $v1, 0x14 +/* 0634F8 800BB2A8 AC430000 */ sw $v1, 0x0($v0) +/* 0634FC 800BB2AC AC60000C */ sw $zero, 0xC($v1) +/* 063500 800BB2B0 AC600010 */ sw $zero, 0x10($v1) +/* 063504 800BB2B4 24A50001 */ addiu $a1, $a1, 0x1 +/* 063508 800BB2B8 AC440008 */ sw $a0, 0x8($v0) +/* 06350C 800BB2BC 14A6FFF7 */ bne $a1, $a2, L800BB29C +/* 063510 800BB2C0 00402025 */ move $a0, $v0 +/* 063514 800BB2C4 AC400004 */ sw $zero, 0x4($v0) +/* 063518 800BB2C8 8D2E0004 */ lw $t6, 0x4($t1) +/* 06351C 800BB2CC 24E7003C */ addiu $a3, $a3, 0x3C +/* 063520 800BB2D0 25080024 */ addiu $t0, $t0, 0x24 +/* 063524 800BB2D4 25290008 */ addiu $t1, $t1, 0x8 +/* 063528 800BB2D8 14EAFFE7 */ bne $a3, $t2, L800BB278 +/* 06352C 800BB2DC ADC20008 */ sw $v0, 0x8($t6) +/* 063530 800BB2E0 240F0001 */ addiu $t7, $zero, 0x1 +/* 063534 800BB2E4 3C01800F */ lui $at, %hi(D_800ED4C0) +/* 063538 800BB2E8 3C188005 */ lui $t8, %hi(D_80048E9C) +/* 06353C 800BB2EC 83188E9C */ lb $t8, %lo(D_80048E9C)($t8) +/* 063540 800BB2F0 AC2FD4C0 */ sw $t7, %lo(D_800ED4C0)($at) +/* 063544 800BB2F4 3C19800F */ lui $t9, %hi(D_800ED320) +/* 063548 800BB2F8 3C01800F */ lui $at, %hi(D_800ED4C4) +/* 06354C 800BB2FC 2739D320 */ addiu $t9, $t9, %lo(D_800ED320) +/* 063550 800BB300 3C04800F */ lui $a0, %hi(D_800ECD70) +/* 063554 800BB304 3C0505F5 */ lui $a1, (0x5F5E100 >> 16) +/* 063558 800BB308 3C06800C */ lui $a2, %hi(func_800BAD0C) +/* 06355C 800BB30C 240B0034 */ addiu $t3, $zero, 0x34 +/* 063560 800BB310 AFAB0014 */ sw $t3, 0x14($sp) +/* 063564 800BB314 24C6AD0C */ addiu $a2, $a2, %lo(func_800BAD0C) +/* 063568 800BB318 34A5E100 */ ori $a1, $a1, (0x5F5E100 & 0xFFFF) +/* 06356C 800BB31C 2484CD70 */ addiu $a0, $a0, %lo(D_800ECD70) +/* 063570 800BB320 AFB90010 */ sw $t9, 0x10($sp) +/* 063574 800BB324 00003825 */ move $a3, $zero +/* 063578 800BB328 0C00BEF8 */ jal osCreateThread +/* 06357C 800BB32C AC38D4C4 */ sw $t8, %lo(D_800ED4C4)($at) +/* 063580 800BB330 3C0DFEDC */ lui $t5, (0xFEDCBA98 >> 16) +/* 063584 800BB334 35ADBA98 */ ori $t5, $t5, (0xFEDCBA98 & 0xFFFF) +/* 063588 800BB338 240C0000 */ addiu $t4, $zero, 0x0 +/* 06358C 800BB33C 3C01800F */ lui $at, %hi(D_800ECF58) +/* 063590 800BB340 3C04800F */ lui $a0, %hi(D_800ECD70) +/* 063594 800BB344 AC2CCF58 */ sw $t4, %lo(D_800ECF58)($at) +/* 063598 800BB348 AC2DCF5C */ sw $t5, %lo(D_800ECF5C)($at) +/* 06359C 800BB34C 0C00E334 */ jal osStartThread +/* 0635A0 800BB350 2484CD70 */ addiu $a0, $a0, %lo(D_800ECD70) +/* 0635A4 800BB354 8FBF001C */ lw $ra, 0x1C($sp) +/* 0635A8 800BB358 27BD0020 */ addiu $sp, $sp, 0x20 +/* 0635AC 800BB35C 03E00008 */ jr $ra +/* 0635B0 800BB360 00000000 */ nop +.size func_800BB24C, . - func_800BB24C diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/15.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/15.s new file mode 100644 index 00000000..4c17f930 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/15.s @@ -0,0 +1,14 @@ +glabel func_800BB364 # 15 +/* 0635B4 800BB364 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 0635B8 800BB368 AFBF0014 */ sw $ra, 0x14($sp) +/* 0635BC 800BB36C AFA40024 */ sw $a0, 0x24($sp) +/* 0635C0 800BB370 AFA00018 */ sw $zero, 0x18($sp) +/* 0635C4 800BB374 AFA50028 */ sw $a1, 0x28($sp) +/* 0635C8 800BB378 AFA6002C */ sw $a2, 0x2C($sp) +/* 0635CC 800BB37C 0C02EC0A */ jal func_800BB028 +/* 0635D0 800BB380 27A40018 */ addiu $a0, $sp, 0x18 +/* 0635D4 800BB384 8FBF0014 */ lw $ra, 0x14($sp) +/* 0635D8 800BB388 27BD0030 */ addiu $sp, $sp, 0x30 +/* 0635DC 800BB38C 03E00008 */ jr $ra +/* 0635E0 800BB390 00000000 */ nop +.size func_800BB364, . - func_800BB364 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/16.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/16.s new file mode 100644 index 00000000..c014b55d --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/16.s @@ -0,0 +1,13 @@ +glabel func_800BB394 # 16 +/* 0635E4 800BB394 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 0635E8 800BB398 AFBF0014 */ sw $ra, 0x14($sp) +/* 0635EC 800BB39C 240E0001 */ addiu $t6, $zero, 0x1 +/* 0635F0 800BB3A0 AFA40024 */ sw $a0, 0x24($sp) +/* 0635F4 800BB3A4 AFAE0018 */ sw $t6, 0x18($sp) +/* 0635F8 800BB3A8 0C02EC0A */ jal func_800BB028 +/* 0635FC 800BB3AC 27A40018 */ addiu $a0, $sp, 0x18 +/* 063600 800BB3B0 8FBF0014 */ lw $ra, 0x14($sp) +/* 063604 800BB3B4 27BD0028 */ addiu $sp, $sp, 0x28 +/* 063608 800BB3B8 03E00008 */ jr $ra +/* 06360C 800BB3BC 00000000 */ nop +.size func_800BB394, . - func_800BB394 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/17.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/17.s new file mode 100644 index 00000000..05677b82 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/17.s @@ -0,0 +1,14 @@ +glabel func_800BB3C0 # 17 +/* 063610 800BB3C0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 063614 800BB3C4 AFBF0014 */ sw $ra, 0x14($sp) +/* 063618 800BB3C8 240E0002 */ addiu $t6, $zero, 0x2 +/* 06361C 800BB3CC AFA40028 */ sw $a0, 0x28($sp) +/* 063620 800BB3D0 AFAE001C */ sw $t6, 0x1C($sp) +/* 063624 800BB3D4 AFA5002C */ sw $a1, 0x2C($sp) +/* 063628 800BB3D8 0C02EC0A */ jal func_800BB028 +/* 06362C 800BB3DC 27A4001C */ addiu $a0, $sp, 0x1C +/* 063630 800BB3E0 8FBF0014 */ lw $ra, 0x14($sp) +/* 063634 800BB3E4 27BD0030 */ addiu $sp, $sp, 0x30 +/* 063638 800BB3E8 03E00008 */ jr $ra +/* 06363C 800BB3EC 00000000 */ nop +.size func_800BB3C0, . - func_800BB3C0 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/18.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/18.s new file mode 100644 index 00000000..511bffba --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/18.s @@ -0,0 +1,12 @@ +glabel func_800BB3F0 # 18 +/* 063640 800BB3F0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 063644 800BB3F4 AFBF0014 */ sw $ra, 0x14($sp) +/* 063648 800BB3F8 240E0003 */ addiu $t6, $zero, 0x3 +/* 06364C 800BB3FC AFAE001C */ sw $t6, 0x1C($sp) +/* 063650 800BB400 0C02EC0A */ jal func_800BB028 +/* 063654 800BB404 27A4001C */ addiu $a0, $sp, 0x1C +/* 063658 800BB408 8FBF0014 */ lw $ra, 0x14($sp) +/* 06365C 800BB40C 27BD0028 */ addiu $sp, $sp, 0x28 +/* 063660 800BB410 03E00008 */ jr $ra +/* 063664 800BB414 00000000 */ nop +.size func_800BB3F0, . - func_800BB3F0 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/19.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/19.s new file mode 100644 index 00000000..2ddf2107 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/19.s @@ -0,0 +1,12 @@ +glabel func_800BB418 # 19 +/* 063668 800BB418 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 06366C 800BB41C AFBF0014 */ sw $ra, 0x14($sp) +/* 063670 800BB420 240E0004 */ addiu $t6, $zero, 0x4 +/* 063674 800BB424 AFAE001C */ sw $t6, 0x1C($sp) +/* 063678 800BB428 0C02EC0A */ jal func_800BB028 +/* 06367C 800BB42C 27A4001C */ addiu $a0, $sp, 0x1C +/* 063680 800BB430 8FBF0014 */ lw $ra, 0x14($sp) +/* 063684 800BB434 27BD0028 */ addiu $sp, $sp, 0x28 +/* 063688 800BB438 03E00008 */ jr $ra +/* 06368C 800BB43C 00000000 */ nop +.size func_800BB418, . - func_800BB418 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/2.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/2.s new file mode 100644 index 00000000..abe37b5a --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/2.s @@ -0,0 +1,29 @@ +glabel func_800BAA04 # 2 +/* 062C54 800BAA04 8C8E0004 */ lw $t6, 0x4($a0) +/* 062C58 800BAA08 8CA30004 */ lw $v1, 0x4($a1) +/* 062C5C 800BAA0C 8CAF0000 */ lw $t7, 0x0($a1) +/* 062C60 800BAA10 8DC20008 */ lw $v0, 0x8($t6) +/* 062C64 800BAA14 10600011 */ beqz $v1, L800BAA5C +/* 062C68 800BAA18 ADE00010 */ sw $zero, 0x10($t7) +/* 062C6C 800BAA1C 8CA60008 */ lw $a2, 0x8($a1) +/* 062C70 800BAA20 8CD80004 */ lw $t8, 0x4($a2) +/* 062C74 800BAA24 57000005 */ bnel $t8, $zero, L800BAA3C +/* 062C78 800BAA28 ACC30004 */ sw $v1, 0x4($a2) +/* 062C7C 800BAA2C 8CB90004 */ lw $t9, 0x4($a1) +/* 062C80 800BAA30 10000004 */ b L800BAA44 +/* 062C84 800BAA34 AC990004 */ sw $t9, 0x4($a0) +/* 062C88 800BAA38 ACC30004 */ sw $v1, 0x4($a2) +glabel L800BAA3C +/* 062C8C 800BAA3C 8CA80008 */ lw $t0, 0x8($a1) +/* 062C90 800BAA40 AC680008 */ sw $t0, 0x8($v1) +glabel L800BAA44 +/* 062C94 800BAA44 8C490004 */ lw $t1, 0x4($v0) +/* 062C98 800BAA48 ACA90004 */ sw $t1, 0x4($a1) +/* 062C9C 800BAA4C AC450004 */ sw $a1, 0x4($v0) +/* 062CA0 800BAA50 ACA20008 */ sw $v0, 0x8($a1) +/* 062CA4 800BAA54 8C8A0004 */ lw $t2, 0x4($a0) +/* 062CA8 800BAA58 AD450008 */ sw $a1, 0x8($t2) +glabel L800BAA5C +/* 062CAC 800BAA5C 03E00008 */ jr $ra +/* 062CB0 800BAA60 00000000 */ nop +.size func_800BAA04, . - func_800BAA04 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/20.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/20.s new file mode 100644 index 00000000..c1f559e8 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/20.s @@ -0,0 +1,12 @@ +glabel func_800BB440 # 20 +/* 063690 800BB440 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 063694 800BB444 AFBF0014 */ sw $ra, 0x14($sp) +/* 063698 800BB448 240E0005 */ addiu $t6, $zero, 0x5 +/* 06369C 800BB44C AFAE001C */ sw $t6, 0x1C($sp) +/* 0636A0 800BB450 0C02EC0A */ jal func_800BB028 +/* 0636A4 800BB454 27A4001C */ addiu $a0, $sp, 0x1C +/* 0636A8 800BB458 8FBF0014 */ lw $ra, 0x14($sp) +/* 0636AC 800BB45C 27BD0028 */ addiu $sp, $sp, 0x28 +/* 0636B0 800BB460 03E00008 */ jr $ra +/* 0636B4 800BB464 00000000 */ nop +.size func_800BB440, . - func_800BB440 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/21.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/21.s new file mode 100644 index 00000000..37e8cd4d --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/21.s @@ -0,0 +1,14 @@ +glabel func_800BB468 # 21 +/* 0636B8 800BB468 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 0636BC 800BB46C 00A03025 */ move $a2, $a1 +/* 0636C0 800BB470 00802825 */ move $a1, $a0 +/* 0636C4 800BB474 AFA40018 */ sw $a0, 0x18($sp) +/* 0636C8 800BB478 AFBF0014 */ sw $ra, 0x14($sp) +/* 0636CC 800BB47C 3C04800F */ lui $a0, %hi(D_800ED4C4) +/* 0636D0 800BB480 0C02ECD9 */ jal func_800BB364 +/* 0636D4 800BB484 8C84D4C4 */ lw $a0, %lo(D_800ED4C4)($a0) +/* 0636D8 800BB488 8FBF0014 */ lw $ra, 0x14($sp) +/* 0636DC 800BB48C 27BD0018 */ addiu $sp, $sp, 0x18 +/* 0636E0 800BB490 03E00008 */ jr $ra +/* 0636E4 800BB494 00000000 */ nop +.size func_800BB468, . - func_800BB468 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/22.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/22.s new file mode 100644 index 00000000..423d6fdc --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/22.s @@ -0,0 +1,11 @@ +glabel func_800BB498 # 22 +/* 0636E8 800BB498 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 0636EC 800BB49C AFBF0014 */ sw $ra, 0x14($sp) +/* 0636F0 800BB4A0 3C04800F */ lui $a0, %hi(D_800ED4C4) +/* 0636F4 800BB4A4 0C02ECE5 */ jal func_800BB394 +/* 0636F8 800BB4A8 8C84D4C4 */ lw $a0, %lo(D_800ED4C4)($a0) +/* 0636FC 800BB4AC 8FBF0014 */ lw $ra, 0x14($sp) +/* 063700 800BB4B0 27BD0018 */ addiu $sp, $sp, 0x18 +/* 063704 800BB4B4 03E00008 */ jr $ra +/* 063708 800BB4B8 00000000 */ nop +.size func_800BB498, . - func_800BB498 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/23.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/23.s new file mode 100644 index 00000000..71f28a22 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/23.s @@ -0,0 +1,12 @@ +glabel func_800BB4BC # 23 +/* 06370C 800BB4BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 063710 800BB4C0 00802825 */ move $a1, $a0 +/* 063714 800BB4C4 AFBF0014 */ sw $ra, 0x14($sp) +/* 063718 800BB4C8 3C04800F */ lui $a0, %hi(D_800ED4C4) +/* 06371C 800BB4CC 0C02ECF0 */ jal func_800BB3C0 +/* 063720 800BB4D0 8C84D4C4 */ lw $a0, %lo(D_800ED4C4)($a0) +/* 063724 800BB4D4 8FBF0014 */ lw $ra, 0x14($sp) +/* 063728 800BB4D8 27BD0018 */ addiu $sp, $sp, 0x18 +/* 06372C 800BB4DC 03E00008 */ jr $ra +/* 063730 800BB4E0 00000000 */ nop +.size func_800BB4BC, . - func_800BB4BC diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/3.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/3.s new file mode 100644 index 00000000..2907788e --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/3.s @@ -0,0 +1,49 @@ +glabel func_800BAA64 # 3 +/* 062CB4 800BAA64 94830002 */ lhu $v1, 0x2($a0) +/* 062CB8 800BAA68 8C820010 */ lw $v0, 0x10($a0) +/* 062CBC 800BAA6C 24050001 */ addiu $a1, $zero, 0x1 +/* 062CC0 800BAA70 5460001A */ bnel $v1, $zero, L800BAADC +/* 062CC4 800BAA74 00001025 */ move $v0, $zero +/* 062CC8 800BAA78 944E0000 */ lhu $t6, 0x0($v0) +glabel L800BAA7C +/* 062CCC 800BAA7C 000E7B42 */ srl $t7, $t6, 13 +/* 062CD0 800BAA80 2DE10005 */ sltiu $at, $t7, 0x5 +/* 062CD4 800BAA84 10200012 */ beqz $at, L800BAAD0 +/* 062CD8 800BAA88 000F7880 */ sll $t7, $t7, 2 +/* 062CDC 800BAA8C 3C01800D */ lui $at, %hi(jtbl_800D6908) +/* 062CE0 800BAA90 002F0821 */ addu $at, $at, $t7 +/* 062CE4 800BAA94 8C2F6908 */ lw $t7, %lo(jtbl_800D6908)($at) +/* 062CE8 800BAA98 01E00008 */ jr $t7 +/* 062CEC 800BAA9C 00000000 */ nop +glabel L800BAAA0 +/* 062CF0 800BAAA0 03E00008 */ jr $ra +/* 062CF4 800BAAA4 24020001 */ addiu $v0, $zero, 0x1 +glabel L800BAAA8 +/* 062CF8 800BAAA8 10000009 */ b L800BAAD0 +/* 062CFC 800BAAAC 24030001 */ addiu $v1, $zero, 0x1 +glabel L800BAAB0 +/* 062D00 800BAAB0 10000007 */ b L800BAAD0 +/* 062D04 800BAAB4 24420002 */ addiu $v0, $v0, 0x2 +glabel L800BAAB8 +/* 062D08 800BAAB8 94980004 */ lhu $t8, 0x4($a0) +/* 062D0C 800BAABC 54B80004 */ bnel $a1, $t8, L800BAAD0 +/* 062D10 800BAAC0 8C82000C */ lw $v0, 0xC($a0) +/* 062D14 800BAAC4 10000002 */ b L800BAAD0 +/* 062D18 800BAAC8 24420002 */ addiu $v0, $v0, 0x2 +/* 062D1C 800BAACC 8C82000C */ lw $v0, 0xC($a0) +glabel L800BAAD0 +/* 062D20 800BAAD0 5060FFEA */ beql $v1, $zero, L800BAA7C +/* 062D24 800BAAD4 944E0000 */ lhu $t6, 0x0($v0) +/* 062D28 800BAAD8 00001025 */ move $v0, $zero +glabel L800BAADC +/* 062D2C 800BAADC 03E00008 */ jr $ra +/* 062D30 800BAAE0 00000000 */ nop +.size func_800BAA64, . - func_800BAA64 + +.late_rodata +glabel jtbl_800D6908 +.word L800BAAA0 +.word L800BAAA8 +.word L800BAAA8 +.word L800BAAB0 +.word L800BAAB8 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/4.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/4.s new file mode 100644 index 00000000..e84e355d --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/4.s @@ -0,0 +1,40 @@ +glabel func_800BAAE4 # 4 +/* 062D34 800BAAE4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 062D38 800BAAE8 AFBF001C */ sw $ra, 0x1C($sp) +/* 062D3C 800BAAEC AFB10018 */ sw $s1, 0x18($sp) +/* 062D40 800BAAF0 AFB00014 */ sw $s0, 0x14($sp) +/* 062D44 800BAAF4 8C900004 */ lw $s0, 0x4($a0) +/* 062D48 800BAAF8 00808825 */ move $s1, $a0 +/* 062D4C 800BAAFC 52000016 */ beql $s0, $zero, L800BAB58 +/* 062D50 800BAB00 8FBF001C */ lw $ra, 0x1C($sp) +/* 062D54 800BAB04 8E040000 */ lw $a0, 0x0($s0) +glabel L800BAB08 +/* 062D58 800BAB08 8C8E0010 */ lw $t6, 0x10($a0) +/* 062D5C 800BAB0C 51C00012 */ beql $t6, $zero, L800BAB58 +/* 062D60 800BAB10 8FBF001C */ lw $ra, 0x1C($sp) +/* 062D64 800BAB14 8C820008 */ lw $v0, 0x8($a0) +/* 062D68 800BAB18 50400007 */ beql $v0, $zero, L800BAB38 +/* 062D6C 800BAB1C 02202025 */ move $a0, $s1 +/* 062D70 800BAB20 0443000A */ bgezl $v0, L800BAB4C +/* 062D74 800BAB24 8E100004 */ lw $s0, 0x4($s0) +/* 062D78 800BAB28 0C02EA99 */ jal func_800BAA64 +/* 062D7C 800BAB2C 00000000 */ nop +/* 062D80 800BAB30 10400005 */ beqz $v0, L800BAB48 +/* 062D84 800BAB34 02202025 */ move $a0, $s1 +glabel L800BAB38 +/* 062D88 800BAB38 0C02EA81 */ jal func_800BAA04 +/* 062D8C 800BAB3C 02002825 */ move $a1, $s0 +/* 062D90 800BAB40 10000002 */ b L800BAB4C +/* 062D94 800BAB44 8E300004 */ lw $s0, 0x4($s1) +glabel L800BAB48 +/* 062D98 800BAB48 8E100004 */ lw $s0, 0x4($s0) +glabel L800BAB4C +/* 062D9C 800BAB4C 5600FFEE */ bnel $s0, $zero, L800BAB08 +/* 062DA0 800BAB50 8E040000 */ lw $a0, 0x0($s0) +/* 062DA4 800BAB54 8FBF001C */ lw $ra, 0x1C($sp) +glabel L800BAB58 +/* 062DA8 800BAB58 8FB00014 */ lw $s0, 0x14($sp) +/* 062DAC 800BAB5C 8FB10018 */ lw $s1, 0x18($sp) +/* 062DB0 800BAB60 03E00008 */ jr $ra +/* 062DB4 800BAB64 27BD0020 */ addiu $sp, $sp, 0x20 +.size func_800BAAE4, . - func_800BAAE4 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/5.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/5.s new file mode 100644 index 00000000..68a3b0fe --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/5.s @@ -0,0 +1,48 @@ +glabel func_800BAB68 # 5 +/* 062DB8 800BAB68 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 062DBC 800BAB6C AFBF0014 */ sw $ra, 0x14($sp) +/* 062DC0 800BAB70 8CAE0010 */ lw $t6, 0x10($a1) +/* 062DC4 800BAB74 00803825 */ move $a3, $a0 +/* 062DC8 800BAB78 00C02025 */ move $a0, $a2 +/* 062DCC 800BAB7C 55C0000E */ bnel $t6, $zero, L800BABB8 +/* 062DD0 800BAB80 90E20000 */ lbu $v0, 0x0($a3) +/* 062DD4 800BAB84 AFA60020 */ sw $a2, 0x20($sp) +/* 062DD8 800BAB88 0C0011FC */ jal func_800047F0 +/* 062DDC 800BAB8C AFA70018 */ sw $a3, 0x18($sp) +/* 062DE0 800BAB90 0C0011F4 */ jal func_800047D0 +/* 062DE4 800BAB94 8FA40020 */ lw $a0, 0x20($sp) +/* 062DE8 800BAB98 8FA70018 */ lw $a3, 0x18($sp) +/* 062DEC 800BAB9C 90EF0000 */ lbu $t7, 0x0($a3) +/* 062DF0 800BABA0 11E00002 */ beqz $t7, L800BABAC +/* 062DF4 800BABA4 00000000 */ nop +/* 062DF8 800BABA8 A0E00000 */ sb $zero, 0x0($a3) +glabel L800BABAC +/* 062DFC 800BABAC 10000013 */ b L800BABFC +/* 062E00 800BABB0 24020001 */ addiu $v0, $zero, 0x1 +/* 062E04 800BABB4 90E20000 */ lbu $v0, 0x0($a3) +glabel L800BABB8 +/* 062E08 800BABB8 90B80001 */ lbu $t8, 0x1($a1) +/* 062E0C 800BABBC 5302000F */ beql $t8, $v0, L800BABFC +/* 062E10 800BABC0 00001025 */ move $v0, $zero +/* 062E14 800BABC4 10400007 */ beqz $v0, L800BABE4 +/* 062E18 800BABC8 00C02025 */ move $a0, $a2 +/* 062E1C 800BABCC 00C02025 */ move $a0, $a2 +/* 062E20 800BABD0 0C0011F4 */ jal func_800047D0 +/* 062E24 800BABD4 AFA70018 */ sw $a3, 0x18($sp) +/* 062E28 800BABD8 8FA70018 */ lw $a3, 0x18($sp) +/* 062E2C 800BABDC 10000006 */ b L800BABF8 +/* 062E30 800BABE0 A0E00000 */ sb $zero, 0x0($a3) +glabel L800BABE4 +/* 062E34 800BABE4 0C0011EC */ jal func_800047B0 +/* 062E38 800BABE8 AFA70018 */ sw $a3, 0x18($sp) +/* 062E3C 800BABEC 8FA70018 */ lw $a3, 0x18($sp) +/* 062E40 800BABF0 24190001 */ addiu $t9, $zero, 0x1 +/* 062E44 800BABF4 A0F90000 */ sb $t9, 0x0($a3) +glabel L800BABF8 +/* 062E48 800BABF8 00001025 */ move $v0, $zero +glabel L800BABFC +/* 062E4C 800BABFC 8FBF0014 */ lw $ra, 0x14($sp) +/* 062E50 800BAC00 27BD0018 */ addiu $sp, $sp, 0x18 +/* 062E54 800BAC04 03E00008 */ jr $ra +/* 062E58 800BAC08 00000000 */ nop +.size func_800BAB68, . - func_800BAB68 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/6.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/6.s new file mode 100644 index 00000000..36d92eab --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/6.s @@ -0,0 +1,86 @@ +glabel func_800BAC0C # 6 +/* 062E5C 800BAC0C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 062E60 800BAC10 AFBF0024 */ sw $ra, 0x24($sp) +/* 062E64 800BAC14 AFB20020 */ sw $s2, 0x20($sp) +/* 062E68 800BAC18 AFB1001C */ sw $s1, 0x1C($sp) +/* 062E6C 800BAC1C AFB00018 */ sw $s0, 0x18($sp) +/* 062E70 800BAC20 8C8E0000 */ lw $t6, 0x0($a0) +/* 062E74 800BAC24 00809025 */ move $s2, $a0 +/* 062E78 800BAC28 2DC10006 */ sltiu $at, $t6, 0x6 +/* 062E7C 800BAC2C 1020002B */ beqz $at, L800BACDC +/* 062E80 800BAC30 000E7080 */ sll $t6, $t6, 2 +/* 062E84 800BAC34 3C01800D */ lui $at, %hi(jtbl_800D691C) +/* 062E88 800BAC38 002E0821 */ addu $at, $at, $t6 +/* 062E8C 800BAC3C 8C2E691C */ lw $t6, %lo(jtbl_800D691C)($at) +/* 062E90 800BAC40 01C00008 */ jr $t6 +/* 062E94 800BAC44 00000000 */ nop +glabel L800BAC48 +/* 062E98 800BAC48 8E44000C */ lw $a0, 0xC($s2) +/* 062E9C 800BAC4C 8E450010 */ lw $a1, 0x10($s2) +/* 062EA0 800BAC50 0C02EC23 */ jal func_800BB08C +/* 062EA4 800BAC54 8E460014 */ lw $a2, 0x14($s2) +/* 062EA8 800BAC58 10000021 */ b L800BACE0 +/* 062EAC 800BAC5C 8E440008 */ lw $a0, 0x8($s2) +glabel L800BAC60 +/* 062EB0 800BAC60 8E44000C */ lw $a0, 0xC($s2) +/* 062EB4 800BAC64 0C02EC66 */ jal func_800BB198 +/* 062EB8 800BAC68 8E450010 */ lw $a1, 0x10($s2) +/* 062EBC 800BAC6C 1000001C */ b L800BACE0 +/* 062EC0 800BAC70 8E440008 */ lw $a0, 0x8($s2) +glabel L800BAC74 +/* 062EC4 800BAC74 0C02EC4B */ jal func_800BB12C +/* 062EC8 800BAC78 8E44000C */ lw $a0, 0xC($s2) +/* 062ECC 800BAC7C 10000018 */ b L800BACE0 +/* 062ED0 800BAC80 8E440008 */ lw $a0, 0x8($s2) +glabel L800BAC84 +/* 062ED4 800BAC84 00008025 */ move $s0, $zero +/* 062ED8 800BAC88 24110004 */ addiu $s1, $zero, 0x4 +glabel L800BAC8C +/* 062EDC 800BAC8C 0C02EC4B */ jal func_800BB12C +/* 062EE0 800BAC90 02002025 */ move $a0, $s0 +/* 062EE4 800BAC94 26100001 */ addiu $s0, $s0, 0x1 +/* 062EE8 800BAC98 1611FFFC */ bne $s0, $s1, L800BAC8C +/* 062EEC 800BAC9C 00000000 */ nop +/* 062EF0 800BACA0 1000000F */ b L800BACE0 +/* 062EF4 800BACA4 8E440008 */ lw $a0, 0x8($s2) +glabel L800BACA8 +/* 062EF8 800BACA8 240F0001 */ addiu $t7, $zero, 0x1 +/* 062EFC 800BACAC 3C01800F */ lui $at, %hi(D_800ED4C0) +/* 062F00 800BACB0 1000000A */ b L800BACDC +/* 062F04 800BACB4 AC2FD4C0 */ sw $t7, %lo(D_800ED4C0)($at) +glabel L800BACB8 +/* 062F08 800BACB8 3C01800F */ lui $at, %hi(D_800ED4C0) +/* 062F0C 800BACBC AC20D4C0 */ sw $zero, %lo(D_800ED4C0)($at) +/* 062F10 800BACC0 00008025 */ move $s0, $zero +/* 062F14 800BACC4 24110004 */ addiu $s1, $zero, 0x4 +glabel L800BACC8 +/* 062F18 800BACC8 0C02EC4B */ jal func_800BB12C +/* 062F1C 800BACCC 02002025 */ move $a0, $s0 +/* 062F20 800BACD0 26100001 */ addiu $s0, $s0, 0x1 +/* 062F24 800BACD4 1611FFFC */ bne $s0, $s1, L800BACC8 +/* 062F28 800BACD8 00000000 */ nop +glabel L800BACDC +/* 062F2C 800BACDC 8E440008 */ lw $a0, 0x8($s2) +glabel L800BACE0 +/* 062F30 800BACE0 00003025 */ move $a2, $zero +/* 062F34 800BACE4 50800004 */ beql $a0, $zero, L800BACF8 +/* 062F38 800BACE8 8FBF0024 */ lw $ra, 0x24($sp) +/* 062F3C 800BACEC 0C00B4BC */ jal osSendMesg +/* 062F40 800BACF0 8E450004 */ lw $a1, 0x4($s2) +/* 062F44 800BACF4 8FBF0024 */ lw $ra, 0x24($sp) +glabel L800BACF8 +/* 062F48 800BACF8 8FB00018 */ lw $s0, 0x18($sp) +/* 062F4C 800BACFC 8FB1001C */ lw $s1, 0x1C($sp) +/* 062F50 800BAD00 8FB20020 */ lw $s2, 0x20($sp) +/* 062F54 800BAD04 03E00008 */ jr $ra +/* 062F58 800BAD08 27BD0028 */ addiu $sp, $sp, 0x28 +.size func_800BAC0C, . - func_800BAC0C + +.late_rodata +glabel jtbl_800D691C +.word L800BAC48 +.word L800BAC74 +.word L800BAC60 +.word L800BAC84 +.word L800BACA8 +.word L800BACB8 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/7.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/7.s new file mode 100644 index 00000000..2f77597a --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/7.s @@ -0,0 +1,115 @@ +glabel func_800BAD0C # 7 +/* 062F5C 800BAD0C 27BDFF80 */ addiu $sp, $sp, -0x80 +/* 062F60 800BAD10 AFBE0038 */ sw $fp, 0x38($sp) +/* 062F64 800BAD14 3C1E800F */ lui $fp, %hi(D_800ED4C8) +/* 062F68 800BAD18 27DED4C8 */ addiu $fp, $fp, %lo(D_800ED4C8) +/* 062F6C 800BAD1C AFBF003C */ sw $ra, 0x3C($sp) +/* 062F70 800BAD20 AFA40080 */ sw $a0, 0x80($sp) +/* 062F74 800BAD24 AFB70034 */ sw $s7, 0x34($sp) +/* 062F78 800BAD28 AFB60030 */ sw $s6, 0x30($sp) +/* 062F7C 800BAD2C AFB5002C */ sw $s5, 0x2C($sp) +/* 062F80 800BAD30 AFB40028 */ sw $s4, 0x28($sp) +/* 062F84 800BAD34 AFB30024 */ sw $s3, 0x24($sp) +/* 062F88 800BAD38 AFB20020 */ sw $s2, 0x20($sp) +/* 062F8C 800BAD3C AFB1001C */ sw $s1, 0x1C($sp) +/* 062F90 800BAD40 AFB00018 */ sw $s0, 0x18($sp) +/* 062F94 800BAD44 27A40078 */ addiu $a0, $sp, 0x78 +/* 062F98 800BAD48 03C02825 */ move $a1, $fp +/* 062F9C 800BAD4C 27A60058 */ addiu $a2, $sp, 0x58 +/* 062FA0 800BAD50 0C00027A */ jal func_800009E8 +/* 062FA4 800BAD54 24070008 */ addiu $a3, $zero, 0x8 +/* 062FA8 800BAD58 3C17800F */ lui $s7, %hi(D_800ED4A0) +/* 062FAC 800BAD5C 26F7D4A0 */ addiu $s7, $s7, %lo(D_800ED4A0) +/* 062FB0 800BAD60 24160001 */ addiu $s6, $zero, 0x1 +/* 062FB4 800BAD64 27B50054 */ addiu $s5, $sp, 0x54 +/* 062FB8 800BAD68 24140004 */ addiu $s4, $zero, 0x4 +/* 062FBC 800BAD6C 03C02025 */ move $a0, $fp +glabel L800BAD70 +/* 062FC0 800BAD70 02A02825 */ move $a1, $s5 +/* 062FC4 800BAD74 0C00B540 */ jal osRecvMesg +/* 062FC8 800BAD78 02C03025 */ move $a2, $s6 +/* 062FCC 800BAD7C 8FA40054 */ lw $a0, 0x54($sp) +/* 062FD0 800BAD80 00009825 */ move $s3, $zero +/* 062FD4 800BAD84 02E09025 */ move $s2, $s7 +/* 062FD8 800BAD88 14960033 */ bne $a0, $s6, L800BAE58 +/* 062FDC 800BAD8C 00000000 */ nop +glabel L800BAD90 +/* 062FE0 800BAD90 8E510004 */ lw $s1, 0x4($s2) +/* 062FE4 800BAD94 8E2E0000 */ lw $t6, 0x0($s1) +/* 062FE8 800BAD98 8DCF0010 */ lw $t7, 0x10($t6) +/* 062FEC 800BAD9C 51E0002A */ beql $t7, $zero, L800BAE48 +/* 062FF0 800BADA0 26730001 */ addiu $s3, $s3, 0x1 +/* 062FF4 800BADA4 0C02EAB9 */ jal func_800BAAE4 +/* 062FF8 800BADA8 02402025 */ move $a0, $s2 +/* 062FFC 800BADAC 8E510004 */ lw $s1, 0x4($s2) +/* 063000 800BADB0 02402025 */ move $a0, $s2 +/* 063004 800BADB4 02603025 */ move $a2, $s3 +/* 063008 800BADB8 8E300000 */ lw $s0, 0x0($s1) +/* 06300C 800BADBC 0C02EADA */ jal func_800BAB68 +/* 063010 800BADC0 02002825 */ move $a1, $s0 +/* 063014 800BADC4 1440001F */ bnez $v0, L800BAE44 +/* 063018 800BADC8 02402025 */ move $a0, $s2 +/* 06301C 800BADCC 02002825 */ move $a1, $s0 +/* 063020 800BADD0 0C02E9E8 */ jal func_800BA7A0 +/* 063024 800BADD4 02603025 */ move $a2, $s3 +/* 063028 800BADD8 96180002 */ lhu $t8, 0x2($s0) +/* 06302C 800BADDC 8E020008 */ lw $v0, 0x8($s0) +/* 063030 800BADE0 2719FFFF */ addiu $t9, $t8, -0x1 +/* 063034 800BADE4 18400003 */ blez $v0, L800BADF4 +/* 063038 800BADE8 A6190002 */ sh $t9, 0x2($s0) +/* 06303C 800BADEC 2448FFFF */ addiu $t0, $v0, -0x1 +/* 063040 800BADF0 AE080008 */ sw $t0, 0x8($s0) +glabel L800BADF4 +/* 063044 800BADF4 8E310004 */ lw $s1, 0x4($s1) +/* 063048 800BADF8 52200013 */ beql $s1, $zero, L800BAE48 +/* 06304C 800BADFC 26730001 */ addiu $s3, $s3, 0x1 +/* 063050 800BAE00 8E300000 */ lw $s0, 0x0($s1) +glabel L800BAE04 +/* 063054 800BAE04 02402025 */ move $a0, $s2 +/* 063058 800BAE08 8E090010 */ lw $t1, 0x10($s0) +/* 06305C 800BAE0C 5120000E */ beql $t1, $zero, L800BAE48 +/* 063060 800BAE10 26730001 */ addiu $s3, $s3, 0x1 +/* 063064 800BAE14 0C02EA43 */ jal func_800BA90C +/* 063068 800BAE18 02002825 */ move $a1, $s0 +/* 06306C 800BAE1C 960A0002 */ lhu $t2, 0x2($s0) +/* 063070 800BAE20 8E020008 */ lw $v0, 0x8($s0) +/* 063074 800BAE24 254BFFFF */ addiu $t3, $t2, -0x1 +/* 063078 800BAE28 18400003 */ blez $v0, L800BAE38 +/* 06307C 800BAE2C A60B0002 */ sh $t3, 0x2($s0) +/* 063080 800BAE30 244CFFFF */ addiu $t4, $v0, -0x1 +/* 063084 800BAE34 AE0C0008 */ sw $t4, 0x8($s0) +glabel L800BAE38 +/* 063088 800BAE38 8E310004 */ lw $s1, 0x4($s1) +/* 06308C 800BAE3C 5620FFF1 */ bnel $s1, $zero, L800BAE04 +/* 063090 800BAE40 8E300000 */ lw $s0, 0x0($s1) +glabel L800BAE44 +/* 063094 800BAE44 26730001 */ addiu $s3, $s3, 0x1 +glabel L800BAE48 +/* 063098 800BAE48 1674FFD1 */ bne $s3, $s4, L800BAD90 +/* 06309C 800BAE4C 26520008 */ addiu $s2, $s2, 0x8 +/* 0630A0 800BAE50 1000FFC7 */ b L800BAD70 +/* 0630A4 800BAE54 03C02025 */ move $a0, $fp +glabel L800BAE58 +/* 0630A8 800BAE58 0C02EB03 */ jal func_800BAC0C +/* 0630AC 800BAE5C 00000000 */ nop +/* 0630B0 800BAE60 1000FFC3 */ b L800BAD70 +/* 0630B4 800BAE64 03C02025 */ move $a0, $fp +/* 0630B8 800BAE68 00000000 */ nop +/* 0630BC 800BAE6C 00000000 */ nop +/* 0630C0 800BAE70 00000000 */ nop +/* 0630C4 800BAE74 00000000 */ nop +/* 0630C8 800BAE78 00000000 */ nop +/* 0630CC 800BAE7C 00000000 */ nop +/* 0630D0 800BAE80 8FBF003C */ lw $ra, 0x3C($sp) +/* 0630D4 800BAE84 8FB00018 */ lw $s0, 0x18($sp) +/* 0630D8 800BAE88 8FB1001C */ lw $s1, 0x1C($sp) +/* 0630DC 800BAE8C 8FB20020 */ lw $s2, 0x20($sp) +/* 0630E0 800BAE90 8FB30024 */ lw $s3, 0x24($sp) +/* 0630E4 800BAE94 8FB40028 */ lw $s4, 0x28($sp) +/* 0630E8 800BAE98 8FB5002C */ lw $s5, 0x2C($sp) +/* 0630EC 800BAE9C 8FB60030 */ lw $s6, 0x30($sp) +/* 0630F0 800BAEA0 8FB70034 */ lw $s7, 0x34($sp) +/* 0630F4 800BAEA4 8FBE0038 */ lw $fp, 0x38($sp) +/* 0630F8 800BAEA8 03E00008 */ jr $ra +/* 0630FC 800BAEAC 27BD0080 */ addiu $sp, $sp, 0x80 +.size func_800BAD0C, . - func_800BAD0C diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/8.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/8.s new file mode 100644 index 00000000..6f736228 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/8.s @@ -0,0 +1,48 @@ +glabel func_800BAEB0 # 8 +/* 063100 800BAEB0 8C820004 */ lw $v0, 0x4($a0) +/* 063104 800BAEB4 50400024 */ beql $v0, $zero, L800BAF48 +/* 063108 800BAEB8 00001025 */ move $v0, $zero +/* 06310C 800BAEBC 8C430000 */ lw $v1, 0x0($v0) +glabel L800BAEC0 +/* 063110 800BAEC0 1060001B */ beqz $v1, L800BAF30 +/* 063114 800BAEC4 00000000 */ nop +/* 063118 800BAEC8 8C6E0010 */ lw $t6, 0x10($v1) +/* 06311C 800BAECC 00602025 */ move $a0, $v1 +/* 063120 800BAED0 51C0001A */ beql $t6, $zero, L800BAF3C +/* 063124 800BAED4 8C420004 */ lw $v0, 0x4($v0) +/* 063128 800BAED8 906F0000 */ lbu $t7, 0x0($v1) +/* 06312C 800BAEDC 54AF0017 */ bnel $a1, $t7, L800BAF3C +/* 063130 800BAEE0 8C420004 */ lw $v0, 0x4($v0) +/* 063134 800BAEE4 50C0000A */ beql $a2, $zero, L800BAF10 +/* 063138 800BAEE8 0005C880 */ sll $t9, $a1, 2 +/* 06313C 800BAEEC 8C630008 */ lw $v1, 0x8($v1) +/* 063140 800BAEF0 18600011 */ blez $v1, L800BAF38 +/* 063144 800BAEF4 0066082A */ slt $at, $v1, $a2 +/* 063148 800BAEF8 50200010 */ beql $at, $zero, L800BAF3C +/* 06314C 800BAEFC 8C420004 */ lw $v0, 0x4($v0) +/* 063150 800BAF00 AC860008 */ sw $a2, 0x8($a0) +/* 063154 800BAF04 03E00008 */ jr $ra +/* 063158 800BAF08 24020001 */ addiu $v0, $zero, 0x1 +/* 06315C 800BAF0C 0005C880 */ sll $t9, $a1, 2 +glabel L800BAF10 +/* 063160 800BAF10 3C08800D */ lui $t0, %hi(D_800D5238) +/* 063164 800BAF14 A4800004 */ sh $zero, 0x4($a0) +/* 063168 800BAF18 A4800002 */ sh $zero, 0x2($a0) +/* 06316C 800BAF1C 01194021 */ addu $t0, $t0, $t9 +/* 063170 800BAF20 8D085238 */ lw $t0, %lo(D_800D5238)($t0) +/* 063174 800BAF24 24020001 */ addiu $v0, $zero, 0x1 +/* 063178 800BAF28 03E00008 */ jr $ra +/* 06317C 800BAF2C AC880010 */ sw $t0, 0x10($a0) +glabel L800BAF30 +/* 063180 800BAF30 03E00008 */ jr $ra +/* 063184 800BAF34 00001025 */ move $v0, $zero +glabel L800BAF38 +/* 063188 800BAF38 8C420004 */ lw $v0, 0x4($v0) +glabel L800BAF3C +/* 06318C 800BAF3C 5440FFE0 */ bnel $v0, $zero, L800BAEC0 +/* 063190 800BAF40 8C430000 */ lw $v1, 0x0($v0) +/* 063194 800BAF44 00001025 */ move $v0, $zero +glabel L800BAF48 +/* 063198 800BAF48 03E00008 */ jr $ra +/* 06319C 800BAF4C 00000000 */ nop +.size func_800BAEB0, . - func_800BAEB0 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/9.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/9.s new file mode 100644 index 00000000..ca648fce --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/9.s @@ -0,0 +1,62 @@ +glabel func_800BAF50 # 9 +/* 0631A0 800BAF50 8C820004 */ lw $v0, 0x4($a0) +/* 0631A4 800BAF54 00A03825 */ move $a3, $a1 +/* 0631A8 800BAF58 3C08800D */ lui $t0, %hi(D_800D5274) +/* 0631AC 800BAF5C 8C430008 */ lw $v1, 0x8($v0) +/* 0631B0 800BAF60 1040002E */ beqz $v0, L800BB01C +/* 0631B4 800BAF64 00403025 */ move $a2, $v0 +/* 0631B8 800BAF68 25085274 */ addiu $t0, $t0, %lo(D_800D5274) +/* 0631BC 800BAF6C 8CC50000 */ lw $a1, 0x0($a2) +glabel L800BAF70 +/* 0631C0 800BAF70 8CAE0010 */ lw $t6, 0x10($a1) +/* 0631C4 800BAF74 11C00024 */ beqz $t6, L800BB008 +/* 0631C8 800BAF78 00000000 */ nop +/* 0631CC 800BAF7C 90B90000 */ lbu $t9, 0x0($a1) +/* 0631D0 800BAF80 01077821 */ addu $t7, $t0, $a3 +/* 0631D4 800BAF84 91F80000 */ lbu $t8, 0x0($t7) +/* 0631D8 800BAF88 01194821 */ addu $t1, $t0, $t9 +/* 0631DC 800BAF8C 912A0000 */ lbu $t2, 0x0($t1) +/* 0631E0 800BAF90 030A082A */ slt $at, $t8, $t2 +/* 0631E4 800BAF94 5420001F */ bnel $at, $zero, L800BB014 +/* 0631E8 800BAF98 8CC60004 */ lw $a2, 0x4($a2) +/* 0631EC 800BAF9C 14C20009 */ bne $a2, $v0, L800BAFC4 +/* 0631F0 800BAFA0 00000000 */ nop +/* 0631F4 800BAFA4 8C6B0004 */ lw $t3, 0x4($v1) +/* 0631F8 800BAFA8 8C6C0008 */ lw $t4, 0x8($v1) +/* 0631FC 800BAFAC AD8B0004 */ sw $t3, 0x4($t4) +/* 063200 800BAFB0 AC830004 */ sw $v1, 0x4($a0) +/* 063204 800BAFB4 AC660004 */ sw $a2, 0x4($v1) +/* 063208 800BAFB8 ACC30008 */ sw $v1, 0x8($a2) +/* 06320C 800BAFBC 03E00008 */ jr $ra +/* 063210 800BAFC0 8C620000 */ lw $v0, 0x0($v1) +glabel L800BAFC4 +/* 063214 800BAFC4 10C3000E */ beq $a2, $v1, L800BB000 +/* 063218 800BAFC8 00000000 */ nop +/* 06321C 800BAFCC 8C6D0004 */ lw $t5, 0x4($v1) +/* 063220 800BAFD0 8C6E0008 */ lw $t6, 0x8($v1) +/* 063224 800BAFD4 ADCD0004 */ sw $t5, 0x4($t6) +/* 063228 800BAFD8 8C6F0008 */ lw $t7, 0x8($v1) +/* 06322C 800BAFDC 8C990004 */ lw $t9, 0x4($a0) +/* 063230 800BAFE0 AF2F0008 */ sw $t7, 0x8($t9) +/* 063234 800BAFE4 8CC90008 */ lw $t1, 0x8($a2) +/* 063238 800BAFE8 AC690008 */ sw $t1, 0x8($v1) +/* 06323C 800BAFEC AD230004 */ sw $v1, 0x4($t1) +/* 063240 800BAFF0 AC660004 */ sw $a2, 0x4($v1) +/* 063244 800BAFF4 ACC30008 */ sw $v1, 0x8($a2) +/* 063248 800BAFF8 03E00008 */ jr $ra +/* 06324C 800BAFFC 8C620000 */ lw $v0, 0x0($v1) +glabel L800BB000 +/* 063250 800BB000 03E00008 */ jr $ra +/* 063254 800BB004 8C620000 */ lw $v0, 0x0($v1) +glabel L800BB008 +/* 063258 800BB008 03E00008 */ jr $ra +/* 06325C 800BB00C 00A01025 */ move $v0, $a1 +/* 063260 800BB010 8CC60004 */ lw $a2, 0x4($a2) +glabel L800BB014 +/* 063264 800BB014 54C0FFD6 */ bnel $a2, $zero, L800BAF70 +/* 063268 800BB018 8CC50000 */ lw $a1, 0x0($a2) +glabel L800BB01C +/* 06326C 800BB01C 00001025 */ move $v0, $zero +/* 063270 800BB020 03E00008 */ jr $ra +/* 063274 800BB024 00000000 */ nop +.size func_800BAF50, . - func_800BAF50 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D68E0.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D68E0.s new file mode 100644 index 00000000..fe428157 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D68E0.s @@ -0,0 +1,6 @@ +glabel jtbl_800D68E0 +.word L800BA808 +.word L800BA824 +.word L800BA860 +.word L800BA894 +.word L800BA8B0 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D68F4.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D68F4.s new file mode 100644 index 00000000..f0d6b95c --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D68F4.s @@ -0,0 +1,6 @@ +glabel jtbl_800D68F4 +.word L800BA950 +.word L800BA96C +.word L800BA988 +.word L800BA9A4 +.word L800BA9C0 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D6908.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D6908.s new file mode 100644 index 00000000..791062ed --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D6908.s @@ -0,0 +1,6 @@ +glabel jtbl_800D6908 +.word L800BAAA0 +.word L800BAAA8 +.word L800BAAA8 +.word L800BAAB0 +.word L800BAAB8 diff --git a/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D691C.s b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D691C.s new file mode 100644 index 00000000..6f7057a9 --- /dev/null +++ b/asm/non_matchings/ovl1/ovl1_10/ovl1_10/jtbl_800D691C.s @@ -0,0 +1,7 @@ +glabel jtbl_800D691C +.word L800BAC48 +.word L800BAC74 +.word L800BAC60 +.word L800BAC84 +.word L800BACA8 +.word L800BACB8 diff --git a/asm/ovl11/ovl11_2.s b/asm/ovl11/ovl11_2.s index 347dc514..31e2d4b4 100644 --- a/asm/ovl11/ovl11_2.s +++ b/asm/ovl11/ovl11_2.s @@ -910,7 +910,6 @@ glabel func_801E028C_ovl11 /* 1EAC2C 801E036C 00290821 */ addu $at, $at, $t1 /* 1EAC30 801E0370 03E00008 */ jr $ra /* 1EAC34 801E0374 E4243C90 */ swc1 $f4, 0x3c90($at) - .L801E0378_ovl11: /* 1EAC38 801E0378 3C0A800E */ lui $t2, %hi(D_800E3210) # $t2, 0x800e /* 1EAC3C 801E037C 254A3210 */ addiu $t2, %lo(D_800E3210) # addiu $t2, $t2, 0x3210 diff --git a/data/ovl1/kirby.066630.5.c b/data/ovl1/kirby.066630.5.c index db23cdc0..613f3626 100644 --- a/data/ovl1/kirby.066630.5.c +++ b/data/ovl1/kirby.066630.5.c @@ -5,50 +5,28 @@ // ovl1_10 u32 D_800D68E0 = 0x800BA808; - u32 D_800D68E4 = 0x800BA824; - u32 D_800D68E8 = 0x800BA860; - u32 D_800D68EC = 0x800BA894; - u32 D_800D68F0 = 0x800BA8B0; u32 D_800D68F4 = 0x800BA950; - u32 D_800D68F8 = 0x800BA96C; - u32 D_800D68FC = 0x800BA988; - u32 D_800D6900 = 0x800BA9A4; - u32 D_800D6904 = 0x800BA9C0; u32 D_800D6908 = 0x800BAAA0; - u32 D_800D690C = 0x800BAAA8; - u32 D_800D6910 = 0x800BAAA8; - u32 D_800D6914 = 0x800BAAB0; - u32 D_800D6918 = 0x800BAAB8; u32 D_800D691C = 0x800BAC48; - u32 D_800D6920 = 0x800BAC74; - u32 D_800D6924 = 0x800BAC60; - u32 D_800D6928 = 0x800BAC84; - u32 D_800D692C = 0x800BACA8; - u32 D_800D6930 = 0x800BACB8; -u32 D_800D6934 = 0x00000000; - -u32 D_800D6938 = 0x00000000; - -u32 D_800D693C = 0x00000000; diff --git a/kirby.us.ld b/kirby.us.ld index 117f17df..7fbb1e44 100644 --- a/kirby.us.ld +++ b/kirby.us.ld @@ -376,7 +376,7 @@ SECTIONS BUILD_DIR/src/ovl1/ovl1_7.o(.rodata*); BUILD_DIR/data/ovl1/kirby.066630.4.o(.data*); BUILD_DIR/src/ovl1/ovl1_8.o(.rodata); - BUILD_DIR/data/ovl1/kirby.066630.5.o(.data*); + BUILD_DIR/src/ovl1/ovl1_10.o(.rodata); BUILD_DIR/src/ovl1/ovl1_11.o(.rodata); BUILD_DIR/data/ovl1/ovl1_11_rodata.o(.rodata); BUILD_DIR/src/ovl1/ovl1_12.o(.rodata); @@ -480,9 +480,12 @@ SECTIONS /* 0x80151100 135490-139150 [3CC0] */ BEGIN_SEG(ovl6, 0x80151100) SUBALIGN(16) { BUILD_DIR/src/ovl6/ovl6.o(.text); - BUILD_DIR/data/kirby.139150.o(.data*); } END_SEG(ovl6) + BEGIN_SEG(ovl6Data, _ovl6SegmentEnd) { + BUILD_DIR/data/kirby.139150.o(.data*); + } + END_SEG(ovl6Data) /* 0x80198880 13E8F0-168840 [29F50] */ BEGIN_SEG(ovl7, 0x80198880) SUBALIGN(16) { @@ -557,11 +560,14 @@ SECTIONS BUILD_DIR/src/ovl10/ovl10_2.o(.text); BUILD_DIR/src/ovl10/ovl10_3.o(.text); BUILD_DIR/asm/ovl10/ovl10_4.o(.text); + } + END_SEG(ovl10) + BEGIN_SEG(ovl10Data, _ovl10SegmentEnd) { BUILD_DIR/data/ovl10/data.o(.data*); BUILD_DIR/src/ovl10/ovl10_3.o(.rodata); BUILD_DIR/data/ovl10/data_after_ovl10_3.o(.rodata); } - END_SEG(ovl10) + END_SEG(ovl10Data) BEGIN_NOLOAD(ovl10) { BUILD_DIR/asm/ovl10/ovl10_bss.o(.bss); } @@ -658,10 +664,13 @@ SECTIONS BEGIN_SEG(ovl16, 0x801DB1E0) SUBALIGN(16) { BUILD_DIR/src/ovl16/ovl16.o(.text); BUILD_DIR/asm/ovl16/ovl16_2.o(.text); + } + END_SEG(ovl16) + BEGIN_SEG(ovl16Data, _ovl16SegmentEnd) { BUILD_DIR/data/ovl16/data.o(.data); BUILD_DIR/data/ovl16/data_2.o(.rodata); } - END_SEG(ovl16) + END_SEG(ovl16Data) /* 0x801DB1E0 2263D0-230050 [9C80] */ BEGIN_SEG(ovl17, 0x801DB1E0) SUBALIGN(16) { diff --git a/src/ovl1/ovl1_10.c b/src/ovl1/ovl1_10.c index 8097405a..69809ae9 100644 --- a/src/ovl1/ovl1_10.c +++ b/src/ovl1/ovl1_10.c @@ -1,54 +1,795 @@ #include #include -#include "ovl0/ovl0_2.h" +#include "ovl1/ovl1_6.h" +#include "D_8004A7C4.h" +#include "ovl0/ovl0_2.h" // D_80048E9C -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BA788.s") +extern OSMesgQueue D_800ED4C8; +extern u64 D_800ECF50[0x3D0]; +extern OSThread D_800ECD70; +void func_800BAD0C(void *); -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BA90C.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BAA04.s") +void func_800BA7A0(u8 *arg0, void *arg1, ? arg2) { + u16 *temp_t0; + u16 *temp_v0; + u16 temp_t3; + u16 temp_v1; + u16 var_a3; + u32 temp_t6; -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BAA64.s") + var_a3 = arg1->unk2; + if (var_a3 == 0) { + do { + temp_v0 = arg1->unk10; + temp_v1 = *temp_v0; + temp_t6 = temp_v1 >> 0xD; + switch (temp_t6) { + case 0: + var_a3 = arg1->unk2; + arg1->unk10 = *(&D_800D5238 + (arg1->unk0 * 4)); + break; + case 1: + arg1->unk2 = temp_v1 & 0x1FFF; + arg1->unk10 = temp_v0 + 2; + if (*arg0 == 0) { + func_800047F0(arg2); + func_800047B0(arg2); + arg1->unk1 = 1; + *arg0 = 1; + } + var_a3 = arg1->unk2; + break; + case 2: + arg1->unk2 = temp_v1 & 0x1FFF; + arg1->unk10 = temp_v0 + 2; + if (*arg0 != 0) { + func_800047D0(arg2); + arg1->unk1 = 0; + *arg0 = 0; + } + var_a3 = arg1->unk2; + break; + case 3: + temp_t0 = temp_v0 + 2; + arg1->unk4 = temp_v1 & 0x1FFF; + arg1->unk10 = temp_t0; + arg1->unkC = temp_t0; + var_a3 = arg1->unk2; + break; + case 4: + temp_t3 = arg1->unk4 - 1; + arg1->unk4 = temp_t3; + if (temp_t3 & 0xFFFF) { + var_a3 = arg1->unk2; + arg1->unk10 = arg1->unkC; + } else { + var_a3 = arg1->unk2; + arg1->unk10 = arg1->unk10 + 2; + } + break; + } + } while (var_a3 == 0); + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/0.s") +#endif -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BAAE4.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BAB68.s") +void func_800BA90C(s32 arg0, void *arg1) { + u16 *temp_t6_2; + u16 *temp_v1; + u16 temp_a0; + u16 temp_t1; + u16 temp_t3; + u16 temp_t9; + u16 var_v0; + u32 temp_t6; -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BAC0C.s") + var_v0 = arg1->unk2; + if (var_v0 == 0) { + do { + temp_v1 = arg1->unk10; + temp_a0 = *temp_v1; + temp_t6 = temp_a0 >> 0xD; + switch (temp_t6) { + case 0: + var_v0 = arg1->unk2; + arg1->unk10 = *(&D_800D5238 + (arg1->unk0 * 4)); + break; + case 1: + temp_t1 = temp_a0 & 0x1FFF; + arg1->unk2 = temp_t1; + arg1->unk10 = temp_v1 + 2; + arg1->unk1 = 1; + var_v0 = temp_t1 & 0xFFFF; + break; + case 2: + temp_t3 = temp_a0 & 0x1FFF; + arg1->unk2 = temp_t3; + arg1->unk10 = temp_v1 + 2; + arg1->unk1 = 0; + var_v0 = temp_t3 & 0xFFFF; + break; + case 3: + temp_t6_2 = temp_v1 + 2; + arg1->unk4 = temp_a0 & 0x1FFF; + arg1->unk10 = temp_t6_2; + arg1->unkC = temp_t6_2; + var_v0 = arg1->unk2; + break; + case 4: + temp_t9 = arg1->unk4 - 1; + arg1->unk4 = temp_t9; + if (temp_t9 & 0xFFFF) { + var_v0 = arg1->unk2; + arg1->unk10 = arg1->unkC; + } else { + var_v0 = arg1->unk2; + arg1->unk10 = arg1->unk10 + 2; + } + break; + } + } while (var_v0 == 0); + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/1.s") +#endif -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BAD0C.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c +void func_800BAA04(void *arg0, void *arg1) { + void *temp_a2; + void *temp_v0; + void *temp_v1; -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BAEB0.s") + temp_v1 = arg1->unk4; + temp_v0 = arg0->unk4->unk8; + arg1->unk0->unk10 = 0; + if (temp_v1 != NULL) { + temp_a2 = arg1->unk8; + if (temp_a2->unk4 == NULL) { + arg0->unk4 = arg1->unk4; + } else { + temp_a2->unk4 = temp_v1; + temp_v1->unk8 = arg1->unk8; + } + arg1->unk4 = temp_v0->unk4; + temp_v0->unk4 = arg1; + arg1->unk8 = temp_v0; + arg0->unk4->unk8 = arg1; + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/2.s") +#endif -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BAF50.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c +s32 func_800BAA64(void *arg0) { + u16 *var_v0; + u16 var_v1; + u32 temp_t7; -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB028.s") + var_v1 = arg0->unk2; + var_v0 = arg0->unk10; + if (var_v1 == 0) { +loop_1: + temp_t7 = *var_v0 >> 0xD; + switch (temp_t7) { + case 0: + return 1; + case 1: + case 2: + var_v1 = 1; + default: +block_9: + if (var_v1 != 0) { + /* Duplicate return node #10. Try simplifying control flow for better match */ + return 0; + } + goto loop_1; + case 3: + var_v0 += 2; + goto block_9; + case 4: + if (arg0->unk4 == 1) { + var_v0 += 2; + } else { + var_v0 = arg0->unkC; + } + goto block_9; + } + } else { + return 0; + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/3.s") +#endif -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB08C.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB12C.s") +void func_800BAAE4(void *arg0) { + s32 temp_v0; + void *temp_a0; + void *var_s0; -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB198.s") + var_s0 = arg0->unk4; + if (var_s0 != NULL) { +loop_1: + temp_a0 = var_s0->unk0; + if (temp_a0->unk10 != 0) { + temp_v0 = temp_a0->unk8; + if ((temp_v0 == 0) || ((temp_v0 < 0) && (func_800BAA64(temp_a0) != 0))) { + func_800BAA04(arg0, var_s0); + var_s0 = arg0->unk4; + } else { + var_s0 = var_s0->unk4; + } + if (var_s0 != NULL) { + goto loop_1; + } + } + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/4.s") +#endif -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB24C.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB364.s") +s32 func_800BAB68(u8 *arg0, void *arg1, s32 arg2) { + u8 temp_v0; -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB394.s") + if (arg1->unk10 == 0) { + func_800047F0(arg2, arg0); + func_800047D0(arg2); + if (*arg0 != 0) { + *arg0 = 0; + } + return 1; + } + temp_v0 = *arg0; + if (arg1->unk1 != temp_v0) { + if (temp_v0 != 0) { + func_800047D0(arg2, arg0); + *arg0 = 0; + } else { + func_800047B0(arg2, arg0); + *arg0 = 1; + } + } + return 0; +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/5.s") +#endif -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB3C0.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB3F0.s") +void func_800BAC0C(void *arg0) { + OSMesgQueue *temp_a0; + s32 var_s0; + s32 var_s0_2; + u32 temp_t6; -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB418.s") + temp_t6 = arg0->unk0; + switch (temp_t6) { + case 0: + func_800BB08C(arg0->unkC, arg0->unk10, arg0->unk14); + break; + case 2: + func_800BB198(arg0->unkC, arg0->unk10); + break; + case 1: + func_800BB12C(arg0->unkC); + break; + case 3: + var_s0 = 0; + do { + func_800BB12C(var_s0); + var_s0 += 1; + } while (var_s0 != 4); + break; + case 4: + D_800ED4C0 = 1; + break; + case 5: + D_800ED4C0 = 0; + var_s0_2 = 0; + do { + func_800BB12C(var_s0_2); + var_s0_2 += 1; + } while (var_s0_2 != 4); + break; + } + temp_a0 = arg0->unk8; + if (temp_a0 != NULL) { + osSendMesg(temp_a0, arg0->unk4, 0); + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/6.s") +#endif -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB440.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB468.s") +void func_800BAD0C(void *arg0) { + ? sp78; + ? sp58; + void *sp54; + ? *var_s2; + s32 temp_v0; + s32 temp_v0_2; + s32 var_s3; + void *temp_s0; + void *temp_s0_2; + void *temp_s1; + void *var_s1; -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB498.s") + func_800009E8(&sp78, &D_800ED4C8, &sp58, 8); +loop_1: + osRecvMesg(&D_800ED4C8, &sp54, 1); + var_s3 = 0; + var_s2 = &D_800ED4A0; + if (sp54 == 1) { + do { + if (var_s2->unk4->unk0->unk10 != 0) { + func_800BAAE4(var_s2); + temp_s1 = var_s2->unk4; + temp_s0 = temp_s1->unk0; + if (func_800BAB68(var_s2, temp_s0, var_s3) == 0) { + func_800BA7A0(var_s2, temp_s0, var_s3); + temp_v0 = temp_s0->unk8; + temp_s0->unk2 = temp_s0->unk2 - 1; + if (temp_v0 > 0) { + temp_s0->unk8 = temp_v0 - 1; + } + var_s1 = temp_s1->unk4; + if (var_s1 != NULL) { +loop_7: + temp_s0_2 = var_s1->unk0; + if (temp_s0_2->unk10 != 0) { + func_800BA90C(var_s2, temp_s0_2); + temp_v0_2 = temp_s0_2->unk8; + temp_s0_2->unk2 = temp_s0_2->unk2 - 1; + if (temp_v0_2 > 0) { + temp_s0_2->unk8 = temp_v0_2 - 1; + } + var_s1 = var_s1->unk4; + if (var_s1 != NULL) { + goto loop_7; + } + } + } + } + } + var_s3 += 1; + var_s2 += 8; + } while (var_s3 != 4); + goto loop_1; + } + func_800BAC0C(sp54); + goto loop_1; +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/7.s") +#endif -GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10/func_800BB4BC.s") +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +s32 func_800BAEB0(void *arg0, s32 arg1, s32 arg2) { + s32 temp_v1_2; + void *temp_v1; + void *var_v0; + + var_v0 = arg0->unk4; + if (var_v0 != NULL) { +loop_1: + temp_v1 = var_v0->unk0; + if (temp_v1 != NULL) { + if ((temp_v1->unk10 != 0) && (arg1 == temp_v1->unk0)) { + if (arg2 != 0) { + temp_v1_2 = temp_v1->unk8; + if ((temp_v1_2 > 0) && (temp_v1_2 < arg2)) { + temp_v1->unk8 = arg2; + return 1; + } + goto block_10; + } + temp_v1->unk4 = 0; + temp_v1->unk2 = 0; + temp_v1->unk10 = *(&D_800D5238 + (arg1 * 4)); + return 1; + } +block_10: + var_v0 = var_v0->unk4; + if (var_v0 == NULL) { + /* Duplicate return node #11. Try simplifying control flow for better match */ + return 0; + } + goto loop_1; + } + return 0; + } + return 0; +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/8.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void *func_800BAF50(void *arg0, s32 arg1) { + void *temp_a1; + void *temp_t1; + void *temp_v0; + void *temp_v1; + void *var_a2; + + temp_v0 = arg0->unk4; + temp_v1 = temp_v0->unk8; + var_a2 = temp_v0; + if (temp_v0 != NULL) { +loop_2: + temp_a1 = var_a2->unk0; + if (temp_a1->unk10 != 0) { + if (*(&D_800D5274 + arg1) >= *(&D_800D5274 + temp_a1->unk0)) { + if (var_a2 == temp_v0) { + temp_v1->unk8->unk4 = temp_v1->unk4; + arg0->unk4 = temp_v1; + temp_v1->unk4 = var_a2; + var_a2->unk8 = temp_v1; + return temp_v1->unk0; + } + if (var_a2 != temp_v1) { + temp_v1->unk8->unk4 = temp_v1->unk4; + arg0->unk4->unk8 = temp_v1->unk8; + temp_t1 = var_a2->unk8; + temp_v1->unk8 = temp_t1; + temp_t1->unk4 = temp_v1; + temp_v1->unk4 = var_a2; + var_a2->unk8 = temp_v1; + return temp_v1->unk0; + } + return temp_v1->unk0; + } + var_a2 = var_a2->unk4; + if (var_a2 == NULL) { + /* Duplicate return node #11. Try simplifying control flow for better match */ + return NULL; + } + goto loop_2; + } + return temp_a1; + } + return NULL; +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/9.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB028(void *arg0) { + OSMesg sp34; + OSMesgQueue sp1C; + + osCreateMesgQueue(&sp1C, &sp34, 1); + arg0->unk4 = 1; + arg0->unk8 = &sp1C; + osSendMesg(&D_800ED4C8, arg0, 0); + osRecvMesg(&sp1C, NULL, 1); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/10.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB08C(s32 arg0, s32 arg1, s32 arg2) { + void *sp1C; + void *temp_a0; + void *temp_v0; + + if (D_800ED4C0 != 0) { + temp_a0 = (arg0 * 8) + &D_800ED4A0; + sp1C = temp_a0; + if (func_800BAEB0(temp_a0) == 0) { + temp_v0 = func_800BAF50(temp_a0, arg1); + if (temp_v0 != NULL) { + if (arg2 == 0) { + temp_v0->unk8 = -1; + } else { + temp_v0->unk8 = arg2; + } + temp_v0->unk1 = 0; + temp_v0->unk2 = 0; + temp_v0->unk4 = 0; + temp_v0->unkC = 0; + temp_v0->unk0 = arg1; + temp_v0->unk10 = *(&D_800D5238 + (arg1 * 4)); + } + } + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/11.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB12C(s32 arg0) { + void *temp_v1; + void *var_v0; + + func_800047F0(); + func_800047D0(arg0); + temp_v1 = (arg0 * 8) + &D_800ED4A0; + if (temp_v1->unk0 != 0) { + temp_v1->unk0 = 0; + } + var_v0 = temp_v1->unk4; + if (var_v0 != NULL) { + do { + var_v0->unk0->unk10 = 0; + var_v0 = var_v0->unk4; + } while (var_v0 != NULL); + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/12.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB198(s32 arg0, s32 arg1) { + void **temp_v1; + void **var_s0; + void *temp_s1; + void *temp_v0; + + temp_s1 = (arg0 * 8) + &D_800ED4A0; + temp_v1 = temp_s1->unk4; + var_s0 = temp_v1; + if ((*temp_v1)->unk10 != 0) { + if (temp_v1 != NULL) { +loop_2: + temp_v0 = var_s0->unk0; + if (temp_v0->unk10 != 0) { + if (arg1 == temp_v0->unk0) { + func_800BAA04(temp_s1, var_s0); + var_s0 = temp_s1->unk4; + } else { + var_s0 = var_s0->unk4; + } + if (var_s0 != NULL) { + goto loop_2; + } + } + } + func_800BAB68(temp_s1, *temp_s1->unk4, arg0); + } +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/13.s") +#endif + +typedef struct { + u32 _000; + u32 _004; + u32 *_008; +} UnkStruct800ED4A0_004; +typedef struct { + u32 _000; + UnkStruct800ED4A0_004 *_004; +} UnkStruct800ED4A0; extern UnkStruct800ED4A0 D_800ED4A0[]; +typedef struct { + u32 _000[3][5]; +} UnkStruct800ED320; extern UnkStruct800ED320 D_800ED320[]; +typedef struct { + u32 _000[3][3]; +} UnkStruct800ED410; extern UnkStruct800ED410 D_800ED410[]; + + +extern u32 D_800ED4C0; +extern u32 *D_800ED4C4; +#ifdef NON_MATCHING +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c +void func_800BB24C(void) { + // ? **temp_t6; + // ? **var_a0; + // ? **var_t0; + // ? **var_v0; + // ? *var_a3; + UnkStruct800ED4A0 *var_t1; + // ? *var_v1; + s32 i, j; + UnkStruct800ED410 *a0; + + // end of stack, start of something else, zeros? + // entry size: 0x3C + // total size; 0x96F0 + // entries: 644 + // D_800ED320 = &D_800ED320; + // start of region of pointers to something + // entry size: 0x24 + // var_t0 = &D_800ED410; + + // region where something is actually written every frame + // entry size: 0x8 + + for (i = 0; i < 644; i++) { + D_800ED4A0[i]._000[0][0] = 0; + D_800ED4A0[i]._000[0][1] = &D_800ED410[i]; + // var_v0 = D._000_800ED410; + D_800ED410[i]._000[0][2] = &D_800ED320[i]; + // var_v1 = D_800ED320; + D_800ED320[i][0][3] = 0; + D_800ED320[i][0][4] = 0; + a0 = &D_800ED410[i]; + for (j = 1; j < 4; j++) { + a0->_004 = &D_800ED410[i]; + D_800ED410[i][j][0] = &D_800ED320[i]; + D_800ED410[i][j][2] = &D_800ED320[i]; + // var_v0 += 0xC; + + D_800ED320[i][j][3] = 0; + D_800ED320[i][j][4] = 0; + // var_v1 += 0x14; + a0 = a0->_004; + } + D_800ED410[i]._004 = 0; + D_800ED4A0[i]._004->_008 = &D_800ED410[i]; + // D_800ED320 += 0x3C; + // D_800ED410 += 0x24; + // D_800ED4A0 += 8; + // } while (var_a3 != &D_800ED410); + } + D_800ED4C0 = 1; + D_800ED4C4 = D_80048E9C; + osCreateThread(&D_800ECD70, 100000000, func_800BAD0C, NULL, &D_800ECF50[0x3D0], 0x34); + D_800ECF50[0] = 0xFEDCBA98; // canary is never checked + osStartThread(&D_800ECD70); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/14.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB364(s32 arg0, s32 arg1, s32 arg2) { + s32 sp2C; + s32 sp28; + s32 sp24; + s32 sp18; + + sp24 = arg0; + sp18 = 0; + sp28 = arg1; + sp2C = arg2; + func_800BB028(&sp18); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/15.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB394(s32 arg0) { + s32 sp24; + s32 sp18; + + sp24 = arg0; + sp18 = 1; + func_800BB028(&sp18); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/16.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB3C0(s32 arg0, s32 arg1) { + s32 sp2C; + s32 sp28; + s32 sp1C; + + sp28 = arg0; + sp1C = 2; + sp2C = arg1; + func_800BB028(&sp1C); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/17.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB3F0(void) { + s32 sp1C; + + sp1C = 3; + func_800BB028(&sp1C); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/18.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB418(void) { + s32 sp1C; + + sp1C = 4; + func_800BB028(&sp1C); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/19.s") +#endif + +#ifdef MIPS_TO_C +void func_800BB440(void) { + s32 sp1C; + + sp1C = 5; + func_800BB028(&sp1C); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/20.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB468(s32 arg0, ? arg1) { + func_800BB364(D_800ED4C4, arg0, arg1); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/21.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB498(void) { + func_800BB394(D_800ED4C4); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/22.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c + +void func_800BB4BC(s32 arg0) { + func_800BB3C0(D_800ED4C4, arg0); +} +#else +GLOBAL_ASM("asm/non_matchings/ovl1/ovl1_10//ovl1_10/23.s") +#endif void func_800BB4E4(s32 arg0, s32 arg1, s32 arg2) { func_800BB364(D_80048E9C[arg0], arg1, arg2, arg0); diff --git a/tools/temp_tools/ugh2.txt b/tools/temp_tools/ugh2.txt new file mode 100644 index 00000000..b3a4cd4d --- /dev/null +++ b/tools/temp_tools/ugh2.txt @@ -0,0 +1,654 @@ +D_8009A220 CartRomHandle +D_80098E00 CartRomHandle2 +func_80000400 EntryPoint +func_80008830 HS64_AObjLinkToAnimation +func_800097E0 HS64_AObjNew +func_800087D8 HS64_AObjPop +func_80008860 HS64_AObjPush +func_80008994 HS64_CameraPop +func_800089EC HS64_CameraPush +func_80008910 HS64_DObjPop +func_80008968 HS64_DObjPush +func_8000835C HS64_GObjPop +D_8004A7E0 HS64_GObjProcMesgQ +func_80008068 HS64_GObjProcessPop +func_80008198 HS64_GObjProcessPush +func_800083A0 HS64_GObjPush +func_80007F60 HS64_GObjThreadPop +func_80007FB8 HS64_GObjThreadPush +func_80007FE4 HS64_GObjThreadStackPop +func_8000803C HS64_GObjThreadStackPush +func_8000828C HS64_GetGObjProcessStack +func_800082D4 HS64_GetGObjProcessStackSize +func_8000888C HS64_MObjPop +func_800088E4 HS64_MObjPush +func_8001BBAC HS64_MkRotationMtxF +func_8001B4AC HS64_MkScaleMtxF +func_8001B6E4 HS64_MkTranslateMtxF +func_80008754 HS64_OMMtxPop +func_800087AC HS64_OMMtxPush +func_8000AE84 HS64_omInit +D_8009A160 LeoDiskHandle +D_80098E78 LeoDiskHandle80098E78 +func_A4000000 ROMHeader +func_801E6450 T_801E6450 +func_80037EA0 _Ldtob +func_80038590 _Litob +func_80033270 _Printf +func_80032C00 _Putfld +func_8003FBA0 __OSGlobalIntMask +func_80035810 __cosf +func_80041CC0 __libm_qnan_f +func_8002DDAC __ll_div +func_8002DD44 __ll_lshift +func_8002DE98 __ll_mod +func_8002DE08 __ll_mul +func_8002DD70 __ll_rem +func_8002DF34 __ll_rshift +func_80029908 __n_allocParam +func_8003FB5C __osActiveQueue +func_80038F30 __osAiDeviceBusy +D_8009A208 __osBaseCounter +D_8009A1E0 __osBaseTimer +func_80031CB0 __osCheckId +func_800319A0 __osCheckPackId +func_8002E860 __osCleanupThread +func_8002F640 __osContGetInitData +D_80098AF0 __osContLastCmd +func_80098AB0 __osContPifRam +func_80037320 __osContRamRead +func_800370D0 __osContRamWrite +func_8003FB80 __osContinitialized +func_8003FBE0 __osCurrentHandle +D_8009A200 __osCurrentTime +func_8002E870 __osDequeueThread +func_80032540 __osDevMgrMain +func_80035360 __osDisableInt +D_8009A1D4 __osDiskHandle +func_8002E6E4 __osDispatchThread +func_80038930 __osDpDeviceBusy +func_8009B500 __osEepPifRam +func_8002FA34 __osEepStatus +D_80098AF8 __osEepromTimer +D_80098B30 __osEepromTimerMsg +D_80098B18 __osEepromTimerQ +func_8002E58C __osEnqueueAndYield +func_8002E68C __osEnqueueThread +D_8009A0E0 __osEventStateTab +func_8002DF70 __osException +func_8002DF60 __osExceptionPreamble +func_8003FB64 __osFaultedThread +func_80098B40 __osFinalrom +func_80034CF0 __osGetActiveQueue +func_80031B04 __osGetId +func_80030400 __osGetSR +func_8003FB30 __osHwIntTable +func_80031554 __osIdCheckSum +func_80034918 __osInsertTimer +func_80041B00 __osIntOffTable +func_80041B20 __osIntTable + U __osLeoAbnormalResume +func_8002E950 __osLeoInterrupt + U __osLeoResume +func_80098AF1 __osMaxControllers +func_80039124 __osPackEepReadData +func_8002F710 __osPackRequestData +func_80036D60 __osPfsGetInitData +func_800360B4 __osPfsGetOneChannelData +func_80035F20 __osPfsGetStatus +func_8003FBB4 __osPfsInodeCacheBank +D_8009A2A0 __osPfsPifRam +func_80031D84 __osPfsRWInode +func_800352C8 __osPfsReleasePages +func_80036C90 __osPfsRequestData +func_80035FF0 __osPfsRequestOneChannel +func_80035CA0 __osPfsSelectBank +D_8009A0C8 __osPiAccessQueue +func_8003FBF0 __osPiAccessQueueEnabled +func_80032470 __osPiCreateAccessQueue +func_8003FBC0 __osPiDevMgr +func_800324C0 __osPiGetAccess +func_80032504 __osPiRelAccess +func_8003FBDC __osPiTable +func_8002E6D4 __osPopThread +func_80031410 __osProbeTLB +func_80041A30 __osRcpImTable +func_80031650 __osRepairPackId +func_80035090 __osResetGlobalIntMask +func_80035380 __osRestoreInt +func_8003FB58 __osRunQueue +func_8003FB60 __osRunningThread +func_80034CE0 __osSetCompare +func_80035D20 __osSetFpcCsr +func_80034AA0 __osSetGlobalIntMask +func_800303F0 __osSetSR +func_800348A4 __osSetTimerIntr +func_8003FB9C __osShutdown +D_80098A98 __osSiAccessQueue +func_8003FB70 __osSiAccessQueueEnabled +func_8002F410 __osSiCreateAccessQueue +func_80033D60 __osSiDeviceBusy +func_8002F460 __osSiGetAccess +func_80030650 __osSiRawReadIo +func_800304E0 __osSiRawStartDma +func_80038830 __osSiRawWriteIo +func_8002F4A4 __osSiRelAccess +func_80033D30 __osSpDeviceBusy +func_80038970 __osSpGetStatus +func_80030450 __osSpRawStartDma +func_800391F0 __osSpSetPc +func_80038960 __osSpSetStatus +func_800314E0 __osSumcalc +func_80098B50 __osThreadSave +func_8003FB50 __osThreadTail +D_8009A210 __osTimerCounter +func_8003472C __osTimerInterrupt +func_8003FC50 __osTimerList +func_800346A0 __osTimerServicesInit +func_8003FD60 __osViCurr +func_8003FE50 __osViDevMgr +func_80038C90 __osViGetCurrentContext +func_800353A0 __osViInit +D_8009A20C __osViIntrCount +func_8003FD64 __osViNext +func_800354E0 __osViSwapContext +func_01E8BB50 __romPos +func_8002D6E0 __sinf +func_8002DD08 __ull_div +func_8002DE38 __ull_divremi +func_8002DCCC __ull_rem +func_8002DCA0 __ull_rshift +func_8002AAE0 _allocatePVoice +func_800344F0 _bcmp +func_80034D00 _bcopy +func_8003B220 _binary_f3dex2_F3DEX2_2_04H_F3DEX2_2_04H_code_end +func_00001390 _binary_f3dex2_F3DEX2_2_04H_F3DEX2_2_04H_code_size +func_80039E90 _binary_f3dex2_F3DEX2_2_04H_F3DEX2_2_04H_code_start +func_80042410 _binary_f3dex2_F3DEX2_2_04H_F3DEX2_2_04H_data_end +func_00000420 _binary_f3dex2_F3DEX2_2_04H_F3DEX2_2_04H_data_size +func_80041FF0 _binary_f3dex2_F3DEX2_2_04H_F3DEX2_2_04H_data_start +func_8003C3B0 _binary_ucode_L3DEX2_2_04H_L3DEX2_2_04H_code_end +func_00001190 _binary_ucode_L3DEX2_2_04H_L3DEX2_2_04H_code_size +func_8003B220 _binary_ucode_L3DEX2_2_04H_L3DEX2_2_04H_code_start +func_80042800 _binary_ucode_L3DEX2_2_04H_L3DEX2_2_04H_data_end +func_000003F0 _binary_ucode_L3DEX2_2_04H_L3DEX2_2_04H_data_size +func_80042410 _binary_ucode_L3DEX2_2_04H_L3DEX2_2_04H_data_start +func_8003DC70 _binary_ucode_S2DEX2_2_04_S2DEX2_2_04_code_end +func_000018C0 _binary_ucode_S2DEX2_2_04_S2DEX2_2_04_code_size +func_8003C3B0 _binary_ucode_S2DEX2_2_04_S2DEX2_2_04_code_start +func_80042B90 _binary_ucode_S2DEX2_2_04_S2DEX2_2_04_data_end +func_00000390 _binary_ucode_S2DEX2_2_04_S2DEX2_2_04_data_size +func_80042800 _binary_ucode_S2DEX2_2_04_S2DEX2_2_04_data_start +func_8002E8B0 _blkclr +func_A4001000 _bootSegmentEnd +func_00001000 _bootSegmentRomEnd +func_00000000 _bootSegmentRomStart +func_A4000000 _bootSegmentStart +func_8002E8B0 _bzero +func_80018890 acosf +func_80037080 alCents2Ratio +func_80035010 alCopy +func_80025F50 alLink +func_80025F74 alUnlink +func_800053D0 alloc_region +func_80005400 alloc_with_alignment +func_80005DE4 append_microcode_load +func_8001880C asinf +func_800B1EC8 assign_new_process_entry +func_8001870C atan2f +func_800185E4 atanf +func_80034F14 back_copy2 +func_80034F2C back_copy3 +func_80034EE4 backalignable +func_80034F48 backwards +func_80034FA4 backwards_16 +func_80034F48 backwards_32 +func_80034FE0 backwards_4 +func_80034EB4 backwards_bytecopy +func_800344F0 bcmp +func_80034540 bcmp_1_1 +func_8003457C bcmp_1_2 +func_800345B0 bcmp_1_3 +func_800345DC bcmp_1_4 +func_80034D00 bcopy +func_80034E20 bcopy2 +func_80034D58 bcopy_loop1 +func_80034EC8 bcopy_loop2 +func_8002E8B0 blkclr +func_8002E8D0 blkzero +func_800345D4 bytecmp +func_8002E92C bytezero +func_8002E8B0 bzero +func_8002E8E4 bzero_back_1_1 +func_8002E920 bzero_back_1_2 +func_8002E938 bzero_back_1_3 +func_800B8FC8 calc_file_checksum +func_800B90E0 calc_header_checksum +func_800B8F34 calc_save_file_checksum +func_800B9068 calc_save_header_checksum +func_800A447C call_virtual_function +func_80000870 cboot +func_800BBFE0 change_kirby_hp +func_800BC258 change_kirby_lives +func_800BC240 change_kirby_stars +func_800B9F50 check_cutscene_watched +func_80151100 check_save_file_completion_cheat_code +func_800004B0 check_sp_dmem +func_80000480 check_sp_imem +func_80196C6C cmd_8016F240 +func_800345FC cmpdone +func_80034604 cmpne +func_800A5268 copy_controller_inputs_to_kirby_controller +func_80036954 corrupted +func_80036688 corrupted_init +func_80035810 cosf +func_80018970 cotf +func_8003F68C crashScreenGlyphTable +func_80021E00 crash_screen_draw_glyph +func_80021D34 crash_screen_draw_rect +func_80023048 crash_screen_init +func_80021FA4 crash_screen_print +func_80022134 crash_screen_print_float_reg +func_800221BC crash_screen_print_fpcsr +func_800A28C0 crash_screen_print_gobj_info +func_800A2904 crash_screen_print_page_3 +func_80022B88 crash_screen_printf +func_8002206C crash_screen_sleep +func_80022D98 crash_screen_start_thread +func_80022A58 crash_screen_vprint +func_8001CBF0 create_xy_rotation_matrix +func_8001CF00 create_y_rotation_matrix +func_8001CA40 create_yz_rotation_matrix +func_8001CDA0 create_z_rotation_matrix +func_80018920 cscf +func_80002BD0 dma_copy +func_80002D8C dma_overlay_load +func_80002E48 dma_read +func_80002E84 dma_write +func_800BD0E8 draw_hp_segment +func_800BD660 draw_kirby_lives +func_800BD2F4 draw_kirby_stars +func_800BCFD8 draw_lives_digit +func_800BC9A4 draw_pause_bg +func_800BD374 draw_star_segments +func_8002309C fatal_printf +func_80035810 fcos +func_8000B6BC finish_current_thread +func_80034DA4 forw_copy2 +func_80034DBC forw_copy3 +func_80034D74 forwalignable +func_80034DD8 forwards +func_80034E34 forwards_16 +func_80034DD8 forwards_32 +func_80034E70 forwards_4 +func_80034D4C forwards_bytecopy +D_80048CE4 fptr_80048CE4 +func_8002D6E0 fsin +D_8004A7A0 gAObjCount +D_8004A79C gAObjHead +D_800435F0 gAudioThread +D_800437A0 gAudioThreadStack +func_8003F80C gCPUExceptionCauses +D_8004A7C0 gCameraCount +D_8004A7BC gCameraHead +func_8012BCF8 gCollisionState +D_80047F50 gControllerThread +D_80048EA0 gControllers +func_800966D8 gCrashScreen +func_8003F70C gCrashScreenFont +D_80096EF8 gCrashScreenFramebuffer +D_80096F28 gCrashScreenThread +D_80048C68 gCurrFrameBuffer +D_8004A50C gCurrScreenHeight +D_8004A508 gCurrScreenWidth +D_800D6B94 gCurrentLevel +D_80048BF8 gCurrentViMode +D_800D6B90 gCurrentWorld +D_800D6BA0 gCutscenesWatched +D_8004A390 gDLBuffers +D_8004A708 gDLLinkProcs +D_8004A7B0 gDObjCount +D_8004A7AC gDObjHead +func_8004A3D0 gDisplayListHead +func_8004A3D4 gDisplayListHead2 +func_8004A3D8 gDisplayListHead3 +func_8004A3DC gDisplayListHead4 +func_8004A3D0 gDisplayListHeads +D_80048D70 gDmaMessageQueue +func_8004A3F8 gDynamicBuffer1 +D_8004A408 gDynamicBuffer2 +D_8004A418 gDynamicBuffer3 +D_800E4010 gEntitiesAngleXArray +D_800E41D0 gEntitiesAngleYArray +D_800E4390 gEntitiesAngleZArray +D_800E25D0 gEntitiesNextPosXArray +D_800E2790 gEntitiesNextPosYArray +D_800E2950 gEntitiesNextPosZArray +D_800E2B10 gEntitiesPosXArray +D_800E2CD0 gEntitiesPosYArray +D_800E2E90 gEntitiesPosZArray +D_800E4550 gEntitiesScaleXArray +D_800E4710 gEntitiesScaleYArray +D_800E48D0 gEntitiesScaleZArray +D_800DE510 gEntityGObjProcessArray +D_800DE6D0 gEntityGObjProcessArray2 +D_800DE890 gEntityGObjProcessArray3 +D_800DEA50 gEntityGObjProcessArray4 +D_800DEC10 gEntityGObjProcessArray5 +D_800DDC50 gEntityVtableIndexArray +D_80042B90 gEntryStack +func_8003F854 gFPUExceptionCauses +func_803B6900 gFrameBuffer +func_8015A678 gFrameBuffers +D_8004A78C gGObjCount +D_8004A678 gGObjHead +D_8004A570 gGObjProcessCount +D_8004A55C gGObjProcessHead +D_8004A544 gGObjThreadCount +D_8004A540 gGObjThreadHead +D_8004A554 gGObjThreadStackHead +func_800BE4F0 gGameState +D_800D6EC8 gGameTampered +D_80043DA0 gGameThread +D_80043F50 gGameThreadStack +D_8004A680 gHighestPrioDLLinkProcs +D_800D6BB0 gHudDisplayMode +D_80042D90 gIdleThread +D_80048CB8 gInterruptMesgQueue +D_800D6FE8 gKirbyController +D_800D6E50 gKirbyHp +D_800D6E4C gKirbyLives +D_800D6E60 gKirbyStars +D_8012E7C0 gKirbyState +D_8004A7A8 gMObjCount +D_8004A7A4 gMObjHead +D_80043040 gMainThread +D_800431F0 gMainThreadStack +D_8004A54C gNewEntityStackSize +D_8004A794 gOMMtxCount +D_8004A790 gOMMtxHead +D_80048F20 gPlayerControllers +func_8012E968 gPositionState +D_80048900 gRSPBootUcode +D_80048CF0 gRomHandle +D_80048A01 gSPDmemOkay +D_80048A00 gSPImemOkay +D_800EC9F8 gSaveBuffer1 +D_800ECBB0 gSaveBuffer2 +func_8003DD30 gScissorCallback +D_800DF4D0 gSegment4StartArray +D_80048100 gThread6Stack +D_80048A08 gThreadInitializedMQ +D_80048E98 gValidControllerCount +D_8004A530 gViewport +D_8004A500 gZBuffer +func_800A377C game_tick +func_800229CC get_crashed_thread +func_800A7740 get_music_id_from_index +func_80018AA0 get_rng_seed +func_800189A8 get_soft_rng_seed +func_800A7794 get_sound_id_from_index +func_80034E94 gobackwards +func_80034D30 goforwards +func_8001A13C guLookAt +func_80019EB0 guLookAtF +func_8001A1B0 guLookAtF_2 +func_8001A1B0 guLookAtF_2_ovl1 +func_8001A8EC guLookAtReflect +func_8001A504 guLookAtReflectF +func_8001A964 guLookAtReflectF_2 +func_800340D0 guMtxCatF +func_80030B10 guMtxF2L +func_80030C98 guMtxIdent +func_80030C10 guMtxIdentF +func_80030C10 guMtxIdentF_ovl1 +func_80030C10 guMtxIdentF_ovl17 +func_80030CC8 guMtxL2F +func_80034030 guMtxXFMF +func_80034C50 guNormalize +func_8001AFA4 guOrtho +func_8001AE10 guOrthoF +func_8001AE10 guOrthoF_ovl1 +func_8003DD38 identityMatrix +D_80042F40 idleThreadStack +func_80002BA0 init_dma_message_queue +func_800B8C34 init_save_file_maybe +func_80033BE0 inval_dcache_1 +func_80033C00 inval_dcache_2 +func_80033C10 inval_dcache_3 +func_80033C18 inval_dcache_4 +func_80033C24 inval_dcache_5 +func_80033B48 inval_icache_1 +func_80033B58 inval_icache_2 +func_80033B60 inval_icache_3 +func_80033B6C inval_icache_4 +func_A4000040 ipl3_entry +func_A4000BF0 ipl3_font +func_8012122C kirby_in_inactionable_state +func_80019E5C lbreflect_Int16Cos +func_80019E14 lbreflect_Int16Sin +func_8003E330 lbreflect_Int16SinTable +func_80018D7C lbvector_Add +func_80018FBC lbvector_Angle +func_80018DEC lbvector_Diff +func_80019870 lbvector_DiffLen +func_80018D3C lbvector_Len +func_80019380 lbvector_Negate +func_80018CA0 lbvector_Normalize +func_80019090 lbvector_Rotate +func_80018E70 lbvector_Scale +func_80018EA4 lbvector_Shrink +func_80018DB4 lbvector_Sub +func_80038500 ldiv +func_800001A0 leoBootID +D_80097990 leoDiskStack +func_80038400 lldiv +func_800A3128 load_menu_overlays +func_800A6B20 load_overlay +func_8003DC70 mainSegOverlay +func_80033A40 memcpy +func_8000783C mlAlloc +func_80007830 mlReset +func_800078A4 mlSetup +func_8010E2B8 mtx_create_translate_scale +func_80027520 n_alEnvmixerParam +func_8003FB10 n_alGlobals +func_8002AA0C n_alSynAddPlayer +func_8002A910 n_alSynAddSeqPlayer +func_8002A998 n_alSynAddSndPlayer +func_8002ABD0 n_alSynAllocVoice +func_8002AD10 n_alSynSetPan +func_8002D250 n_alSynSetVol +func_8002AA70 n_alSynStopVoice +func_8003FB14 n_syn +func_8000A0C0 omGAddCommon +func_800086EC omGDLLinkDestructor +func_8000AC3C omGDispatchProc +func_80008590 omGInsertDLLink +func_8000A580 omGLinkObjDLCommon +func_8000A350 omGMoveCommon +func_8000A888 omGMoveObjDL +func_8000A904 omGMoveObjDLHead +func_800085F8 omGSetupCameraDLLink +func_80008664 omGSetupDLLink_HighestPrioMax +func_80032B30 osAfterPreNMI +func_80034AF0 osAiSetFrequency +func_80038E80 osAiSetNextBuffer +func_8000031C osAppNMIBuffer +func_80035A20 osCartRomInit +func_80000310 osCicId +func_8003FB90 osClockRate +func_80032BD4 osContGetQuery +func_8002FDB4 osContGetReadData +func_8002F4D0 osContInit +func_80032B50 osContStartQuery +func_8002FD30 osContStartReadData +func_80033AE0 osCreateMesgQueue +func_80032280 osCreatePiManager +func_8002FBE0 osCreateThread +func_80038980 osCreateViManager +func_8002DB90 osDestroyThread +func_80038880 osDpSetNextBuffer +func_80030590 osEPiLinkHandle +func_80036E30 osEPiRawReadIo +func_80034240 osEPiRawStartDma +func_800376C0 osEPiRawWriteIo +func_800338C0 osEPiStartDma +func_8002FF10 osEepromLongRead +func_80033C40 osEepromLongWrite +func_80032060 osEepromProbe +func_80038F60 osEepromRead +func_8002F810 osEepromWrite +func_800314D0 osGetCount +func_80033FC0 osGetThreadPri +func_80034610 osGetTime +func_800300A0 osInitialize +func_80033B90 osInvalDCache +func_80033B10 osInvalICache +func_80033D90 osJamMesg +func_800339A0 osLeoDiskInit +func_80036FD0 osMapTLBRdb +func_80000318 osMemSize +func_8002F2B4 osMotorInit +func_80036150 osPfsChecker +func_800350F0 osPfsDeleteFile +func_800320D0 osPfsFindFile +func_80031270 osPfsFreeBlocks +func_80035D30 osPfsInitPak +func_80036AF0 osPfsIsPlug +func_80030794 osPfsReadWriteFile +func_800357E0 osPiGetCmdQueue +func_80030330 osPiRawReadIo +func_800329D0 osPiRawStartDma +func_8002D500 osRecvMesg +func_8000030C osResetType +func_80000308 osRomBase +func_80000304 osRomType +func_8002D2F0 osSendMesg +func_80032AB0 osSetEventMesg +func_8002D640 osSetIntMask +func_80033EE0 osSetThreadPri +func_80035980 osSetTime +func_80037850 osSetTimer +func_8002D9BC osSpTaskLoad +func_8002DB4C osSpTaskStartGo +func_800306A0 osSpTaskYield +func_80034470 osSpTaskYielded +func_80038CD0 osStartThread +func_8002D440 osStopThread +func_80000300 osTvType +func_80000314 osVersion +func_800305E0 osViBlack +func_8003FB98 osViClock +func_800391B0 osViGetCurrentFramebuffer +func_80030410 osViGetNextFramebuffer +func_8003FCB0 osViModeMpalLan1 +func_8003FC60 osViModeNtscLan1 +func_8003FD70 osViModePalLan1 +func_800359B0 osViSetEvent +func_80030D80 osViSetMode +func_80038E20 osViSetYScale +func_80033FE0 osViSwapBuffer +func_8002FFA0 osVirtualToPhysical +func_80030020 osWritebackDCache +func_80038CA0 osWritebackDCacheAll +func_80038CB0 osWritebackDCacheAll_1 +func_80037030 osYieldThread +func_8021F304 ovl18_TamperCheck +func_800A6B64 ovl1_TamperCheck +func_80151E94 ovl3_process_command_string +D_80048B08 pad13 +func_8003459C partalgncmp +D_80048A20 piMesgBuffer +D_80048AE8 piMesgQueue +func_800A75B0 play_music +func_800A7678 play_sound +func_800AC5B0 pop_spobj +func_800A4270 print_error_stub +func_80003ECC query_controllers +func_80018AFC random_f32 +func_80018BF8 random_f32_2 +func_80018B60 random_s32_range +func_800189E4 random_soft_f32 +func_80018A44 random_soft_s32_range +func_800189B4 random_soft_u16 +func_80018AAC random_u16 +func_80018C5C random_u16_range +func_80018BD4 random_u8 +func_80003FDC read_controller_input +func_800AE7A8 request_job +func_800AEADC request_track +func_800AEC08 request_track_general +func_8003DD78 resetRDPDisplayList +func_80007CF4 reset_rdp_settings +func_800B1EC8 restart_thread_with_new_function +func_80034D6C ret +func_8009B4F0 retrace +func_A4000B70 rspboot +D_80048E80 sContPads +D_80048E70 sControllerStatuses +func_8015AB50 sFileSelectBackgroundImage +func_8018A104 sKirbyHeadphoneModel +func_8015AB70 sMenuLevelPercentImage +D_800D6B4C sMusicCount +func_800C0534 sMusicNames +func_800490F0 sPakDevices +D_80048DA0 sSIMesgQueue +D_800DD6F8 sSetTileCommand +D_800D6B50 sSoundCount +func_800C0B1C sSoundNames +D_800DD6F4 sTextureImageCommand +func_800BA5C4 save_file_set_to_full_completion +func_80018948 secf +func_8002E4A4 send_mesg +func_800B9F90 set_cutscene_watched +func_80018A94 set_hard_rng_seed +func_80122F6C set_kirby_action_1 +func_80122F94 set_kirby_action_2 +func_80007CE8 set_scissor_callback +func_80018998 set_soft_rng_seed +func_8002D684 setintmask_1 +func_80005378 setup_segment_15 +func_80007C9C setup_viewport +func_80098A90 siAccessBuf +func_8002D6E0 sinf +func_800A7704 sound_str_atoi +func_800FC9C0 spawn_entity +func_80032B20 sqrtf +func_80033A94 strchr +func_80033A6C strlen +func_80300000 tamper_check_ovl20 +func_800185B0 tanf +func_800007C8 thread1_idle +func_80002598 thread3_main +func_8001FD64 thread4_audio +func_800005D8 thread5_game +func_800004E0 thread_crash_stack_overflow +func_80034568 unalgncmp +func_800081C4 unlink_gobj_process +func_80000460 unused_get_main_thread +func_8000046C unused_get_main_thread_stack +func_80000478 unused_get_main_thread_stack_length +func_800F89C0 vec3_abs_angle_diff +func_800196D4 vec3_compare_directions +func_8011C2D4 vec3_cross_product +func_80019870 vec3_diff_mag +func_800A455C vec3_dist_square +func_800A44BC vec3_dot_product +func_800A4534 vec3_mag_square +func_800191CC vec3_negate +func_80019740 vec3_normalized_cross_product +func_80018E24 vec3_sub_normalize +func_800197EC vec3_subtract_compare_directions +func_800B92D8 verify_save +D_8009B4D8 viCounterMsg +D_8009B4A8 viEventBuf +D_8009B490 viEventQueue +D_8009B4C0 viRetraceMsg +D_8009A2E0 viThread +D_8009A490 viThreadStack +func_80196990 vtbl_80196990 +func_8003452C wordcmp +func_8002E90C wordzero +func_80021F80 write_to_buf +func_8002E944 zerodone diff --git a/unnamed_syms.txt b/unnamed_syms.txt index 31c32a95..ebe23a17 100644 --- a/unnamed_syms.txt +++ b/unnamed_syms.txt @@ -509,10 +509,8 @@ SYM(func_800A3150, 0x800A3150); SYM(func_800A6B18, 0x800A6B18); SYM(func_800A3228, 0x800A3228); SYM(func_800A3128, 0x800A3128); -SYM(func_80158048_ovl1, 0x80158048); SYM(func_800A3408, 0x800A3408); SYM(func_80159A54_ovl1, 0x80159A54); -SYM(func_8015531C_ovl1, 0x8015531C); SYM(func_800F8560, 0x800F8560); SYM(func_800A3230, 0x800A3230); SYM(func_800A336C, 0x800A336C); @@ -7210,10 +7208,6 @@ SYM(func_80155DF0_ovl19, 0x80155DF0); SYM(D_00023750, 0x00023750); SYM(func_8019F000_ovl19, 0x8019F000); SYM(func_801A0880_ovl19, 0x801A0880); - - - - SYM(D_80128446, 0x80128446); SYM(D_8012844E, 0x8012844E); SYM(D_8012844C, 0x8012844C); @@ -7234,10 +7228,7 @@ SYM(D_800BE550, 0x800BE550); /* part of Lights1 at D_800BE548 */ SYM(D_800D6F34, 0x800D6F34); SYM(D_800E8920, 0x800E8920); SYM(D_800D6F10, 0x800D6F10); -SYM(gEntitiesScaleXArray, 0x800E4550); -SYM(gEntitiesScaleZArray, 0x800E48D0); SYM(D_800E6850, 0x800E6850); -SYM(gEntitiesScaleYArray, 0x800E4710); SYM(D_800E3C90, 0x800E3C90); SYM(D_800E3750, 0x800E3750); SYM(D_800E3210, 0x800E3210);