falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UnkBattleFunc2

This commit is contained in:
Ethan Roseman 2020-12-30 16:08:46 +09:00
parent 1dd75cd0e5
commit efb9deb1cc
19 changed files with 11 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
asm/nonmatchings/battle/area_dig/6DDE90/func_80218184_6DDF44.s
View File

@ -1,51 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218184_6DDF44
/* 6DDF44 80218184 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 6DDF48 80218188 AFB10014 */ sw $s1, 0x14($sp)
/* 6DDF4C 8021818C 0080882D */ daddu $s1, $a0, $zero
/* 6DDF50 80218190 AFBF0020 */ sw $ra, 0x20($sp)
/* 6DDF54 80218194 AFB3001C */ sw $s3, 0x1c($sp)
/* 6DDF58 80218198 AFB20018 */ sw $s2, 0x18($sp)
/* 6DDF5C 8021819C AFB00010 */ sw $s0, 0x10($sp)
/* 6DDF60 802181A0 8E30000C */ lw $s0, 0xc($s1)
/* 6DDF64 802181A4 8E050000 */ lw $a1, ($s0)
/* 6DDF68 802181A8 0C0B1EAF */ jal get_variable
/* 6DDF6C 802181AC 26100004 */ addiu $s0, $s0, 4
/* 6DDF70 802181B0 8E050000 */ lw $a1, ($s0)
/* 6DDF74 802181B4 26100004 */ addiu $s0, $s0, 4
/* 6DDF78 802181B8 0220202D */ daddu $a0, $s1, $zero
/* 6DDF7C 802181BC 0C0B1EAF */ jal get_variable
/* 6DDF80 802181C0 0040982D */ daddu $s3, $v0, $zero
/* 6DDF84 802181C4 8E050000 */ lw $a1, ($s0)
/* 6DDF88 802181C8 26100004 */ addiu $s0, $s0, 4
/* 6DDF8C 802181CC 0220202D */ daddu $a0, $s1, $zero
/* 6DDF90 802181D0 0C0B1EAF */ jal get_variable
/* 6DDF94 802181D4 0040902D */ daddu $s2, $v0, $zero
/* 6DDF98 802181D8 0220202D */ daddu $a0, $s1, $zero
/* 6DDF9C 802181DC 8E050000 */ lw $a1, ($s0)
/* 6DDFA0 802181E0 0C0B1EAF */ jal get_variable
/* 6DDFA4 802181E4 0040802D */ daddu $s0, $v0, $zero
/* 6DDFA8 802181E8 44936000 */ mtc1 $s3, $f12
/* 6DDFAC 802181EC 00000000 */ nop
/* 6DDFB0 802181F0 46806320 */ cvt.s.w $f12, $f12
/* 6DDFB4 802181F4 44927000 */ mtc1 $s2, $f14
/* 6DDFB8 802181F8 00000000 */ nop
/* 6DDFBC 802181FC 468073A0 */ cvt.s.w $f14, $f14
/* 6DDFC0 80218200 44900000 */ mtc1 $s0, $f0
/* 6DDFC4 80218204 00000000 */ nop
/* 6DDFC8 80218208 46800020 */ cvt.s.w $f0, $f0
/* 6DDFCC 8021820C 44060000 */ mfc1 $a2, $f0
/* 6DDFD0 80218210 0C0B5D30 */ jal func_802D74C0
/* 6DDFD4 80218214 0040382D */ daddu $a3, $v0, $zero
/* 6DDFD8 80218218 8FBF0020 */ lw $ra, 0x20($sp)
/* 6DDFDC 8021821C 8FB3001C */ lw $s3, 0x1c($sp)
/* 6DDFE0 80218220 8FB20018 */ lw $s2, 0x18($sp)
/* 6DDFE4 80218224 8FB10014 */ lw $s1, 0x14($sp)
/* 6DDFE8 80218228 8FB00010 */ lw $s0, 0x10($sp)
/* 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

51
asm/nonmatchings/battle/area_jan/573AC0/func_80218254_573B74.s
View File

@ -1,51 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218254_573B74
/* 573B74 80218254 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 573B78 80218258 AFB10014 */ sw $s1, 0x14($sp)
/* 573B7C 8021825C 0080882D */ daddu $s1, $a0, $zero
/* 573B80 80218260 AFBF0020 */ sw $ra, 0x20($sp)
/* 573B84 80218264 AFB3001C */ sw $s3, 0x1c($sp)
/* 573B88 80218268 AFB20018 */ sw $s2, 0x18($sp)
/* 573B8C 8021826C AFB00010 */ sw $s0, 0x10($sp)
/* 573B90 80218270 8E30000C */ lw $s0, 0xc($s1)
/* 573B94 80218274 8E050000 */ lw $a1, ($s0)
/* 573B98 80218278 0C0B1EAF */ jal get_variable
/* 573B9C 8021827C 26100004 */ addiu $s0, $s0, 4
/* 573BA0 80218280 8E050000 */ lw $a1, ($s0)
/* 573BA4 80218284 26100004 */ addiu $s0, $s0, 4
/* 573BA8 80218288 0220202D */ daddu $a0, $s1, $zero
/* 573BAC 8021828C 0C0B1EAF */ jal get_variable
/* 573BB0 80218290 0040982D */ daddu $s3, $v0, $zero
/* 573BB4 80218294 8E050000 */ lw $a1, ($s0)
/* 573BB8 80218298 26100004 */ addiu $s0, $s0, 4
/* 573BBC 8021829C 0220202D */ daddu $a0, $s1, $zero
/* 573BC0 802182A0 0C0B1EAF */ jal get_variable
/* 573BC4 802182A4 0040902D */ daddu $s2, $v0, $zero
/* 573BC8 802182A8 0220202D */ daddu $a0, $s1, $zero
/* 573BCC 802182AC 8E050000 */ lw $a1, ($s0)
/* 573BD0 802182B0 0C0B1EAF */ jal get_variable
/* 573BD4 802182B4 0040802D */ daddu $s0, $v0, $zero
/* 573BD8 802182B8 44936000 */ mtc1 $s3, $f12
/* 573BDC 802182BC 00000000 */ nop
/* 573BE0 802182C0 46806320 */ cvt.s.w $f12, $f12
/* 573BE4 802182C4 44927000 */ mtc1 $s2, $f14
/* 573BE8 802182C8 00000000 */ nop
/* 573BEC 802182CC 468073A0 */ cvt.s.w $f14, $f14
/* 573BF0 802182D0 44900000 */ mtc1 $s0, $f0
/* 573BF4 802182D4 00000000 */ nop
/* 573BF8 802182D8 46800020 */ cvt.s.w $f0, $f0
/* 573BFC 802182DC 44060000 */ mfc1 $a2, $f0
/* 573C00 802182E0 0C0B5D30 */ jal func_802D74C0
/* 573C04 802182E4 0040382D */ daddu $a3, $v0, $zero
/* 573C08 802182E8 8FBF0020 */ lw $ra, 0x20($sp)
/* 573C0C 802182EC 8FB3001C */ lw $s3, 0x1c($sp)
/* 573C10 802182F0 8FB20018 */ lw $s2, 0x18($sp)
/* 573C14 802182F4 8FB10014 */ lw $s1, 0x14($sp)
/* 573C18 802182F8 8FB00010 */ lw $s0, 0x10($sp)
/* 573C1C 802182FC 24020002 */ addiu $v0, $zero, 2
/* 573C20 80218300 03E00008 */ jr $ra
/* 573C24 80218304 27BD0028 */ addiu $sp, $sp, 0x28
/* 573C28 80218308 00000000 */ nop
/* 573C2C 8021830C 00000000 */ nop

51
asm/nonmatchings/battle/area_mim/4F7BE0/func_802180B4_4F7C94.s
View File

@ -1,51 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802180B4_4F7C94
/* 4F7C94 802180B4 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 4F7C98 802180B8 AFB10014 */ sw $s1, 0x14($sp)
/* 4F7C9C 802180BC 0080882D */ daddu $s1, $a0, $zero
/* 4F7CA0 802180C0 AFBF0020 */ sw $ra, 0x20($sp)
/* 4F7CA4 802180C4 AFB3001C */ sw $s3, 0x1c($sp)
/* 4F7CA8 802180C8 AFB20018 */ sw $s2, 0x18($sp)
/* 4F7CAC 802180CC AFB00010 */ sw $s0, 0x10($sp)
/* 4F7CB0 802180D0 8E30000C */ lw $s0, 0xc($s1)
/* 4F7CB4 802180D4 8E050000 */ lw $a1, ($s0)
/* 4F7CB8 802180D8 0C0B1EAF */ jal get_variable
/* 4F7CBC 802180DC 26100004 */ addiu $s0, $s0, 4
/* 4F7CC0 802180E0 8E050000 */ lw $a1, ($s0)
/* 4F7CC4 802180E4 26100004 */ addiu $s0, $s0, 4
/* 4F7CC8 802180E8 0220202D */ daddu $a0, $s1, $zero
/* 4F7CCC 802180EC 0C0B1EAF */ jal get_variable
/* 4F7CD0 802180F0 0040982D */ daddu $s3, $v0, $zero
/* 4F7CD4 802180F4 8E050000 */ lw $a1, ($s0)
/* 4F7CD8 802180F8 26100004 */ addiu $s0, $s0, 4
/* 4F7CDC 802180FC 0220202D */ daddu $a0, $s1, $zero
/* 4F7CE0 80218100 0C0B1EAF */ jal get_variable
/* 4F7CE4 80218104 0040902D */ daddu $s2, $v0, $zero
/* 4F7CE8 80218108 0220202D */ daddu $a0, $s1, $zero
/* 4F7CEC 8021810C 8E050000 */ lw $a1, ($s0)
/* 4F7CF0 80218110 0C0B1EAF */ jal get_variable
/* 4F7CF4 80218114 0040802D */ daddu $s0, $v0, $zero
/* 4F7CF8 80218118 44936000 */ mtc1 $s3, $f12
/* 4F7CFC 8021811C 00000000 */ nop
/* 4F7D00 80218120 46806320 */ cvt.s.w $f12, $f12
/* 4F7D04 80218124 44927000 */ mtc1 $s2, $f14
/* 4F7D08 80218128 00000000 */ nop
/* 4F7D0C 8021812C 468073A0 */ cvt.s.w $f14, $f14
/* 4F7D10 80218130 44900000 */ mtc1 $s0, $f0
/* 4F7D14 80218134 00000000 */ nop
/* 4F7D18 80218138 46800020 */ cvt.s.w $f0, $f0
/* 4F7D1C 8021813C 44060000 */ mfc1 $a2, $f0
/* 4F7D20 80218140 0C0B5D30 */ jal func_802D74C0
/* 4F7D24 80218144 0040382D */ daddu $a3, $v0, $zero
/* 4F7D28 80218148 8FBF0020 */ lw $ra, 0x20($sp)
/* 4F7D2C 8021814C 8FB3001C */ lw $s3, 0x1c($sp)
/* 4F7D30 80218150 8FB20018 */ lw $s2, 0x18($sp)
/* 4F7D34 80218154 8FB10014 */ lw $s1, 0x14($sp)
/* 4F7D38 80218158 8FB00010 */ lw $s0, 0x10($sp)
/* 4F7D3C 8021815C 24020002 */ addiu $v0, $zero, 2
/* 4F7D40 80218160 03E00008 */ jr $ra
/* 4F7D44 80218164 27BD0028 */ addiu $sp, $sp, 0x28
/* 4F7D48 80218168 00000000 */ nop
/* 4F7D4C 8021816C 00000000 */ nop

51
asm/nonmatchings/battle/area_nok/48DA50/func_80218964_48DB04.s
View File

@ -1,51 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218964_48DB04
/* 48DB04 80218964 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 48DB08 80218968 AFB10014 */ sw $s1, 0x14($sp)
/* 48DB0C 8021896C 0080882D */ daddu $s1, $a0, $zero
/* 48DB10 80218970 AFBF0020 */ sw $ra, 0x20($sp)
/* 48DB14 80218974 AFB3001C */ sw $s3, 0x1c($sp)
/* 48DB18 80218978 AFB20018 */ sw $s2, 0x18($sp)
/* 48DB1C 8021897C AFB00010 */ sw $s0, 0x10($sp)
/* 48DB20 80218980 8E30000C */ lw $s0, 0xc($s1)
/* 48DB24 80218984 8E050000 */ lw $a1, ($s0)
/* 48DB28 80218988 0C0B1EAF */ jal get_variable
/* 48DB2C 8021898C 26100004 */ addiu $s0, $s0, 4
/* 48DB30 80218990 8E050000 */ lw $a1, ($s0)
/* 48DB34 80218994 26100004 */ addiu $s0, $s0, 4
/* 48DB38 80218998 0220202D */ daddu $a0, $s1, $zero
/* 48DB3C 8021899C 0C0B1EAF */ jal get_variable
/* 48DB40 802189A0 0040982D */ daddu $s3, $v0, $zero
/* 48DB44 802189A4 8E050000 */ lw $a1, ($s0)
/* 48DB48 802189A8 26100004 */ addiu $s0, $s0, 4
/* 48DB4C 802189AC 0220202D */ daddu $a0, $s1, $zero
/* 48DB50 802189B0 0C0B1EAF */ jal get_variable
/* 48DB54 802189B4 0040902D */ daddu $s2, $v0, $zero
/* 48DB58 802189B8 0220202D */ daddu $a0, $s1, $zero
/* 48DB5C 802189BC 8E050000 */ lw $a1, ($s0)
/* 48DB60 802189C0 0C0B1EAF */ jal get_variable
/* 48DB64 802189C4 0040802D */ daddu $s0, $v0, $zero
/* 48DB68 802189C8 44936000 */ mtc1 $s3, $f12
/* 48DB6C 802189CC 00000000 */ nop
/* 48DB70 802189D0 46806320 */ cvt.s.w $f12, $f12
/* 48DB74 802189D4 44927000 */ mtc1 $s2, $f14
/* 48DB78 802189D8 00000000 */ nop
/* 48DB7C 802189DC 468073A0 */ cvt.s.w $f14, $f14
/* 48DB80 802189E0 44900000 */ mtc1 $s0, $f0
/* 48DB84 802189E4 00000000 */ nop
/* 48DB88 802189E8 46800020 */ cvt.s.w $f0, $f0
/* 48DB8C 802189EC 44060000 */ mfc1 $a2, $f0
/* 48DB90 802189F0 0C0B5D30 */ jal func_802D74C0
/* 48DB94 802189F4 0040382D */ daddu $a3, $v0, $zero
/* 48DB98 802189F8 8FBF0020 */ lw $ra, 0x20($sp)
/* 48DB9C 802189FC 8FB3001C */ lw $s3, 0x1c($sp)
/* 48DBA0 80218A00 8FB20018 */ lw $s2, 0x18($sp)
/* 48DBA4 80218A04 8FB10014 */ lw $s1, 0x14($sp)
/* 48DBA8 80218A08 8FB00010 */ lw $s0, 0x10($sp)
/* 48DBAC 80218A0C 24020002 */ addiu $v0, $zero, 2
/* 48DBB0 80218A10 03E00008 */ jr $ra
/* 48DBB4 80218A14 27BD0028 */ addiu $sp, $sp, 0x28
/* 48DBB8 80218A18 00000000 */ nop
/* 48DBBC 80218A1C 00000000 */ nop

51
asm/nonmatchings/battle/area_omo3/557AD0/func_80218A24_557E04.s
View File

@ -1,51 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218A24_557E04
/* 557E04 80218A24 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 557E08 80218A28 AFB10014 */ sw $s1, 0x14($sp)
/* 557E0C 80218A2C 0080882D */ daddu $s1, $a0, $zero
/* 557E10 80218A30 AFBF0020 */ sw $ra, 0x20($sp)
/* 557E14 80218A34 AFB3001C */ sw $s3, 0x1c($sp)
/* 557E18 80218A38 AFB20018 */ sw $s2, 0x18($sp)
/* 557E1C 80218A3C AFB00010 */ sw $s0, 0x10($sp)
/* 557E20 80218A40 8E30000C */ lw $s0, 0xc($s1)
/* 557E24 80218A44 8E050000 */ lw $a1, ($s0)
/* 557E28 80218A48 0C0B1EAF */ jal get_variable
/* 557E2C 80218A4C 26100004 */ addiu $s0, $s0, 4
/* 557E30 80218A50 8E050000 */ lw $a1, ($s0)
/* 557E34 80218A54 26100004 */ addiu $s0, $s0, 4
/* 557E38 80218A58 0220202D */ daddu $a0, $s1, $zero
/* 557E3C 80218A5C 0C0B1EAF */ jal get_variable
/* 557E40 80218A60 0040982D */ daddu $s3, $v0, $zero
/* 557E44 80218A64 8E050000 */ lw $a1, ($s0)
/* 557E48 80218A68 26100004 */ addiu $s0, $s0, 4
/* 557E4C 80218A6C 0220202D */ daddu $a0, $s1, $zero
/* 557E50 80218A70 0C0B1EAF */ jal get_variable
/* 557E54 80218A74 0040902D */ daddu $s2, $v0, $zero
/* 557E58 80218A78 0220202D */ daddu $a0, $s1, $zero
/* 557E5C 80218A7C 8E050000 */ lw $a1, ($s0)
/* 557E60 80218A80 0C0B1EAF */ jal get_variable
/* 557E64 80218A84 0040802D */ daddu $s0, $v0, $zero
/* 557E68 80218A88 44936000 */ mtc1 $s3, $f12
/* 557E6C 80218A8C 00000000 */ nop
/* 557E70 80218A90 46806320 */ cvt.s.w $f12, $f12
/* 557E74 80218A94 44927000 */ mtc1 $s2, $f14
/* 557E78 80218A98 00000000 */ nop
/* 557E7C 80218A9C 468073A0 */ cvt.s.w $f14, $f14
/* 557E80 80218AA0 44900000 */ mtc1 $s0, $f0
/* 557E84 80218AA4 00000000 */ nop
/* 557E88 80218AA8 46800020 */ cvt.s.w $f0, $f0
/* 557E8C 80218AAC 44060000 */ mfc1 $a2, $f0
/* 557E90 80218AB0 0C0B5D30 */ jal func_802D74C0
/* 557E94 80218AB4 0040382D */ daddu $a3, $v0, $zero
/* 557E98 80218AB8 8FBF0020 */ lw $ra, 0x20($sp)
/* 557E9C 80218ABC 8FB3001C */ lw $s3, 0x1c($sp)
/* 557EA0 80218AC0 8FB20018 */ lw $s2, 0x18($sp)
/* 557EA4 80218AC4 8FB10014 */ lw $s1, 0x14($sp)
/* 557EA8 80218AC8 8FB00010 */ lw $s0, 0x10($sp)
/* 557EAC 80218ACC 24020002 */ addiu $v0, $zero, 2
/* 557EB0 80218AD0 03E00008 */ jr $ra
/* 557EB4 80218AD4 27BD0028 */ addiu $sp, $sp, 0x28
/* 557EB8 80218AD8 00000000 */ nop
/* 557EBC 80218ADC 00000000 */ nop

52
asm/nonmatchings/battle/area_pra/648E10/func_80218180_648F90.s
View File

@ -1,52 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218180_648F90
/* 648F90 80218180 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 648F94 80218184 AFB10014 */ sw $s1, 0x14($sp)
/* 648F98 80218188 0080882D */ daddu $s1, $a0, $zero
/* 648F9C 8021818C AFBF0020 */ sw $ra, 0x20($sp)
/* 648FA0 80218190 AFB3001C */ sw $s3, 0x1c($sp)
/* 648FA4 80218194 AFB20018 */ sw $s2, 0x18($sp)
/* 648FA8 80218198 AFB00010 */ sw $s0, 0x10($sp)
/* 648FAC 8021819C 8E30000C */ lw $s0, 0xc($s1)
/* 648FB0 802181A0 8E050000 */ lw $a1, ($s0)
/* 648FB4 802181A4 0C0B1EAF */ jal get_variable
/* 648FB8 802181A8 26100004 */ addiu $s0, $s0, 4
/* 648FBC 802181AC 8E050000 */ lw $a1, ($s0)
/* 648FC0 802181B0 26100004 */ addiu $s0, $s0, 4
/* 648FC4 802181B4 0220202D */ daddu $a0, $s1, $zero
/* 648FC8 802181B8 0C0B1EAF */ jal get_variable
/* 648FCC 802181BC 0040982D */ daddu $s3, $v0, $zero
/* 648FD0 802181C0 8E050000 */ lw $a1, ($s0)
/* 648FD4 802181C4 26100004 */ addiu $s0, $s0, 4
/* 648FD8 802181C8 0220202D */ daddu $a0, $s1, $zero
/* 648FDC 802181CC 0C0B1EAF */ jal get_variable
/* 648FE0 802181D0 0040902D */ daddu $s2, $v0, $zero
/* 648FE4 802181D4 0220202D */ daddu $a0, $s1, $zero
/* 648FE8 802181D8 8E050000 */ lw $a1, ($s0)
/* 648FEC 802181DC 0C0B1EAF */ jal get_variable
/* 648FF0 802181E0 0040802D */ daddu $s0, $v0, $zero
/* 648FF4 802181E4 44936000 */ mtc1 $s3, $f12
/* 648FF8 802181E8 00000000 */ nop
/* 648FFC 802181EC 46806320 */ cvt.s.w $f12, $f12
/* 649000 802181F0 44927000 */ mtc1 $s2, $f14
/* 649004 802181F4 00000000 */ nop
/* 649008 802181F8 468073A0 */ cvt.s.w $f14, $f14
/* 64900C 802181FC 44900000 */ mtc1 $s0, $f0
/* 649010 80218200 00000000 */ nop
/* 649014 80218204 46800020 */ cvt.s.w $f0, $f0
/* 649018 80218208 44060000 */ mfc1 $a2, $f0
/* 64901C 8021820C 0C0B5D30 */ jal func_802D74C0
/* 649020 80218210 0040382D */ daddu $a3, $v0, $zero
/* 649024 80218214 8FBF0020 */ lw $ra, 0x20($sp)
/* 649028 80218218 8FB3001C */ lw $s3, 0x1c($sp)
/* 64902C 8021821C 8FB20018 */ lw $s2, 0x18($sp)
/* 649030 80218220 8FB10014 */ lw $s1, 0x14($sp)
/* 649034 80218224 8FB00010 */ lw $s0, 0x10($sp)
/* 649038 80218228 24020002 */ addiu $v0, $zero, 2
/* 64903C 8021822C 03E00008 */ jr $ra
/* 649040 80218230 27BD0028 */ addiu $sp, $sp, 0x28
/* 649044 80218234 00000000 */ nop
/* 649048 80218238 00000000 */ nop
/* 64904C 8021823C 00000000 */ nop

52
asm/nonmatchings/battle/area_pra3/669D80/func_80219770_66B4F0.s
View File

@ -1,52 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219770_66B4F0
/* 66B4F0 80219770 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 66B4F4 80219774 AFB10014 */ sw $s1, 0x14($sp)
/* 66B4F8 80219778 0080882D */ daddu $s1, $a0, $zero
/* 66B4FC 8021977C AFBF0020 */ sw $ra, 0x20($sp)
/* 66B500 80219780 AFB3001C */ sw $s3, 0x1c($sp)
/* 66B504 80219784 AFB20018 */ sw $s2, 0x18($sp)
/* 66B508 80219788 AFB00010 */ sw $s0, 0x10($sp)
/* 66B50C 8021978C 8E30000C */ lw $s0, 0xc($s1)
/* 66B510 80219790 8E050000 */ lw $a1, ($s0)
/* 66B514 80219794 0C0B1EAF */ jal get_variable
/* 66B518 80219798 26100004 */ addiu $s0, $s0, 4
/* 66B51C 8021979C 8E050000 */ lw $a1, ($s0)
/* 66B520 802197A0 26100004 */ addiu $s0, $s0, 4
/* 66B524 802197A4 0220202D */ daddu $a0, $s1, $zero
/* 66B528 802197A8 0C0B1EAF */ jal get_variable
/* 66B52C 802197AC 0040982D */ daddu $s3, $v0, $zero
/* 66B530 802197B0 8E050000 */ lw $a1, ($s0)
/* 66B534 802197B4 26100004 */ addiu $s0, $s0, 4
/* 66B538 802197B8 0220202D */ daddu $a0, $s1, $zero
/* 66B53C 802197BC 0C0B1EAF */ jal get_variable
/* 66B540 802197C0 0040902D */ daddu $s2, $v0, $zero
/* 66B544 802197C4 0220202D */ daddu $a0, $s1, $zero
/* 66B548 802197C8 8E050000 */ lw $a1, ($s0)
/* 66B54C 802197CC 0C0B1EAF */ jal get_variable
/* 66B550 802197D0 0040802D */ daddu $s0, $v0, $zero
/* 66B554 802197D4 44936000 */ mtc1 $s3, $f12
/* 66B558 802197D8 00000000 */ nop
/* 66B55C 802197DC 46806320 */ cvt.s.w $f12, $f12
/* 66B560 802197E0 44927000 */ mtc1 $s2, $f14
/* 66B564 802197E4 00000000 */ nop
/* 66B568 802197E8 468073A0 */ cvt.s.w $f14, $f14
/* 66B56C 802197EC 44900000 */ mtc1 $s0, $f0
/* 66B570 802197F0 00000000 */ nop
/* 66B574 802197F4 46800020 */ cvt.s.w $f0, $f0
/* 66B578 802197F8 44060000 */ mfc1 $a2, $f0
/* 66B57C 802197FC 0C0B5D30 */ jal func_802D74C0
/* 66B580 80219800 0040382D */ daddu $a3, $v0, $zero
/* 66B584 80219804 8FBF0020 */ lw $ra, 0x20($sp)
/* 66B588 80219808 8FB3001C */ lw $s3, 0x1c($sp)
/* 66B58C 8021980C 8FB20018 */ lw $s2, 0x18($sp)
/* 66B590 80219810 8FB10014 */ lw $s1, 0x14($sp)
/* 66B594 80219814 8FB00010 */ lw $s0, 0x10($sp)
/* 66B598 80219818 24020002 */ addiu $v0, $zero, 2
/* 66B59C 8021981C 03E00008 */ jr $ra
/* 66B5A0 80219820 27BD0028 */ addiu $sp, $sp, 0x28
/* 66B5A4 80219824 00000000 */ nop
/* 66B5A8 80219828 00000000 */ nop
/* 66B5AC 8021982C 00000000 */ nop

49
asm/nonmatchings/battle/area_tik2/608CB0/func_80218B2C_6095DC.s
View File

@ -1,49 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218B2C_6095DC
/* 6095DC 80218B2C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 6095E0 80218B30 AFB10014 */ sw $s1, 0x14($sp)
/* 6095E4 80218B34 0080882D */ daddu $s1, $a0, $zero
/* 6095E8 80218B38 AFBF0020 */ sw $ra, 0x20($sp)
/* 6095EC 80218B3C AFB3001C */ sw $s3, 0x1c($sp)
/* 6095F0 80218B40 AFB20018 */ sw $s2, 0x18($sp)
/* 6095F4 80218B44 AFB00010 */ sw $s0, 0x10($sp)
/* 6095F8 80218B48 8E30000C */ lw $s0, 0xc($s1)
/* 6095FC 80218B4C 8E050000 */ lw $a1, ($s0)
/* 609600 80218B50 0C0B1EAF */ jal get_variable
/* 609604 80218B54 26100004 */ addiu $s0, $s0, 4
/* 609608 80218B58 8E050000 */ lw $a1, ($s0)
/* 60960C 80218B5C 26100004 */ addiu $s0, $s0, 4
/* 609610 80218B60 0220202D */ daddu $a0, $s1, $zero
/* 609614 80218B64 0C0B1EAF */ jal get_variable
/* 609618 80218B68 0040982D */ daddu $s3, $v0, $zero
/* 60961C 80218B6C 8E050000 */ lw $a1, ($s0)
/* 609620 80218B70 26100004 */ addiu $s0, $s0, 4
/* 609624 80218B74 0220202D */ daddu $a0, $s1, $zero
/* 609628 80218B78 0C0B1EAF */ jal get_variable
/* 60962C 80218B7C 0040902D */ daddu $s2, $v0, $zero
/* 609630 80218B80 0220202D */ daddu $a0, $s1, $zero
/* 609634 80218B84 8E050000 */ lw $a1, ($s0)
/* 609638 80218B88 0C0B1EAF */ jal get_variable
/* 60963C 80218B8C 0040802D */ daddu $s0, $v0, $zero
/* 609640 80218B90 44936000 */ mtc1 $s3, $f12
/* 609644 80218B94 00000000 */ nop
/* 609648 80218B98 46806320 */ cvt.s.w $f12, $f12
/* 60964C 80218B9C 44927000 */ mtc1 $s2, $f14
/* 609650 80218BA0 00000000 */ nop
/* 609654 80218BA4 468073A0 */ cvt.s.w $f14, $f14
/* 609658 80218BA8 44900000 */ mtc1 $s0, $f0
/* 60965C 80218BAC 00000000 */ nop
/* 609660 80218BB0 46800020 */ cvt.s.w $f0, $f0
/* 609664 80218BB4 44060000 */ mfc1 $a2, $f0
/* 609668 80218BB8 0C0B5D30 */ jal func_802D74C0
/* 60966C 80218BBC 0040382D */ daddu $a3, $v0, $zero
/* 609670 80218BC0 8FBF0020 */ lw $ra, 0x20($sp)
/* 609674 80218BC4 8FB3001C */ lw $s3, 0x1c($sp)
/* 609678 80218BC8 8FB20018 */ lw $s2, 0x18($sp)
/* 60967C 80218BCC 8FB10014 */ lw $s1, 0x14($sp)
/* 609680 80218BD0 8FB00010 */ lw $s0, 0x10($sp)
/* 609684 80218BD4 24020002 */ addiu $v0, $zero, 2
/* 609688 80218BD8 03E00008 */ jr $ra
/* 60968C 80218BDC 27BD0028 */ addiu $sp, $sp, 0x28

52
asm/nonmatchings/battle/area_tik3/6187C0/func_80218250_618940.s
View File

@ -1,52 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218250_618940
/* 618940 80218250 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 618944 80218254 AFB10014 */ sw $s1, 0x14($sp)
/* 618948 80218258 0080882D */ daddu $s1, $a0, $zero
/* 61894C 8021825C AFBF0020 */ sw $ra, 0x20($sp)
/* 618950 80218260 AFB3001C */ sw $s3, 0x1c($sp)
/* 618954 80218264 AFB20018 */ sw $s2, 0x18($sp)
/* 618958 80218268 AFB00010 */ sw $s0, 0x10($sp)
/* 61895C 8021826C 8E30000C */ lw $s0, 0xc($s1)
/* 618960 80218270 8E050000 */ lw $a1, ($s0)
/* 618964 80218274 0C0B1EAF */ jal get_variable
/* 618968 80218278 26100004 */ addiu $s0, $s0, 4
/* 61896C 8021827C 8E050000 */ lw $a1, ($s0)
/* 618970 80218280 26100004 */ addiu $s0, $s0, 4
/* 618974 80218284 0220202D */ daddu $a0, $s1, $zero
/* 618978 80218288 0C0B1EAF */ jal get_variable
/* 61897C 8021828C 0040982D */ daddu $s3, $v0, $zero
/* 618980 80218290 8E050000 */ lw $a1, ($s0)
/* 618984 80218294 26100004 */ addiu $s0, $s0, 4
/* 618988 80218298 0220202D */ daddu $a0, $s1, $zero
/* 61898C 8021829C 0C0B1EAF */ jal get_variable
/* 618990 802182A0 0040902D */ daddu $s2, $v0, $zero
/* 618994 802182A4 0220202D */ daddu $a0, $s1, $zero
/* 618998 802182A8 8E050000 */ lw $a1, ($s0)
/* 61899C 802182AC 0C0B1EAF */ jal get_variable
/* 6189A0 802182B0 0040802D */ daddu $s0, $v0, $zero
/* 6189A4 802182B4 44936000 */ mtc1 $s3, $f12
/* 6189A8 802182B8 00000000 */ nop
/* 6189AC 802182BC 46806320 */ cvt.s.w $f12, $f12
/* 6189B0 802182C0 44927000 */ mtc1 $s2, $f14
/* 6189B4 802182C4 00000000 */ nop
/* 6189B8 802182C8 468073A0 */ cvt.s.w $f14, $f14
/* 6189BC 802182CC 44900000 */ mtc1 $s0, $f0
/* 6189C0 802182D0 00000000 */ nop
/* 6189C4 802182D4 46800020 */ cvt.s.w $f0, $f0
/* 6189C8 802182D8 44060000 */ mfc1 $a2, $f0
/* 6189CC 802182DC 0C0B5D30 */ jal func_802D74C0
/* 6189D0 802182E0 0040382D */ daddu $a3, $v0, $zero
/* 6189D4 802182E4 8FBF0020 */ lw $ra, 0x20($sp)
/* 6189D8 802182E8 8FB3001C */ lw $s3, 0x1c($sp)
/* 6189DC 802182EC 8FB20018 */ lw $s2, 0x18($sp)
/* 6189E0 802182F0 8FB10014 */ lw $s1, 0x14($sp)
/* 6189E4 802182F4 8FB00010 */ lw $s0, 0x10($sp)
/* 6189E8 802182F8 24020002 */ addiu $v0, $zero, 2
/* 6189EC 802182FC 03E00008 */ jr $ra
/* 6189F0 80218300 27BD0028 */ addiu $sp, $sp, 0x28
/* 6189F4 80218304 00000000 */ nop
/* 6189F8 80218308 00000000 */ nop
/* 6189FC 8021830C 00000000 */ nop

2
src/battle/area_dig/6DDE90.c
View File

@ -3,5 +3,3 @@
#define NAMESPACE b_area_dig
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_dig/6DDE90", func_80218184_6DDF44);

2
src/battle/area_jan/573AC0.c
View File

@ -3,5 +3,3 @@
#define NAMESPACE b_area_jan
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_jan/573AC0", func_80218254_573B74);

2
src/battle/area_mim/4F7BE0.c
View File

@ -3,5 +3,3 @@
#define NAMESPACE b_area_mim
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_mim/4F7BE0", func_802180B4_4F7C94);

2
src/battle/area_nok/48DA50.c
View File

@ -3,5 +3,3 @@
#define NAMESPACE b_area_nok
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_nok/48DA50", func_80218964_48DB04);

1
src/battle/area_omo3/557AD0.c
View File

@ -8,4 +8,3 @@ INCLUDE_ASM(s32, "battle/area_omo3/557AD0", func_8021887C_557C5C);
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_omo3/557AD0", func_80218A24_557E04);

2
src/battle/area_pra/648E10.c
View File

@ -5,5 +5,3 @@
#include "common/UnkBattleFunc1.inc.c"
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_pra/648E10", func_80218180_648F90);

2
src/battle/area_pra3/669D80.c
View File

@ -45,5 +45,3 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219524_66B2A4);
#define NAMESPACE b_area_pra3
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219770_66B4F0);

2
src/battle/area_tik2/608CB0.c
View File

@ -34,6 +34,4 @@ INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218884_609334);
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218B2C_6095DC);
INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218BE0_609690);

2
src/battle/area_tik3/6187C0.c
View File

@ -7,5 +7,3 @@
#define NAMESPACE b_area_tik3
#include "common/UnkBattleFunc2.inc.c"
INCLUDE_ASM(s32, "battle/area_tik3/6187C0", func_80218250_618940);

11
src/common/UnkBattleFunc2.inc.c
View File

@ -11,3 +11,14 @@ ApiStatus N(UnkBattleFunc2)(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus N(UnkBattleFunc2_2)(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_802D74C0(x, y, z, get_variable(script, *args++));
return ApiStatus_DONE2;
}