diff --git a/asm/nonmatchings/battle/area_dig/6DDE90/func_802180D0_6DDE90.s b/asm/nonmatchings/battle/area_dig/6DDE90/func_802180D0_6DDE90.s deleted file mode 100644 index 8286108b78..0000000000 --- a/asm/nonmatchings/battle/area_dig/6DDE90/func_802180D0_6DDE90.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802180D0_6DDE90 -/* 6DDE90 802180D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6DDE94 802180D4 AFB10014 */ sw $s1, 0x14($sp) -/* 6DDE98 802180D8 0080882D */ daddu $s1, $a0, $zero -/* 6DDE9C 802180DC AFBF0020 */ sw $ra, 0x20($sp) -/* 6DDEA0 802180E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 6DDEA4 802180E4 AFB20018 */ sw $s2, 0x18($sp) -/* 6DDEA8 802180E8 AFB00010 */ sw $s0, 0x10($sp) -/* 6DDEAC 802180EC 8E30000C */ lw $s0, 0xc($s1) -/* 6DDEB0 802180F0 8E050000 */ lw $a1, ($s0) -/* 6DDEB4 802180F4 0C0B1EAF */ jal get_variable -/* 6DDEB8 802180F8 26100004 */ addiu $s0, $s0, 4 -/* 6DDEBC 802180FC 8E050000 */ lw $a1, ($s0) -/* 6DDEC0 80218100 26100004 */ addiu $s0, $s0, 4 -/* 6DDEC4 80218104 0220202D */ daddu $a0, $s1, $zero -/* 6DDEC8 80218108 0C0B1EAF */ jal get_variable -/* 6DDECC 8021810C 0040982D */ daddu $s3, $v0, $zero -/* 6DDED0 80218110 8E050000 */ lw $a1, ($s0) -/* 6DDED4 80218114 26100004 */ addiu $s0, $s0, 4 -/* 6DDED8 80218118 0220202D */ daddu $a0, $s1, $zero -/* 6DDEDC 8021811C 0C0B1EAF */ jal get_variable -/* 6DDEE0 80218120 0040902D */ daddu $s2, $v0, $zero -/* 6DDEE4 80218124 0220202D */ daddu $a0, $s1, $zero -/* 6DDEE8 80218128 8E050000 */ lw $a1, ($s0) -/* 6DDEEC 8021812C 0C0B1EAF */ jal get_variable -/* 6DDEF0 80218130 0040802D */ daddu $s0, $v0, $zero -/* 6DDEF4 80218134 44936000 */ mtc1 $s3, $f12 -/* 6DDEF8 80218138 00000000 */ nop -/* 6DDEFC 8021813C 46806320 */ cvt.s.w $f12, $f12 -/* 6DDF00 80218140 44927000 */ mtc1 $s2, $f14 -/* 6DDF04 80218144 00000000 */ nop -/* 6DDF08 80218148 468073A0 */ cvt.s.w $f14, $f14 -/* 6DDF0C 8021814C 44900000 */ mtc1 $s0, $f0 -/* 6DDF10 80218150 00000000 */ nop -/* 6DDF14 80218154 46800020 */ cvt.s.w $f0, $f0 -/* 6DDF18 80218158 44060000 */ mfc1 $a2, $f0 -/* 6DDF1C 8021815C 0C0B5D18 */ jal func_802D7460 -/* 6DDF20 80218160 0040382D */ daddu $a3, $v0, $zero -/* 6DDF24 80218164 8FBF0020 */ lw $ra, 0x20($sp) -/* 6DDF28 80218168 8FB3001C */ lw $s3, 0x1c($sp) -/* 6DDF2C 8021816C 8FB20018 */ lw $s2, 0x18($sp) -/* 6DDF30 80218170 8FB10014 */ lw $s1, 0x14($sp) -/* 6DDF34 80218174 8FB00010 */ lw $s0, 0x10($sp) -/* 6DDF38 80218178 24020002 */ addiu $v0, $zero, 2 -/* 6DDF3C 8021817C 03E00008 */ jr $ra -/* 6DDF40 80218180 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_dig/6DDE90/func_80218184_6DDF44.s b/asm/nonmatchings/battle/area_dig/6DDE90/func_80218184_6DDF44.s index 9f1fc46765..5df03a2cc0 100644 --- a/asm/nonmatchings/battle/area_dig/6DDE90/func_80218184_6DDF44.s +++ b/asm/nonmatchings/battle/area_dig/6DDE90/func_80218184_6DDF44.s @@ -28,13 +28,13 @@ glabel func_80218184_6DDF44 /* 6DDFA0 802181E0 0C0B1EAF */ jal get_variable /* 6DDFA4 802181E4 0040802D */ daddu $s0, $v0, $zero /* 6DDFA8 802181E8 44936000 */ mtc1 $s3, $f12 -/* 6DDFAC 802181EC 00000000 */ nop +/* 6DDFAC 802181EC 00000000 */ nop /* 6DDFB0 802181F0 46806320 */ cvt.s.w $f12, $f12 /* 6DDFB4 802181F4 44927000 */ mtc1 $s2, $f14 -/* 6DDFB8 802181F8 00000000 */ nop +/* 6DDFB8 802181F8 00000000 */ nop /* 6DDFBC 802181FC 468073A0 */ cvt.s.w $f14, $f14 /* 6DDFC0 80218200 44900000 */ mtc1 $s0, $f0 -/* 6DDFC4 80218204 00000000 */ nop +/* 6DDFC4 80218204 00000000 */ nop /* 6DDFC8 80218208 46800020 */ cvt.s.w $f0, $f0 /* 6DDFCC 8021820C 44060000 */ mfc1 $a2, $f0 /* 6DDFD0 80218210 0C0B5D30 */ jal func_802D74C0 @@ -47,5 +47,5 @@ glabel func_80218184_6DDF44 /* 6DDFEC 8021822C 24020002 */ addiu $v0, $zero, 2 /* 6DDFF0 80218230 03E00008 */ jr $ra /* 6DDFF4 80218234 27BD0028 */ addiu $sp, $sp, 0x28 -/* 6DDFF8 80218238 00000000 */ nop -/* 6DDFFC 8021823C 00000000 */ nop +/* 6DDFF8 80218238 00000000 */ nop +/* 6DDFFC 8021823C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_jan/573AC0/func_802181A0_573AC0.s b/asm/nonmatchings/battle/area_jan/573AC0/func_802181A0_573AC0.s deleted file mode 100644 index 739a0a8b33..0000000000 --- a/asm/nonmatchings/battle/area_jan/573AC0/func_802181A0_573AC0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802181A0_573AC0 -/* 573AC0 802181A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 573AC4 802181A4 AFB10014 */ sw $s1, 0x14($sp) -/* 573AC8 802181A8 0080882D */ daddu $s1, $a0, $zero -/* 573ACC 802181AC AFBF0020 */ sw $ra, 0x20($sp) -/* 573AD0 802181B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 573AD4 802181B4 AFB20018 */ sw $s2, 0x18($sp) -/* 573AD8 802181B8 AFB00010 */ sw $s0, 0x10($sp) -/* 573ADC 802181BC 8E30000C */ lw $s0, 0xc($s1) -/* 573AE0 802181C0 8E050000 */ lw $a1, ($s0) -/* 573AE4 802181C4 0C0B1EAF */ jal get_variable -/* 573AE8 802181C8 26100004 */ addiu $s0, $s0, 4 -/* 573AEC 802181CC 8E050000 */ lw $a1, ($s0) -/* 573AF0 802181D0 26100004 */ addiu $s0, $s0, 4 -/* 573AF4 802181D4 0220202D */ daddu $a0, $s1, $zero -/* 573AF8 802181D8 0C0B1EAF */ jal get_variable -/* 573AFC 802181DC 0040982D */ daddu $s3, $v0, $zero -/* 573B00 802181E0 8E050000 */ lw $a1, ($s0) -/* 573B04 802181E4 26100004 */ addiu $s0, $s0, 4 -/* 573B08 802181E8 0220202D */ daddu $a0, $s1, $zero -/* 573B0C 802181EC 0C0B1EAF */ jal get_variable -/* 573B10 802181F0 0040902D */ daddu $s2, $v0, $zero -/* 573B14 802181F4 0220202D */ daddu $a0, $s1, $zero -/* 573B18 802181F8 8E050000 */ lw $a1, ($s0) -/* 573B1C 802181FC 0C0B1EAF */ jal get_variable -/* 573B20 80218200 0040802D */ daddu $s0, $v0, $zero -/* 573B24 80218204 44936000 */ mtc1 $s3, $f12 -/* 573B28 80218208 00000000 */ nop -/* 573B2C 8021820C 46806320 */ cvt.s.w $f12, $f12 -/* 573B30 80218210 44927000 */ mtc1 $s2, $f14 -/* 573B34 80218214 00000000 */ nop -/* 573B38 80218218 468073A0 */ cvt.s.w $f14, $f14 -/* 573B3C 8021821C 44900000 */ mtc1 $s0, $f0 -/* 573B40 80218220 00000000 */ nop -/* 573B44 80218224 46800020 */ cvt.s.w $f0, $f0 -/* 573B48 80218228 44060000 */ mfc1 $a2, $f0 -/* 573B4C 8021822C 0C0B5D18 */ jal func_802D7460 -/* 573B50 80218230 0040382D */ daddu $a3, $v0, $zero -/* 573B54 80218234 8FBF0020 */ lw $ra, 0x20($sp) -/* 573B58 80218238 8FB3001C */ lw $s3, 0x1c($sp) -/* 573B5C 8021823C 8FB20018 */ lw $s2, 0x18($sp) -/* 573B60 80218240 8FB10014 */ lw $s1, 0x14($sp) -/* 573B64 80218244 8FB00010 */ lw $s0, 0x10($sp) -/* 573B68 80218248 24020002 */ addiu $v0, $zero, 2 -/* 573B6C 8021824C 03E00008 */ jr $ra -/* 573B70 80218250 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_mim/4F7BE0/func_80218000_4F7BE0.s b/asm/nonmatchings/battle/area_mim/4F7BE0/func_80218000_4F7BE0.s deleted file mode 100644 index d13af3f48d..0000000000 --- a/asm/nonmatchings/battle/area_mim/4F7BE0/func_80218000_4F7BE0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_4F7BE0 -/* 4F7BE0 80218000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 4F7BE4 80218004 AFB10014 */ sw $s1, 0x14($sp) -/* 4F7BE8 80218008 0080882D */ daddu $s1, $a0, $zero -/* 4F7BEC 8021800C AFBF0020 */ sw $ra, 0x20($sp) -/* 4F7BF0 80218010 AFB3001C */ sw $s3, 0x1c($sp) -/* 4F7BF4 80218014 AFB20018 */ sw $s2, 0x18($sp) -/* 4F7BF8 80218018 AFB00010 */ sw $s0, 0x10($sp) -/* 4F7BFC 8021801C 8E30000C */ lw $s0, 0xc($s1) -/* 4F7C00 80218020 8E050000 */ lw $a1, ($s0) -/* 4F7C04 80218024 0C0B1EAF */ jal get_variable -/* 4F7C08 80218028 26100004 */ addiu $s0, $s0, 4 -/* 4F7C0C 8021802C 8E050000 */ lw $a1, ($s0) -/* 4F7C10 80218030 26100004 */ addiu $s0, $s0, 4 -/* 4F7C14 80218034 0220202D */ daddu $a0, $s1, $zero -/* 4F7C18 80218038 0C0B1EAF */ jal get_variable -/* 4F7C1C 8021803C 0040982D */ daddu $s3, $v0, $zero -/* 4F7C20 80218040 8E050000 */ lw $a1, ($s0) -/* 4F7C24 80218044 26100004 */ addiu $s0, $s0, 4 -/* 4F7C28 80218048 0220202D */ daddu $a0, $s1, $zero -/* 4F7C2C 8021804C 0C0B1EAF */ jal get_variable -/* 4F7C30 80218050 0040902D */ daddu $s2, $v0, $zero -/* 4F7C34 80218054 0220202D */ daddu $a0, $s1, $zero -/* 4F7C38 80218058 8E050000 */ lw $a1, ($s0) -/* 4F7C3C 8021805C 0C0B1EAF */ jal get_variable -/* 4F7C40 80218060 0040802D */ daddu $s0, $v0, $zero -/* 4F7C44 80218064 44936000 */ mtc1 $s3, $f12 -/* 4F7C48 80218068 00000000 */ nop -/* 4F7C4C 8021806C 46806320 */ cvt.s.w $f12, $f12 -/* 4F7C50 80218070 44927000 */ mtc1 $s2, $f14 -/* 4F7C54 80218074 00000000 */ nop -/* 4F7C58 80218078 468073A0 */ cvt.s.w $f14, $f14 -/* 4F7C5C 8021807C 44900000 */ mtc1 $s0, $f0 -/* 4F7C60 80218080 00000000 */ nop -/* 4F7C64 80218084 46800020 */ cvt.s.w $f0, $f0 -/* 4F7C68 80218088 44060000 */ mfc1 $a2, $f0 -/* 4F7C6C 8021808C 0C0B5D18 */ jal func_802D7460 -/* 4F7C70 80218090 0040382D */ daddu $a3, $v0, $zero -/* 4F7C74 80218094 8FBF0020 */ lw $ra, 0x20($sp) -/* 4F7C78 80218098 8FB3001C */ lw $s3, 0x1c($sp) -/* 4F7C7C 8021809C 8FB20018 */ lw $s2, 0x18($sp) -/* 4F7C80 802180A0 8FB10014 */ lw $s1, 0x14($sp) -/* 4F7C84 802180A4 8FB00010 */ lw $s0, 0x10($sp) -/* 4F7C88 802180A8 24020002 */ addiu $v0, $zero, 2 -/* 4F7C8C 802180AC 03E00008 */ jr $ra -/* 4F7C90 802180B0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_nok/48DA50/func_802188B0_48DA50.s b/asm/nonmatchings/battle/area_nok/48DA50/func_802188B0_48DA50.s deleted file mode 100644 index a7fdd18d47..0000000000 --- a/asm/nonmatchings/battle/area_nok/48DA50/func_802188B0_48DA50.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802188B0_48DA50 -/* 48DA50 802188B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 48DA54 802188B4 AFB10014 */ sw $s1, 0x14($sp) -/* 48DA58 802188B8 0080882D */ daddu $s1, $a0, $zero -/* 48DA5C 802188BC AFBF0020 */ sw $ra, 0x20($sp) -/* 48DA60 802188C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 48DA64 802188C4 AFB20018 */ sw $s2, 0x18($sp) -/* 48DA68 802188C8 AFB00010 */ sw $s0, 0x10($sp) -/* 48DA6C 802188CC 8E30000C */ lw $s0, 0xc($s1) -/* 48DA70 802188D0 8E050000 */ lw $a1, ($s0) -/* 48DA74 802188D4 0C0B1EAF */ jal get_variable -/* 48DA78 802188D8 26100004 */ addiu $s0, $s0, 4 -/* 48DA7C 802188DC 8E050000 */ lw $a1, ($s0) -/* 48DA80 802188E0 26100004 */ addiu $s0, $s0, 4 -/* 48DA84 802188E4 0220202D */ daddu $a0, $s1, $zero -/* 48DA88 802188E8 0C0B1EAF */ jal get_variable -/* 48DA8C 802188EC 0040982D */ daddu $s3, $v0, $zero -/* 48DA90 802188F0 8E050000 */ lw $a1, ($s0) -/* 48DA94 802188F4 26100004 */ addiu $s0, $s0, 4 -/* 48DA98 802188F8 0220202D */ daddu $a0, $s1, $zero -/* 48DA9C 802188FC 0C0B1EAF */ jal get_variable -/* 48DAA0 80218900 0040902D */ daddu $s2, $v0, $zero -/* 48DAA4 80218904 0220202D */ daddu $a0, $s1, $zero -/* 48DAA8 80218908 8E050000 */ lw $a1, ($s0) -/* 48DAAC 8021890C 0C0B1EAF */ jal get_variable -/* 48DAB0 80218910 0040802D */ daddu $s0, $v0, $zero -/* 48DAB4 80218914 44936000 */ mtc1 $s3, $f12 -/* 48DAB8 80218918 00000000 */ nop -/* 48DABC 8021891C 46806320 */ cvt.s.w $f12, $f12 -/* 48DAC0 80218920 44927000 */ mtc1 $s2, $f14 -/* 48DAC4 80218924 00000000 */ nop -/* 48DAC8 80218928 468073A0 */ cvt.s.w $f14, $f14 -/* 48DACC 8021892C 44900000 */ mtc1 $s0, $f0 -/* 48DAD0 80218930 00000000 */ nop -/* 48DAD4 80218934 46800020 */ cvt.s.w $f0, $f0 -/* 48DAD8 80218938 44060000 */ mfc1 $a2, $f0 -/* 48DADC 8021893C 0C0B5D18 */ jal func_802D7460 -/* 48DAE0 80218940 0040382D */ daddu $a3, $v0, $zero -/* 48DAE4 80218944 8FBF0020 */ lw $ra, 0x20($sp) -/* 48DAE8 80218948 8FB3001C */ lw $s3, 0x1c($sp) -/* 48DAEC 8021894C 8FB20018 */ lw $s2, 0x18($sp) -/* 48DAF0 80218950 8FB10014 */ lw $s1, 0x14($sp) -/* 48DAF4 80218954 8FB00010 */ lw $s0, 0x10($sp) -/* 48DAF8 80218958 24020002 */ addiu $v0, $zero, 2 -/* 48DAFC 8021895C 03E00008 */ jr $ra -/* 48DB00 80218960 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_omo3/557AD0/func_80218970_557D50.s b/asm/nonmatchings/battle/area_omo3/557AD0/func_80218970_557D50.s deleted file mode 100644 index 766b950056..0000000000 --- a/asm/nonmatchings/battle/area_omo3/557AD0/func_80218970_557D50.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218970_557D50 -/* 557D50 80218970 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 557D54 80218974 AFB10014 */ sw $s1, 0x14($sp) -/* 557D58 80218978 0080882D */ daddu $s1, $a0, $zero -/* 557D5C 8021897C AFBF0020 */ sw $ra, 0x20($sp) -/* 557D60 80218980 AFB3001C */ sw $s3, 0x1c($sp) -/* 557D64 80218984 AFB20018 */ sw $s2, 0x18($sp) -/* 557D68 80218988 AFB00010 */ sw $s0, 0x10($sp) -/* 557D6C 8021898C 8E30000C */ lw $s0, 0xc($s1) -/* 557D70 80218990 8E050000 */ lw $a1, ($s0) -/* 557D74 80218994 0C0B1EAF */ jal get_variable -/* 557D78 80218998 26100004 */ addiu $s0, $s0, 4 -/* 557D7C 8021899C 8E050000 */ lw $a1, ($s0) -/* 557D80 802189A0 26100004 */ addiu $s0, $s0, 4 -/* 557D84 802189A4 0220202D */ daddu $a0, $s1, $zero -/* 557D88 802189A8 0C0B1EAF */ jal get_variable -/* 557D8C 802189AC 0040982D */ daddu $s3, $v0, $zero -/* 557D90 802189B0 8E050000 */ lw $a1, ($s0) -/* 557D94 802189B4 26100004 */ addiu $s0, $s0, 4 -/* 557D98 802189B8 0220202D */ daddu $a0, $s1, $zero -/* 557D9C 802189BC 0C0B1EAF */ jal get_variable -/* 557DA0 802189C0 0040902D */ daddu $s2, $v0, $zero -/* 557DA4 802189C4 0220202D */ daddu $a0, $s1, $zero -/* 557DA8 802189C8 8E050000 */ lw $a1, ($s0) -/* 557DAC 802189CC 0C0B1EAF */ jal get_variable -/* 557DB0 802189D0 0040802D */ daddu $s0, $v0, $zero -/* 557DB4 802189D4 44936000 */ mtc1 $s3, $f12 -/* 557DB8 802189D8 00000000 */ nop -/* 557DBC 802189DC 46806320 */ cvt.s.w $f12, $f12 -/* 557DC0 802189E0 44927000 */ mtc1 $s2, $f14 -/* 557DC4 802189E4 00000000 */ nop -/* 557DC8 802189E8 468073A0 */ cvt.s.w $f14, $f14 -/* 557DCC 802189EC 44900000 */ mtc1 $s0, $f0 -/* 557DD0 802189F0 00000000 */ nop -/* 557DD4 802189F4 46800020 */ cvt.s.w $f0, $f0 -/* 557DD8 802189F8 44060000 */ mfc1 $a2, $f0 -/* 557DDC 802189FC 0C0B5D18 */ jal func_802D7460 -/* 557DE0 80218A00 0040382D */ daddu $a3, $v0, $zero -/* 557DE4 80218A04 8FBF0020 */ lw $ra, 0x20($sp) -/* 557DE8 80218A08 8FB3001C */ lw $s3, 0x1c($sp) -/* 557DEC 80218A0C 8FB20018 */ lw $s2, 0x18($sp) -/* 557DF0 80218A10 8FB10014 */ lw $s1, 0x14($sp) -/* 557DF4 80218A14 8FB00010 */ lw $s0, 0x10($sp) -/* 557DF8 80218A18 24020002 */ addiu $v0, $zero, 2 -/* 557DFC 80218A1C 03E00008 */ jr $ra -/* 557E00 80218A20 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra/648E10/func_802180CC_648EDC.s b/asm/nonmatchings/battle/area_pra/648E10/func_802180CC_648EDC.s deleted file mode 100644 index 769f02afef..0000000000 --- a/asm/nonmatchings/battle/area_pra/648E10/func_802180CC_648EDC.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802180CC_648EDC -/* 648EDC 802180CC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 648EE0 802180D0 AFB10014 */ sw $s1, 0x14($sp) -/* 648EE4 802180D4 0080882D */ daddu $s1, $a0, $zero -/* 648EE8 802180D8 AFBF0020 */ sw $ra, 0x20($sp) -/* 648EEC 802180DC AFB3001C */ sw $s3, 0x1c($sp) -/* 648EF0 802180E0 AFB20018 */ sw $s2, 0x18($sp) -/* 648EF4 802180E4 AFB00010 */ sw $s0, 0x10($sp) -/* 648EF8 802180E8 8E30000C */ lw $s0, 0xc($s1) -/* 648EFC 802180EC 8E050000 */ lw $a1, ($s0) -/* 648F00 802180F0 0C0B1EAF */ jal get_variable -/* 648F04 802180F4 26100004 */ addiu $s0, $s0, 4 -/* 648F08 802180F8 8E050000 */ lw $a1, ($s0) -/* 648F0C 802180FC 26100004 */ addiu $s0, $s0, 4 -/* 648F10 80218100 0220202D */ daddu $a0, $s1, $zero -/* 648F14 80218104 0C0B1EAF */ jal get_variable -/* 648F18 80218108 0040982D */ daddu $s3, $v0, $zero -/* 648F1C 8021810C 8E050000 */ lw $a1, ($s0) -/* 648F20 80218110 26100004 */ addiu $s0, $s0, 4 -/* 648F24 80218114 0220202D */ daddu $a0, $s1, $zero -/* 648F28 80218118 0C0B1EAF */ jal get_variable -/* 648F2C 8021811C 0040902D */ daddu $s2, $v0, $zero -/* 648F30 80218120 0220202D */ daddu $a0, $s1, $zero -/* 648F34 80218124 8E050000 */ lw $a1, ($s0) -/* 648F38 80218128 0C0B1EAF */ jal get_variable -/* 648F3C 8021812C 0040802D */ daddu $s0, $v0, $zero -/* 648F40 80218130 44936000 */ mtc1 $s3, $f12 -/* 648F44 80218134 00000000 */ nop -/* 648F48 80218138 46806320 */ cvt.s.w $f12, $f12 -/* 648F4C 8021813C 44927000 */ mtc1 $s2, $f14 -/* 648F50 80218140 00000000 */ nop -/* 648F54 80218144 468073A0 */ cvt.s.w $f14, $f14 -/* 648F58 80218148 44900000 */ mtc1 $s0, $f0 -/* 648F5C 8021814C 00000000 */ nop -/* 648F60 80218150 46800020 */ cvt.s.w $f0, $f0 -/* 648F64 80218154 44060000 */ mfc1 $a2, $f0 -/* 648F68 80218158 0C0B5D18 */ jal func_802D7460 -/* 648F6C 8021815C 0040382D */ daddu $a3, $v0, $zero -/* 648F70 80218160 8FBF0020 */ lw $ra, 0x20($sp) -/* 648F74 80218164 8FB3001C */ lw $s3, 0x1c($sp) -/* 648F78 80218168 8FB20018 */ lw $s2, 0x18($sp) -/* 648F7C 8021816C 8FB10014 */ lw $s1, 0x14($sp) -/* 648F80 80218170 8FB00010 */ lw $s0, 0x10($sp) -/* 648F84 80218174 24020002 */ addiu $v0, $zero, 2 -/* 648F88 80218178 03E00008 */ jr $ra -/* 648F8C 8021817C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_pra3/669D80/func_802196BC_66B43C.s b/asm/nonmatchings/battle/area_pra3/669D80/func_802196BC_66B43C.s deleted file mode 100644 index 648dc2c7ca..0000000000 --- a/asm/nonmatchings/battle/area_pra3/669D80/func_802196BC_66B43C.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802196BC_66B43C -/* 66B43C 802196BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 66B440 802196C0 AFB10014 */ sw $s1, 0x14($sp) -/* 66B444 802196C4 0080882D */ daddu $s1, $a0, $zero -/* 66B448 802196C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 66B44C 802196CC AFB3001C */ sw $s3, 0x1c($sp) -/* 66B450 802196D0 AFB20018 */ sw $s2, 0x18($sp) -/* 66B454 802196D4 AFB00010 */ sw $s0, 0x10($sp) -/* 66B458 802196D8 8E30000C */ lw $s0, 0xc($s1) -/* 66B45C 802196DC 8E050000 */ lw $a1, ($s0) -/* 66B460 802196E0 0C0B1EAF */ jal get_variable -/* 66B464 802196E4 26100004 */ addiu $s0, $s0, 4 -/* 66B468 802196E8 8E050000 */ lw $a1, ($s0) -/* 66B46C 802196EC 26100004 */ addiu $s0, $s0, 4 -/* 66B470 802196F0 0220202D */ daddu $a0, $s1, $zero -/* 66B474 802196F4 0C0B1EAF */ jal get_variable -/* 66B478 802196F8 0040982D */ daddu $s3, $v0, $zero -/* 66B47C 802196FC 8E050000 */ lw $a1, ($s0) -/* 66B480 80219700 26100004 */ addiu $s0, $s0, 4 -/* 66B484 80219704 0220202D */ daddu $a0, $s1, $zero -/* 66B488 80219708 0C0B1EAF */ jal get_variable -/* 66B48C 8021970C 0040902D */ daddu $s2, $v0, $zero -/* 66B490 80219710 0220202D */ daddu $a0, $s1, $zero -/* 66B494 80219714 8E050000 */ lw $a1, ($s0) -/* 66B498 80219718 0C0B1EAF */ jal get_variable -/* 66B49C 8021971C 0040802D */ daddu $s0, $v0, $zero -/* 66B4A0 80219720 44936000 */ mtc1 $s3, $f12 -/* 66B4A4 80219724 00000000 */ nop -/* 66B4A8 80219728 46806320 */ cvt.s.w $f12, $f12 -/* 66B4AC 8021972C 44927000 */ mtc1 $s2, $f14 -/* 66B4B0 80219730 00000000 */ nop -/* 66B4B4 80219734 468073A0 */ cvt.s.w $f14, $f14 -/* 66B4B8 80219738 44900000 */ mtc1 $s0, $f0 -/* 66B4BC 8021973C 00000000 */ nop -/* 66B4C0 80219740 46800020 */ cvt.s.w $f0, $f0 -/* 66B4C4 80219744 44060000 */ mfc1 $a2, $f0 -/* 66B4C8 80219748 0C0B5D18 */ jal func_802D7460 -/* 66B4CC 8021974C 0040382D */ daddu $a3, $v0, $zero -/* 66B4D0 80219750 8FBF0020 */ lw $ra, 0x20($sp) -/* 66B4D4 80219754 8FB3001C */ lw $s3, 0x1c($sp) -/* 66B4D8 80219758 8FB20018 */ lw $s2, 0x18($sp) -/* 66B4DC 8021975C 8FB10014 */ lw $s1, 0x14($sp) -/* 66B4E0 80219760 8FB00010 */ lw $s0, 0x10($sp) -/* 66B4E4 80219764 24020002 */ addiu $v0, $zero, 2 -/* 66B4E8 80219768 03E00008 */ jr $ra -/* 66B4EC 8021976C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218A78_609528.s b/asm/nonmatchings/battle/area_tik2/608CB0/func_80218A78_609528.s deleted file mode 100644 index fc1b08106f..0000000000 --- a/asm/nonmatchings/battle/area_tik2/608CB0/func_80218A78_609528.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218A78_609528 -/* 609528 80218A78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 60952C 80218A7C AFB10014 */ sw $s1, 0x14($sp) -/* 609530 80218A80 0080882D */ daddu $s1, $a0, $zero -/* 609534 80218A84 AFBF0020 */ sw $ra, 0x20($sp) -/* 609538 80218A88 AFB3001C */ sw $s3, 0x1c($sp) -/* 60953C 80218A8C AFB20018 */ sw $s2, 0x18($sp) -/* 609540 80218A90 AFB00010 */ sw $s0, 0x10($sp) -/* 609544 80218A94 8E30000C */ lw $s0, 0xc($s1) -/* 609548 80218A98 8E050000 */ lw $a1, ($s0) -/* 60954C 80218A9C 0C0B1EAF */ jal get_variable -/* 609550 80218AA0 26100004 */ addiu $s0, $s0, 4 -/* 609554 80218AA4 8E050000 */ lw $a1, ($s0) -/* 609558 80218AA8 26100004 */ addiu $s0, $s0, 4 -/* 60955C 80218AAC 0220202D */ daddu $a0, $s1, $zero -/* 609560 80218AB0 0C0B1EAF */ jal get_variable -/* 609564 80218AB4 0040982D */ daddu $s3, $v0, $zero -/* 609568 80218AB8 8E050000 */ lw $a1, ($s0) -/* 60956C 80218ABC 26100004 */ addiu $s0, $s0, 4 -/* 609570 80218AC0 0220202D */ daddu $a0, $s1, $zero -/* 609574 80218AC4 0C0B1EAF */ jal get_variable -/* 609578 80218AC8 0040902D */ daddu $s2, $v0, $zero -/* 60957C 80218ACC 0220202D */ daddu $a0, $s1, $zero -/* 609580 80218AD0 8E050000 */ lw $a1, ($s0) -/* 609584 80218AD4 0C0B1EAF */ jal get_variable -/* 609588 80218AD8 0040802D */ daddu $s0, $v0, $zero -/* 60958C 80218ADC 44936000 */ mtc1 $s3, $f12 -/* 609590 80218AE0 00000000 */ nop -/* 609594 80218AE4 46806320 */ cvt.s.w $f12, $f12 -/* 609598 80218AE8 44927000 */ mtc1 $s2, $f14 -/* 60959C 80218AEC 00000000 */ nop -/* 6095A0 80218AF0 468073A0 */ cvt.s.w $f14, $f14 -/* 6095A4 80218AF4 44900000 */ mtc1 $s0, $f0 -/* 6095A8 80218AF8 00000000 */ nop -/* 6095AC 80218AFC 46800020 */ cvt.s.w $f0, $f0 -/* 6095B0 80218B00 44060000 */ mfc1 $a2, $f0 -/* 6095B4 80218B04 0C0B5D18 */ jal func_802D7460 -/* 6095B8 80218B08 0040382D */ daddu $a3, $v0, $zero -/* 6095BC 80218B0C 8FBF0020 */ lw $ra, 0x20($sp) -/* 6095C0 80218B10 8FB3001C */ lw $s3, 0x1c($sp) -/* 6095C4 80218B14 8FB20018 */ lw $s2, 0x18($sp) -/* 6095C8 80218B18 8FB10014 */ lw $s1, 0x14($sp) -/* 6095CC 80218B1C 8FB00010 */ lw $s0, 0x10($sp) -/* 6095D0 80218B20 24020002 */ addiu $v0, $zero, 2 -/* 6095D4 80218B24 03E00008 */ jr $ra -/* 6095D8 80218B28 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/area_tik3/6187C0/func_8021819C_61888C.s b/asm/nonmatchings/battle/area_tik3/6187C0/func_8021819C_61888C.s deleted file mode 100644 index baebe72842..0000000000 --- a/asm/nonmatchings/battle/area_tik3/6187C0/func_8021819C_61888C.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021819C_61888C -/* 61888C 8021819C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 618890 802181A0 AFB10014 */ sw $s1, 0x14($sp) -/* 618894 802181A4 0080882D */ daddu $s1, $a0, $zero -/* 618898 802181A8 AFBF0020 */ sw $ra, 0x20($sp) -/* 61889C 802181AC AFB3001C */ sw $s3, 0x1c($sp) -/* 6188A0 802181B0 AFB20018 */ sw $s2, 0x18($sp) -/* 6188A4 802181B4 AFB00010 */ sw $s0, 0x10($sp) -/* 6188A8 802181B8 8E30000C */ lw $s0, 0xc($s1) -/* 6188AC 802181BC 8E050000 */ lw $a1, ($s0) -/* 6188B0 802181C0 0C0B1EAF */ jal get_variable -/* 6188B4 802181C4 26100004 */ addiu $s0, $s0, 4 -/* 6188B8 802181C8 8E050000 */ lw $a1, ($s0) -/* 6188BC 802181CC 26100004 */ addiu $s0, $s0, 4 -/* 6188C0 802181D0 0220202D */ daddu $a0, $s1, $zero -/* 6188C4 802181D4 0C0B1EAF */ jal get_variable -/* 6188C8 802181D8 0040982D */ daddu $s3, $v0, $zero -/* 6188CC 802181DC 8E050000 */ lw $a1, ($s0) -/* 6188D0 802181E0 26100004 */ addiu $s0, $s0, 4 -/* 6188D4 802181E4 0220202D */ daddu $a0, $s1, $zero -/* 6188D8 802181E8 0C0B1EAF */ jal get_variable -/* 6188DC 802181EC 0040902D */ daddu $s2, $v0, $zero -/* 6188E0 802181F0 0220202D */ daddu $a0, $s1, $zero -/* 6188E4 802181F4 8E050000 */ lw $a1, ($s0) -/* 6188E8 802181F8 0C0B1EAF */ jal get_variable -/* 6188EC 802181FC 0040802D */ daddu $s0, $v0, $zero -/* 6188F0 80218200 44936000 */ mtc1 $s3, $f12 -/* 6188F4 80218204 00000000 */ nop -/* 6188F8 80218208 46806320 */ cvt.s.w $f12, $f12 -/* 6188FC 8021820C 44927000 */ mtc1 $s2, $f14 -/* 618900 80218210 00000000 */ nop -/* 618904 80218214 468073A0 */ cvt.s.w $f14, $f14 -/* 618908 80218218 44900000 */ mtc1 $s0, $f0 -/* 61890C 8021821C 00000000 */ nop -/* 618910 80218220 46800020 */ cvt.s.w $f0, $f0 -/* 618914 80218224 44060000 */ mfc1 $a2, $f0 -/* 618918 80218228 0C0B5D18 */ jal func_802D7460 -/* 61891C 8021822C 0040382D */ daddu $a3, $v0, $zero -/* 618920 80218230 8FBF0020 */ lw $ra, 0x20($sp) -/* 618924 80218234 8FB3001C */ lw $s3, 0x1c($sp) -/* 618928 80218238 8FB20018 */ lw $s2, 0x18($sp) -/* 61892C 8021823C 8FB10014 */ lw $s1, 0x14($sp) -/* 618930 80218240 8FB00010 */ lw $s0, 0x10($sp) -/* 618934 80218244 24020002 */ addiu $v0, $zero, 2 -/* 618938 80218248 03E00008 */ jr $ra -/* 61893C 8021824C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/include/functions.h b/include/functions.h index bd1526a111..256c4d7b12 100644 --- a/include/functions.h +++ b/include/functions.h @@ -156,4 +156,7 @@ ScriptInstance* get_script_by_index(s32 index); void suspend_all_group(s32 groupFlags); void kill_script(ScriptInstance* instanceToKill); +void func_802D7460(f32 x, f32 y, f32 z, s32 arg3); +void func_802D74C0(f32 x, f32 y, f32 z, s32 arg3); + #endif diff --git a/src/battle/area_dig/6DDE90.c b/src/battle/area_dig/6DDE90.c index 2241a32b77..a7c708ed53 100644 --- a/src/battle/area_dig/6DDE90.c +++ b/src/battle/area_dig/6DDE90.c @@ -2,6 +2,6 @@ #define NAMESPACE b_area_dig -INCLUDE_ASM(s32, "battle/area_dig/6DDE90", func_802180D0_6DDE90); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_dig/6DDE90", func_80218184_6DDF44); diff --git a/src/battle/area_jan/573AC0.c b/src/battle/area_jan/573AC0.c index 9ffeed3eeb..26e12f0f83 100644 --- a/src/battle/area_jan/573AC0.c +++ b/src/battle/area_jan/573AC0.c @@ -2,6 +2,6 @@ #define NAMESPACE b_area_jan -INCLUDE_ASM(s32, "battle/area_jan/573AC0", func_802181A0_573AC0); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_jan/573AC0", func_80218254_573B74); diff --git a/src/battle/area_mim/4F7BE0.c b/src/battle/area_mim/4F7BE0.c index dbb6c085c5..72af8641c5 100644 --- a/src/battle/area_mim/4F7BE0.c +++ b/src/battle/area_mim/4F7BE0.c @@ -2,6 +2,6 @@ #define NAMESPACE b_area_mim -INCLUDE_ASM(s32, "battle/area_mim/4F7BE0", func_80218000_4F7BE0); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_mim/4F7BE0", func_802180B4_4F7C94); diff --git a/src/battle/area_nok/48DA50.c b/src/battle/area_nok/48DA50.c index 51319efcd2..98ec3111f1 100644 --- a/src/battle/area_nok/48DA50.c +++ b/src/battle/area_nok/48DA50.c @@ -2,6 +2,6 @@ #define NAMESPACE b_area_nok -INCLUDE_ASM(s32, "battle/area_nok/48DA50", func_802188B0_48DA50); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_nok/48DA50", func_80218964_48DB04); diff --git a/src/battle/area_omo3/557AD0.c b/src/battle/area_omo3/557AD0.c index 29163a131a..bdd8a9d30d 100644 --- a/src/battle/area_omo3/557AD0.c +++ b/src/battle/area_omo3/557AD0.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "battle/area_omo3/557AD0", func_802186F0_557AD0); INCLUDE_ASM(s32, "battle/area_omo3/557AD0", func_8021887C_557C5C); -INCLUDE_ASM(s32, "battle/area_omo3/557AD0", func_80218970_557D50); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_omo3/557AD0", func_80218A24_557E04); diff --git a/src/battle/area_pra/648E10.c b/src/battle/area_pra/648E10.c index d3878d6568..1257007f72 100644 --- a/src/battle/area_pra/648E10.c +++ b/src/battle/area_pra/648E10.c @@ -4,6 +4,6 @@ #include "common/UnkBattleFunc1.inc.c" -INCLUDE_ASM(s32, "battle/area_pra/648E10", func_802180CC_648EDC); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_pra/648E10", func_80218180_648F90); diff --git a/src/battle/area_pra3/669D80.c b/src/battle/area_pra3/669D80.c index 8187cf6e9c..efc6d5a975 100644 --- a/src/battle/area_pra3/669D80.c +++ b/src/battle/area_pra3/669D80.c @@ -44,6 +44,6 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219524_66B2A4); #include "common/UnkBattleFunc1.inc.c" #define NAMESPACE b_area_pra3 -INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802196BC_66B43C); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219770_66B4F0); diff --git a/src/battle/area_tik2/608CB0.c b/src/battle/area_tik2/608CB0.c index 176c0cbb3e..383e21d82e 100644 --- a/src/battle/area_tik2/608CB0.c +++ b/src/battle/area_tik2/608CB0.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218884_609334); #include "common/StartRumbleWithParams.inc.c" #define NAMESPACE b_area_tik2 -INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218A78_609528); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218B2C_6095DC); diff --git a/src/battle/area_tik3/6187C0.c b/src/battle/area_tik3/6187C0.c index 08412b15fb..16dcb7d550 100644 --- a/src/battle/area_tik3/6187C0.c +++ b/src/battle/area_tik3/6187C0.c @@ -6,6 +6,6 @@ #include "common/UnkBattleFunc1.inc.c" #define NAMESPACE b_area_tik3 -INCLUDE_ASM(s32, "battle/area_tik3/6187C0", func_8021819C_61888C); +#include "common/UnkBattleFunc2.inc.c" INCLUDE_ASM(s32, "battle/area_tik3/6187C0", func_80218250_618940); diff --git a/src/code_FBE10.c b/src/code_FBE10.c index fb113c49b1..d43442c1cb 100644 --- a/src/code_FBE10.c +++ b/src/code_FBE10.c @@ -1,9 +1,7 @@ #include "common.h" -void func_802D7460(f32 x, f32 y, f32 z, s32 arg3); INCLUDE_ASM(void, "code_fa4c0_len_3bf0", func_802D7460, f32 x, f32 y, f32 z, s32 arg3); -void func_802D74C0(f32 x, f32 y, f32 z, s32 arg3); INCLUDE_ASM(void, "code_fa4c0_len_3bf0", func_802D74C0, f32 x, f32 y, f32 z, s32 arg3); ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall) { diff --git a/src/common/UnkBattleFunc2.inc.c b/src/common/UnkBattleFunc2.inc.c new file mode 100644 index 0000000000..415831e026 --- /dev/null +++ b/src/common/UnkBattleFunc2.inc.c @@ -0,0 +1,13 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkBattleFunc2)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 x = get_variable(script, *args++); + s32 y = get_variable(script, *args++); + s32 z = get_variable(script, *args++); + + func_802D7460(x, y, z, get_variable(script, *args++)); + + return ApiStatus_DONE2; +}