summaryrefslogtreecommitdiff
path: root/asm/code_8057824.s
diff options
context:
space:
mode:
authorAnonymousRandomPerson <chenghanngan.us@gmail.com>2022-02-05 20:23:01 -0500
committerAnonymousRandomPerson <chenghanngan.us@gmail.com>2022-02-05 20:23:01 -0500
commita9b5977d4ca6c0aeedea966a0165b625a4c2dbab (patch)
treebd0ceaf643aafb41fc5bb4e87936dc7b638ddd31 /asm/code_8057824.s
parentf728e7e90ebd50521dbc32f7f2b2be5858d91477 (diff)
Decomped MoveMatchesChargingStatus
Diffstat (limited to 'asm/code_8057824.s')
-rw-r--r--asm/code_8057824.s16
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/code_8057824.s b/asm/code_8057824.s
index 6ae62c4..4dc4556 100644
--- a/asm/code_8057824.s
+++ b/asm/code_8057824.s
@@ -1209,7 +1209,7 @@ sub_80582EC:
adds r4, r2, 0
adds r6, r3, 0
adds r1, r4, 0
- bl IsChargeMove
+ bl MoveMatchesChargingStatus
lsls r0, 24
cmp r0, 0
beq _08058328
@@ -1684,7 +1684,7 @@ sub_805867C:
adds r4, r2, 0
adds r6, r3, 0
adds r1, r4, 0
- bl IsChargeMove
+ bl MoveMatchesChargingStatus
lsls r0, 24
cmp r0, 0
beq _080586B8
@@ -2255,7 +2255,7 @@ SkyAttackMoveAction:
mov r8, r0
adds r0, r4, 0
adds r1, r5, 0
- bl IsChargeMove
+ bl MoveMatchesChargingStatus
lsls r0, 24
cmp r0, 0
beq _08058B14
@@ -3847,7 +3847,7 @@ sub_805968C:
beq _080596B6
adds r0, r5, 0
adds r1, r6, 0
- bl IsChargeMove
+ bl MoveMatchesChargingStatus
lsls r0, 24
cmp r0, 0
beq _080596EC
@@ -3972,7 +3972,7 @@ sub_8059790:
adds r4, r2, 0
adds r6, r3, 0
adds r1, r4, 0
- bl IsChargeMove
+ bl MoveMatchesChargingStatus
lsls r0, 24
cmp r0, 0
beq _080597CC
@@ -4077,7 +4077,7 @@ _0805986C: .4byte gUnknown_80FD128
_08059870:
adds r0, r4, 0
adds r1, r5, 0
- bl IsChargeMove
+ bl MoveMatchesChargingStatus
lsls r0, 24
cmp r0, 0
beq _080598A4
@@ -5002,7 +5002,7 @@ sub_8059F38:
mov r8, r0
adds r0, r4, 0
adds r1, r5, 0
- bl IsChargeMove
+ bl MoveMatchesChargingStatus
lsls r0, 24
cmp r0, 0
beq _08059FA0
@@ -8374,7 +8374,7 @@ SkullBashMoveAction:
adds r4, r2, 0
adds r6, r3, 0
adds r1, r4, 0
- bl IsChargeMove
+ bl MoveMatchesChargingStatus
lsls r0, 24
cmp r0, 0
beq _0805B8EC