diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E88EC.s b/asm/nonmatchings/code_109660_len_1270/func_802E88EC.s deleted file mode 100644 index 0c0e355f78..0000000000 --- a/asm/nonmatchings/code_109660_len_1270/func_802E88EC.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802E88EC -/* 10A16C 802E88EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 10A170 802E88F0 AFB20028 */ sw $s2, 0x28($sp) -/* 10A174 802E88F4 0080902D */ daddu $s2, $a0, $zero -/* 10A178 802E88F8 AFBF002C */ sw $ra, 0x2c($sp) -/* 10A17C 802E88FC AFB10024 */ sw $s1, 0x24($sp) -/* 10A180 802E8900 AFB00020 */ sw $s0, 0x20($sp) -/* 10A184 802E8904 8E510040 */ lw $s1, 0x40($s2) -/* 10A188 802E8908 8E230000 */ lw $v1, ($s1) -/* 10A18C 802E890C 2402FFFF */ addiu $v0, $zero, -1 -/* 10A190 802E8910 10620021 */ beq $v1, $v0, .L802E8998 -/* 10A194 802E8914 3402FFFF */ ori $v0, $zero, 0xffff -/* 10A198 802E8918 96230004 */ lhu $v1, 4($s1) -/* 10A19C 802E891C 10620006 */ beq $v1, $v0, .L802E8938 -/* 10A1A0 802E8920 0000802D */ daddu $s0, $zero, $zero -/* 10A1A4 802E8924 96240004 */ lhu $a0, 4($s1) -/* 10A1A8 802E8928 0C05152F */ jal get_global_flag -/* 10A1AC 802E892C 00000000 */ nop -/* 10A1B0 802E8930 14400002 */ bnez $v0, .L802E893C -/* 10A1B4 802E8934 00000000 */ nop -.L802E8938: -/* 10A1B8 802E8938 24100001 */ addiu $s0, $zero, 1 -.L802E893C: -/* 10A1BC 802E893C 12000016 */ beqz $s0, .L802E8998 -/* 10A1C0 802E8940 00000000 */ nop -/* 10A1C4 802E8944 0C03951B */ jal func_800E546C -/* 10A1C8 802E8948 00000000 */ nop -/* 10A1CC 802E894C C642004C */ lwc1 $f2, 0x4c($s2) -/* 10A1D0 802E8950 4600010D */ trunc.w.s $f4, $f0 -/* 10A1D4 802E8954 E7A40018 */ swc1 $f4, 0x18($sp) -/* 10A1D8 802E8958 2402000A */ addiu $v0, $zero, 0xa -/* 10A1DC 802E895C AFA20010 */ sw $v0, 0x10($sp) -/* 10A1E0 802E8960 AFA00014 */ sw $zero, 0x14($sp) -/* 10A1E4 802E8964 96220004 */ lhu $v0, 4($s1) -/* 10A1E8 802E8968 3C01802F */ lui $at, %hi(D_802EB370) -/* 10A1EC 802E896C D420B370 */ ldc1 $f0, %lo(D_802EB370)($at) -/* 10A1F0 802E8970 460010A1 */ cvt.d.s $f2, $f2 -/* 10A1F4 802E8974 46201080 */ add.d $f2, $f2, $f0 -/* 10A1F8 802E8978 AFA2001C */ sw $v0, 0x1c($sp) -/* 10A1FC 802E897C 8E240000 */ lw $a0, ($s1) -/* 10A200 802E8980 8E450048 */ lw $a1, 0x48($s2) -/* 10A204 802E8984 8E470050 */ lw $a3, 0x50($s2) -/* 10A208 802E8988 462010A0 */ cvt.s.d $f2, $f2 -/* 10A20C 802E898C 44061000 */ mfc1 $a2, $f2 -/* 10A210 802E8990 0C04C4FD */ jal make_item_entity -/* 10A214 802E8994 00000000 */ nop -.L802E8998: -/* 10A218 802E8998 8FBF002C */ lw $ra, 0x2c($sp) -/* 10A21C 802E899C 8FB20028 */ lw $s2, 0x28($sp) -/* 10A220 802E89A0 8FB10024 */ lw $s1, 0x24($sp) -/* 10A224 802E89A4 8FB00020 */ lw $s0, 0x20($sp) -/* 10A228 802E89A8 03E00008 */ jr $ra -/* 10A22C 802E89AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E89B0.s b/asm/nonmatchings/code_109660_len_1270/func_802E89B0.s deleted file mode 100644 index 083da214f5..0000000000 --- a/asm/nonmatchings/code_109660_len_1270/func_802E89B0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802E89B0 -/* 10A230 802E89B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10A234 802E89B4 AFB10014 */ sw $s1, 0x14($sp) -/* 10A238 802E89B8 0080882D */ daddu $s1, $a0, $zero -/* 10A23C 802E89BC AFBF0018 */ sw $ra, 0x18($sp) -/* 10A240 802E89C0 AFB00010 */ sw $s0, 0x10($sp) -/* 10A244 802E89C4 8E300040 */ lw $s0, 0x40($s1) -/* 10A248 802E89C8 0C05152F */ jal get_global_flag -/* 10A24C 802E89CC 8E040014 */ lw $a0, 0x14($s0) -/* 10A250 802E89D0 10400004 */ beqz $v0, .L802E89E4 -/* 10A254 802E89D4 24020010 */ addiu $v0, $zero, 0x10 -/* 10A258 802E89D8 AE020004 */ sw $v0, 4($s0) -/* 10A25C 802E89DC 0C043F5A */ jal func_8010FD68 -/* 10A260 802E89E0 0220202D */ daddu $a0, $s1, $zero -.L802E89E4: -/* 10A264 802E89E4 8FBF0018 */ lw $ra, 0x18($sp) -/* 10A268 802E89E8 8FB10014 */ lw $s1, 0x14($sp) -/* 10A26C 802E89EC 8FB00010 */ lw $s0, 0x10($sp) -/* 10A270 802E89F0 03E00008 */ jr $ra -/* 10A274 802E89F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E89F8.s b/asm/nonmatchings/code_109660_len_1270/func_802E89F8.s deleted file mode 100644 index 7bc5e34925..0000000000 --- a/asm/nonmatchings/code_109660_len_1270/func_802E89F8.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802E89F8 -/* 10A278 802E89F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 10A27C 802E89FC AFBF0010 */ sw $ra, 0x10($sp) -/* 10A280 802E8A00 8C850040 */ lw $a1, 0x40($a0) -/* 10A284 802E8A04 8CA20004 */ lw $v0, 4($a1) -/* 10A288 802E8A08 2403FFFF */ addiu $v1, $zero, -1 -/* 10A28C 802E8A0C 2442FFFF */ addiu $v0, $v0, -1 -/* 10A290 802E8A10 1043000C */ beq $v0, $v1, .L802E8A44 -/* 10A294 802E8A14 ACA20004 */ sw $v0, 4($a1) -/* 10A298 802E8A18 8CA20008 */ lw $v0, 8($a1) -/* 10A29C 802E8A1C 14400009 */ bnez $v0, .L802E8A44 -/* 10A2A0 802E8A20 00000000 */ nop -/* 10A2A4 802E8A24 C480004C */ lwc1 $f0, 0x4c($a0) -/* 10A2A8 802E8A28 3C01802F */ lui $at, %hi(D_802EB380) -/* 10A2AC 802E8A2C D422B380 */ ldc1 $f2, %lo(D_802EB380)($at) -/* 10A2B0 802E8A30 46000021 */ cvt.d.s $f0, $f0 -/* 10A2B4 802E8A34 46220000 */ add.d $f0, $f0, $f2 -/* 10A2B8 802E8A38 46200020 */ cvt.s.d $f0, $f0 -/* 10A2BC 802E8A3C 080BA293 */ j .L802E8A4C -/* 10A2C0 802E8A40 E480004C */ swc1 $f0, 0x4c($a0) -.L802E8A44: -/* 10A2C4 802E8A44 0C043F5A */ jal func_8010FD68 -/* 10A2C8 802E8A48 ACA00004 */ sw $zero, 4($a1) -.L802E8A4C: -/* 10A2CC 802E8A4C 8FBF0010 */ lw $ra, 0x10($sp) -/* 10A2D0 802E8A50 03E00008 */ jr $ra -/* 10A2D4 802E8A54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s b/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s deleted file mode 100644 index c3977801a6..0000000000 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8A58.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802E8A58 -/* 10A2D8 802E8A58 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 10A2DC 802E8A5C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 10A2E0 802E8A60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 10A2E4 802E8A64 AFBF0010 */ sw $ra, 0x10($sp) -/* 10A2E8 802E8A68 8C850040 */ lw $a1, 0x40($a0) -/* 10A2EC 802E8A6C 8443008E */ lh $v1, 0x8e($v0) -/* 10A2F0 802E8A70 8CA2000C */ lw $v0, 0xc($a1) -/* 10A2F4 802E8A74 14430014 */ bne $v0, $v1, .L802E8AC8 -/* 10A2F8 802E8A78 00000000 */ nop -/* 10A2FC 802E8A7C 8CA30004 */ lw $v1, 4($a1) -/* 10A300 802E8A80 10600005 */ beqz $v1, .L802E8A98 -/* 10A304 802E8A84 24020001 */ addiu $v0, $zero, 1 -/* 10A308 802E8A88 10620009 */ beq $v1, $v0, .L802E8AB0 -/* 10A30C 802E8A8C 00000000 */ nop -/* 10A310 802E8A90 080BA2B2 */ j .L802E8AC8 -/* 10A314 802E8A94 00000000 */ nop -.L802E8A98: -/* 10A318 802E8A98 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) -/* 10A31C 802E8A9C 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) -/* 10A320 802E8AA0 1840000B */ blez $v0, .L802E8AD0 -/* 10A324 802E8AA4 24020001 */ addiu $v0, $zero, 1 -/* 10A328 802E8AA8 080BA2B4 */ j .L802E8AD0 -/* 10A32C 802E8AAC ACA20004 */ sw $v0, 4($a1) -.L802E8AB0: -/* 10A330 802E8AB0 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2) -/* 10A334 802E8AB4 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0) -/* 10A338 802E8AB8 04410005 */ bgez $v0, .L802E8AD0 -/* 10A33C 802E8ABC 24020002 */ addiu $v0, $zero, 2 -/* 10A340 802E8AC0 080BA2B4 */ j .L802E8AD0 -/* 10A344 802E8AC4 ACA20004 */ sw $v0, 4($a1) -.L802E8AC8: -/* 10A348 802E8AC8 0C043F5A */ jal func_8010FD68 -/* 10A34C 802E8ACC 00000000 */ nop -.L802E8AD0: -/* 10A350 802E8AD0 8FBF0010 */ lw $ra, 0x10($sp) -/* 10A354 802E8AD4 03E00008 */ jr $ra -/* 10A358 802E8AD8 27BD0018 */ addiu $sp, $sp, 0x18