From 44415597e553f002db13fe16f9e9765dcb60129e Mon Sep 17 00:00:00 2001 From: "brotenko@gmail.com" Date: Sun, 14 Feb 2021 19:07:39 +0100 Subject: [PATCH] decompile repeating move-related functions. --- .../auto_smash_763540/func_802A1000_763540.s | 25 ----- .../d_down_jump_781920/func_802A1000_781920.s | 64 ------------- .../d_down_jump_781920/func_802A10E4_781A04.s | 65 ------------- .../func_802A1000_74AD90.s | 25 ----- .../func_802A1050_74ADE0.s | 27 ------ .../func_802A10A4_74AE34.s | 73 -------------- .../func_802A1000_74F130.s | 25 ----- .../func_802A1050_74F180.s | 27 ------ .../func_802A10A4_74F1D4.s | 14 --- .../func_802A10C8_74F1F8.s | 70 -------------- .../func_802A11CC_74F2FC.s | 57 ----------- .../func_802A1000_7595B0.s | 25 ----- .../func_802A1050_759600.s | 27 ------ .../func_802A10A4_759654.s | 14 --- .../func_802A10C8_759678.s | 78 --------------- .../func_802A11E8_759798.s | 73 -------------- .../func_802A12FC_7598AC.s | 14 --- .../func_802A1000_75E5D0.s | 25 ----- .../func_802A1050_75E620.s | 27 ------ .../func_802A10A4_75E674.s | 14 --- .../func_802A10C8_75E698.s | 78 --------------- .../func_802A11E8_75E7B8.s | 73 -------------- .../func_802A12FC_75E8CC.s | 14 --- .../func_802A1000_74D570.s | 64 ------------- .../func_802A10E4_74D654.s | 14 --- .../func_802A1108_74D678.s | 70 -------------- .../func_802A120C_74D77C.s | 57 ----------- .../mega_quake_756780/func_802A1000_756780.s | 25 ----- .../mega_quake_756780/func_802A1050_7567D0.s | 27 ------ .../func_802A1000_743DF0.s | 64 ------------- .../power_quake_767C90/func_802A1000_767C90.s | 25 ----- .../func_802A1000_77CB80.s | 25 ----- .../spin_smash_737890/func_802A113C_7379CC.s | 27 ------ .../super_smash_775100/func_802A1000_775100.s | 25 ----- .../func_802A1000_779C90.s | 64 ------------- .../code_6F10E0/func_80238000_6F10E0.s | 64 ------------- .../code_6F10E0/func_80239190_6F2270.s | 13 --- .../code_73AED0/func_802A1000_73AED0.s | 25 ----- .../code_73D860/func_802A1000_73D860.s | 64 ------------- .../code_75C980/func_802A1000_75C980.s | 64 ------------- .../code_75C980/func_802A10E4_75CA64.s | 14 --- .../code_75C980/func_802A1108_75CA88.s | 78 --------------- .../code_75C980/func_802A1228_75CBA8.s | 73 -------------- .../code_75C980/func_802A133C_75CCBC.s | 14 --- .../code_761920/func_802A1000_761920.s | 64 ------------- .../code_761920/func_802A10E4_761A04.s | 14 --- .../code_761920/func_802A1108_761A28.s | 78 --------------- .../code_761920/func_802A1228_761B48.s | 73 -------------- .../code_761920/func_802A133C_761C5C.s | 14 --- .../code_772BA0/func_802A1000_772BA0.s | 25 ----- .../code_777690/func_802A1000_777690.s | 25 ----- .../code_77F240/func_802A1000_77F240.s | 25 ----- .../code_785B20/func_802A1000_785B20.s | 64 ------------- include/functions.h | 3 + src/battle/move/auto_jump_765C20.c | 31 ++++++ src/battle/move/auto_multibounce_76A830.c | 30 ++++++ src/battle/move/auto_smash_763540.c | 28 +++++- src/battle/move/d_down_jump_781920.c | 43 ++++++++- src/battle/move/d_down_pound_74AD90.c | 41 +++++++- src/battle/move/dizzy_stomp_748DD0.c | 31 ++++++ src/battle/move/earthquake_jump_785B20.c | 28 +++++- src/battle/move/hammer_charge_0_74F130.c | 69 +++++++++++++- src/battle/move/hammer_charge_1_7595B0.c | 94 ++++++++++++++++-- src/battle/move/hammer_charge_2_75E5D0.c | 93 ++++++++++++++++-- src/battle/move/jump_73D860.c | 55 ++++++++++- src/battle/move/jump_charge_0_74D570.c | 71 +++++++++++++- src/battle/move/jump_charge_1_75C980.c | 95 ++++++++++++++++++- src/battle/move/jump_charge_2_761920.c | 95 ++++++++++++++++++- src/battle/move/mega_jump_770F30.c | 31 ++++++ src/battle/move/mega_quake_756780.c | 26 ++++- src/battle/move/mega_smash_777690.c | 29 +++++- src/battle/move/multibounce_740CC0.c | 31 ++++++ src/battle/move/power_bounce_743DF0.c | 28 +++++- src/battle/move/power_jump_76D760.c | 31 ++++++ src/battle/move/power_quake_767C90.c | 29 +++++- src/battle/move/power_smash_772BA0.c | 29 +++++- src/battle/move/quake_hammer_73AED0.c | 29 +++++- src/battle/move/shell_crack_77F240.c | 26 ++++- src/battle/move/shrink_smash_77CB80.c | 29 +++++- src/battle/move/shrink_stomp_783BA0.c | 31 ++++++ src/battle/move/sleep_stomp_746E10.c | 31 ++++++ src/battle/move/spin_smash_737890.c | 25 ++++- src/battle/move/super_jump_76F330.c | 31 ++++++ src/battle/move/super_smash_775100.c | 29 +++++- src/battle/move/unknown_move_779C90.c | 28 +++++- src/battle/partner/goombario_6F10E0.c | 41 +++++++- src/code_1AF230.c | 2 +- src/os/code_4ac90_len_3910.c | 2 +- 88 files changed, 1289 insertions(+), 2268 deletions(-) delete mode 100644 asm/nonmatchings/battle/move/auto_smash_763540/func_802A1000_763540.s delete mode 100644 asm/nonmatchings/battle/move/d_down_jump_781920/func_802A1000_781920.s delete mode 100644 asm/nonmatchings/battle/move/d_down_jump_781920/func_802A10E4_781A04.s delete mode 100644 asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A1000_74AD90.s delete mode 100644 asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A1050_74ADE0.s delete mode 100644 asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A10A4_74AE34.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A1000_74F130.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A1050_74F180.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A10A4_74F1D4.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A10C8_74F1F8.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A11CC_74F2FC.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A1000_7595B0.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A1050_759600.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A10A4_759654.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A10C8_759678.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A11E8_759798.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A12FC_7598AC.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A1000_75E5D0.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A1050_75E620.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A10A4_75E674.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A10C8_75E698.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A11E8_75E7B8.s delete mode 100644 asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A12FC_75E8CC.s delete mode 100644 asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A1000_74D570.s delete mode 100644 asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A10E4_74D654.s delete mode 100644 asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A1108_74D678.s delete mode 100644 asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A120C_74D77C.s delete mode 100644 asm/nonmatchings/battle/move/mega_quake_756780/func_802A1000_756780.s delete mode 100644 asm/nonmatchings/battle/move/mega_quake_756780/func_802A1050_7567D0.s delete mode 100644 asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A1000_743DF0.s delete mode 100644 asm/nonmatchings/battle/move/power_quake_767C90/func_802A1000_767C90.s delete mode 100644 asm/nonmatchings/battle/move/shrink_smash_77CB80/func_802A1000_77CB80.s delete mode 100644 asm/nonmatchings/battle/move/spin_smash_737890/func_802A113C_7379CC.s delete mode 100644 asm/nonmatchings/battle/move/super_smash_775100/func_802A1000_775100.s delete mode 100644 asm/nonmatchings/battle/move/unknown_move_779C90/func_802A1000_779C90.s delete mode 100644 asm/nonmatchings/code_6F10E0/func_80238000_6F10E0.s delete mode 100644 asm/nonmatchings/code_6F10E0/func_80239190_6F2270.s delete mode 100644 asm/nonmatchings/code_73AED0/func_802A1000_73AED0.s delete mode 100644 asm/nonmatchings/code_73D860/func_802A1000_73D860.s delete mode 100644 asm/nonmatchings/code_75C980/func_802A1000_75C980.s delete mode 100644 asm/nonmatchings/code_75C980/func_802A10E4_75CA64.s delete mode 100644 asm/nonmatchings/code_75C980/func_802A1108_75CA88.s delete mode 100644 asm/nonmatchings/code_75C980/func_802A1228_75CBA8.s delete mode 100644 asm/nonmatchings/code_75C980/func_802A133C_75CCBC.s delete mode 100644 asm/nonmatchings/code_761920/func_802A1000_761920.s delete mode 100644 asm/nonmatchings/code_761920/func_802A10E4_761A04.s delete mode 100644 asm/nonmatchings/code_761920/func_802A1108_761A28.s delete mode 100644 asm/nonmatchings/code_761920/func_802A1228_761B48.s delete mode 100644 asm/nonmatchings/code_761920/func_802A133C_761C5C.s delete mode 100644 asm/nonmatchings/code_772BA0/func_802A1000_772BA0.s delete mode 100644 asm/nonmatchings/code_777690/func_802A1000_777690.s delete mode 100644 asm/nonmatchings/code_77F240/func_802A1000_77F240.s delete mode 100644 asm/nonmatchings/code_785B20/func_802A1000_785B20.s diff --git a/asm/nonmatchings/battle/move/auto_smash_763540/func_802A1000_763540.s b/asm/nonmatchings/battle/move/auto_smash_763540/func_802A1000_763540.s deleted file mode 100644 index ad33b0153d..0000000000 --- a/asm/nonmatchings/battle/move/auto_smash_763540/func_802A1000_763540.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_763540 -/* 763540 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 763544 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 763548 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 76354C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 763550 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 763554 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 763558 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 76355C 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 763560 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 763564 802A1024 0C03A752 */ jal is_ability_active -/* 763568 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 76356C 802A102C 10400003 */ beqz $v0, .L802A103C -/* 763570 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 763574 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 763578 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 76357C 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 763580 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 763584 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 763588 802A1048 03E00008 */ jr $ra -/* 76358C 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/d_down_jump_781920/func_802A1000_781920.s b/asm/nonmatchings/battle/move/d_down_jump_781920/func_802A1000_781920.s deleted file mode 100644 index c9f53caa5f..0000000000 --- a/asm/nonmatchings/battle/move/d_down_jump_781920/func_802A1000_781920.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_781920 -/* 781920 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 781924 802A1004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 781928 802A1008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 78192C 802A100C AFBF0020 */ sw $ra, 0x20($sp) -/* 781930 802A1010 AFB1001C */ sw $s1, 0x1c($sp) -/* 781934 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 781938 802A1018 8C6200D8 */ lw $v0, 0xd8($v1) -/* 78193C 802A101C 0080802D */ daddu $s0, $a0, $zero -/* 781940 802A1020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 781944 802A1024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 781948 802A1028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 78194C 802A102C C444014C */ lwc1 $f4, 0x14c($v0) -/* 781950 802A1030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 781954 802A1034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 781958 802A1038 44062000 */ mfc1 $a2, $f4 -/* 78195C 802A103C 44073000 */ mfc1 $a3, $f6 -/* 781960 802A1040 0060882D */ daddu $s1, $v1, $zero -/* 781964 802A1044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 781968 802A1048 0C00A7CB */ jal dist3D -/* 78196C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) -/* 781970 802A1050 3C014170 */ lui $at, 0x4170 -/* 781974 802A1054 44811000 */ mtc1 $at, $f2 -/* 781978 802A1058 00000000 */ nop -/* 78197C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 781980 802A1060 00000000 */ nop -/* 781984 802A1064 3C0142C8 */ lui $at, 0x42c8 -/* 781988 802A1068 44811000 */ mtc1 $at, $f2 -/* 78198C 802A106C 00000000 */ nop -/* 781990 802A1070 46020003 */ div.s $f0, $f0, $f2 -/* 781994 802A1074 4600020D */ trunc.w.s $f8, $f0 -/* 781998 802A1078 44024000 */ mfc1 $v0, $f8 -/* 78199C 802A107C 00000000 */ nop -/* 7819A0 802A1080 AE020084 */ sw $v0, 0x84($s0) -/* 7819A4 802A1084 28420015 */ slti $v0, $v0, 0x15 -/* 7819A8 802A1088 14400002 */ bnez $v0, .L802A1094 -/* 7819AC 802A108C 24020014 */ addiu $v0, $zero, 0x14 -/* 7819B0 802A1090 AE020084 */ sw $v0, 0x84($s0) -.L802A1094: -/* 7819B4 802A1094 82220083 */ lb $v0, 0x83($s1) -/* 7819B8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 7819BC 802A109C 00000000 */ nop -/* 7819C0 802A10A0 8E020084 */ lw $v0, 0x84($s0) -/* 7819C4 802A10A4 28420006 */ slti $v0, $v0, 6 -/* 7819C8 802A10A8 10400008 */ beqz $v0, .L802A10CC -/* 7819CC 802A10AC 24020006 */ addiu $v0, $zero, 6 -/* 7819D0 802A10B0 080A8433 */ j .L802A10CC -/* 7819D4 802A10B4 AE020084 */ sw $v0, 0x84($s0) -.L802A10B8: -/* 7819D8 802A10B8 8E020084 */ lw $v0, 0x84($s0) -/* 7819DC 802A10BC 2842000C */ slti $v0, $v0, 0xc -/* 7819E0 802A10C0 10400002 */ beqz $v0, .L802A10CC -/* 7819E4 802A10C4 2402000C */ addiu $v0, $zero, 0xc -/* 7819E8 802A10C8 AE020084 */ sw $v0, 0x84($s0) -.L802A10CC: -/* 7819EC 802A10CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 7819F0 802A10D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 7819F4 802A10D4 8FB00018 */ lw $s0, 0x18($sp) -/* 7819F8 802A10D8 24020002 */ addiu $v0, $zero, 2 -/* 7819FC 802A10DC 03E00008 */ jr $ra -/* 781A00 802A10E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/move/d_down_jump_781920/func_802A10E4_781A04.s b/asm/nonmatchings/battle/move/d_down_jump_781920/func_802A10E4_781A04.s deleted file mode 100644 index cfa32590e3..0000000000 --- a/asm/nonmatchings/battle/move/d_down_jump_781920/func_802A10E4_781A04.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10E4_781A04 -/* 781A04 802A10E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 781A08 802A10E8 AFB1001C */ sw $s1, 0x1c($sp) -/* 781A0C 802A10EC 0080882D */ daddu $s1, $a0, $zero -/* 781A10 802A10F0 AFBF0024 */ sw $ra, 0x24($sp) -/* 781A14 802A10F4 AFB20020 */ sw $s2, 0x20($sp) -/* 781A18 802A10F8 AFB00018 */ sw $s0, 0x18($sp) -/* 781A1C 802A10FC 8E30000C */ lw $s0, 0xc($s1) -/* 781A20 802A1100 8E050000 */ lw $a1, ($s0) -/* 781A24 802A1104 0C0B1EAF */ jal get_variable -/* 781A28 802A1108 26100004 */ addiu $s0, $s0, 4 -/* 781A2C 802A110C 8E050000 */ lw $a1, ($s0) -/* 781A30 802A1110 26100004 */ addiu $s0, $s0, 4 -/* 781A34 802A1114 0220202D */ daddu $a0, $s1, $zero -/* 781A38 802A1118 0C0B1EAF */ jal get_variable -/* 781A3C 802A111C 0040902D */ daddu $s2, $v0, $zero -/* 781A40 802A1120 0220202D */ daddu $a0, $s1, $zero -/* 781A44 802A1124 8E050000 */ lw $a1, ($s0) -/* 781A48 802A1128 0C0B1EAF */ jal get_variable -/* 781A4C 802A112C 0040802D */ daddu $s0, $v0, $zero -/* 781A50 802A1130 8E2300AC */ lw $v1, 0xac($s1) -/* 781A54 802A1134 1460000F */ bnez $v1, .L802A1174 -/* 781A58 802A1138 0000202D */ daddu $a0, $zero, $zero -/* 781A5C 802A113C 44920000 */ mtc1 $s2, $f0 -/* 781A60 802A1140 00000000 */ nop -/* 781A64 802A1144 46800020 */ cvt.s.w $f0, $f0 -/* 781A68 802A1148 44050000 */ mfc1 $a1, $f0 -/* 781A6C 802A114C 44900000 */ mtc1 $s0, $f0 -/* 781A70 802A1150 00000000 */ nop -/* 781A74 802A1154 46800020 */ cvt.s.w $f0, $f0 -/* 781A78 802A1158 44060000 */ mfc1 $a2, $f0 -/* 781A7C 802A115C 44820000 */ mtc1 $v0, $f0 -/* 781A80 802A1160 00000000 */ nop -/* 781A84 802A1164 46800020 */ cvt.s.w $f0, $f0 -/* 781A88 802A1168 44070000 */ mfc1 $a3, $f0 -/* 781A8C 802A116C 080A8469 */ j .L802A11A4 -/* 781A90 802A1170 24040001 */ addiu $a0, $zero, 1 -.L802A1174: -/* 781A94 802A1174 44920000 */ mtc1 $s2, $f0 -/* 781A98 802A1178 00000000 */ nop -/* 781A9C 802A117C 46800020 */ cvt.s.w $f0, $f0 -/* 781AA0 802A1180 44050000 */ mfc1 $a1, $f0 -/* 781AA4 802A1184 44900000 */ mtc1 $s0, $f0 -/* 781AA8 802A1188 00000000 */ nop -/* 781AAC 802A118C 46800020 */ cvt.s.w $f0, $f0 -/* 781AB0 802A1190 44060000 */ mfc1 $a2, $f0 -/* 781AB4 802A1194 44820000 */ mtc1 $v0, $f0 -/* 781AB8 802A1198 00000000 */ nop -/* 781ABC 802A119C 46800020 */ cvt.s.w $f0, $f0 -/* 781AC0 802A11A0 44070000 */ mfc1 $a3, $f0 -.L802A11A4: -/* 781AC4 802A11A4 0C01C2D4 */ jal func_80070B50 -/* 781AC8 802A11A8 AFA00010 */ sw $zero, 0x10($sp) -/* 781ACC 802A11AC 8FBF0024 */ lw $ra, 0x24($sp) -/* 781AD0 802A11B0 8FB20020 */ lw $s2, 0x20($sp) -/* 781AD4 802A11B4 8FB1001C */ lw $s1, 0x1c($sp) -/* 781AD8 802A11B8 8FB00018 */ lw $s0, 0x18($sp) -/* 781ADC 802A11BC 24020002 */ addiu $v0, $zero, 2 -/* 781AE0 802A11C0 03E00008 */ jr $ra -/* 781AE4 802A11C4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 781AE8 802A11C8 00000000 */ nop -/* 781AEC 802A11CC 00000000 */ nop diff --git a/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A1000_74AD90.s b/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A1000_74AD90.s deleted file mode 100644 index e359dcebb3..0000000000 --- a/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A1000_74AD90.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_74AD90 -/* 74AD90 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 74AD94 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 74AD98 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 74AD9C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 74ADA0 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 74ADA4 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 74ADA8 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 74ADAC 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 74ADB0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 74ADB4 802A1024 0C03A752 */ jal is_ability_active -/* 74ADB8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 74ADBC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 74ADC0 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 74ADC4 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 74ADC8 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 74ADCC 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 74ADD0 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 74ADD4 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 74ADD8 802A1048 03E00008 */ jr $ra -/* 74ADDC 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A1050_74ADE0.s b/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A1050_74ADE0.s deleted file mode 100644 index aa1cfd7609..0000000000 --- a/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A1050_74ADE0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1050_74ADE0 -/* 74ADE0 802A1050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 74ADE4 802A1054 AFB00010 */ sw $s0, 0x10($sp) -/* 74ADE8 802A1058 0080802D */ daddu $s0, $a0, $zero -/* 74ADEC 802A105C 24040016 */ addiu $a0, $zero, 0x16 -/* 74ADF0 802A1060 AFBF0014 */ sw $ra, 0x14($sp) -/* 74ADF4 802A1064 0C03A752 */ jal is_ability_active -/* 74ADF8 802A1068 AE000084 */ sw $zero, 0x84($s0) -/* 74ADFC 802A106C 10400002 */ beqz $v0, .L802A1078 -/* 74AE00 802A1070 24020001 */ addiu $v0, $zero, 1 -/* 74AE04 802A1074 AE020084 */ sw $v0, 0x84($s0) -.L802A1078: -/* 74AE08 802A1078 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 74AE0C 802A107C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) -/* 74AE10 802A1080 30421000 */ andi $v0, $v0, 0x1000 -/* 74AE14 802A1084 10400002 */ beqz $v0, .L802A1090 -/* 74AE18 802A1088 24020001 */ addiu $v0, $zero, 1 -/* 74AE1C 802A108C AE020084 */ sw $v0, 0x84($s0) -.L802A1090: -/* 74AE20 802A1090 8FBF0014 */ lw $ra, 0x14($sp) -/* 74AE24 802A1094 8FB00010 */ lw $s0, 0x10($sp) -/* 74AE28 802A1098 24020002 */ addiu $v0, $zero, 2 -/* 74AE2C 802A109C 03E00008 */ jr $ra -/* 74AE30 802A10A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A10A4_74AE34.s b/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A10A4_74AE34.s deleted file mode 100644 index 1420d1c3f8..0000000000 --- a/asm/nonmatchings/battle/move/d_down_pound_74AD90/func_802A10A4_74AE34.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10A4_74AE34 -/* 74AE34 802A10A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 74AE38 802A10A8 AFB1001C */ sw $s1, 0x1c($sp) -/* 74AE3C 802A10AC 0080882D */ daddu $s1, $a0, $zero -/* 74AE40 802A10B0 AFBF0024 */ sw $ra, 0x24($sp) -/* 74AE44 802A10B4 AFB20020 */ sw $s2, 0x20($sp) -/* 74AE48 802A10B8 AFB00018 */ sw $s0, 0x18($sp) -/* 74AE4C 802A10BC 8E30000C */ lw $s0, 0xc($s1) -/* 74AE50 802A10C0 8E050000 */ lw $a1, ($s0) -/* 74AE54 802A10C4 0C0B1EAF */ jal get_variable -/* 74AE58 802A10C8 26100004 */ addiu $s0, $s0, 4 -/* 74AE5C 802A10CC 8E050000 */ lw $a1, ($s0) -/* 74AE60 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 74AE64 802A10D4 0220202D */ daddu $a0, $s1, $zero -/* 74AE68 802A10D8 0C0B1EAF */ jal get_variable -/* 74AE6C 802A10DC 0040902D */ daddu $s2, $v0, $zero -/* 74AE70 802A10E0 0220202D */ daddu $a0, $s1, $zero -/* 74AE74 802A10E4 8E050000 */ lw $a1, ($s0) -/* 74AE78 802A10E8 0C0B1EAF */ jal get_variable -/* 74AE7C 802A10EC 0040802D */ daddu $s0, $v0, $zero -/* 74AE80 802A10F0 8E2300AC */ lw $v1, 0xac($s1) -/* 74AE84 802A10F4 14600013 */ bnez $v1, .L802A1144 -/* 74AE88 802A10F8 0040382D */ daddu $a3, $v0, $zero -/* 74AE8C 802A10FC 2642001E */ addiu $v0, $s2, 0x1e -/* 74AE90 802A1100 44821000 */ mtc1 $v0, $f2 -/* 74AE94 802A1104 00000000 */ nop -/* 74AE98 802A1108 468010A0 */ cvt.s.w $f2, $f2 -/* 74AE9C 802A110C 26020019 */ addiu $v0, $s0, 0x19 -/* 74AEA0 802A1110 44051000 */ mfc1 $a1, $f2 -/* 74AEA4 802A1114 44821000 */ mtc1 $v0, $f2 -/* 74AEA8 802A1118 00000000 */ nop -/* 74AEAC 802A111C 468010A0 */ cvt.s.w $f2, $f2 -/* 74AEB0 802A1120 44061000 */ mfc1 $a2, $f2 -/* 74AEB4 802A1124 44871000 */ mtc1 $a3, $f2 -/* 74AEB8 802A1128 00000000 */ nop -/* 74AEBC 802A112C 468010A0 */ cvt.s.w $f2, $f2 -/* 74AEC0 802A1130 3C014234 */ lui $at, 0x4234 -/* 74AEC4 802A1134 44810000 */ mtc1 $at, $f0 -/* 74AEC8 802A1138 44071000 */ mfc1 $a3, $f2 -/* 74AECC 802A113C 080A8462 */ j .L802A1188 -/* 74AED0 802A1140 24040001 */ addiu $a0, $zero, 1 -.L802A1144: -/* 74AED4 802A1144 2642001E */ addiu $v0, $s2, 0x1e -/* 74AED8 802A1148 44821000 */ mtc1 $v0, $f2 -/* 74AEDC 802A114C 00000000 */ nop -/* 74AEE0 802A1150 468010A0 */ cvt.s.w $f2, $f2 -/* 74AEE4 802A1154 26020019 */ addiu $v0, $s0, 0x19 -/* 74AEE8 802A1158 44051000 */ mfc1 $a1, $f2 -/* 74AEEC 802A115C 44821000 */ mtc1 $v0, $f2 -/* 74AEF0 802A1160 00000000 */ nop -/* 74AEF4 802A1164 468010A0 */ cvt.s.w $f2, $f2 -/* 74AEF8 802A1168 44061000 */ mfc1 $a2, $f2 -/* 74AEFC 802A116C 44871000 */ mtc1 $a3, $f2 -/* 74AF00 802A1170 00000000 */ nop -/* 74AF04 802A1174 468010A0 */ cvt.s.w $f2, $f2 -/* 74AF08 802A1178 3C014234 */ lui $at, 0x4234 -/* 74AF0C 802A117C 44810000 */ mtc1 $at, $f0 -/* 74AF10 802A1180 44071000 */ mfc1 $a3, $f2 -/* 74AF14 802A1184 0000202D */ daddu $a0, $zero, $zero -.L802A1188: -/* 74AF18 802A1188 0C01C2D4 */ jal func_80070B50 -/* 74AF1C 802A118C E7A00010 */ swc1 $f0, 0x10($sp) -/* 74AF20 802A1190 8FBF0024 */ lw $ra, 0x24($sp) -/* 74AF24 802A1194 8FB20020 */ lw $s2, 0x20($sp) -/* 74AF28 802A1198 8FB1001C */ lw $s1, 0x1c($sp) -/* 74AF2C 802A119C 8FB00018 */ lw $s0, 0x18($sp) -/* 74AF30 802A11A0 24020002 */ addiu $v0, $zero, 2 -/* 74AF34 802A11A4 03E00008 */ jr $ra -/* 74AF38 802A11A8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 74AF3C 802A11AC 00000000 */ nop diff --git a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A1000_74F130.s b/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A1000_74F130.s deleted file mode 100644 index b73f9df9a4..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A1000_74F130.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_74F130 -/* 74F130 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 74F134 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 74F138 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 74F13C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 74F140 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 74F144 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 74F148 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 74F14C 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 74F150 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 74F154 802A1024 0C03A752 */ jal is_ability_active -/* 74F158 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 74F15C 802A102C 10400003 */ beqz $v0, .L802A103C -/* 74F160 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 74F164 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 74F168 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 74F16C 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 74F170 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 74F174 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 74F178 802A1048 03E00008 */ jr $ra -/* 74F17C 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A1050_74F180.s b/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A1050_74F180.s deleted file mode 100644 index b1fa24cfa5..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A1050_74F180.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1050_74F180 -/* 74F180 802A1050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 74F184 802A1054 AFB00010 */ sw $s0, 0x10($sp) -/* 74F188 802A1058 0080802D */ daddu $s0, $a0, $zero -/* 74F18C 802A105C 24040016 */ addiu $a0, $zero, 0x16 -/* 74F190 802A1060 AFBF0014 */ sw $ra, 0x14($sp) -/* 74F194 802A1064 0C03A752 */ jal is_ability_active -/* 74F198 802A1068 AE000084 */ sw $zero, 0x84($s0) -/* 74F19C 802A106C 10400002 */ beqz $v0, .L802A1078 -/* 74F1A0 802A1070 24020001 */ addiu $v0, $zero, 1 -/* 74F1A4 802A1074 AE020084 */ sw $v0, 0x84($s0) -.L802A1078: -/* 74F1A8 802A1078 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 74F1AC 802A107C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) -/* 74F1B0 802A1080 30421000 */ andi $v0, $v0, 0x1000 -/* 74F1B4 802A1084 10400002 */ beqz $v0, .L802A1090 -/* 74F1B8 802A1088 24020001 */ addiu $v0, $zero, 1 -/* 74F1BC 802A108C AE020084 */ sw $v0, 0x84($s0) -.L802A1090: -/* 74F1C0 802A1090 8FBF0014 */ lw $ra, 0x14($sp) -/* 74F1C4 802A1094 8FB00010 */ lw $s0, 0x10($sp) -/* 74F1C8 802A1098 24020002 */ addiu $v0, $zero, 2 -/* 74F1CC 802A109C 03E00008 */ jr $ra -/* 74F1D0 802A10A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A10A4_74F1D4.s b/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A10A4_74F1D4.s deleted file mode 100644 index 058c3e56bb..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A10A4_74F1D4.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10A4_74F1D4 -/* 74F1D4 802A10A4 AC800084 */ sw $zero, 0x84($a0) -/* 74F1D8 802A10A8 3C02800E */ lui $v0, %hi(gBattleStatus+0x96) -/* 74F1DC 802A10AC 8042C106 */ lb $v0, %lo(gBattleStatus+0x96)($v0) -/* 74F1E0 802A10B0 28420063 */ slti $v0, $v0, 0x63 -/* 74F1E4 802A10B4 14400002 */ bnez $v0, .L802A10C0 -/* 74F1E8 802A10B8 24020001 */ addiu $v0, $zero, 1 -/* 74F1EC 802A10BC AC820084 */ sw $v0, 0x84($a0) -.L802A10C0: -/* 74F1F0 802A10C0 03E00008 */ jr $ra -/* 74F1F4 802A10C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A10C8_74F1F8.s b/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A10C8_74F1F8.s deleted file mode 100644 index d17c777d74..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A10C8_74F1F8.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10C8_74F1F8 -/* 74F1F8 802A10C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 74F1FC 802A10CC AFB1001C */ sw $s1, 0x1c($sp) -/* 74F200 802A10D0 0080882D */ daddu $s1, $a0, $zero -/* 74F204 802A10D4 AFBF0024 */ sw $ra, 0x24($sp) -/* 74F208 802A10D8 AFB20020 */ sw $s2, 0x20($sp) -/* 74F20C 802A10DC AFB00018 */ sw $s0, 0x18($sp) -/* 74F210 802A10E0 8E30000C */ lw $s0, 0xc($s1) -/* 74F214 802A10E4 8E050000 */ lw $a1, ($s0) -/* 74F218 802A10E8 0C0B1EAF */ jal get_variable -/* 74F21C 802A10EC 26100004 */ addiu $s0, $s0, 4 -/* 74F220 802A10F0 8E050000 */ lw $a1, ($s0) -/* 74F224 802A10F4 26100004 */ addiu $s0, $s0, 4 -/* 74F228 802A10F8 0220202D */ daddu $a0, $s1, $zero -/* 74F22C 802A10FC 0C0B1EAF */ jal get_variable -/* 74F230 802A1100 0040902D */ daddu $s2, $v0, $zero -/* 74F234 802A1104 0220202D */ daddu $a0, $s1, $zero -/* 74F238 802A1108 8E050000 */ lw $a1, ($s0) -/* 74F23C 802A110C 0C0B1EAF */ jal get_variable -/* 74F240 802A1110 0040802D */ daddu $s0, $v0, $zero -/* 74F244 802A1114 0000202D */ daddu $a0, $zero, $zero -/* 74F248 802A1118 44921000 */ mtc1 $s2, $f2 -/* 74F24C 802A111C 00000000 */ nop -/* 74F250 802A1120 468010A0 */ cvt.s.w $f2, $f2 -/* 74F254 802A1124 44051000 */ mfc1 $a1, $f2 -/* 74F258 802A1128 44901000 */ mtc1 $s0, $f2 -/* 74F25C 802A112C 00000000 */ nop -/* 74F260 802A1130 468010A0 */ cvt.s.w $f2, $f2 -/* 74F264 802A1134 44061000 */ mfc1 $a2, $f2 -/* 74F268 802A1138 44821000 */ mtc1 $v0, $f2 -/* 74F26C 802A113C 00000000 */ nop -/* 74F270 802A1140 468010A0 */ cvt.s.w $f2, $f2 -/* 74F274 802A1144 3C013F80 */ lui $at, 0x3f80 -/* 74F278 802A1148 44810000 */ mtc1 $at, $f0 -/* 74F27C 802A114C 44071000 */ mfc1 $a3, $f2 -/* 74F280 802A1150 2403003C */ addiu $v1, $zero, 0x3c -/* 74F284 802A1154 AFA30014 */ sw $v1, 0x14($sp) -/* 74F288 802A1158 0C01C634 */ jal func_800718D0 -/* 74F28C 802A115C E7A00010 */ swc1 $f0, 0x10($sp) -/* 74F290 802A1160 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 74F294 802A1164 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 74F298 802A1168 92020096 */ lbu $v0, 0x96($s0) -/* 74F29C 802A116C 24420001 */ addiu $v0, $v0, 1 -/* 74F2A0 802A1170 A2020096 */ sb $v0, 0x96($s0) -/* 74F2A4 802A1174 00021600 */ sll $v0, $v0, 0x18 -/* 74F2A8 802A1178 00021603 */ sra $v0, $v0, 0x18 -/* 74F2AC 802A117C 28420064 */ slti $v0, $v0, 0x64 -/* 74F2B0 802A1180 14400003 */ bnez $v0, .L802A1190 -/* 74F2B4 802A1184 0200882D */ daddu $s1, $s0, $zero -/* 74F2B8 802A1188 24020063 */ addiu $v0, $zero, 0x63 -/* 74F2BC 802A118C A2020096 */ sb $v0, 0x96($s0) -.L802A1190: -/* 74F2C0 802A1190 3C03DFFF */ lui $v1, 0xdfff -/* 74F2C4 802A1194 3463FFFF */ ori $v1, $v1, 0xffff -/* 74F2C8 802A1198 8E240000 */ lw $a0, ($s1) -/* 74F2CC 802A119C 3C051000 */ lui $a1, 0x1000 -/* 74F2D0 802A11A0 A2200097 */ sb $zero, 0x97($s1) -/* 74F2D4 802A11A4 00852025 */ or $a0, $a0, $a1 -/* 74F2D8 802A11A8 00832024 */ and $a0, $a0, $v1 -/* 74F2DC 802A11AC AE240000 */ sw $a0, ($s1) -/* 74F2E0 802A11B0 8FBF0024 */ lw $ra, 0x24($sp) -/* 74F2E4 802A11B4 8FB20020 */ lw $s2, 0x20($sp) -/* 74F2E8 802A11B8 8FB1001C */ lw $s1, 0x1c($sp) -/* 74F2EC 802A11BC 8FB00018 */ lw $s0, 0x18($sp) -/* 74F2F0 802A11C0 24020002 */ addiu $v0, $zero, 2 -/* 74F2F4 802A11C4 03E00008 */ jr $ra -/* 74F2F8 802A11C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A11CC_74F2FC.s b/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A11CC_74F2FC.s deleted file mode 100644 index 05459ef1fa..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_0_74F130/func_802A11CC_74F2FC.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11CC_74F2FC -/* 74F2FC 802A11CC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 74F300 802A11D0 AFB1001C */ sw $s1, 0x1c($sp) -/* 74F304 802A11D4 0080882D */ daddu $s1, $a0, $zero -/* 74F308 802A11D8 AFBF0028 */ sw $ra, 0x28($sp) -/* 74F30C 802A11DC AFB30024 */ sw $s3, 0x24($sp) -/* 74F310 802A11E0 AFB20020 */ sw $s2, 0x20($sp) -/* 74F314 802A11E4 AFB00018 */ sw $s0, 0x18($sp) -/* 74F318 802A11E8 8E30000C */ lw $s0, 0xc($s1) -/* 74F31C 802A11EC 8E050000 */ lw $a1, ($s0) -/* 74F320 802A11F0 0C0B1EAF */ jal get_variable -/* 74F324 802A11F4 26100004 */ addiu $s0, $s0, 4 -/* 74F328 802A11F8 8E050000 */ lw $a1, ($s0) -/* 74F32C 802A11FC 26100004 */ addiu $s0, $s0, 4 -/* 74F330 802A1200 0220202D */ daddu $a0, $s1, $zero -/* 74F334 802A1204 0C0B1EAF */ jal get_variable -/* 74F338 802A1208 0040982D */ daddu $s3, $v0, $zero -/* 74F33C 802A120C 8E050000 */ lw $a1, ($s0) -/* 74F340 802A1210 26100004 */ addiu $s0, $s0, 4 -/* 74F344 802A1214 0220202D */ daddu $a0, $s1, $zero -/* 74F348 802A1218 0C0B1EAF */ jal get_variable -/* 74F34C 802A121C 0040902D */ daddu $s2, $v0, $zero -/* 74F350 802A1220 0220202D */ daddu $a0, $s1, $zero -/* 74F354 802A1224 8E050000 */ lw $a1, ($s0) -/* 74F358 802A1228 0C0B210B */ jal get_float_variable -/* 74F35C 802A122C 0040802D */ daddu $s0, $v0, $zero -/* 74F360 802A1230 24040006 */ addiu $a0, $zero, 6 -/* 74F364 802A1234 2673000A */ addiu $s3, $s3, 0xa -/* 74F368 802A1238 44931000 */ mtc1 $s3, $f2 -/* 74F36C 802A123C 00000000 */ nop -/* 74F370 802A1240 468010A0 */ cvt.s.w $f2, $f2 -/* 74F374 802A1244 26520012 */ addiu $s2, $s2, 0x12 -/* 74F378 802A1248 44051000 */ mfc1 $a1, $f2 -/* 74F37C 802A124C 44921000 */ mtc1 $s2, $f2 -/* 74F380 802A1250 00000000 */ nop -/* 74F384 802A1254 468010A0 */ cvt.s.w $f2, $f2 -/* 74F388 802A1258 44061000 */ mfc1 $a2, $f2 -/* 74F38C 802A125C 44901000 */ mtc1 $s0, $f2 -/* 74F390 802A1260 00000000 */ nop -/* 74F394 802A1264 468010A0 */ cvt.s.w $f2, $f2 -/* 74F398 802A1268 44071000 */ mfc1 $a3, $f2 -/* 74F39C 802A126C 2402002D */ addiu $v0, $zero, 0x2d -/* 74F3A0 802A1270 E7A00010 */ swc1 $f0, 0x10($sp) -/* 74F3A4 802A1274 0C01C82C */ jal func_800720B0 -/* 74F3A8 802A1278 AFA20014 */ sw $v0, 0x14($sp) -/* 74F3AC 802A127C 8FBF0028 */ lw $ra, 0x28($sp) -/* 74F3B0 802A1280 8FB30024 */ lw $s3, 0x24($sp) -/* 74F3B4 802A1284 8FB20020 */ lw $s2, 0x20($sp) -/* 74F3B8 802A1288 8FB1001C */ lw $s1, 0x1c($sp) -/* 74F3BC 802A128C 8FB00018 */ lw $s0, 0x18($sp) -/* 74F3C0 802A1290 24020002 */ addiu $v0, $zero, 2 -/* 74F3C4 802A1294 03E00008 */ jr $ra -/* 74F3C8 802A1298 27BD0030 */ addiu $sp, $sp, 0x30 -/* 74F3CC 802A129C 00000000 */ nop diff --git a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A1000_7595B0.s b/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A1000_7595B0.s deleted file mode 100644 index a738b056a9..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A1000_7595B0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7595B0 -/* 7595B0 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7595B4 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 7595B8 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 7595BC 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 7595C0 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 7595C4 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 7595C8 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 7595CC 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 7595D0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 7595D4 802A1024 0C03A752 */ jal is_ability_active -/* 7595D8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 7595DC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 7595E0 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 7595E4 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 7595E8 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 7595EC 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7595F0 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 7595F4 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 7595F8 802A1048 03E00008 */ jr $ra -/* 7595FC 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A1050_759600.s b/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A1050_759600.s deleted file mode 100644 index d72a7fb3b4..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A1050_759600.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1050_759600 -/* 759600 802A1050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 759604 802A1054 AFB00010 */ sw $s0, 0x10($sp) -/* 759608 802A1058 0080802D */ daddu $s0, $a0, $zero -/* 75960C 802A105C 24040016 */ addiu $a0, $zero, 0x16 -/* 759610 802A1060 AFBF0014 */ sw $ra, 0x14($sp) -/* 759614 802A1064 0C03A752 */ jal is_ability_active -/* 759618 802A1068 AE000084 */ sw $zero, 0x84($s0) -/* 75961C 802A106C 10400002 */ beqz $v0, .L802A1078 -/* 759620 802A1070 24020001 */ addiu $v0, $zero, 1 -/* 759624 802A1074 AE020084 */ sw $v0, 0x84($s0) -.L802A1078: -/* 759628 802A1078 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 75962C 802A107C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) -/* 759630 802A1080 30421000 */ andi $v0, $v0, 0x1000 -/* 759634 802A1084 10400002 */ beqz $v0, .L802A1090 -/* 759638 802A1088 24020001 */ addiu $v0, $zero, 1 -/* 75963C 802A108C AE020084 */ sw $v0, 0x84($s0) -.L802A1090: -/* 759640 802A1090 8FBF0014 */ lw $ra, 0x14($sp) -/* 759644 802A1094 8FB00010 */ lw $s0, 0x10($sp) -/* 759648 802A1098 24020002 */ addiu $v0, $zero, 2 -/* 75964C 802A109C 03E00008 */ jr $ra -/* 759650 802A10A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A10A4_759654.s b/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A10A4_759654.s deleted file mode 100644 index 1264c4e58a..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A10A4_759654.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10A4_759654 -/* 759654 802A10A4 AC800084 */ sw $zero, 0x84($a0) -/* 759658 802A10A8 3C02800E */ lui $v0, %hi(gBattleStatus+0x96) -/* 75965C 802A10AC 8042C106 */ lb $v0, %lo(gBattleStatus+0x96)($v0) -/* 759660 802A10B0 28420063 */ slti $v0, $v0, 0x63 -/* 759664 802A10B4 14400002 */ bnez $v0, .L802A10C0 -/* 759668 802A10B8 24020001 */ addiu $v0, $zero, 1 -/* 75966C 802A10BC AC820084 */ sw $v0, 0x84($a0) -.L802A10C0: -/* 759670 802A10C0 03E00008 */ jr $ra -/* 759674 802A10C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A10C8_759678.s b/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A10C8_759678.s deleted file mode 100644 index 46e3be57b3..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A10C8_759678.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10C8_759678 -/* 759678 802A10C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 75967C 802A10CC AFB1001C */ sw $s1, 0x1c($sp) -/* 759680 802A10D0 0080882D */ daddu $s1, $a0, $zero -/* 759684 802A10D4 AFBF0024 */ sw $ra, 0x24($sp) -/* 759688 802A10D8 AFB20020 */ sw $s2, 0x20($sp) -/* 75968C 802A10DC AFB00018 */ sw $s0, 0x18($sp) -/* 759690 802A10E0 8E30000C */ lw $s0, 0xc($s1) -/* 759694 802A10E4 8E050000 */ lw $a1, ($s0) -/* 759698 802A10E8 0C0B1EAF */ jal get_variable -/* 75969C 802A10EC 26100004 */ addiu $s0, $s0, 4 -/* 7596A0 802A10F0 8E050000 */ lw $a1, ($s0) -/* 7596A4 802A10F4 26100004 */ addiu $s0, $s0, 4 -/* 7596A8 802A10F8 0220202D */ daddu $a0, $s1, $zero -/* 7596AC 802A10FC 0C0B1EAF */ jal get_variable -/* 7596B0 802A1100 0040902D */ daddu $s2, $v0, $zero -/* 7596B4 802A1104 0220202D */ daddu $a0, $s1, $zero -/* 7596B8 802A1108 8E050000 */ lw $a1, ($s0) -/* 7596BC 802A110C 0C0B1EAF */ jal get_variable -/* 7596C0 802A1110 0040802D */ daddu $s0, $v0, $zero -/* 7596C4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 7596C8 802A1118 44921000 */ mtc1 $s2, $f2 -/* 7596CC 802A111C 00000000 */ nop -/* 7596D0 802A1120 468010A0 */ cvt.s.w $f2, $f2 -/* 7596D4 802A1124 44051000 */ mfc1 $a1, $f2 -/* 7596D8 802A1128 44901000 */ mtc1 $s0, $f2 -/* 7596DC 802A112C 00000000 */ nop -/* 7596E0 802A1130 468010A0 */ cvt.s.w $f2, $f2 -/* 7596E4 802A1134 44061000 */ mfc1 $a2, $f2 -/* 7596E8 802A1138 44821000 */ mtc1 $v0, $f2 -/* 7596EC 802A113C 00000000 */ nop -/* 7596F0 802A1140 468010A0 */ cvt.s.w $f2, $f2 -/* 7596F4 802A1144 3C013F80 */ lui $at, 0x3f80 -/* 7596F8 802A1148 44810000 */ mtc1 $at, $f0 -/* 7596FC 802A114C 44071000 */ mfc1 $a3, $f2 -/* 759700 802A1150 2403003C */ addiu $v1, $zero, 0x3c -/* 759704 802A1154 AFA30014 */ sw $v1, 0x14($sp) -/* 759708 802A1158 0C01C634 */ jal func_800718D0 -/* 75970C 802A115C E7A00010 */ swc1 $f0, 0x10($sp) -/* 759710 802A1160 3C04802A */ lui $a0, %hi(D_802A43D0) -/* 759714 802A1164 248443D0 */ addiu $a0, $a0, %lo(D_802A43D0) -/* 759718 802A1168 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 75971C 802A116C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 759720 802A1170 AC800000 */ sw $zero, ($a0) -/* 759724 802A1174 82020096 */ lb $v0, 0x96($s0) -/* 759728 802A1178 92030096 */ lbu $v1, 0x96($s0) -/* 75972C 802A117C 18400003 */ blez $v0, .L802A118C -/* 759730 802A1180 0200882D */ daddu $s1, $s0, $zero -/* 759734 802A1184 24020001 */ addiu $v0, $zero, 1 -/* 759738 802A1188 AC820000 */ sw $v0, ($a0) -.L802A118C: -/* 75973C 802A118C 24620002 */ addiu $v0, $v1, 2 -/* 759740 802A1190 A2020096 */ sb $v0, 0x96($s0) -/* 759744 802A1194 00021600 */ sll $v0, $v0, 0x18 -/* 759748 802A1198 00021603 */ sra $v0, $v0, 0x18 -/* 75974C 802A119C 28420064 */ slti $v0, $v0, 0x64 -/* 759750 802A11A0 14400003 */ bnez $v0, .L802A11B0 -/* 759754 802A11A4 3C03DFFF */ lui $v1, 0xdfff -/* 759758 802A11A8 24020063 */ addiu $v0, $zero, 0x63 -/* 75975C 802A11AC A2020096 */ sb $v0, 0x96($s0) -.L802A11B0: -/* 759760 802A11B0 3463FFFF */ ori $v1, $v1, 0xffff -/* 759764 802A11B4 8E240000 */ lw $a0, ($s1) -/* 759768 802A11B8 3C051000 */ lui $a1, 0x1000 -/* 75976C 802A11BC A2200097 */ sb $zero, 0x97($s1) -/* 759770 802A11C0 00852025 */ or $a0, $a0, $a1 -/* 759774 802A11C4 00832024 */ and $a0, $a0, $v1 -/* 759778 802A11C8 AE240000 */ sw $a0, ($s1) -/* 75977C 802A11CC 8FBF0024 */ lw $ra, 0x24($sp) -/* 759780 802A11D0 8FB20020 */ lw $s2, 0x20($sp) -/* 759784 802A11D4 8FB1001C */ lw $s1, 0x1c($sp) -/* 759788 802A11D8 8FB00018 */ lw $s0, 0x18($sp) -/* 75978C 802A11DC 24020002 */ addiu $v0, $zero, 2 -/* 759790 802A11E0 03E00008 */ jr $ra -/* 759794 802A11E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A11E8_759798.s b/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A11E8_759798.s deleted file mode 100644 index b55a102a5b..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A11E8_759798.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11E8_759798 -/* 759798 802A11E8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 75979C 802A11EC AFB20020 */ sw $s2, 0x20($sp) -/* 7597A0 802A11F0 0080902D */ daddu $s2, $a0, $zero -/* 7597A4 802A11F4 AFBF0028 */ sw $ra, 0x28($sp) -/* 7597A8 802A11F8 AFB30024 */ sw $s3, 0x24($sp) -/* 7597AC 802A11FC AFB1001C */ sw $s1, 0x1c($sp) -/* 7597B0 802A1200 AFB00018 */ sw $s0, 0x18($sp) -/* 7597B4 802A1204 F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 7597B8 802A1208 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 7597BC 802A120C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 7597C0 802A1210 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 7597C4 802A1214 8E50000C */ lw $s0, 0xc($s2) -/* 7597C8 802A1218 8E050000 */ lw $a1, ($s0) -/* 7597CC 802A121C 0C0B1EAF */ jal get_variable -/* 7597D0 802A1220 26100004 */ addiu $s0, $s0, 4 -/* 7597D4 802A1224 8E050000 */ lw $a1, ($s0) -/* 7597D8 802A1228 26100004 */ addiu $s0, $s0, 4 -/* 7597DC 802A122C 0240202D */ daddu $a0, $s2, $zero -/* 7597E0 802A1230 0C0B1EAF */ jal get_variable -/* 7597E4 802A1234 0040982D */ daddu $s3, $v0, $zero -/* 7597E8 802A1238 8E050000 */ lw $a1, ($s0) -/* 7597EC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 7597F0 802A1240 0240202D */ daddu $a0, $s2, $zero -/* 7597F4 802A1244 0C0B1EAF */ jal get_variable -/* 7597F8 802A1248 0040882D */ daddu $s1, $v0, $zero -/* 7597FC 802A124C 0240202D */ daddu $a0, $s2, $zero -/* 759800 802A1250 8E050000 */ lw $a1, ($s0) -/* 759804 802A1254 0C0B210B */ jal get_float_variable -/* 759808 802A1258 0040802D */ daddu $s0, $v0, $zero -/* 75980C 802A125C 24040006 */ addiu $a0, $zero, 6 -/* 759810 802A1260 2673000A */ addiu $s3, $s3, 0xa -/* 759814 802A1264 4493D000 */ mtc1 $s3, $f26 -/* 759818 802A1268 00000000 */ nop -/* 75981C 802A126C 4680D6A0 */ cvt.s.w $f26, $f26 -/* 759820 802A1270 26310012 */ addiu $s1, $s1, 0x12 -/* 759824 802A1274 4491C000 */ mtc1 $s1, $f24 -/* 759828 802A1278 00000000 */ nop -/* 75982C 802A127C 4680C620 */ cvt.s.w $f24, $f24 -/* 759830 802A1280 4490A000 */ mtc1 $s0, $f20 -/* 759834 802A1284 00000000 */ nop -/* 759838 802A1288 4680A520 */ cvt.s.w $f20, $f20 -/* 75983C 802A128C 46000586 */ mov.s $f22, $f0 -/* 759840 802A1290 4405D000 */ mfc1 $a1, $f26 -/* 759844 802A1294 4406C000 */ mfc1 $a2, $f24 -/* 759848 802A1298 4407A000 */ mfc1 $a3, $f20 -/* 75984C 802A129C 2402002D */ addiu $v0, $zero, 0x2d -/* 759850 802A12A0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 759854 802A12A4 0C01C82C */ jal func_800720B0 -/* 759858 802A12A8 AFA20014 */ sw $v0, 0x14($sp) -/* 75985C 802A12AC 2404000C */ addiu $a0, $zero, 0xc -/* 759860 802A12B0 4405D000 */ mfc1 $a1, $f26 -/* 759864 802A12B4 4406C000 */ mfc1 $a2, $f24 -/* 759868 802A12B8 4407A000 */ mfc1 $a3, $f20 -/* 75986C 802A12BC 2402001E */ addiu $v0, $zero, 0x1e -/* 759870 802A12C0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 759874 802A12C4 0C01C2EC */ jal func_80070BB0 -/* 759878 802A12C8 AFA20014 */ sw $v0, 0x14($sp) -/* 75987C 802A12CC 8FBF0028 */ lw $ra, 0x28($sp) -/* 759880 802A12D0 8FB30024 */ lw $s3, 0x24($sp) -/* 759884 802A12D4 8FB20020 */ lw $s2, 0x20($sp) -/* 759888 802A12D8 8FB1001C */ lw $s1, 0x1c($sp) -/* 75988C 802A12DC 8FB00018 */ lw $s0, 0x18($sp) -/* 759890 802A12E0 D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 759894 802A12E4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 759898 802A12E8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 75989C 802A12EC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 7598A0 802A12F0 24020002 */ addiu $v0, $zero, 2 -/* 7598A4 802A12F4 03E00008 */ jr $ra -/* 7598A8 802A12F8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A12FC_7598AC.s b/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A12FC_7598AC.s deleted file mode 100644 index 1ad920bc2b..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_1_7595B0/func_802A12FC_7598AC.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12FC_7598AC -/* 7598AC 802A12FC 3C02802A */ lui $v0, %hi(D_802A43D0) -/* 7598B0 802A1300 8C4243D0 */ lw $v0, %lo(D_802A43D0)($v0) -/* 7598B4 802A1304 54400002 */ bnel $v0, $zero, .L802A1310 -/* 7598B8 802A1308 24020005 */ addiu $v0, $zero, 5 -/* 7598BC 802A130C 24020004 */ addiu $v0, $zero, 4 -.L802A1310: -/* 7598C0 802A1310 AC820084 */ sw $v0, 0x84($a0) -/* 7598C4 802A1314 03E00008 */ jr $ra -/* 7598C8 802A1318 24020002 */ addiu $v0, $zero, 2 -/* 7598CC 802A131C 00000000 */ nop diff --git a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A1000_75E5D0.s b/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A1000_75E5D0.s deleted file mode 100644 index 1b09f314c5..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A1000_75E5D0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_75E5D0 -/* 75E5D0 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 75E5D4 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 75E5D8 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 75E5DC 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 75E5E0 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 75E5E4 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 75E5E8 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 75E5EC 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 75E5F0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 75E5F4 802A1024 0C03A752 */ jal is_ability_active -/* 75E5F8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 75E5FC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 75E600 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 75E604 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 75E608 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 75E60C 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 75E610 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 75E614 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 75E618 802A1048 03E00008 */ jr $ra -/* 75E61C 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A1050_75E620.s b/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A1050_75E620.s deleted file mode 100644 index 891f423c34..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A1050_75E620.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1050_75E620 -/* 75E620 802A1050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 75E624 802A1054 AFB00010 */ sw $s0, 0x10($sp) -/* 75E628 802A1058 0080802D */ daddu $s0, $a0, $zero -/* 75E62C 802A105C 24040016 */ addiu $a0, $zero, 0x16 -/* 75E630 802A1060 AFBF0014 */ sw $ra, 0x14($sp) -/* 75E634 802A1064 0C03A752 */ jal is_ability_active -/* 75E638 802A1068 AE000084 */ sw $zero, 0x84($s0) -/* 75E63C 802A106C 10400002 */ beqz $v0, .L802A1078 -/* 75E640 802A1070 24020001 */ addiu $v0, $zero, 1 -/* 75E644 802A1074 AE020084 */ sw $v0, 0x84($s0) -.L802A1078: -/* 75E648 802A1078 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 75E64C 802A107C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) -/* 75E650 802A1080 30421000 */ andi $v0, $v0, 0x1000 -/* 75E654 802A1084 10400002 */ beqz $v0, .L802A1090 -/* 75E658 802A1088 24020001 */ addiu $v0, $zero, 1 -/* 75E65C 802A108C AE020084 */ sw $v0, 0x84($s0) -.L802A1090: -/* 75E660 802A1090 8FBF0014 */ lw $ra, 0x14($sp) -/* 75E664 802A1094 8FB00010 */ lw $s0, 0x10($sp) -/* 75E668 802A1098 24020002 */ addiu $v0, $zero, 2 -/* 75E66C 802A109C 03E00008 */ jr $ra -/* 75E670 802A10A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A10A4_75E674.s b/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A10A4_75E674.s deleted file mode 100644 index c2c8a1133c..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A10A4_75E674.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10A4_75E674 -/* 75E674 802A10A4 AC800084 */ sw $zero, 0x84($a0) -/* 75E678 802A10A8 3C02800E */ lui $v0, %hi(gBattleStatus+0x96) -/* 75E67C 802A10AC 8042C106 */ lb $v0, %lo(gBattleStatus+0x96)($v0) -/* 75E680 802A10B0 28420063 */ slti $v0, $v0, 0x63 -/* 75E684 802A10B4 14400002 */ bnez $v0, .L802A10C0 -/* 75E688 802A10B8 24020001 */ addiu $v0, $zero, 1 -/* 75E68C 802A10BC AC820084 */ sw $v0, 0x84($a0) -.L802A10C0: -/* 75E690 802A10C0 03E00008 */ jr $ra -/* 75E694 802A10C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A10C8_75E698.s b/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A10C8_75E698.s deleted file mode 100644 index ce356c2b11..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A10C8_75E698.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10C8_75E698 -/* 75E698 802A10C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 75E69C 802A10CC AFB1001C */ sw $s1, 0x1c($sp) -/* 75E6A0 802A10D0 0080882D */ daddu $s1, $a0, $zero -/* 75E6A4 802A10D4 AFBF0024 */ sw $ra, 0x24($sp) -/* 75E6A8 802A10D8 AFB20020 */ sw $s2, 0x20($sp) -/* 75E6AC 802A10DC AFB00018 */ sw $s0, 0x18($sp) -/* 75E6B0 802A10E0 8E30000C */ lw $s0, 0xc($s1) -/* 75E6B4 802A10E4 8E050000 */ lw $a1, ($s0) -/* 75E6B8 802A10E8 0C0B1EAF */ jal get_variable -/* 75E6BC 802A10EC 26100004 */ addiu $s0, $s0, 4 -/* 75E6C0 802A10F0 8E050000 */ lw $a1, ($s0) -/* 75E6C4 802A10F4 26100004 */ addiu $s0, $s0, 4 -/* 75E6C8 802A10F8 0220202D */ daddu $a0, $s1, $zero -/* 75E6CC 802A10FC 0C0B1EAF */ jal get_variable -/* 75E6D0 802A1100 0040902D */ daddu $s2, $v0, $zero -/* 75E6D4 802A1104 0220202D */ daddu $a0, $s1, $zero -/* 75E6D8 802A1108 8E050000 */ lw $a1, ($s0) -/* 75E6DC 802A110C 0C0B1EAF */ jal get_variable -/* 75E6E0 802A1110 0040802D */ daddu $s0, $v0, $zero -/* 75E6E4 802A1114 24040002 */ addiu $a0, $zero, 2 -/* 75E6E8 802A1118 44921000 */ mtc1 $s2, $f2 -/* 75E6EC 802A111C 00000000 */ nop -/* 75E6F0 802A1120 468010A0 */ cvt.s.w $f2, $f2 -/* 75E6F4 802A1124 44051000 */ mfc1 $a1, $f2 -/* 75E6F8 802A1128 44901000 */ mtc1 $s0, $f2 -/* 75E6FC 802A112C 00000000 */ nop -/* 75E700 802A1130 468010A0 */ cvt.s.w $f2, $f2 -/* 75E704 802A1134 44061000 */ mfc1 $a2, $f2 -/* 75E708 802A1138 44821000 */ mtc1 $v0, $f2 -/* 75E70C 802A113C 00000000 */ nop -/* 75E710 802A1140 468010A0 */ cvt.s.w $f2, $f2 -/* 75E714 802A1144 3C013F80 */ lui $at, 0x3f80 -/* 75E718 802A1148 44810000 */ mtc1 $at, $f0 -/* 75E71C 802A114C 44071000 */ mfc1 $a3, $f2 -/* 75E720 802A1150 2403003C */ addiu $v1, $zero, 0x3c -/* 75E724 802A1154 AFA30014 */ sw $v1, 0x14($sp) -/* 75E728 802A1158 0C01C634 */ jal func_800718D0 -/* 75E72C 802A115C E7A00010 */ swc1 $f0, 0x10($sp) -/* 75E730 802A1160 3C04802A */ lui $a0, %hi(D_802A4350) -/* 75E734 802A1164 24844350 */ addiu $a0, $a0, %lo(D_802A4350) -/* 75E738 802A1168 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 75E73C 802A116C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 75E740 802A1170 AC800000 */ sw $zero, ($a0) -/* 75E744 802A1174 82020096 */ lb $v0, 0x96($s0) -/* 75E748 802A1178 92030096 */ lbu $v1, 0x96($s0) -/* 75E74C 802A117C 18400003 */ blez $v0, .L802A118C -/* 75E750 802A1180 0200882D */ daddu $s1, $s0, $zero -/* 75E754 802A1184 24020001 */ addiu $v0, $zero, 1 -/* 75E758 802A1188 AC820000 */ sw $v0, ($a0) -.L802A118C: -/* 75E75C 802A118C 24620003 */ addiu $v0, $v1, 3 -/* 75E760 802A1190 A2020096 */ sb $v0, 0x96($s0) -/* 75E764 802A1194 00021600 */ sll $v0, $v0, 0x18 -/* 75E768 802A1198 00021603 */ sra $v0, $v0, 0x18 -/* 75E76C 802A119C 28420064 */ slti $v0, $v0, 0x64 -/* 75E770 802A11A0 14400003 */ bnez $v0, .L802A11B0 -/* 75E774 802A11A4 3C03DFFF */ lui $v1, 0xdfff -/* 75E778 802A11A8 24020063 */ addiu $v0, $zero, 0x63 -/* 75E77C 802A11AC A2020096 */ sb $v0, 0x96($s0) -.L802A11B0: -/* 75E780 802A11B0 3463FFFF */ ori $v1, $v1, 0xffff -/* 75E784 802A11B4 8E240000 */ lw $a0, ($s1) -/* 75E788 802A11B8 3C051000 */ lui $a1, 0x1000 -/* 75E78C 802A11BC A2200097 */ sb $zero, 0x97($s1) -/* 75E790 802A11C0 00852025 */ or $a0, $a0, $a1 -/* 75E794 802A11C4 00832024 */ and $a0, $a0, $v1 -/* 75E798 802A11C8 AE240000 */ sw $a0, ($s1) -/* 75E79C 802A11CC 8FBF0024 */ lw $ra, 0x24($sp) -/* 75E7A0 802A11D0 8FB20020 */ lw $s2, 0x20($sp) -/* 75E7A4 802A11D4 8FB1001C */ lw $s1, 0x1c($sp) -/* 75E7A8 802A11D8 8FB00018 */ lw $s0, 0x18($sp) -/* 75E7AC 802A11DC 24020002 */ addiu $v0, $zero, 2 -/* 75E7B0 802A11E0 03E00008 */ jr $ra -/* 75E7B4 802A11E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A11E8_75E7B8.s b/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A11E8_75E7B8.s deleted file mode 100644 index d2a132d131..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A11E8_75E7B8.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11E8_75E7B8 -/* 75E7B8 802A11E8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 75E7BC 802A11EC AFB20020 */ sw $s2, 0x20($sp) -/* 75E7C0 802A11F0 0080902D */ daddu $s2, $a0, $zero -/* 75E7C4 802A11F4 AFBF0028 */ sw $ra, 0x28($sp) -/* 75E7C8 802A11F8 AFB30024 */ sw $s3, 0x24($sp) -/* 75E7CC 802A11FC AFB1001C */ sw $s1, 0x1c($sp) -/* 75E7D0 802A1200 AFB00018 */ sw $s0, 0x18($sp) -/* 75E7D4 802A1204 F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 75E7D8 802A1208 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 75E7DC 802A120C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 75E7E0 802A1210 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 75E7E4 802A1214 8E50000C */ lw $s0, 0xc($s2) -/* 75E7E8 802A1218 8E050000 */ lw $a1, ($s0) -/* 75E7EC 802A121C 0C0B1EAF */ jal get_variable -/* 75E7F0 802A1220 26100004 */ addiu $s0, $s0, 4 -/* 75E7F4 802A1224 8E050000 */ lw $a1, ($s0) -/* 75E7F8 802A1228 26100004 */ addiu $s0, $s0, 4 -/* 75E7FC 802A122C 0240202D */ daddu $a0, $s2, $zero -/* 75E800 802A1230 0C0B1EAF */ jal get_variable -/* 75E804 802A1234 0040982D */ daddu $s3, $v0, $zero -/* 75E808 802A1238 8E050000 */ lw $a1, ($s0) -/* 75E80C 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 75E810 802A1240 0240202D */ daddu $a0, $s2, $zero -/* 75E814 802A1244 0C0B1EAF */ jal get_variable -/* 75E818 802A1248 0040882D */ daddu $s1, $v0, $zero -/* 75E81C 802A124C 0240202D */ daddu $a0, $s2, $zero -/* 75E820 802A1250 8E050000 */ lw $a1, ($s0) -/* 75E824 802A1254 0C0B210B */ jal get_float_variable -/* 75E828 802A1258 0040802D */ daddu $s0, $v0, $zero -/* 75E82C 802A125C 24040006 */ addiu $a0, $zero, 6 -/* 75E830 802A1260 2673000A */ addiu $s3, $s3, 0xa -/* 75E834 802A1264 4493D000 */ mtc1 $s3, $f26 -/* 75E838 802A1268 00000000 */ nop -/* 75E83C 802A126C 4680D6A0 */ cvt.s.w $f26, $f26 -/* 75E840 802A1270 26310012 */ addiu $s1, $s1, 0x12 -/* 75E844 802A1274 4491C000 */ mtc1 $s1, $f24 -/* 75E848 802A1278 00000000 */ nop -/* 75E84C 802A127C 4680C620 */ cvt.s.w $f24, $f24 -/* 75E850 802A1280 4490A000 */ mtc1 $s0, $f20 -/* 75E854 802A1284 00000000 */ nop -/* 75E858 802A1288 4680A520 */ cvt.s.w $f20, $f20 -/* 75E85C 802A128C 46000586 */ mov.s $f22, $f0 -/* 75E860 802A1290 4405D000 */ mfc1 $a1, $f26 -/* 75E864 802A1294 4406C000 */ mfc1 $a2, $f24 -/* 75E868 802A1298 4407A000 */ mfc1 $a3, $f20 -/* 75E86C 802A129C 2402002D */ addiu $v0, $zero, 0x2d -/* 75E870 802A12A0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 75E874 802A12A4 0C01C82C */ jal func_800720B0 -/* 75E878 802A12A8 AFA20014 */ sw $v0, 0x14($sp) -/* 75E87C 802A12AC 2404000D */ addiu $a0, $zero, 0xd -/* 75E880 802A12B0 4405D000 */ mfc1 $a1, $f26 -/* 75E884 802A12B4 4406C000 */ mfc1 $a2, $f24 -/* 75E888 802A12B8 4407A000 */ mfc1 $a3, $f20 -/* 75E88C 802A12BC 2402001E */ addiu $v0, $zero, 0x1e -/* 75E890 802A12C0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 75E894 802A12C4 0C01C2EC */ jal func_80070BB0 -/* 75E898 802A12C8 AFA20014 */ sw $v0, 0x14($sp) -/* 75E89C 802A12CC 8FBF0028 */ lw $ra, 0x28($sp) -/* 75E8A0 802A12D0 8FB30024 */ lw $s3, 0x24($sp) -/* 75E8A4 802A12D4 8FB20020 */ lw $s2, 0x20($sp) -/* 75E8A8 802A12D8 8FB1001C */ lw $s1, 0x1c($sp) -/* 75E8AC 802A12DC 8FB00018 */ lw $s0, 0x18($sp) -/* 75E8B0 802A12E0 D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 75E8B4 802A12E4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 75E8B8 802A12E8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 75E8BC 802A12EC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 75E8C0 802A12F0 24020002 */ addiu $v0, $zero, 2 -/* 75E8C4 802A12F4 03E00008 */ jr $ra -/* 75E8C8 802A12F8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A12FC_75E8CC.s b/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A12FC_75E8CC.s deleted file mode 100644 index 2e21639220..0000000000 --- a/asm/nonmatchings/battle/move/hammer_charge_2_75E5D0/func_802A12FC_75E8CC.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12FC_75E8CC -/* 75E8CC 802A12FC 3C02802A */ lui $v0, %hi(D_802A4350) -/* 75E8D0 802A1300 8C424350 */ lw $v0, %lo(D_802A4350)($v0) -/* 75E8D4 802A1304 54400002 */ bnel $v0, $zero, .L802A1310 -/* 75E8D8 802A1308 24020005 */ addiu $v0, $zero, 5 -/* 75E8DC 802A130C 24020004 */ addiu $v0, $zero, 4 -.L802A1310: -/* 75E8E0 802A1310 AC820084 */ sw $v0, 0x84($a0) -/* 75E8E4 802A1314 03E00008 */ jr $ra -/* 75E8E8 802A1318 24020002 */ addiu $v0, $zero, 2 -/* 75E8EC 802A131C 00000000 */ nop diff --git a/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A1000_74D570.s b/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A1000_74D570.s deleted file mode 100644 index 564b67fd59..0000000000 --- a/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A1000_74D570.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_74D570 -/* 74D570 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 74D574 802A1004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 74D578 802A1008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 74D57C 802A100C AFBF0020 */ sw $ra, 0x20($sp) -/* 74D580 802A1010 AFB1001C */ sw $s1, 0x1c($sp) -/* 74D584 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 74D588 802A1018 8C6200D8 */ lw $v0, 0xd8($v1) -/* 74D58C 802A101C 0080802D */ daddu $s0, $a0, $zero -/* 74D590 802A1020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 74D594 802A1024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 74D598 802A1028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 74D59C 802A102C C444014C */ lwc1 $f4, 0x14c($v0) -/* 74D5A0 802A1030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 74D5A4 802A1034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 74D5A8 802A1038 44062000 */ mfc1 $a2, $f4 -/* 74D5AC 802A103C 44073000 */ mfc1 $a3, $f6 -/* 74D5B0 802A1040 0060882D */ daddu $s1, $v1, $zero -/* 74D5B4 802A1044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 74D5B8 802A1048 0C00A7CB */ jal dist3D -/* 74D5BC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) -/* 74D5C0 802A1050 3C014170 */ lui $at, 0x4170 -/* 74D5C4 802A1054 44811000 */ mtc1 $at, $f2 -/* 74D5C8 802A1058 00000000 */ nop -/* 74D5CC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 74D5D0 802A1060 00000000 */ nop -/* 74D5D4 802A1064 3C0142C8 */ lui $at, 0x42c8 -/* 74D5D8 802A1068 44811000 */ mtc1 $at, $f2 -/* 74D5DC 802A106C 00000000 */ nop -/* 74D5E0 802A1070 46020003 */ div.s $f0, $f0, $f2 -/* 74D5E4 802A1074 4600020D */ trunc.w.s $f8, $f0 -/* 74D5E8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 74D5EC 802A107C 00000000 */ nop -/* 74D5F0 802A1080 AE020084 */ sw $v0, 0x84($s0) -/* 74D5F4 802A1084 28420015 */ slti $v0, $v0, 0x15 -/* 74D5F8 802A1088 14400002 */ bnez $v0, .L802A1094 -/* 74D5FC 802A108C 24020014 */ addiu $v0, $zero, 0x14 -/* 74D600 802A1090 AE020084 */ sw $v0, 0x84($s0) -.L802A1094: -/* 74D604 802A1094 82220083 */ lb $v0, 0x83($s1) -/* 74D608 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 74D60C 802A109C 00000000 */ nop -/* 74D610 802A10A0 8E020084 */ lw $v0, 0x84($s0) -/* 74D614 802A10A4 28420006 */ slti $v0, $v0, 6 -/* 74D618 802A10A8 10400008 */ beqz $v0, .L802A10CC -/* 74D61C 802A10AC 24020006 */ addiu $v0, $zero, 6 -/* 74D620 802A10B0 080A8433 */ j .L802A10CC -/* 74D624 802A10B4 AE020084 */ sw $v0, 0x84($s0) -.L802A10B8: -/* 74D628 802A10B8 8E020084 */ lw $v0, 0x84($s0) -/* 74D62C 802A10BC 2842000C */ slti $v0, $v0, 0xc -/* 74D630 802A10C0 10400002 */ beqz $v0, .L802A10CC -/* 74D634 802A10C4 2402000C */ addiu $v0, $zero, 0xc -/* 74D638 802A10C8 AE020084 */ sw $v0, 0x84($s0) -.L802A10CC: -/* 74D63C 802A10CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 74D640 802A10D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 74D644 802A10D4 8FB00018 */ lw $s0, 0x18($sp) -/* 74D648 802A10D8 24020002 */ addiu $v0, $zero, 2 -/* 74D64C 802A10DC 03E00008 */ jr $ra -/* 74D650 802A10E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A10E4_74D654.s b/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A10E4_74D654.s deleted file mode 100644 index f91f6eda57..0000000000 --- a/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A10E4_74D654.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10E4_74D654 -/* 74D654 802A10E4 AC800084 */ sw $zero, 0x84($a0) -/* 74D658 802A10E8 3C02800E */ lui $v0, %hi(gBattleStatus+0x97) -/* 74D65C 802A10EC 8042C107 */ lb $v0, %lo(gBattleStatus+0x97)($v0) -/* 74D660 802A10F0 28420063 */ slti $v0, $v0, 0x63 -/* 74D664 802A10F4 14400002 */ bnez $v0, .L802A1100 -/* 74D668 802A10F8 24020001 */ addiu $v0, $zero, 1 -/* 74D66C 802A10FC AC820084 */ sw $v0, 0x84($a0) -.L802A1100: -/* 74D670 802A1100 03E00008 */ jr $ra -/* 74D674 802A1104 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A1108_74D678.s b/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A1108_74D678.s deleted file mode 100644 index 1d57354ceb..0000000000 --- a/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A1108_74D678.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1108_74D678 -/* 74D678 802A1108 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 74D67C 802A110C AFB1001C */ sw $s1, 0x1c($sp) -/* 74D680 802A1110 0080882D */ daddu $s1, $a0, $zero -/* 74D684 802A1114 AFBF0024 */ sw $ra, 0x24($sp) -/* 74D688 802A1118 AFB20020 */ sw $s2, 0x20($sp) -/* 74D68C 802A111C AFB00018 */ sw $s0, 0x18($sp) -/* 74D690 802A1120 8E30000C */ lw $s0, 0xc($s1) -/* 74D694 802A1124 8E050000 */ lw $a1, ($s0) -/* 74D698 802A1128 0C0B1EAF */ jal get_variable -/* 74D69C 802A112C 26100004 */ addiu $s0, $s0, 4 -/* 74D6A0 802A1130 8E050000 */ lw $a1, ($s0) -/* 74D6A4 802A1134 26100004 */ addiu $s0, $s0, 4 -/* 74D6A8 802A1138 0220202D */ daddu $a0, $s1, $zero -/* 74D6AC 802A113C 0C0B1EAF */ jal get_variable -/* 74D6B0 802A1140 0040902D */ daddu $s2, $v0, $zero -/* 74D6B4 802A1144 0220202D */ daddu $a0, $s1, $zero -/* 74D6B8 802A1148 8E050000 */ lw $a1, ($s0) -/* 74D6BC 802A114C 0C0B1EAF */ jal get_variable -/* 74D6C0 802A1150 0040802D */ daddu $s0, $v0, $zero -/* 74D6C4 802A1154 0000202D */ daddu $a0, $zero, $zero -/* 74D6C8 802A1158 44921000 */ mtc1 $s2, $f2 -/* 74D6CC 802A115C 00000000 */ nop -/* 74D6D0 802A1160 468010A0 */ cvt.s.w $f2, $f2 -/* 74D6D4 802A1164 44051000 */ mfc1 $a1, $f2 -/* 74D6D8 802A1168 44901000 */ mtc1 $s0, $f2 -/* 74D6DC 802A116C 00000000 */ nop -/* 74D6E0 802A1170 468010A0 */ cvt.s.w $f2, $f2 -/* 74D6E4 802A1174 44061000 */ mfc1 $a2, $f2 -/* 74D6E8 802A1178 44821000 */ mtc1 $v0, $f2 -/* 74D6EC 802A117C 00000000 */ nop -/* 74D6F0 802A1180 468010A0 */ cvt.s.w $f2, $f2 -/* 74D6F4 802A1184 3C013F80 */ lui $at, 0x3f80 -/* 74D6F8 802A1188 44810000 */ mtc1 $at, $f0 -/* 74D6FC 802A118C 44071000 */ mfc1 $a3, $f2 -/* 74D700 802A1190 2403003C */ addiu $v1, $zero, 0x3c -/* 74D704 802A1194 AFA30014 */ sw $v1, 0x14($sp) -/* 74D708 802A1198 0C01C634 */ jal func_800718D0 -/* 74D70C 802A119C E7A00010 */ swc1 $f0, 0x10($sp) -/* 74D710 802A11A0 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 74D714 802A11A4 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 74D718 802A11A8 92020097 */ lbu $v0, 0x97($s0) -/* 74D71C 802A11AC 24420001 */ addiu $v0, $v0, 1 -/* 74D720 802A11B0 A2020097 */ sb $v0, 0x97($s0) -/* 74D724 802A11B4 00021600 */ sll $v0, $v0, 0x18 -/* 74D728 802A11B8 00021603 */ sra $v0, $v0, 0x18 -/* 74D72C 802A11BC 28420064 */ slti $v0, $v0, 0x64 -/* 74D730 802A11C0 14400003 */ bnez $v0, .L802A11D0 -/* 74D734 802A11C4 0200882D */ daddu $s1, $s0, $zero -/* 74D738 802A11C8 24020063 */ addiu $v0, $zero, 0x63 -/* 74D73C 802A11CC A2020097 */ sb $v0, 0x97($s0) -.L802A11D0: -/* 74D740 802A11D0 3C03EFFF */ lui $v1, 0xefff -/* 74D744 802A11D4 3463FFFF */ ori $v1, $v1, 0xffff -/* 74D748 802A11D8 8E240000 */ lw $a0, ($s1) -/* 74D74C 802A11DC 3C052000 */ lui $a1, 0x2000 -/* 74D750 802A11E0 A2200096 */ sb $zero, 0x96($s1) -/* 74D754 802A11E4 00852025 */ or $a0, $a0, $a1 -/* 74D758 802A11E8 00832024 */ and $a0, $a0, $v1 -/* 74D75C 802A11EC AE240000 */ sw $a0, ($s1) -/* 74D760 802A11F0 8FBF0024 */ lw $ra, 0x24($sp) -/* 74D764 802A11F4 8FB20020 */ lw $s2, 0x20($sp) -/* 74D768 802A11F8 8FB1001C */ lw $s1, 0x1c($sp) -/* 74D76C 802A11FC 8FB00018 */ lw $s0, 0x18($sp) -/* 74D770 802A1200 24020002 */ addiu $v0, $zero, 2 -/* 74D774 802A1204 03E00008 */ jr $ra -/* 74D778 802A1208 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A120C_74D77C.s b/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A120C_74D77C.s deleted file mode 100644 index f670ac68ce..0000000000 --- a/asm/nonmatchings/battle/move/jump_charge_0_74D570/func_802A120C_74D77C.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A120C_74D77C -/* 74D77C 802A120C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 74D780 802A1210 AFB1001C */ sw $s1, 0x1c($sp) -/* 74D784 802A1214 0080882D */ daddu $s1, $a0, $zero -/* 74D788 802A1218 AFBF0028 */ sw $ra, 0x28($sp) -/* 74D78C 802A121C AFB30024 */ sw $s3, 0x24($sp) -/* 74D790 802A1220 AFB20020 */ sw $s2, 0x20($sp) -/* 74D794 802A1224 AFB00018 */ sw $s0, 0x18($sp) -/* 74D798 802A1228 8E30000C */ lw $s0, 0xc($s1) -/* 74D79C 802A122C 8E050000 */ lw $a1, ($s0) -/* 74D7A0 802A1230 0C0B1EAF */ jal get_variable -/* 74D7A4 802A1234 26100004 */ addiu $s0, $s0, 4 -/* 74D7A8 802A1238 8E050000 */ lw $a1, ($s0) -/* 74D7AC 802A123C 26100004 */ addiu $s0, $s0, 4 -/* 74D7B0 802A1240 0220202D */ daddu $a0, $s1, $zero -/* 74D7B4 802A1244 0C0B1EAF */ jal get_variable -/* 74D7B8 802A1248 0040982D */ daddu $s3, $v0, $zero -/* 74D7BC 802A124C 8E050000 */ lw $a1, ($s0) -/* 74D7C0 802A1250 26100004 */ addiu $s0, $s0, 4 -/* 74D7C4 802A1254 0220202D */ daddu $a0, $s1, $zero -/* 74D7C8 802A1258 0C0B1EAF */ jal get_variable -/* 74D7CC 802A125C 0040902D */ daddu $s2, $v0, $zero -/* 74D7D0 802A1260 0220202D */ daddu $a0, $s1, $zero -/* 74D7D4 802A1264 8E050000 */ lw $a1, ($s0) -/* 74D7D8 802A1268 0C0B210B */ jal get_float_variable -/* 74D7DC 802A126C 0040802D */ daddu $s0, $v0, $zero -/* 74D7E0 802A1270 24040006 */ addiu $a0, $zero, 6 -/* 74D7E4 802A1274 2673000A */ addiu $s3, $s3, 0xa -/* 74D7E8 802A1278 44931000 */ mtc1 $s3, $f2 -/* 74D7EC 802A127C 00000000 */ nop -/* 74D7F0 802A1280 468010A0 */ cvt.s.w $f2, $f2 -/* 74D7F4 802A1284 26520012 */ addiu $s2, $s2, 0x12 -/* 74D7F8 802A1288 44051000 */ mfc1 $a1, $f2 -/* 74D7FC 802A128C 44921000 */ mtc1 $s2, $f2 -/* 74D800 802A1290 00000000 */ nop -/* 74D804 802A1294 468010A0 */ cvt.s.w $f2, $f2 -/* 74D808 802A1298 44061000 */ mfc1 $a2, $f2 -/* 74D80C 802A129C 44901000 */ mtc1 $s0, $f2 -/* 74D810 802A12A0 00000000 */ nop -/* 74D814 802A12A4 468010A0 */ cvt.s.w $f2, $f2 -/* 74D818 802A12A8 44071000 */ mfc1 $a3, $f2 -/* 74D81C 802A12AC 2402002D */ addiu $v0, $zero, 0x2d -/* 74D820 802A12B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 74D824 802A12B4 0C01C82C */ jal func_800720B0 -/* 74D828 802A12B8 AFA20014 */ sw $v0, 0x14($sp) -/* 74D82C 802A12BC 8FBF0028 */ lw $ra, 0x28($sp) -/* 74D830 802A12C0 8FB30024 */ lw $s3, 0x24($sp) -/* 74D834 802A12C4 8FB20020 */ lw $s2, 0x20($sp) -/* 74D838 802A12C8 8FB1001C */ lw $s1, 0x1c($sp) -/* 74D83C 802A12CC 8FB00018 */ lw $s0, 0x18($sp) -/* 74D840 802A12D0 24020002 */ addiu $v0, $zero, 2 -/* 74D844 802A12D4 03E00008 */ jr $ra -/* 74D848 802A12D8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 74D84C 802A12DC 00000000 */ nop diff --git a/asm/nonmatchings/battle/move/mega_quake_756780/func_802A1000_756780.s b/asm/nonmatchings/battle/move/mega_quake_756780/func_802A1000_756780.s deleted file mode 100644 index b32a74d803..0000000000 --- a/asm/nonmatchings/battle/move/mega_quake_756780/func_802A1000_756780.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_756780 -/* 756780 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 756784 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 756788 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 75678C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 756790 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 756794 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 756798 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 75679C 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 7567A0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 7567A4 802A1024 0C03A752 */ jal is_ability_active -/* 7567A8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 7567AC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 7567B0 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 7567B4 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 7567B8 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 7567BC 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7567C0 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 7567C4 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 7567C8 802A1048 03E00008 */ jr $ra -/* 7567CC 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/mega_quake_756780/func_802A1050_7567D0.s b/asm/nonmatchings/battle/move/mega_quake_756780/func_802A1050_7567D0.s deleted file mode 100644 index ab3b1e8f5d..0000000000 --- a/asm/nonmatchings/battle/move/mega_quake_756780/func_802A1050_7567D0.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1050_7567D0 -/* 7567D0 802A1050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7567D4 802A1054 AFB00010 */ sw $s0, 0x10($sp) -/* 7567D8 802A1058 0080802D */ daddu $s0, $a0, $zero -/* 7567DC 802A105C 24040016 */ addiu $a0, $zero, 0x16 -/* 7567E0 802A1060 AFBF0014 */ sw $ra, 0x14($sp) -/* 7567E4 802A1064 0C03A752 */ jal is_ability_active -/* 7567E8 802A1068 AE000084 */ sw $zero, 0x84($s0) -/* 7567EC 802A106C 10400002 */ beqz $v0, .L802A1078 -/* 7567F0 802A1070 24020001 */ addiu $v0, $zero, 1 -/* 7567F4 802A1074 AE020084 */ sw $v0, 0x84($s0) -.L802A1078: -/* 7567F8 802A1078 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7567FC 802A107C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) -/* 756800 802A1080 30421000 */ andi $v0, $v0, 0x1000 -/* 756804 802A1084 10400002 */ beqz $v0, .L802A1090 -/* 756808 802A1088 24020001 */ addiu $v0, $zero, 1 -/* 75680C 802A108C AE020084 */ sw $v0, 0x84($s0) -.L802A1090: -/* 756810 802A1090 8FBF0014 */ lw $ra, 0x14($sp) -/* 756814 802A1094 8FB00010 */ lw $s0, 0x10($sp) -/* 756818 802A1098 24020002 */ addiu $v0, $zero, 2 -/* 75681C 802A109C 03E00008 */ jr $ra -/* 756820 802A10A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A1000_743DF0.s b/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A1000_743DF0.s deleted file mode 100644 index 30fd701789..0000000000 --- a/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A1000_743DF0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_743DF0 -/* 743DF0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 743DF4 802A1004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 743DF8 802A1008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 743DFC 802A100C AFBF0020 */ sw $ra, 0x20($sp) -/* 743E00 802A1010 AFB1001C */ sw $s1, 0x1c($sp) -/* 743E04 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 743E08 802A1018 8C6200D8 */ lw $v0, 0xd8($v1) -/* 743E0C 802A101C 0080802D */ daddu $s0, $a0, $zero -/* 743E10 802A1020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 743E14 802A1024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 743E18 802A1028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 743E1C 802A102C C444014C */ lwc1 $f4, 0x14c($v0) -/* 743E20 802A1030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 743E24 802A1034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 743E28 802A1038 44062000 */ mfc1 $a2, $f4 -/* 743E2C 802A103C 44073000 */ mfc1 $a3, $f6 -/* 743E30 802A1040 0060882D */ daddu $s1, $v1, $zero -/* 743E34 802A1044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 743E38 802A1048 0C00A7CB */ jal dist3D -/* 743E3C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) -/* 743E40 802A1050 3C014170 */ lui $at, 0x4170 -/* 743E44 802A1054 44811000 */ mtc1 $at, $f2 -/* 743E48 802A1058 00000000 */ nop -/* 743E4C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 743E50 802A1060 00000000 */ nop -/* 743E54 802A1064 3C0142C8 */ lui $at, 0x42c8 -/* 743E58 802A1068 44811000 */ mtc1 $at, $f2 -/* 743E5C 802A106C 00000000 */ nop -/* 743E60 802A1070 46020003 */ div.s $f0, $f0, $f2 -/* 743E64 802A1074 4600020D */ trunc.w.s $f8, $f0 -/* 743E68 802A1078 44024000 */ mfc1 $v0, $f8 -/* 743E6C 802A107C 00000000 */ nop -/* 743E70 802A1080 AE020084 */ sw $v0, 0x84($s0) -/* 743E74 802A1084 28420015 */ slti $v0, $v0, 0x15 -/* 743E78 802A1088 14400002 */ bnez $v0, .L802A1094 -/* 743E7C 802A108C 24020014 */ addiu $v0, $zero, 0x14 -/* 743E80 802A1090 AE020084 */ sw $v0, 0x84($s0) -.L802A1094: -/* 743E84 802A1094 82220083 */ lb $v0, 0x83($s1) -/* 743E88 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 743E8C 802A109C 00000000 */ nop -/* 743E90 802A10A0 8E020084 */ lw $v0, 0x84($s0) -/* 743E94 802A10A4 28420006 */ slti $v0, $v0, 6 -/* 743E98 802A10A8 10400008 */ beqz $v0, .L802A10CC -/* 743E9C 802A10AC 24020006 */ addiu $v0, $zero, 6 -/* 743EA0 802A10B0 080A8433 */ j .L802A10CC -/* 743EA4 802A10B4 AE020084 */ sw $v0, 0x84($s0) -.L802A10B8: -/* 743EA8 802A10B8 8E020084 */ lw $v0, 0x84($s0) -/* 743EAC 802A10BC 2842000C */ slti $v0, $v0, 0xc -/* 743EB0 802A10C0 10400002 */ beqz $v0, .L802A10CC -/* 743EB4 802A10C4 2402000C */ addiu $v0, $zero, 0xc -/* 743EB8 802A10C8 AE020084 */ sw $v0, 0x84($s0) -.L802A10CC: -/* 743EBC 802A10CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 743EC0 802A10D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 743EC4 802A10D4 8FB00018 */ lw $s0, 0x18($sp) -/* 743EC8 802A10D8 24020002 */ addiu $v0, $zero, 2 -/* 743ECC 802A10DC 03E00008 */ jr $ra -/* 743ED0 802A10E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/battle/move/power_quake_767C90/func_802A1000_767C90.s b/asm/nonmatchings/battle/move/power_quake_767C90/func_802A1000_767C90.s deleted file mode 100644 index 1fc8ff12d3..0000000000 --- a/asm/nonmatchings/battle/move/power_quake_767C90/func_802A1000_767C90.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_767C90 -/* 767C90 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 767C94 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 767C98 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 767C9C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 767CA0 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 767CA4 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 767CA8 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 767CAC 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 767CB0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 767CB4 802A1024 0C03A752 */ jal is_ability_active -/* 767CB8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 767CBC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 767CC0 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 767CC4 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 767CC8 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 767CCC 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 767CD0 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 767CD4 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 767CD8 802A1048 03E00008 */ jr $ra -/* 767CDC 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/shrink_smash_77CB80/func_802A1000_77CB80.s b/asm/nonmatchings/battle/move/shrink_smash_77CB80/func_802A1000_77CB80.s deleted file mode 100644 index dff80c55bf..0000000000 --- a/asm/nonmatchings/battle/move/shrink_smash_77CB80/func_802A1000_77CB80.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_77CB80 -/* 77CB80 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 77CB84 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 77CB88 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 77CB8C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 77CB90 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 77CB94 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 77CB98 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 77CB9C 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 77CBA0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 77CBA4 802A1024 0C03A752 */ jal is_ability_active -/* 77CBA8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 77CBAC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 77CBB0 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 77CBB4 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 77CBB8 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 77CBBC 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 77CBC0 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 77CBC4 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 77CBC8 802A1048 03E00008 */ jr $ra -/* 77CBCC 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/spin_smash_737890/func_802A113C_7379CC.s b/asm/nonmatchings/battle/move/spin_smash_737890/func_802A113C_7379CC.s deleted file mode 100644 index 55d338e5f6..0000000000 --- a/asm/nonmatchings/battle/move/spin_smash_737890/func_802A113C_7379CC.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A113C_7379CC -/* 7379CC 802A113C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7379D0 802A1140 AFB00010 */ sw $s0, 0x10($sp) -/* 7379D4 802A1144 0080802D */ daddu $s0, $a0, $zero -/* 7379D8 802A1148 24040016 */ addiu $a0, $zero, 0x16 -/* 7379DC 802A114C AFBF0014 */ sw $ra, 0x14($sp) -/* 7379E0 802A1150 0C03A752 */ jal is_ability_active -/* 7379E4 802A1154 AE000084 */ sw $zero, 0x84($s0) -/* 7379E8 802A1158 10400002 */ beqz $v0, .L802A1164 -/* 7379EC 802A115C 24020001 */ addiu $v0, $zero, 1 -/* 7379F0 802A1160 AE020084 */ sw $v0, 0x84($s0) -.L802A1164: -/* 7379F4 802A1164 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7379F8 802A1168 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) -/* 7379FC 802A116C 30421000 */ andi $v0, $v0, 0x1000 -/* 737A00 802A1170 10400002 */ beqz $v0, .L802A117C -/* 737A04 802A1174 24020001 */ addiu $v0, $zero, 1 -/* 737A08 802A1178 AE020084 */ sw $v0, 0x84($s0) -.L802A117C: -/* 737A0C 802A117C 8FBF0014 */ lw $ra, 0x14($sp) -/* 737A10 802A1180 8FB00010 */ lw $s0, 0x10($sp) -/* 737A14 802A1184 24020002 */ addiu $v0, $zero, 2 -/* 737A18 802A1188 03E00008 */ jr $ra -/* 737A1C 802A118C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/super_smash_775100/func_802A1000_775100.s b/asm/nonmatchings/battle/move/super_smash_775100/func_802A1000_775100.s deleted file mode 100644 index b509f6825a..0000000000 --- a/asm/nonmatchings/battle/move/super_smash_775100/func_802A1000_775100.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_775100 -/* 775100 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 775104 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 775108 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 77510C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 775110 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 775114 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 775118 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 77511C 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 775120 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 775124 802A1024 0C03A752 */ jal is_ability_active -/* 775128 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 77512C 802A102C 10400003 */ beqz $v0, .L802A103C -/* 775130 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 775134 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 775138 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 77513C 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 775140 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 775144 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 775148 802A1048 03E00008 */ jr $ra -/* 77514C 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/battle/move/unknown_move_779C90/func_802A1000_779C90.s b/asm/nonmatchings/battle/move/unknown_move_779C90/func_802A1000_779C90.s deleted file mode 100644 index a6d791c07f..0000000000 --- a/asm/nonmatchings/battle/move/unknown_move_779C90/func_802A1000_779C90.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_779C90 -/* 779C90 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 779C94 802A1004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 779C98 802A1008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 779C9C 802A100C AFBF0020 */ sw $ra, 0x20($sp) -/* 779CA0 802A1010 AFB1001C */ sw $s1, 0x1c($sp) -/* 779CA4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 779CA8 802A1018 8C6200D8 */ lw $v0, 0xd8($v1) -/* 779CAC 802A101C 0080802D */ daddu $s0, $a0, $zero -/* 779CB0 802A1020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 779CB4 802A1024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 779CB8 802A1028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 779CBC 802A102C C444014C */ lwc1 $f4, 0x14c($v0) -/* 779CC0 802A1030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 779CC4 802A1034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 779CC8 802A1038 44062000 */ mfc1 $a2, $f4 -/* 779CCC 802A103C 44073000 */ mfc1 $a3, $f6 -/* 779CD0 802A1040 0060882D */ daddu $s1, $v1, $zero -/* 779CD4 802A1044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 779CD8 802A1048 0C00A7CB */ jal dist3D -/* 779CDC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) -/* 779CE0 802A1050 3C014170 */ lui $at, 0x4170 -/* 779CE4 802A1054 44811000 */ mtc1 $at, $f2 -/* 779CE8 802A1058 00000000 */ nop -/* 779CEC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 779CF0 802A1060 00000000 */ nop -/* 779CF4 802A1064 3C0142C8 */ lui $at, 0x42c8 -/* 779CF8 802A1068 44811000 */ mtc1 $at, $f2 -/* 779CFC 802A106C 00000000 */ nop -/* 779D00 802A1070 46020003 */ div.s $f0, $f0, $f2 -/* 779D04 802A1074 4600020D */ trunc.w.s $f8, $f0 -/* 779D08 802A1078 44024000 */ mfc1 $v0, $f8 -/* 779D0C 802A107C 00000000 */ nop -/* 779D10 802A1080 AE020084 */ sw $v0, 0x84($s0) -/* 779D14 802A1084 28420015 */ slti $v0, $v0, 0x15 -/* 779D18 802A1088 14400002 */ bnez $v0, .L802A1094 -/* 779D1C 802A108C 24020014 */ addiu $v0, $zero, 0x14 -/* 779D20 802A1090 AE020084 */ sw $v0, 0x84($s0) -.L802A1094: -/* 779D24 802A1094 82220083 */ lb $v0, 0x83($s1) -/* 779D28 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 779D2C 802A109C 00000000 */ nop -/* 779D30 802A10A0 8E020084 */ lw $v0, 0x84($s0) -/* 779D34 802A10A4 28420006 */ slti $v0, $v0, 6 -/* 779D38 802A10A8 10400008 */ beqz $v0, .L802A10CC -/* 779D3C 802A10AC 24020006 */ addiu $v0, $zero, 6 -/* 779D40 802A10B0 080A8433 */ j .L802A10CC -/* 779D44 802A10B4 AE020084 */ sw $v0, 0x84($s0) -.L802A10B8: -/* 779D48 802A10B8 8E020084 */ lw $v0, 0x84($s0) -/* 779D4C 802A10BC 2842000C */ slti $v0, $v0, 0xc -/* 779D50 802A10C0 10400002 */ beqz $v0, .L802A10CC -/* 779D54 802A10C4 2402000C */ addiu $v0, $zero, 0xc -/* 779D58 802A10C8 AE020084 */ sw $v0, 0x84($s0) -.L802A10CC: -/* 779D5C 802A10CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 779D60 802A10D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 779D64 802A10D4 8FB00018 */ lw $s0, 0x18($sp) -/* 779D68 802A10D8 24020002 */ addiu $v0, $zero, 2 -/* 779D6C 802A10DC 03E00008 */ jr $ra -/* 779D70 802A10E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_6F10E0/func_80238000_6F10E0.s b/asm/nonmatchings/code_6F10E0/func_80238000_6F10E0.s deleted file mode 100644 index e59599564c..0000000000 --- a/asm/nonmatchings/code_6F10E0/func_80238000_6F10E0.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80238000_6F10E0 -/* 6F10E0 80238000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 6F10E4 80238004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 6F10E8 80238008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 6F10EC 8023800C AFBF0020 */ sw $ra, 0x20($sp) -/* 6F10F0 80238010 AFB1001C */ sw $s1, 0x1c($sp) -/* 6F10F4 80238014 AFB00018 */ sw $s0, 0x18($sp) -/* 6F10F8 80238018 8C6200DC */ lw $v0, 0xdc($v1) -/* 6F10FC 8023801C 0080802D */ daddu $s0, $a0, $zero -/* 6F1100 80238020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 6F1104 80238024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 6F1108 80238028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 6F110C 8023802C C444014C */ lwc1 $f4, 0x14c($v0) -/* 6F1110 80238030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 6F1114 80238034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 6F1118 80238038 44062000 */ mfc1 $a2, $f4 -/* 6F111C 8023803C 44073000 */ mfc1 $a3, $f6 -/* 6F1120 80238040 0060882D */ daddu $s1, $v1, $zero -/* 6F1124 80238044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 6F1128 80238048 0C00A7CB */ jal dist3D -/* 6F112C 8023804C E7A00014 */ swc1 $f0, 0x14($sp) -/* 6F1130 80238050 3C014170 */ lui $at, 0x4170 -/* 6F1134 80238054 44811000 */ mtc1 $at, $f2 -/* 6F1138 80238058 00000000 */ nop -/* 6F113C 8023805C 46020002 */ mul.s $f0, $f0, $f2 -/* 6F1140 80238060 00000000 */ nop -/* 6F1144 80238064 3C0142C8 */ lui $at, 0x42c8 -/* 6F1148 80238068 44811000 */ mtc1 $at, $f2 -/* 6F114C 8023806C 00000000 */ nop -/* 6F1150 80238070 46020003 */ div.s $f0, $f0, $f2 -/* 6F1154 80238074 4600020D */ trunc.w.s $f8, $f0 -/* 6F1158 80238078 44024000 */ mfc1 $v0, $f8 -/* 6F115C 8023807C 00000000 */ nop -/* 6F1160 80238080 AE020084 */ sw $v0, 0x84($s0) -/* 6F1164 80238084 28420015 */ slti $v0, $v0, 0x15 -/* 6F1168 80238088 14400002 */ bnez $v0, .L80238094 -/* 6F116C 8023808C 24020014 */ addiu $v0, $zero, 0x14 -/* 6F1170 80238090 AE020084 */ sw $v0, 0x84($s0) -.L80238094: -/* 6F1174 80238094 82220083 */ lb $v0, 0x83($s1) -/* 6F1178 80238098 10400007 */ beqz $v0, .L802380B8 -/* 6F117C 8023809C 00000000 */ nop -/* 6F1180 802380A0 8E020084 */ lw $v0, 0x84($s0) -/* 6F1184 802380A4 2842000A */ slti $v0, $v0, 0xa -/* 6F1188 802380A8 10400008 */ beqz $v0, .L802380CC -/* 6F118C 802380AC 2402000A */ addiu $v0, $zero, 0xa -/* 6F1190 802380B0 0808E033 */ j .L802380CC -/* 6F1194 802380B4 AE020084 */ sw $v0, 0x84($s0) -.L802380B8: -/* 6F1198 802380B8 8E020084 */ lw $v0, 0x84($s0) -/* 6F119C 802380BC 2842000F */ slti $v0, $v0, 0xf -/* 6F11A0 802380C0 10400002 */ beqz $v0, .L802380CC -/* 6F11A4 802380C4 2402000F */ addiu $v0, $zero, 0xf -/* 6F11A8 802380C8 AE020084 */ sw $v0, 0x84($s0) -.L802380CC: -/* 6F11AC 802380CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 6F11B0 802380D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 6F11B4 802380D4 8FB00018 */ lw $s0, 0x18($sp) -/* 6F11B8 802380D8 24020002 */ addiu $v0, $zero, 2 -/* 6F11BC 802380DC 03E00008 */ jr $ra -/* 6F11C0 802380E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_6F10E0/func_80239190_6F2270.s b/asm/nonmatchings/code_6F10E0/func_80239190_6F2270.s deleted file mode 100644 index a8f5a0f059..0000000000 --- a/asm/nonmatchings/code_6F10E0/func_80239190_6F2270.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80239190_6F2270 -/* 6F2270 80239190 3C028024 */ lui $v0, %hi(D_8023CDA4) -/* 6F2274 80239194 8C42CDA4 */ lw $v0, %lo(D_8023CDA4)($v0) -/* 6F2278 80239198 54400002 */ bnel $v0, $zero, .L802391A4 -/* 6F227C 8023919C 24020025 */ addiu $v0, $zero, 0x25 -/* 6F2280 802391A0 24020024 */ addiu $v0, $zero, 0x24 -.L802391A4: -/* 6F2284 802391A4 AC820084 */ sw $v0, 0x84($a0) -/* 6F2288 802391A8 03E00008 */ jr $ra -/* 6F228C 802391AC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_73AED0/func_802A1000_73AED0.s b/asm/nonmatchings/code_73AED0/func_802A1000_73AED0.s deleted file mode 100644 index 6e6d81b234..0000000000 --- a/asm/nonmatchings/code_73AED0/func_802A1000_73AED0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_73AED0 -/* 73AED0 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 73AED4 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 73AED8 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 73AEDC 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 73AEE0 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 73AEE4 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 73AEE8 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 73AEEC 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 73AEF0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 73AEF4 802A1024 0C03A752 */ jal is_ability_active -/* 73AEF8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 73AEFC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 73AF00 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 73AF04 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 73AF08 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 73AF0C 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 73AF10 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 73AF14 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 73AF18 802A1048 03E00008 */ jr $ra -/* 73AF1C 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_73D860/func_802A1000_73D860.s b/asm/nonmatchings/code_73D860/func_802A1000_73D860.s deleted file mode 100644 index 81bd841158..0000000000 --- a/asm/nonmatchings/code_73D860/func_802A1000_73D860.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_73D860 -/* 73D860 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 73D864 802A1004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 73D868 802A1008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 73D86C 802A100C AFBF0020 */ sw $ra, 0x20($sp) -/* 73D870 802A1010 AFB1001C */ sw $s1, 0x1c($sp) -/* 73D874 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 73D878 802A1018 8C6200D8 */ lw $v0, 0xd8($v1) -/* 73D87C 802A101C 0080802D */ daddu $s0, $a0, $zero -/* 73D880 802A1020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 73D884 802A1024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 73D888 802A1028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 73D88C 802A102C C444014C */ lwc1 $f4, 0x14c($v0) -/* 73D890 802A1030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 73D894 802A1034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 73D898 802A1038 44062000 */ mfc1 $a2, $f4 -/* 73D89C 802A103C 44073000 */ mfc1 $a3, $f6 -/* 73D8A0 802A1040 0060882D */ daddu $s1, $v1, $zero -/* 73D8A4 802A1044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 73D8A8 802A1048 0C00A7CB */ jal dist3D -/* 73D8AC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) -/* 73D8B0 802A1050 3C014170 */ lui $at, 0x4170 -/* 73D8B4 802A1054 44811000 */ mtc1 $at, $f2 -/* 73D8B8 802A1058 00000000 */ nop -/* 73D8BC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 73D8C0 802A1060 00000000 */ nop -/* 73D8C4 802A1064 3C0142C8 */ lui $at, 0x42c8 -/* 73D8C8 802A1068 44811000 */ mtc1 $at, $f2 -/* 73D8CC 802A106C 00000000 */ nop -/* 73D8D0 802A1070 46020003 */ div.s $f0, $f0, $f2 -/* 73D8D4 802A1074 4600020D */ trunc.w.s $f8, $f0 -/* 73D8D8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 73D8DC 802A107C 00000000 */ nop -/* 73D8E0 802A1080 AE020084 */ sw $v0, 0x84($s0) -/* 73D8E4 802A1084 28420015 */ slti $v0, $v0, 0x15 -/* 73D8E8 802A1088 14400002 */ bnez $v0, .L802A1094 -/* 73D8EC 802A108C 24020014 */ addiu $v0, $zero, 0x14 -/* 73D8F0 802A1090 AE020084 */ sw $v0, 0x84($s0) -.L802A1094: -/* 73D8F4 802A1094 82220083 */ lb $v0, 0x83($s1) -/* 73D8F8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 73D8FC 802A109C 00000000 */ nop -/* 73D900 802A10A0 8E020084 */ lw $v0, 0x84($s0) -/* 73D904 802A10A4 28420006 */ slti $v0, $v0, 6 -/* 73D908 802A10A8 10400008 */ beqz $v0, .L802A10CC -/* 73D90C 802A10AC 24020006 */ addiu $v0, $zero, 6 -/* 73D910 802A10B0 080A8433 */ j .L802A10CC -/* 73D914 802A10B4 AE020084 */ sw $v0, 0x84($s0) -.L802A10B8: -/* 73D918 802A10B8 8E020084 */ lw $v0, 0x84($s0) -/* 73D91C 802A10BC 2842000C */ slti $v0, $v0, 0xc -/* 73D920 802A10C0 10400002 */ beqz $v0, .L802A10CC -/* 73D924 802A10C4 2402000C */ addiu $v0, $zero, 0xc -/* 73D928 802A10C8 AE020084 */ sw $v0, 0x84($s0) -.L802A10CC: -/* 73D92C 802A10CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 73D930 802A10D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 73D934 802A10D4 8FB00018 */ lw $s0, 0x18($sp) -/* 73D938 802A10D8 24020002 */ addiu $v0, $zero, 2 -/* 73D93C 802A10DC 03E00008 */ jr $ra -/* 73D940 802A10E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_75C980/func_802A1000_75C980.s b/asm/nonmatchings/code_75C980/func_802A1000_75C980.s deleted file mode 100644 index 33d5692457..0000000000 --- a/asm/nonmatchings/code_75C980/func_802A1000_75C980.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_75C980 -/* 75C980 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 75C984 802A1004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 75C988 802A1008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 75C98C 802A100C AFBF0020 */ sw $ra, 0x20($sp) -/* 75C990 802A1010 AFB1001C */ sw $s1, 0x1c($sp) -/* 75C994 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 75C998 802A1018 8C6200D8 */ lw $v0, 0xd8($v1) -/* 75C99C 802A101C 0080802D */ daddu $s0, $a0, $zero -/* 75C9A0 802A1020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 75C9A4 802A1024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 75C9A8 802A1028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 75C9AC 802A102C C444014C */ lwc1 $f4, 0x14c($v0) -/* 75C9B0 802A1030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 75C9B4 802A1034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 75C9B8 802A1038 44062000 */ mfc1 $a2, $f4 -/* 75C9BC 802A103C 44073000 */ mfc1 $a3, $f6 -/* 75C9C0 802A1040 0060882D */ daddu $s1, $v1, $zero -/* 75C9C4 802A1044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 75C9C8 802A1048 0C00A7CB */ jal dist3D -/* 75C9CC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) -/* 75C9D0 802A1050 3C014170 */ lui $at, 0x4170 -/* 75C9D4 802A1054 44811000 */ mtc1 $at, $f2 -/* 75C9D8 802A1058 00000000 */ nop -/* 75C9DC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 75C9E0 802A1060 00000000 */ nop -/* 75C9E4 802A1064 3C0142C8 */ lui $at, 0x42c8 -/* 75C9E8 802A1068 44811000 */ mtc1 $at, $f2 -/* 75C9EC 802A106C 00000000 */ nop -/* 75C9F0 802A1070 46020003 */ div.s $f0, $f0, $f2 -/* 75C9F4 802A1074 4600020D */ trunc.w.s $f8, $f0 -/* 75C9F8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 75C9FC 802A107C 00000000 */ nop -/* 75CA00 802A1080 AE020084 */ sw $v0, 0x84($s0) -/* 75CA04 802A1084 28420015 */ slti $v0, $v0, 0x15 -/* 75CA08 802A1088 14400002 */ bnez $v0, .L802A1094 -/* 75CA0C 802A108C 24020014 */ addiu $v0, $zero, 0x14 -/* 75CA10 802A1090 AE020084 */ sw $v0, 0x84($s0) -.L802A1094: -/* 75CA14 802A1094 82220083 */ lb $v0, 0x83($s1) -/* 75CA18 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 75CA1C 802A109C 00000000 */ nop -/* 75CA20 802A10A0 8E020084 */ lw $v0, 0x84($s0) -/* 75CA24 802A10A4 28420006 */ slti $v0, $v0, 6 -/* 75CA28 802A10A8 10400008 */ beqz $v0, .L802A10CC -/* 75CA2C 802A10AC 24020006 */ addiu $v0, $zero, 6 -/* 75CA30 802A10B0 080A8433 */ j .L802A10CC -/* 75CA34 802A10B4 AE020084 */ sw $v0, 0x84($s0) -.L802A10B8: -/* 75CA38 802A10B8 8E020084 */ lw $v0, 0x84($s0) -/* 75CA3C 802A10BC 2842000C */ slti $v0, $v0, 0xc -/* 75CA40 802A10C0 10400002 */ beqz $v0, .L802A10CC -/* 75CA44 802A10C4 2402000C */ addiu $v0, $zero, 0xc -/* 75CA48 802A10C8 AE020084 */ sw $v0, 0x84($s0) -.L802A10CC: -/* 75CA4C 802A10CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 75CA50 802A10D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 75CA54 802A10D4 8FB00018 */ lw $s0, 0x18($sp) -/* 75CA58 802A10D8 24020002 */ addiu $v0, $zero, 2 -/* 75CA5C 802A10DC 03E00008 */ jr $ra -/* 75CA60 802A10E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_75C980/func_802A10E4_75CA64.s b/asm/nonmatchings/code_75C980/func_802A10E4_75CA64.s deleted file mode 100644 index ad0fe89da8..0000000000 --- a/asm/nonmatchings/code_75C980/func_802A10E4_75CA64.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10E4_75CA64 -/* 75CA64 802A10E4 AC800084 */ sw $zero, 0x84($a0) -/* 75CA68 802A10E8 3C02800E */ lui $v0, %hi(gBattleStatus+0x97) -/* 75CA6C 802A10EC 8042C107 */ lb $v0, %lo(gBattleStatus+0x97)($v0) -/* 75CA70 802A10F0 28420063 */ slti $v0, $v0, 0x63 -/* 75CA74 802A10F4 14400002 */ bnez $v0, .L802A1100 -/* 75CA78 802A10F8 24020001 */ addiu $v0, $zero, 1 -/* 75CA7C 802A10FC AC820084 */ sw $v0, 0x84($a0) -.L802A1100: -/* 75CA80 802A1100 03E00008 */ jr $ra -/* 75CA84 802A1104 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_75C980/func_802A1108_75CA88.s b/asm/nonmatchings/code_75C980/func_802A1108_75CA88.s deleted file mode 100644 index b4d4d5fceb..0000000000 --- a/asm/nonmatchings/code_75C980/func_802A1108_75CA88.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1108_75CA88 -/* 75CA88 802A1108 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 75CA8C 802A110C AFB1001C */ sw $s1, 0x1c($sp) -/* 75CA90 802A1110 0080882D */ daddu $s1, $a0, $zero -/* 75CA94 802A1114 AFBF0024 */ sw $ra, 0x24($sp) -/* 75CA98 802A1118 AFB20020 */ sw $s2, 0x20($sp) -/* 75CA9C 802A111C AFB00018 */ sw $s0, 0x18($sp) -/* 75CAA0 802A1120 8E30000C */ lw $s0, 0xc($s1) -/* 75CAA4 802A1124 8E050000 */ lw $a1, ($s0) -/* 75CAA8 802A1128 0C0B1EAF */ jal get_variable -/* 75CAAC 802A112C 26100004 */ addiu $s0, $s0, 4 -/* 75CAB0 802A1130 8E050000 */ lw $a1, ($s0) -/* 75CAB4 802A1134 26100004 */ addiu $s0, $s0, 4 -/* 75CAB8 802A1138 0220202D */ daddu $a0, $s1, $zero -/* 75CABC 802A113C 0C0B1EAF */ jal get_variable -/* 75CAC0 802A1140 0040902D */ daddu $s2, $v0, $zero -/* 75CAC4 802A1144 0220202D */ daddu $a0, $s1, $zero -/* 75CAC8 802A1148 8E050000 */ lw $a1, ($s0) -/* 75CACC 802A114C 0C0B1EAF */ jal get_variable -/* 75CAD0 802A1150 0040802D */ daddu $s0, $v0, $zero -/* 75CAD4 802A1154 24040001 */ addiu $a0, $zero, 1 -/* 75CAD8 802A1158 44921000 */ mtc1 $s2, $f2 -/* 75CADC 802A115C 00000000 */ nop -/* 75CAE0 802A1160 468010A0 */ cvt.s.w $f2, $f2 -/* 75CAE4 802A1164 44051000 */ mfc1 $a1, $f2 -/* 75CAE8 802A1168 44901000 */ mtc1 $s0, $f2 -/* 75CAEC 802A116C 00000000 */ nop -/* 75CAF0 802A1170 468010A0 */ cvt.s.w $f2, $f2 -/* 75CAF4 802A1174 44061000 */ mfc1 $a2, $f2 -/* 75CAF8 802A1178 44821000 */ mtc1 $v0, $f2 -/* 75CAFC 802A117C 00000000 */ nop -/* 75CB00 802A1180 468010A0 */ cvt.s.w $f2, $f2 -/* 75CB04 802A1184 3C013F80 */ lui $at, 0x3f80 -/* 75CB08 802A1188 44810000 */ mtc1 $at, $f0 -/* 75CB0C 802A118C 44071000 */ mfc1 $a3, $f2 -/* 75CB10 802A1190 2403003C */ addiu $v1, $zero, 0x3c -/* 75CB14 802A1194 AFA30014 */ sw $v1, 0x14($sp) -/* 75CB18 802A1198 0C01C634 */ jal func_800718D0 -/* 75CB1C 802A119C E7A00010 */ swc1 $f0, 0x10($sp) -/* 75CB20 802A11A0 3C04802A */ lui $a0, %hi(D_802A2C50) -/* 75CB24 802A11A4 24842C50 */ addiu $a0, $a0, %lo(D_802A2C50) -/* 75CB28 802A11A8 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 75CB2C 802A11AC 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 75CB30 802A11B0 AC800000 */ sw $zero, ($a0) -/* 75CB34 802A11B4 82020097 */ lb $v0, 0x97($s0) -/* 75CB38 802A11B8 92030097 */ lbu $v1, 0x97($s0) -/* 75CB3C 802A11BC 18400003 */ blez $v0, .L802A11CC -/* 75CB40 802A11C0 0200882D */ daddu $s1, $s0, $zero -/* 75CB44 802A11C4 24020001 */ addiu $v0, $zero, 1 -/* 75CB48 802A11C8 AC820000 */ sw $v0, ($a0) -.L802A11CC: -/* 75CB4C 802A11CC 24620002 */ addiu $v0, $v1, 2 -/* 75CB50 802A11D0 A2020097 */ sb $v0, 0x97($s0) -/* 75CB54 802A11D4 00021600 */ sll $v0, $v0, 0x18 -/* 75CB58 802A11D8 00021603 */ sra $v0, $v0, 0x18 -/* 75CB5C 802A11DC 28420064 */ slti $v0, $v0, 0x64 -/* 75CB60 802A11E0 14400003 */ bnez $v0, .L802A11F0 -/* 75CB64 802A11E4 3C03EFFF */ lui $v1, 0xefff -/* 75CB68 802A11E8 24020063 */ addiu $v0, $zero, 0x63 -/* 75CB6C 802A11EC A2020097 */ sb $v0, 0x97($s0) -.L802A11F0: -/* 75CB70 802A11F0 3463FFFF */ ori $v1, $v1, 0xffff -/* 75CB74 802A11F4 8E240000 */ lw $a0, ($s1) -/* 75CB78 802A11F8 3C052000 */ lui $a1, 0x2000 -/* 75CB7C 802A11FC A2200096 */ sb $zero, 0x96($s1) -/* 75CB80 802A1200 00852025 */ or $a0, $a0, $a1 -/* 75CB84 802A1204 00832024 */ and $a0, $a0, $v1 -/* 75CB88 802A1208 AE240000 */ sw $a0, ($s1) -/* 75CB8C 802A120C 8FBF0024 */ lw $ra, 0x24($sp) -/* 75CB90 802A1210 8FB20020 */ lw $s2, 0x20($sp) -/* 75CB94 802A1214 8FB1001C */ lw $s1, 0x1c($sp) -/* 75CB98 802A1218 8FB00018 */ lw $s0, 0x18($sp) -/* 75CB9C 802A121C 24020002 */ addiu $v0, $zero, 2 -/* 75CBA0 802A1220 03E00008 */ jr $ra -/* 75CBA4 802A1224 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_75C980/func_802A1228_75CBA8.s b/asm/nonmatchings/code_75C980/func_802A1228_75CBA8.s deleted file mode 100644 index 9760abc76c..0000000000 --- a/asm/nonmatchings/code_75C980/func_802A1228_75CBA8.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1228_75CBA8 -/* 75CBA8 802A1228 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 75CBAC 802A122C AFB20020 */ sw $s2, 0x20($sp) -/* 75CBB0 802A1230 0080902D */ daddu $s2, $a0, $zero -/* 75CBB4 802A1234 AFBF0028 */ sw $ra, 0x28($sp) -/* 75CBB8 802A1238 AFB30024 */ sw $s3, 0x24($sp) -/* 75CBBC 802A123C AFB1001C */ sw $s1, 0x1c($sp) -/* 75CBC0 802A1240 AFB00018 */ sw $s0, 0x18($sp) -/* 75CBC4 802A1244 F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 75CBC8 802A1248 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 75CBCC 802A124C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 75CBD0 802A1250 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 75CBD4 802A1254 8E50000C */ lw $s0, 0xc($s2) -/* 75CBD8 802A1258 8E050000 */ lw $a1, ($s0) -/* 75CBDC 802A125C 0C0B1EAF */ jal get_variable -/* 75CBE0 802A1260 26100004 */ addiu $s0, $s0, 4 -/* 75CBE4 802A1264 8E050000 */ lw $a1, ($s0) -/* 75CBE8 802A1268 26100004 */ addiu $s0, $s0, 4 -/* 75CBEC 802A126C 0240202D */ daddu $a0, $s2, $zero -/* 75CBF0 802A1270 0C0B1EAF */ jal get_variable -/* 75CBF4 802A1274 0040982D */ daddu $s3, $v0, $zero -/* 75CBF8 802A1278 8E050000 */ lw $a1, ($s0) -/* 75CBFC 802A127C 26100004 */ addiu $s0, $s0, 4 -/* 75CC00 802A1280 0240202D */ daddu $a0, $s2, $zero -/* 75CC04 802A1284 0C0B1EAF */ jal get_variable -/* 75CC08 802A1288 0040882D */ daddu $s1, $v0, $zero -/* 75CC0C 802A128C 0240202D */ daddu $a0, $s2, $zero -/* 75CC10 802A1290 8E050000 */ lw $a1, ($s0) -/* 75CC14 802A1294 0C0B210B */ jal get_float_variable -/* 75CC18 802A1298 0040802D */ daddu $s0, $v0, $zero -/* 75CC1C 802A129C 24040006 */ addiu $a0, $zero, 6 -/* 75CC20 802A12A0 2673000A */ addiu $s3, $s3, 0xa -/* 75CC24 802A12A4 4493D000 */ mtc1 $s3, $f26 -/* 75CC28 802A12A8 00000000 */ nop -/* 75CC2C 802A12AC 4680D6A0 */ cvt.s.w $f26, $f26 -/* 75CC30 802A12B0 26310012 */ addiu $s1, $s1, 0x12 -/* 75CC34 802A12B4 4491C000 */ mtc1 $s1, $f24 -/* 75CC38 802A12B8 00000000 */ nop -/* 75CC3C 802A12BC 4680C620 */ cvt.s.w $f24, $f24 -/* 75CC40 802A12C0 4490A000 */ mtc1 $s0, $f20 -/* 75CC44 802A12C4 00000000 */ nop -/* 75CC48 802A12C8 4680A520 */ cvt.s.w $f20, $f20 -/* 75CC4C 802A12CC 46000586 */ mov.s $f22, $f0 -/* 75CC50 802A12D0 4405D000 */ mfc1 $a1, $f26 -/* 75CC54 802A12D4 4406C000 */ mfc1 $a2, $f24 -/* 75CC58 802A12D8 4407A000 */ mfc1 $a3, $f20 -/* 75CC5C 802A12DC 2402002D */ addiu $v0, $zero, 0x2d -/* 75CC60 802A12E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 75CC64 802A12E4 0C01C82C */ jal func_800720B0 -/* 75CC68 802A12E8 AFA20014 */ sw $v0, 0x14($sp) -/* 75CC6C 802A12EC 2404000C */ addiu $a0, $zero, 0xc -/* 75CC70 802A12F0 4405D000 */ mfc1 $a1, $f26 -/* 75CC74 802A12F4 4406C000 */ mfc1 $a2, $f24 -/* 75CC78 802A12F8 4407A000 */ mfc1 $a3, $f20 -/* 75CC7C 802A12FC 2402001E */ addiu $v0, $zero, 0x1e -/* 75CC80 802A1300 E7B60010 */ swc1 $f22, 0x10($sp) -/* 75CC84 802A1304 0C01C2EC */ jal func_80070BB0 -/* 75CC88 802A1308 AFA20014 */ sw $v0, 0x14($sp) -/* 75CC8C 802A130C 8FBF0028 */ lw $ra, 0x28($sp) -/* 75CC90 802A1310 8FB30024 */ lw $s3, 0x24($sp) -/* 75CC94 802A1314 8FB20020 */ lw $s2, 0x20($sp) -/* 75CC98 802A1318 8FB1001C */ lw $s1, 0x1c($sp) -/* 75CC9C 802A131C 8FB00018 */ lw $s0, 0x18($sp) -/* 75CCA0 802A1320 D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 75CCA4 802A1324 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 75CCA8 802A1328 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 75CCAC 802A132C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 75CCB0 802A1330 24020002 */ addiu $v0, $zero, 2 -/* 75CCB4 802A1334 03E00008 */ jr $ra -/* 75CCB8 802A1338 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_75C980/func_802A133C_75CCBC.s b/asm/nonmatchings/code_75C980/func_802A133C_75CCBC.s deleted file mode 100644 index d2a61f0dfa..0000000000 --- a/asm/nonmatchings/code_75C980/func_802A133C_75CCBC.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A133C_75CCBC -/* 75CCBC 802A133C 3C02802A */ lui $v0, %hi(D_802A2C50) -/* 75CCC0 802A1340 8C422C50 */ lw $v0, %lo(D_802A2C50)($v0) -/* 75CCC4 802A1344 54400002 */ bnel $v0, $zero, .L802A1350 -/* 75CCC8 802A1348 24020007 */ addiu $v0, $zero, 7 -/* 75CCCC 802A134C 24020006 */ addiu $v0, $zero, 6 -.L802A1350: -/* 75CCD0 802A1350 AC820084 */ sw $v0, 0x84($a0) -/* 75CCD4 802A1354 03E00008 */ jr $ra -/* 75CCD8 802A1358 24020002 */ addiu $v0, $zero, 2 -/* 75CCDC 802A135C 00000000 */ nop diff --git a/asm/nonmatchings/code_761920/func_802A1000_761920.s b/asm/nonmatchings/code_761920/func_802A1000_761920.s deleted file mode 100644 index f8c980aa69..0000000000 --- a/asm/nonmatchings/code_761920/func_802A1000_761920.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_761920 -/* 761920 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 761924 802A1004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 761928 802A1008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 76192C 802A100C AFBF0020 */ sw $ra, 0x20($sp) -/* 761930 802A1010 AFB1001C */ sw $s1, 0x1c($sp) -/* 761934 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 761938 802A1018 8C6200D8 */ lw $v0, 0xd8($v1) -/* 76193C 802A101C 0080802D */ daddu $s0, $a0, $zero -/* 761940 802A1020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 761944 802A1024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 761948 802A1028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 76194C 802A102C C444014C */ lwc1 $f4, 0x14c($v0) -/* 761950 802A1030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 761954 802A1034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 761958 802A1038 44062000 */ mfc1 $a2, $f4 -/* 76195C 802A103C 44073000 */ mfc1 $a3, $f6 -/* 761960 802A1040 0060882D */ daddu $s1, $v1, $zero -/* 761964 802A1044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 761968 802A1048 0C00A7CB */ jal dist3D -/* 76196C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) -/* 761970 802A1050 3C014170 */ lui $at, 0x4170 -/* 761974 802A1054 44811000 */ mtc1 $at, $f2 -/* 761978 802A1058 00000000 */ nop -/* 76197C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 761980 802A1060 00000000 */ nop -/* 761984 802A1064 3C0142C8 */ lui $at, 0x42c8 -/* 761988 802A1068 44811000 */ mtc1 $at, $f2 -/* 76198C 802A106C 00000000 */ nop -/* 761990 802A1070 46020003 */ div.s $f0, $f0, $f2 -/* 761994 802A1074 4600020D */ trunc.w.s $f8, $f0 -/* 761998 802A1078 44024000 */ mfc1 $v0, $f8 -/* 76199C 802A107C 00000000 */ nop -/* 7619A0 802A1080 AE020084 */ sw $v0, 0x84($s0) -/* 7619A4 802A1084 28420015 */ slti $v0, $v0, 0x15 -/* 7619A8 802A1088 14400002 */ bnez $v0, .L802A1094 -/* 7619AC 802A108C 24020014 */ addiu $v0, $zero, 0x14 -/* 7619B0 802A1090 AE020084 */ sw $v0, 0x84($s0) -.L802A1094: -/* 7619B4 802A1094 82220083 */ lb $v0, 0x83($s1) -/* 7619B8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 7619BC 802A109C 00000000 */ nop -/* 7619C0 802A10A0 8E020084 */ lw $v0, 0x84($s0) -/* 7619C4 802A10A4 28420006 */ slti $v0, $v0, 6 -/* 7619C8 802A10A8 10400008 */ beqz $v0, .L802A10CC -/* 7619CC 802A10AC 24020006 */ addiu $v0, $zero, 6 -/* 7619D0 802A10B0 080A8433 */ j .L802A10CC -/* 7619D4 802A10B4 AE020084 */ sw $v0, 0x84($s0) -.L802A10B8: -/* 7619D8 802A10B8 8E020084 */ lw $v0, 0x84($s0) -/* 7619DC 802A10BC 2842000C */ slti $v0, $v0, 0xc -/* 7619E0 802A10C0 10400002 */ beqz $v0, .L802A10CC -/* 7619E4 802A10C4 2402000C */ addiu $v0, $zero, 0xc -/* 7619E8 802A10C8 AE020084 */ sw $v0, 0x84($s0) -.L802A10CC: -/* 7619EC 802A10CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 7619F0 802A10D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 7619F4 802A10D4 8FB00018 */ lw $s0, 0x18($sp) -/* 7619F8 802A10D8 24020002 */ addiu $v0, $zero, 2 -/* 7619FC 802A10DC 03E00008 */ jr $ra -/* 761A00 802A10E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_761920/func_802A10E4_761A04.s b/asm/nonmatchings/code_761920/func_802A10E4_761A04.s deleted file mode 100644 index d5f2977942..0000000000 --- a/asm/nonmatchings/code_761920/func_802A10E4_761A04.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10E4_761A04 -/* 761A04 802A10E4 AC800084 */ sw $zero, 0x84($a0) -/* 761A08 802A10E8 3C02800E */ lui $v0, %hi(gBattleStatus+0x97) -/* 761A0C 802A10EC 8042C107 */ lb $v0, %lo(gBattleStatus+0x97)($v0) -/* 761A10 802A10F0 28420063 */ slti $v0, $v0, 0x63 -/* 761A14 802A10F4 14400002 */ bnez $v0, .L802A1100 -/* 761A18 802A10F8 24020001 */ addiu $v0, $zero, 1 -/* 761A1C 802A10FC AC820084 */ sw $v0, 0x84($a0) -.L802A1100: -/* 761A20 802A1100 03E00008 */ jr $ra -/* 761A24 802A1104 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_761920/func_802A1108_761A28.s b/asm/nonmatchings/code_761920/func_802A1108_761A28.s deleted file mode 100644 index 2e2978679b..0000000000 --- a/asm/nonmatchings/code_761920/func_802A1108_761A28.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1108_761A28 -/* 761A28 802A1108 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 761A2C 802A110C AFB1001C */ sw $s1, 0x1c($sp) -/* 761A30 802A1110 0080882D */ daddu $s1, $a0, $zero -/* 761A34 802A1114 AFBF0024 */ sw $ra, 0x24($sp) -/* 761A38 802A1118 AFB20020 */ sw $s2, 0x20($sp) -/* 761A3C 802A111C AFB00018 */ sw $s0, 0x18($sp) -/* 761A40 802A1120 8E30000C */ lw $s0, 0xc($s1) -/* 761A44 802A1124 8E050000 */ lw $a1, ($s0) -/* 761A48 802A1128 0C0B1EAF */ jal get_variable -/* 761A4C 802A112C 26100004 */ addiu $s0, $s0, 4 -/* 761A50 802A1130 8E050000 */ lw $a1, ($s0) -/* 761A54 802A1134 26100004 */ addiu $s0, $s0, 4 -/* 761A58 802A1138 0220202D */ daddu $a0, $s1, $zero -/* 761A5C 802A113C 0C0B1EAF */ jal get_variable -/* 761A60 802A1140 0040902D */ daddu $s2, $v0, $zero -/* 761A64 802A1144 0220202D */ daddu $a0, $s1, $zero -/* 761A68 802A1148 8E050000 */ lw $a1, ($s0) -/* 761A6C 802A114C 0C0B1EAF */ jal get_variable -/* 761A70 802A1150 0040802D */ daddu $s0, $v0, $zero -/* 761A74 802A1154 24040002 */ addiu $a0, $zero, 2 -/* 761A78 802A1158 44921000 */ mtc1 $s2, $f2 -/* 761A7C 802A115C 00000000 */ nop -/* 761A80 802A1160 468010A0 */ cvt.s.w $f2, $f2 -/* 761A84 802A1164 44051000 */ mfc1 $a1, $f2 -/* 761A88 802A1168 44901000 */ mtc1 $s0, $f2 -/* 761A8C 802A116C 00000000 */ nop -/* 761A90 802A1170 468010A0 */ cvt.s.w $f2, $f2 -/* 761A94 802A1174 44061000 */ mfc1 $a2, $f2 -/* 761A98 802A1178 44821000 */ mtc1 $v0, $f2 -/* 761A9C 802A117C 00000000 */ nop -/* 761AA0 802A1180 468010A0 */ cvt.s.w $f2, $f2 -/* 761AA4 802A1184 3C013F80 */ lui $at, 0x3f80 -/* 761AA8 802A1188 44810000 */ mtc1 $at, $f0 -/* 761AAC 802A118C 44071000 */ mfc1 $a3, $f2 -/* 761AB0 802A1190 2403003C */ addiu $v1, $zero, 0x3c -/* 761AB4 802A1194 AFA30014 */ sw $v1, 0x14($sp) -/* 761AB8 802A1198 0C01C634 */ jal func_800718D0 -/* 761ABC 802A119C E7A00010 */ swc1 $f0, 0x10($sp) -/* 761AC0 802A11A0 3C04802A */ lui $a0, %hi(D_802A2C20) -/* 761AC4 802A11A4 24842C20 */ addiu $a0, $a0, %lo(D_802A2C20) -/* 761AC8 802A11A8 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 761ACC 802A11AC 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 761AD0 802A11B0 AC800000 */ sw $zero, ($a0) -/* 761AD4 802A11B4 82020097 */ lb $v0, 0x97($s0) -/* 761AD8 802A11B8 92030097 */ lbu $v1, 0x97($s0) -/* 761ADC 802A11BC 18400003 */ blez $v0, .L802A11CC -/* 761AE0 802A11C0 0200882D */ daddu $s1, $s0, $zero -/* 761AE4 802A11C4 24020001 */ addiu $v0, $zero, 1 -/* 761AE8 802A11C8 AC820000 */ sw $v0, ($a0) -.L802A11CC: -/* 761AEC 802A11CC 24620003 */ addiu $v0, $v1, 3 -/* 761AF0 802A11D0 A2020097 */ sb $v0, 0x97($s0) -/* 761AF4 802A11D4 00021600 */ sll $v0, $v0, 0x18 -/* 761AF8 802A11D8 00021603 */ sra $v0, $v0, 0x18 -/* 761AFC 802A11DC 28420064 */ slti $v0, $v0, 0x64 -/* 761B00 802A11E0 14400003 */ bnez $v0, .L802A11F0 -/* 761B04 802A11E4 3C03EFFF */ lui $v1, 0xefff -/* 761B08 802A11E8 24020063 */ addiu $v0, $zero, 0x63 -/* 761B0C 802A11EC A2020097 */ sb $v0, 0x97($s0) -.L802A11F0: -/* 761B10 802A11F0 3463FFFF */ ori $v1, $v1, 0xffff -/* 761B14 802A11F4 8E240000 */ lw $a0, ($s1) -/* 761B18 802A11F8 3C052000 */ lui $a1, 0x2000 -/* 761B1C 802A11FC A2200096 */ sb $zero, 0x96($s1) -/* 761B20 802A1200 00852025 */ or $a0, $a0, $a1 -/* 761B24 802A1204 00832024 */ and $a0, $a0, $v1 -/* 761B28 802A1208 AE240000 */ sw $a0, ($s1) -/* 761B2C 802A120C 8FBF0024 */ lw $ra, 0x24($sp) -/* 761B30 802A1210 8FB20020 */ lw $s2, 0x20($sp) -/* 761B34 802A1214 8FB1001C */ lw $s1, 0x1c($sp) -/* 761B38 802A1218 8FB00018 */ lw $s0, 0x18($sp) -/* 761B3C 802A121C 24020002 */ addiu $v0, $zero, 2 -/* 761B40 802A1220 03E00008 */ jr $ra -/* 761B44 802A1224 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_761920/func_802A1228_761B48.s b/asm/nonmatchings/code_761920/func_802A1228_761B48.s deleted file mode 100644 index c228d0a9f9..0000000000 --- a/asm/nonmatchings/code_761920/func_802A1228_761B48.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1228_761B48 -/* 761B48 802A1228 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 761B4C 802A122C AFB20020 */ sw $s2, 0x20($sp) -/* 761B50 802A1230 0080902D */ daddu $s2, $a0, $zero -/* 761B54 802A1234 AFBF0028 */ sw $ra, 0x28($sp) -/* 761B58 802A1238 AFB30024 */ sw $s3, 0x24($sp) -/* 761B5C 802A123C AFB1001C */ sw $s1, 0x1c($sp) -/* 761B60 802A1240 AFB00018 */ sw $s0, 0x18($sp) -/* 761B64 802A1244 F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 761B68 802A1248 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 761B6C 802A124C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 761B70 802A1250 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 761B74 802A1254 8E50000C */ lw $s0, 0xc($s2) -/* 761B78 802A1258 8E050000 */ lw $a1, ($s0) -/* 761B7C 802A125C 0C0B1EAF */ jal get_variable -/* 761B80 802A1260 26100004 */ addiu $s0, $s0, 4 -/* 761B84 802A1264 8E050000 */ lw $a1, ($s0) -/* 761B88 802A1268 26100004 */ addiu $s0, $s0, 4 -/* 761B8C 802A126C 0240202D */ daddu $a0, $s2, $zero -/* 761B90 802A1270 0C0B1EAF */ jal get_variable -/* 761B94 802A1274 0040982D */ daddu $s3, $v0, $zero -/* 761B98 802A1278 8E050000 */ lw $a1, ($s0) -/* 761B9C 802A127C 26100004 */ addiu $s0, $s0, 4 -/* 761BA0 802A1280 0240202D */ daddu $a0, $s2, $zero -/* 761BA4 802A1284 0C0B1EAF */ jal get_variable -/* 761BA8 802A1288 0040882D */ daddu $s1, $v0, $zero -/* 761BAC 802A128C 0240202D */ daddu $a0, $s2, $zero -/* 761BB0 802A1290 8E050000 */ lw $a1, ($s0) -/* 761BB4 802A1294 0C0B210B */ jal get_float_variable -/* 761BB8 802A1298 0040802D */ daddu $s0, $v0, $zero -/* 761BBC 802A129C 24040006 */ addiu $a0, $zero, 6 -/* 761BC0 802A12A0 2673000A */ addiu $s3, $s3, 0xa -/* 761BC4 802A12A4 4493D000 */ mtc1 $s3, $f26 -/* 761BC8 802A12A8 00000000 */ nop -/* 761BCC 802A12AC 4680D6A0 */ cvt.s.w $f26, $f26 -/* 761BD0 802A12B0 26310012 */ addiu $s1, $s1, 0x12 -/* 761BD4 802A12B4 4491C000 */ mtc1 $s1, $f24 -/* 761BD8 802A12B8 00000000 */ nop -/* 761BDC 802A12BC 4680C620 */ cvt.s.w $f24, $f24 -/* 761BE0 802A12C0 4490A000 */ mtc1 $s0, $f20 -/* 761BE4 802A12C4 00000000 */ nop -/* 761BE8 802A12C8 4680A520 */ cvt.s.w $f20, $f20 -/* 761BEC 802A12CC 46000586 */ mov.s $f22, $f0 -/* 761BF0 802A12D0 4405D000 */ mfc1 $a1, $f26 -/* 761BF4 802A12D4 4406C000 */ mfc1 $a2, $f24 -/* 761BF8 802A12D8 4407A000 */ mfc1 $a3, $f20 -/* 761BFC 802A12DC 2402002D */ addiu $v0, $zero, 0x2d -/* 761C00 802A12E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 761C04 802A12E4 0C01C82C */ jal func_800720B0 -/* 761C08 802A12E8 AFA20014 */ sw $v0, 0x14($sp) -/* 761C0C 802A12EC 2404000D */ addiu $a0, $zero, 0xd -/* 761C10 802A12F0 4405D000 */ mfc1 $a1, $f26 -/* 761C14 802A12F4 4406C000 */ mfc1 $a2, $f24 -/* 761C18 802A12F8 4407A000 */ mfc1 $a3, $f20 -/* 761C1C 802A12FC 2402001E */ addiu $v0, $zero, 0x1e -/* 761C20 802A1300 E7B60010 */ swc1 $f22, 0x10($sp) -/* 761C24 802A1304 0C01C2EC */ jal func_80070BB0 -/* 761C28 802A1308 AFA20014 */ sw $v0, 0x14($sp) -/* 761C2C 802A130C 8FBF0028 */ lw $ra, 0x28($sp) -/* 761C30 802A1310 8FB30024 */ lw $s3, 0x24($sp) -/* 761C34 802A1314 8FB20020 */ lw $s2, 0x20($sp) -/* 761C38 802A1318 8FB1001C */ lw $s1, 0x1c($sp) -/* 761C3C 802A131C 8FB00018 */ lw $s0, 0x18($sp) -/* 761C40 802A1320 D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 761C44 802A1324 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 761C48 802A1328 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 761C4C 802A132C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 761C50 802A1330 24020002 */ addiu $v0, $zero, 2 -/* 761C54 802A1334 03E00008 */ jr $ra -/* 761C58 802A1338 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/code_761920/func_802A133C_761C5C.s b/asm/nonmatchings/code_761920/func_802A133C_761C5C.s deleted file mode 100644 index 24f075fce5..0000000000 --- a/asm/nonmatchings/code_761920/func_802A133C_761C5C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A133C_761C5C -/* 761C5C 802A133C 3C02802A */ lui $v0, %hi(D_802A2C20) -/* 761C60 802A1340 8C422C20 */ lw $v0, %lo(D_802A2C20)($v0) -/* 761C64 802A1344 54400002 */ bnel $v0, $zero, .L802A1350 -/* 761C68 802A1348 24020007 */ addiu $v0, $zero, 7 -/* 761C6C 802A134C 24020006 */ addiu $v0, $zero, 6 -.L802A1350: -/* 761C70 802A1350 AC820084 */ sw $v0, 0x84($a0) -/* 761C74 802A1354 03E00008 */ jr $ra -/* 761C78 802A1358 24020002 */ addiu $v0, $zero, 2 -/* 761C7C 802A135C 00000000 */ nop diff --git a/asm/nonmatchings/code_772BA0/func_802A1000_772BA0.s b/asm/nonmatchings/code_772BA0/func_802A1000_772BA0.s deleted file mode 100644 index d04b598778..0000000000 --- a/asm/nonmatchings/code_772BA0/func_802A1000_772BA0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_772BA0 -/* 772BA0 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 772BA4 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 772BA8 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 772BAC 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 772BB0 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 772BB4 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 772BB8 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 772BBC 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 772BC0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 772BC4 802A1024 0C03A752 */ jal is_ability_active -/* 772BC8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 772BCC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 772BD0 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 772BD4 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 772BD8 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 772BDC 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 772BE0 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 772BE4 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 772BE8 802A1048 03E00008 */ jr $ra -/* 772BEC 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_777690/func_802A1000_777690.s b/asm/nonmatchings/code_777690/func_802A1000_777690.s deleted file mode 100644 index 1071bdaa14..0000000000 --- a/asm/nonmatchings/code_777690/func_802A1000_777690.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_777690 -/* 777690 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 777694 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 777698 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 77769C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 7776A0 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 7776A4 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 7776A8 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 7776AC 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 7776B0 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 7776B4 802A1024 0C03A752 */ jal is_ability_active -/* 7776B8 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 7776BC 802A102C 10400003 */ beqz $v0, .L802A103C -/* 7776C0 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 7776C4 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 7776C8 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 7776CC 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7776D0 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 7776D4 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 7776D8 802A1048 03E00008 */ jr $ra -/* 7776DC 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_77F240/func_802A1000_77F240.s b/asm/nonmatchings/code_77F240/func_802A1000_77F240.s deleted file mode 100644 index c984e16403..0000000000 --- a/asm/nonmatchings/code_77F240/func_802A1000_77F240.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_77F240 -/* 77F240 802A1000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 77F244 802A1004 AFB00010 */ sw $s0, 0x10($sp) -/* 77F248 802A1008 0080802D */ daddu $s0, $a0, $zero -/* 77F24C 802A100C 2402000F */ addiu $v0, $zero, 0xf -/* 77F250 802A1010 3C03800E */ lui $v1, %hi(gBattleStatus+0x83) -/* 77F254 802A1014 8063C0F3 */ lb $v1, %lo(gBattleStatus+0x83)($v1) -/* 77F258 802A1018 24040015 */ addiu $a0, $zero, 0x15 -/* 77F25C 802A101C AFBF0014 */ sw $ra, 0x14($sp) -/* 77F260 802A1020 AE020088 */ sw $v0, 0x88($s0) -/* 77F264 802A1024 0C03A752 */ jal is_ability_active -/* 77F268 802A1028 AE030084 */ sw $v1, 0x84($s0) -/* 77F26C 802A102C 10400003 */ beqz $v0, .L802A103C -/* 77F270 802A1030 24020028 */ addiu $v0, $zero, 0x28 -/* 77F274 802A1034 AE000084 */ sw $zero, 0x84($s0) -/* 77F278 802A1038 AE020088 */ sw $v0, 0x88($s0) -.L802A103C: -/* 77F27C 802A103C 8FBF0014 */ lw $ra, 0x14($sp) -/* 77F280 802A1040 8FB00010 */ lw $s0, 0x10($sp) -/* 77F284 802A1044 24020002 */ addiu $v0, $zero, 2 -/* 77F288 802A1048 03E00008 */ jr $ra -/* 77F28C 802A104C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_785B20/func_802A1000_785B20.s b/asm/nonmatchings/code_785B20/func_802A1000_785B20.s deleted file mode 100644 index 54666cae67..0000000000 --- a/asm/nonmatchings/code_785B20/func_802A1000_785B20.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_785B20 -/* 785B20 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 785B24 802A1004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 785B28 802A1008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 785B2C 802A100C AFBF0020 */ sw $ra, 0x20($sp) -/* 785B30 802A1010 AFB1001C */ sw $s1, 0x1c($sp) -/* 785B34 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 785B38 802A1018 8C6200D8 */ lw $v0, 0xd8($v1) -/* 785B3C 802A101C 0080802D */ daddu $s0, $a0, $zero -/* 785B40 802A1020 C442001C */ lwc1 $f2, 0x1c($v0) -/* 785B44 802A1024 C44C0144 */ lwc1 $f12, 0x144($v0) -/* 785B48 802A1028 C44E0148 */ lwc1 $f14, 0x148($v0) -/* 785B4C 802A102C C444014C */ lwc1 $f4, 0x14c($v0) -/* 785B50 802A1030 C4460018 */ lwc1 $f6, 0x18($v0) -/* 785B54 802A1034 C4400020 */ lwc1 $f0, 0x20($v0) -/* 785B58 802A1038 44062000 */ mfc1 $a2, $f4 -/* 785B5C 802A103C 44073000 */ mfc1 $a3, $f6 -/* 785B60 802A1040 0060882D */ daddu $s1, $v1, $zero -/* 785B64 802A1044 E7A20010 */ swc1 $f2, 0x10($sp) -/* 785B68 802A1048 0C00A7CB */ jal dist3D -/* 785B6C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) -/* 785B70 802A1050 3C014170 */ lui $at, 0x4170 -/* 785B74 802A1054 44811000 */ mtc1 $at, $f2 -/* 785B78 802A1058 00000000 */ nop -/* 785B7C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 785B80 802A1060 00000000 */ nop -/* 785B84 802A1064 3C0142C8 */ lui $at, 0x42c8 -/* 785B88 802A1068 44811000 */ mtc1 $at, $f2 -/* 785B8C 802A106C 00000000 */ nop -/* 785B90 802A1070 46020003 */ div.s $f0, $f0, $f2 -/* 785B94 802A1074 4600020D */ trunc.w.s $f8, $f0 -/* 785B98 802A1078 44024000 */ mfc1 $v0, $f8 -/* 785B9C 802A107C 00000000 */ nop -/* 785BA0 802A1080 AE020084 */ sw $v0, 0x84($s0) -/* 785BA4 802A1084 28420015 */ slti $v0, $v0, 0x15 -/* 785BA8 802A1088 14400002 */ bnez $v0, .L802A1094 -/* 785BAC 802A108C 24020014 */ addiu $v0, $zero, 0x14 -/* 785BB0 802A1090 AE020084 */ sw $v0, 0x84($s0) -.L802A1094: -/* 785BB4 802A1094 82220083 */ lb $v0, 0x83($s1) -/* 785BB8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 785BBC 802A109C 00000000 */ nop -/* 785BC0 802A10A0 8E020084 */ lw $v0, 0x84($s0) -/* 785BC4 802A10A4 28420006 */ slti $v0, $v0, 6 -/* 785BC8 802A10A8 10400008 */ beqz $v0, .L802A10CC -/* 785BCC 802A10AC 24020006 */ addiu $v0, $zero, 6 -/* 785BD0 802A10B0 080A8433 */ j .L802A10CC -/* 785BD4 802A10B4 AE020084 */ sw $v0, 0x84($s0) -.L802A10B8: -/* 785BD8 802A10B8 8E020084 */ lw $v0, 0x84($s0) -/* 785BDC 802A10BC 2842000C */ slti $v0, $v0, 0xc -/* 785BE0 802A10C0 10400002 */ beqz $v0, .L802A10CC -/* 785BE4 802A10C4 2402000C */ addiu $v0, $zero, 0xc -/* 785BE8 802A10C8 AE020084 */ sw $v0, 0x84($s0) -.L802A10CC: -/* 785BEC 802A10CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 785BF0 802A10D0 8FB1001C */ lw $s1, 0x1c($sp) -/* 785BF4 802A10D4 8FB00018 */ lw $s0, 0x18($sp) -/* 785BF8 802A10D8 24020002 */ addiu $v0, $zero, 2 -/* 785BFC 802A10DC 03E00008 */ jr $ra -/* 785C00 802A10E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/include/functions.h b/include/functions.h index 9e5bdf05b4..49acc11a7c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -240,5 +240,8 @@ void func_802D7460(f32 x, f32 y, f32 z, s32 arg3); void func_802D74C0(f32 x, f32 y, f32 z, s32 arg3); void show_damage_popup(f32 x, f32 y, f32 z, s32 damageAmount); +void func_80070B50(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); +void func_800718D0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); +void func_80070BB0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); #endif diff --git a/src/battle/move/auto_jump_765C20.c b/src/battle/move/auto_jump_765C20.c index 682a9ea19b..b9682b3730 100644 --- a/src/battle/move/auto_jump_765C20.c +++ b/src/battle/move/auto_jump_765C20.c @@ -1,3 +1,34 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_802A1000_765C20(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/auto_jump_765C20", func_802A1000_765C20); +#endif + diff --git a/src/battle/move/auto_multibounce_76A830.c b/src/battle/move/auto_multibounce_76A830.c index 7015cd23f6..9459109276 100644 --- a/src/battle/move/auto_multibounce_76A830.c +++ b/src/battle/move/auto_multibounce_76A830.c @@ -1,3 +1,33 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_80238000_6F10E0(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/auto_multibounce_76A830", func_802A1000_76A830); +#endif diff --git a/src/battle/move/auto_smash_763540.c b/src/battle/move/auto_smash_763540.c index 882d5c7353..6dfc734786 100644 --- a/src/battle/move/auto_smash_763540.c +++ b/src/battle/move/auto_smash_763540.c @@ -1,5 +1,31 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/auto_smash_763540", func_802A1000_763540); +ApiStatus func_802A1000_763540(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +#ifdef NOT_MATCHING +ApiStatus func_802A1050_763590(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/auto_smash_763540", func_802A1050_763590); +#endif diff --git a/src/battle/move/d_down_jump_781920.c b/src/battle/move/d_down_jump_781920.c index a6299fc5e0..05249759ab 100644 --- a/src/battle/move/d_down_jump_781920.c +++ b/src/battle/move/d_down_jump_781920.c @@ -1,5 +1,44 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/d_down_jump_781920", func_802A1000_781920); +ApiStatus func_802A1000_781920(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus2 = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 posX = playerActor->currentPos.x; + f32 posY = playerActor->currentPos.y; + f32 posZ = playerActor->currentPos.z; + f32 goalX = playerActor->movePos.goal.x; + f32 goalY = playerActor->movePos.goal.y; + f32 goalZ = playerActor->movePos.goal.z; -INCLUDE_ASM(s32, "battle/move/d_down_jump_781920", func_802A10E4_781A04); + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (battleStatus2->unk_83 != 0) { + if (script->varTable[0] < 6) { + script->varTable[0] = 6; + } + } else if (script->varTable[0] < 12) { + script->varTable[0] = 12; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10E4_781A04(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var0 = get_variable(script, *args++); + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + + if (script->varTable[10] == 0) { + func_80070B50(TRUE, var0, var1, var2, 0.0f); + } else { + func_80070B50(FALSE, var0, var1, var2, 0.,0f); + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/move/d_down_pound_74AD90.c b/src/battle/move/d_down_pound_74AD90.c index 956d55dd2d..7f2e12ef62 100644 --- a/src/battle/move/d_down_pound_74AD90.c +++ b/src/battle/move/d_down_pound_74AD90.c @@ -1,7 +1,42 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/d_down_pound_74AD90", func_802A1000_74AD90); +ApiStatus func_802A1000_74AD90(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; -INCLUDE_ASM(s32, "battle/move/d_down_pound_74AD90", func_802A1050_74ADE0); + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } -INCLUDE_ASM(s32, "battle/move/d_down_pound_74AD90", func_802A10A4_74AE34); + return ApiStatus_DONE2; +} + +ApiStatus func_802A1050_74ADE0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10A4_74AE34(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var0 = get_variable(script, *args++); + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + + if (script->varTable[10] == 0) { + func_80070B50(TRUE, (var0 + 30), (var1 + 25), var2, 45.0f); + } else { + func_80070B50(FALSE, (var0 + 30), (var1 + 25), var2, 45.0f); + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/move/dizzy_stomp_748DD0.c b/src/battle/move/dizzy_stomp_748DD0.c index 79815b0021..92563b00fd 100644 --- a/src/battle/move/dizzy_stomp_748DD0.c +++ b/src/battle/move/dizzy_stomp_748DD0.c @@ -1,3 +1,34 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_802A1000_748DD0(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/dizzy_stomp_748DD0", func_802A1000_748DD0); +#endif + diff --git a/src/battle/move/earthquake_jump_785B20.c b/src/battle/move/earthquake_jump_785B20.c index 27fd01ab8c..6eca3b0885 100644 --- a/src/battle/move/earthquake_jump_785B20.c +++ b/src/battle/move/earthquake_jump_785B20.c @@ -1,5 +1,31 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/earthquake_jump_785B20", func_802A1000_785B20); +ApiStatus func_802A1000_785B20(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 posX = playerActor->currentPos.x; + f32 posY = playerActor->currentPos.y; + f32 posZ = playerActor->currentPos.z; + f32 goalX = playerActor->movePos.goal.x; + f32 goalY = playerActor->movePos.goal.y; + f32 goalZ = playerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 6) { + script->varTable[0] = 6; + } + } else if (script->varTable[0] < 12) { + script->varTable[0] = 12; + } + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/move/earthquake_jump_785B20", func_802A10E4_785C04); diff --git a/src/battle/move/hammer_charge_0_74F130.c b/src/battle/move/hammer_charge_0_74F130.c index 2564cdab50..f723753cb2 100644 --- a/src/battle/move/hammer_charge_0_74F130.c +++ b/src/battle/move/hammer_charge_0_74F130.c @@ -1,11 +1,70 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/hammer_charge_0_74F130", func_802A1000_74F130); +ApiStatus func_802A1000_74F130(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; -INCLUDE_ASM(s32, "battle/move/hammer_charge_0_74F130", func_802A1050_74F180); + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } -INCLUDE_ASM(s32, "battle/move/hammer_charge_0_74F130", func_802A10A4_74F1D4); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "battle/move/hammer_charge_0_74F130", func_802A10C8_74F1F8); +ApiStatus func_802A1050_74F180(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; -INCLUDE_ASM(s32, "battle/move/hammer_charge_0_74F130", func_802A11CC_74F2FC); + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10A4_74F1D4(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + script->varTable[0] = 0; + + if (battleStatus->hammerCharge >= 99) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10C8_74F1F8(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + + func_800718D0(0, var1, var2, var3, 1.0f, 60); + battleStatus->hammerCharge += 1; + + if (battleStatus->hammerCharge >= 100) { + (*&battleStatus)->hammerCharge = 99; // TODO: macro? + } + + battleStatus->jumpCharge = 0; + battleStatus->flags1 = ((battleStatus->flags1 | 0x10000000) & 0xDFFFFFFF); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A11CC_74F2FC(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var0 = get_variable(script, *args++); + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + f32 var3 = get_float_variable(script, *args++); + + func_800720B0(6, (var0 + 10), (var1 + 18), var2, var3, 45); + + return ApiStatus_DONE2; +} diff --git a/src/battle/move/hammer_charge_1_7595B0.c b/src/battle/move/hammer_charge_1_7595B0.c index 3ec6114a91..4ab2f8f499 100644 --- a/src/battle/move/hammer_charge_1_7595B0.c +++ b/src/battle/move/hammer_charge_1_7595B0.c @@ -1,13 +1,95 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/hammer_charge_1_7595B0", func_802A1000_7595B0); +extern s32 D_802A2C50; +extern UNK_TYPE D_802A43D0; -INCLUDE_ASM(s32, "battle/move/hammer_charge_1_7595B0", func_802A1050_759600); +ApiStatus func_802A1000_7595B0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; -INCLUDE_ASM(s32, "battle/move/hammer_charge_1_7595B0", func_802A10A4_759654); + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } -INCLUDE_ASM(s32, "battle/move/hammer_charge_1_7595B0", func_802A10C8_759678); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "battle/move/hammer_charge_1_7595B0", func_802A11E8_759798); +ApiStatus func_802A1050_759600(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10A4_759654(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + script->varTable[0] = 0; + + if (battleStatus->hammerCharge >= 99) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10C8_759678(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus2 = battleStatus; // TODO: macro? + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + s32* var4; + + func_800718D0(1, var1, var2, var3, 1.0f, 60); + var4 = &D_802A2C50; + *var4 = 0; + if (battleStatus2->hammerCharge > 0) { + *var4 = 1; + } + + battleStatus2->hammerCharge += 2; + + if (battleStatus2->hammerCharge >= 100) { + (*&battleStatus)->hammerCharge = 99; // TODO: macro? + } + + battleStatus2->jumpCharge = 0; + battleStatus->flags1 = (battleStatus->flags1 | 0x10000000) & 0xDFFFFFFF; + + return ApiStatus_DONE2; +} + +ApiStatus func_802A11E8_759798(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + f32 var4 = get_float_variable(script, *args++); + s32 var5 = 45; + s32 var6 = 30; + + func_800720B0(6, (var1 + 10), (var2 + 18), var3, var4, var5); + func_80070BB0(12, (var1 + 10), (var2 + 18), var3, var4, var6); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A12FC_7598AC(ScriptInstance* script, s32 isInitialCall) { + if (D_802A43D0 == 0) { + script->varTable[0] = 4; + } else { + script->varTable[0] = 5; + } + + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "battle/move/hammer_charge_1_7595B0", func_802A12FC_7598AC); diff --git a/src/battle/move/hammer_charge_2_75E5D0.c b/src/battle/move/hammer_charge_2_75E5D0.c index 5de8eeabca..73332b69a3 100644 --- a/src/battle/move/hammer_charge_2_75E5D0.c +++ b/src/battle/move/hammer_charge_2_75E5D0.c @@ -1,13 +1,94 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/hammer_charge_2_75E5D0", func_802A1000_75E5D0); +extern s32 D_802A2C50; +extern UNK_TYPE D_802A43D0; -INCLUDE_ASM(s32, "battle/move/hammer_charge_2_75E5D0", func_802A1050_75E620); +ApiStatus func_802A1000_75E5D0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; -INCLUDE_ASM(s32, "battle/move/hammer_charge_2_75E5D0", func_802A10A4_75E674); + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } -INCLUDE_ASM(s32, "battle/move/hammer_charge_2_75E5D0", func_802A10C8_75E698); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "battle/move/hammer_charge_2_75E5D0", func_802A11E8_75E7B8); +ApiStatus func_802A1050_75E620(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; -INCLUDE_ASM(s32, "battle/move/hammer_charge_2_75E5D0", func_802A12FC_75E8CC); + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10A4_75E674(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + script->varTable[0] = 0; + + if (battleStatus->hammerCharge >= 99) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10C8_75E698(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus2 = battleStatus; // TODO: macro? + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + s32* var4; + + func_800718D0(2, var1, var2, var3, 1.0f, 60); + var4 = &D_802A2C50; + *var4 = 0; + if (battleStatus2->hammerCharge > 0) { + *var4 = 1; + } + + battleStatus2->hammerCharge += 3; + + if (battleStatus2->hammerCharge >= 100) { + (*&battleStatus)->hammerCharge = 99; // TODO: macro? + } + + battleStatus2->jumpCharge = 0; + battleStatus->flags1 = (battleStatus->flags1 | 0x10000000) & 0xDFFFFFFF; + + return ApiStatus_DONE2; +} + +ApiStatus func_802A11E8_75E7B8(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + f32 var4 = get_float_variable(script, *args++); + s32 var5 = 45; + s32 var6 = 30; + + func_800720B0(6, (var1 + 10), (var2 + 18), var3, var4, var5); + func_80070BB0(13, (var1 + 10), (var2 + 18), var3, var4, var6); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A12FC_75E8CC(ScriptInstance* script, s32 isInitialCall) { + if (D_802A43D0 == 0) { + script->varTable[0] = 4; + } else { + script->varTable[0] = 5; + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/move/jump_73D860.c b/src/battle/move/jump_73D860.c index d71b32688a..f90ef2a681 100644 --- a/src/battle/move/jump_73D860.c +++ b/src/battle/move/jump_73D860.c @@ -1,5 +1,58 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/jump_73D860", func_802A1000_73D860); +ApiStatus func_802A1000_73D860(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 posX = playerActor->currentPos.x; + f32 posY = playerActor->currentPos.y; + f32 posZ = playerActor->currentPos.z; + f32 goalX = playerActor->movePos.goal.x; + f32 goalY = playerActor->movePos.goal.y; + f32 goalZ = playerActor->movePos.goal.z; + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 6) { + script->varTable[0] = 6; + } + } else if (script->varTable[0] < 12) { + script->varTable[0] = 12; + } + + return ApiStatus_DONE2; +} + +// NOT WORKING +#ifdef NON_MATCHING +ApiStatus func_802A10E4_73D944(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + + script->varTable[16] = 1; + + if (playerData->bootsLevel != 1) { + if (playerData->bootsLevel < 2) { + if (playerData->bootsLevel != 0) { + return ApiStatus_DONE2; + } + } else { + if (playerData->bootsLevel != 2) { + return ApiStatus_DONE2; + } + script->varTable[16] = 3; + } + } else { + script->varTable[16] = 2; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/jump_73D860", func_802A10E4_73D944); +#endif + diff --git a/src/battle/move/jump_charge_0_74D570.c b/src/battle/move/jump_charge_0_74D570.c index 58955db145..0ed9de22e2 100644 --- a/src/battle/move/jump_charge_0_74D570.c +++ b/src/battle/move/jump_charge_0_74D570.c @@ -1,9 +1,72 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/jump_charge_0_74D570", func_802A1000_74D570); +ApiStatus func_802A1000_74D570(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 posX = playerActor->currentPos.x; + f32 posY = playerActor->currentPos.y; + f32 posZ = playerActor->currentPos.z; + f32 goalX = playerActor->movePos.goal.x; + f32 goalY = playerActor->movePos.goal.y; + f32 goalZ = playerActor->movePos.goal.z; -INCLUDE_ASM(s32, "battle/move/jump_charge_0_74D570", func_802A10E4_74D654); + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; -INCLUDE_ASM(s32, "battle/move/jump_charge_0_74D570", func_802A1108_74D678); + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } -INCLUDE_ASM(s32, "battle/move/jump_charge_0_74D570", func_802A120C_74D77C); + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 6) { + script->varTable[0] = 6; + } + } else if (script->varTable[0] < 12) { + script->varTable[0] = 12; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10E4_74D654(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + script->varTable[0] = 0; + + if (battleStatus->jumpCharge >= 99) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A1108_74D678(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + + func_800718D0(0, var1, var2, var3, 1.0f, 60); + battleStatus->jumpCharge += 1; + + if (battleStatus->jumpCharge >= 100) { + (*&battleStatus)->jumpCharge = 99; // TODO: macro? + } + + battleStatus->hammerCharge = 0; + battleStatus->flags1 = ((battleStatus->flags1 | 0x20000000) & 0xEFFFFFFF); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A120C_74D77C(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var0 = get_variable(script, *args++); + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + f32 var3 = get_float_variable(script, *args++); + + func_800720B0(6, (var0 + 10), (var1 + 18), var2, var3, 45); + + return ApiStatus_DONE2; +} diff --git a/src/battle/move/jump_charge_1_75C980.c b/src/battle/move/jump_charge_1_75C980.c index aa8117c23a..3a68453ba5 100644 --- a/src/battle/move/jump_charge_1_75C980.c +++ b/src/battle/move/jump_charge_1_75C980.c @@ -1,11 +1,96 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/jump_charge_1_75C980", func_802A1000_75C980); +extern s32 D_802A2C50; +extern UNK_TYPE D_802A43D0; -INCLUDE_ASM(s32, "battle/move/jump_charge_1_75C980", func_802A10E4_75CA64); +ApiStatus func_802A1000_75C980(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; // TODO: macro? + Actor* playerActor = battleStatus->playerActor; + f32 posX = playerActor->currentPos.x; + f32 posY = playerActor->currentPos.y; + f32 posZ = playerActor->currentPos.z; + f32 goalX = playerActor->movePos.goal.x; + f32 goalY = playerActor->movePos.goal.y; + f32 goalZ = playerActor->movePos.goal.z; -INCLUDE_ASM(s32, "battle/move/jump_charge_1_75C980", func_802A1108_75CA88); + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; -INCLUDE_ASM(s32, "battle/move/jump_charge_1_75C980", func_802A1228_75CBA8); + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } -INCLUDE_ASM(s32, "battle/move/jump_charge_1_75C980", func_802A133C_75CCBC); + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 6) { + script->varTable[0] = 6; + } + } else if (script->varTable[0] < 12) { + script->varTable[0] = 12; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10E4_75CA64(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + script->varTable[0] = 0; + + if (battleStatus->jumpCharge >= 99) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A1108_75CA88(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus2 = battleStatus; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + s32* var4; + + func_800718D0(1, var1, var2, var3, 1.0f, 60); + var4 = &D_802A2C50; + *var4 = 0; + if (battleStatus2->jumpCharge > 0) { + *var4 = 1; + } + + battleStatus2->jumpCharge += 2; + + if (battleStatus2->jumpCharge >= 100) { + (*&battleStatus)->jumpCharge = 99; // TODO: macro? + } + + battleStatus2->hammerCharge = 0; + battleStatus->flags1 = (battleStatus->flags1 | 0x20000000) & 0xEFFFFFFF; + + return ApiStatus_DONE2; +} + +ApiStatus func_802A1228_75CBA8(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + f32 var4 = get_float_variable(script, *args++); + s32 var5 = 45; + s32 var6 = 30; + + func_800720B0(6, (var1 + 10), (var2 + 18), var3, var4, var5); + func_80070BB0(12, (var1 + 10), (var2 + 18), var3, var4, var6); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A133C_75CCBC(ScriptInstance* script, s32 isInitialCall) { + if (D_802A43D0 == 0) { + script->varTable[0] = 6; + } else { + script->varTable[0] = 7; + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/move/jump_charge_2_761920.c b/src/battle/move/jump_charge_2_761920.c index 5baf624bed..4f7d95583a 100644 --- a/src/battle/move/jump_charge_2_761920.c +++ b/src/battle/move/jump_charge_2_761920.c @@ -1,11 +1,96 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/jump_charge_2_761920", func_802A1000_761920); +extern s32 D_802A2C50; +extern UNK_TYPE D_802A43D0; -INCLUDE_ASM(s32, "battle/move/jump_charge_2_761920", func_802A10E4_761A04); +ApiStatus func_802A1000_761920(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 posX = playerActor->currentPos.x; + f32 posY = playerActor->currentPos.y; + f32 posZ = playerActor->currentPos.z; + f32 goalX = playerActor->movePos.goal.x; + f32 goalY = playerActor->movePos.goal.y; + f32 goalZ = playerActor->movePos.goal.z; -INCLUDE_ASM(s32, "battle/move/jump_charge_2_761920", func_802A1108_761A28); + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; -INCLUDE_ASM(s32, "battle/move/jump_charge_2_761920", func_802A1228_761B48); + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } -INCLUDE_ASM(s32, "battle/move/jump_charge_2_761920", func_802A133C_761C5C); + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 6) { + script->varTable[0] = 6; + } + } else if (script->varTable[0] < 12) { + script->varTable[0] = 12; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10E4_761A04(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + script->varTable[0] = 0; + + if (battleStatus->jumpCharge >= 99) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A1108_761A28(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* battleStatus2 = battleStatus; // TODO: macro? + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + s32* var4; + + func_800718D0(2, var1, var2, var3, 1.0f, 60); + var4 = &D_802A2C50; + *var4 = 0; + if (battleStatus2->jumpCharge > 0) { + *var4 = 1; + } + + battleStatus2->jumpCharge += 3; + + if (battleStatus2->jumpCharge >= 100) { + (*&battleStatus)->jumpCharge = 99; // TODO: macro? + } + + battleStatus2->hammerCharge = 0; + battleStatus->flags1 = (battleStatus->flags1 | 0x20000000) & 0xEFFFFFFF; + + return ApiStatus_DONE2; +} + +ApiStatus func_802A1228_761B48(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + f32 var4 = get_float_variable(script, *args++); + s32 var5 = 45; + s32 var6 = 30; + + func_800720B0(6, (var1 + 10), (var2 + 18), var3, var4, var5); + func_80070BB0(13, (var1 + 10), (var2 + 18), var3, var4, var6); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A133C_761C5C(ScriptInstance* script, s32 isInitialCall) { + if (D_802A43D0 == 0) { + script->varTable[0] = 6; + } else { + script->varTable[0] = 7; + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/move/mega_jump_770F30.c b/src/battle/move/mega_jump_770F30.c index f90bbb42a2..b6299ea6cb 100644 --- a/src/battle/move/mega_jump_770F30.c +++ b/src/battle/move/mega_jump_770F30.c @@ -1,3 +1,34 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_802A1000_770F30(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/mega_jump_770F30", func_802A1000_770F30); +#endif + diff --git a/src/battle/move/mega_quake_756780.c b/src/battle/move/mega_quake_756780.c index 84121e94d0..676902e7b0 100644 --- a/src/battle/move/mega_quake_756780.c +++ b/src/battle/move/mega_quake_756780.c @@ -1,7 +1,29 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/mega_quake_756780", func_802A1000_756780); +ApiStatus func_802A1000_756780(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; -INCLUDE_ASM(s32, "battle/move/mega_quake_756780", func_802A1050_7567D0); + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A1050_7567D0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/move/mega_quake_756780", func_802A10A4_756824); diff --git a/src/battle/move/mega_smash_777690.c b/src/battle/move/mega_smash_777690.c index 6aa9de6bc6..2d85b36c5b 100644 --- a/src/battle/move/mega_smash_777690.c +++ b/src/battle/move/mega_smash_777690.c @@ -1,5 +1,32 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/mega_smash_777690", func_802A1000_777690); +ApiStatus func_802A1000_777690(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +#ifdef NOT_MATCHING +ApiStatus func_802A1050_7776E0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/mega_smash_777690", func_802A1050_7776E0); +#endif + diff --git a/src/battle/move/multibounce_740CC0.c b/src/battle/move/multibounce_740CC0.c index 2510b5e4d4..33f8f19f86 100644 --- a/src/battle/move/multibounce_740CC0.c +++ b/src/battle/move/multibounce_740CC0.c @@ -1,3 +1,34 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_802A1000_740CC0(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/multibounce_740CC0", func_802A1000_740CC0); +#endif + diff --git a/src/battle/move/power_bounce_743DF0.c b/src/battle/move/power_bounce_743DF0.c index cf3f60492a..fa7dc869d5 100644 --- a/src/battle/move/power_bounce_743DF0.c +++ b/src/battle/move/power_bounce_743DF0.c @@ -1,6 +1,32 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/power_bounce_743DF0", func_802A1000_743DF0); +ApiStatus func_802A1000_743DF0(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 posX = playerActor->currentPos.x; + f32 posY = playerActor->currentPos.y; + f32 posZ = playerActor->currentPos.z; + f32 goalX = playerActor->movePos.goal.x; + f32 goalY = playerActor->movePos.goal.y; + f32 goalZ = playerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 6) { + script->varTable[0] = 6; + } + } else if (script->varTable[0] < 12) { + script->varTable[0] = 12; + } + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/move/power_bounce_743DF0", func_802A10E4_743ED4); diff --git a/src/battle/move/power_jump_76D760.c b/src/battle/move/power_jump_76D760.c index d2258c8b06..dfb14daa95 100644 --- a/src/battle/move/power_jump_76D760.c +++ b/src/battle/move/power_jump_76D760.c @@ -1,3 +1,34 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_802A1000_76D760(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/power_jump_76D760", func_802A1000_76D760); +#endif + diff --git a/src/battle/move/power_quake_767C90.c b/src/battle/move/power_quake_767C90.c index 24335ee237..1fdf28911a 100644 --- a/src/battle/move/power_quake_767C90.c +++ b/src/battle/move/power_quake_767C90.c @@ -1,5 +1,32 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/power_quake_767C90", func_802A1000_767C90); +ApiStatus func_802A1000_767C90(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +#ifdef NOT_MATCHING +ApiStatus func_802A1050_767CE0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/power_quake_767C90", func_802A1050_767CE0); +#endif + diff --git a/src/battle/move/power_smash_772BA0.c b/src/battle/move/power_smash_772BA0.c index 95d3c12445..c4899c91d8 100644 --- a/src/battle/move/power_smash_772BA0.c +++ b/src/battle/move/power_smash_772BA0.c @@ -1,5 +1,32 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/power_smash_772BA0", func_802A1000_772BA0); +ApiStatus func_802A1000_772BA0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +#ifdef NOT_MATCHING +ApiStatus func_802A1050_772BF0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/power_smash_772BA0", func_802A1050_772BF0); +#endif + diff --git a/src/battle/move/quake_hammer_73AED0.c b/src/battle/move/quake_hammer_73AED0.c index 68021def6f..a366637e97 100644 --- a/src/battle/move/quake_hammer_73AED0.c +++ b/src/battle/move/quake_hammer_73AED0.c @@ -1,5 +1,32 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/quake_hammer_73AED0", func_802A1000_73AED0); +ApiStatus func_802A1000_73AED0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +#ifdef NOT_MATCHING +ApiStatus func_802A1050_73AF20(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/quake_hammer_73AED0", func_802A1050_73AF20); +#endif + diff --git a/src/battle/move/shell_crack_77F240.c b/src/battle/move/shell_crack_77F240.c index 114ed13765..346addabff 100644 --- a/src/battle/move/shell_crack_77F240.c +++ b/src/battle/move/shell_crack_77F240.c @@ -1,7 +1,29 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/shell_crack_77F240", func_802A1000_77F240); +ApiStatus func_802A1000_77F240(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; -INCLUDE_ASM(s32, "battle/move/shell_crack_77F240", func_802A1050_77F290); + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A10A4_77F2E4(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/move/shell_crack_77F240", func_802A10A4_77F2E4); diff --git a/src/battle/move/shrink_smash_77CB80.c b/src/battle/move/shrink_smash_77CB80.c index 73992e22c5..a2694732d2 100644 --- a/src/battle/move/shrink_smash_77CB80.c +++ b/src/battle/move/shrink_smash_77CB80.c @@ -1,5 +1,32 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/shrink_smash_77CB80", func_802A1000_77CB80); +ApiStatus func_802A1000_77CB80(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +#ifdef NOT_MATCHING +ApiStatus func_802A1050_77CBD0(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/shrink_smash_77CB80", func_802A1050_77CBD0); +#endif + diff --git a/src/battle/move/shrink_stomp_783BA0.c b/src/battle/move/shrink_stomp_783BA0.c index 2ad187c28a..faea666965 100644 --- a/src/battle/move/shrink_stomp_783BA0.c +++ b/src/battle/move/shrink_stomp_783BA0.c @@ -1,3 +1,34 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_802A1000_783BA0(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/shrink_stomp_783BA0", func_802A1000_783BA0); +#endif + diff --git a/src/battle/move/sleep_stomp_746E10.c b/src/battle/move/sleep_stomp_746E10.c index 6565e1450d..cfcaade20c 100644 --- a/src/battle/move/sleep_stomp_746E10.c +++ b/src/battle/move/sleep_stomp_746E10.c @@ -1,3 +1,34 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_802A1000_746E10(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/sleep_stomp_746E10", func_802A1000_746E10); +#endif + diff --git a/src/battle/move/spin_smash_737890.c b/src/battle/move/spin_smash_737890.c index b6afca59ae..f6b8a3510d 100644 --- a/src/battle/move/spin_smash_737890.c +++ b/src/battle/move/spin_smash_737890.c @@ -5,5 +5,28 @@ INCLUDE_ASM(s32, "battle/move/spin_smash_737890", func_802A1000_737890); INCLUDE_ASM(s32, "battle/move/spin_smash_737890", func_802A1074_737904); INCLUDE_ASM(s32, "battle/move/spin_smash_737890", func_802A10EC_73797C); +ApiStatus func_802A10EC_73797C(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; -INCLUDE_ASM(s32, "battle/move/spin_smash_737890", func_802A113C_7379CC); + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +ApiStatus func_802A113C_7379CC(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} diff --git a/src/battle/move/super_jump_76F330.c b/src/battle/move/super_jump_76F330.c index e881f50828..2be9c28972 100644 --- a/src/battle/move/super_jump_76F330.c +++ b/src/battle/move/super_jump_76F330.c @@ -1,3 +1,34 @@ #include "common.h" +#ifdef NON_MATCHING +ApiStatus func_802A1000_76F330(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/super_jump_76F330", func_802A1000_76F330); +#endif + diff --git a/src/battle/move/super_smash_775100.c b/src/battle/move/super_smash_775100.c index 3c9e9db7b5..1dc1a852bb 100644 --- a/src/battle/move/super_smash_775100.c +++ b/src/battle/move/super_smash_775100.c @@ -1,5 +1,32 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/super_smash_775100", func_802A1000_775100); +ApiStatus func_802A1000_775100(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = *(&gBattleStatus.unk_83); + script->varTable[1] = 15; + if (is_ability_active(Ability_BERSERKER) != FALSE) { + script->varTable[0] = 0; + script->varTable[1] = 40; + } + + return ApiStatus_DONE2; +} + +#ifdef NOT_MATCHING +ApiStatus func_802A1050_775150(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + + if (is_ability_active(Ability_RIGHT_ON) != FALSE) { + script->varTable[0] = 1; + } + + if ((gBattleStatus.flags1 & 0x1000) != FALSE) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "battle/move/super_smash_775100", func_802A1050_775150); +#endif + diff --git a/src/battle/move/unknown_move_779C90.c b/src/battle/move/unknown_move_779C90.c index 140af98736..99d9042641 100644 --- a/src/battle/move/unknown_move_779C90.c +++ b/src/battle/move/unknown_move_779C90.c @@ -1,5 +1,31 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/move/unknown_move_779C90", func_802A1000_779C90); +ApiStatus func_802A1000_779C90(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* playerActor = battleStatus->playerActor; + f32 posX = playerActor->currentPos.x; + f32 posY = playerActor->currentPos.y; + f32 posZ = playerActor->currentPos.z; + f32 goalX = playerActor->movePos.goal.x; + f32 goalY = playerActor->movePos.goal.y; + f32 goalZ = playerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 6) { + script->varTable[0] = 6; + } + } else if (script->varTable[0] < 12) { + script->varTable[0] = 12; + } + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/move/unknown_move_779C90", func_802A10E4_779D74); diff --git a/src/battle/partner/goombario_6F10E0.c b/src/battle/partner/goombario_6F10E0.c index 0de63cfbc0..7075a6a096 100644 --- a/src/battle/partner/goombario_6F10E0.c +++ b/src/battle/partner/goombario_6F10E0.c @@ -1,6 +1,35 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80238000_6F10E0); +extern UNK_TYPE D_802A43D0; + +//INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80238000_6F10E0); +ApiStatus func_80238000_6F10E0(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + BattleStatus* secondBattleStatus = &gBattleStatus; + Actor* partnerActor = battleStatus->partnerActor; + f32 posX = partnerActor->currentPos.x; + f32 posY = partnerActor->currentPos.y; + f32 posZ = partnerActor->currentPos.z; + f32 goalX = partnerActor->movePos.goal.x; + f32 goalY = partnerActor->movePos.goal.y; + f32 goalZ = partnerActor->movePos.goal.z; + + script->varTable[0] = (dist3D(posX, posY, posZ, goalX, goalY, goalZ) * 15.0f) / 100.0f; + + if (script->varTable[0] >= 21) { + script->varTable[0] = 20; + } + + if (secondBattleStatus->unk_83 != 0) { + if (script->varTable[0] < 10) { + script->varTable[0] = 10; + } + } else if (script->varTable[0] < 15) { + script->varTable[0] = 15; + } + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_802380E4_6F11C4); @@ -28,4 +57,12 @@ INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_802390B0_6F2190); INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_802390C8_6F21A8); -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80239190_6F2270); +ApiStatus func_80239190_6F2270(ScriptInstance* script, s32 isInitialCall) { + if (D_802A43D0 == 0) { + script->varTable[0] = 36; + } else { + script->varTable[0] = 37; + } + + return ApiStatus_DONE2; +} diff --git a/src/code_1AF230.c b/src/code_1AF230.c index 6968fb2644..3236446938 100644 --- a/src/code_1AF230.c +++ b/src/code_1AF230.c @@ -3,7 +3,7 @@ typedef struct StarPowerEntry { /* 0x04 */ void* dmaStart; /* 0x08 */ void* dmaEnd; - /* 0x0C */ void* dmaDest;S + /* 0x0C */ void* dmaDest; /* 0x10 */ Bytecode* init; } StarPowerEntry; // size = 0x14 diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index 8aed6e17ad..a8f90459af 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -105,7 +105,7 @@ INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070A90, s32 arg0, f32 arg1, f INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070AF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070B50); +INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070B50, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070BB0);