diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-02-17 21:45:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 21:45:57 -0800 |
| commit | 3555fb7c945ef5152910a84390ecbd1a38ea585d (patch) | |
| tree | 4237c0ab086005ea05539b8de7c10b867eec43db /asm/code_8057144.s | |
| parent | 1d64db5214b455bbd6f50ad6369ec04420e03984 (diff) | |
| parent | ece475a4804a64790cfa86dfa0ba577a732adee8 (diff) | |
Merge pull request #96 from AnonymousRandomPerson/master
Attack AI decomp
Diffstat (limited to 'asm/code_8057144.s')
| -rw-r--r-- | asm/code_8057144.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/code_8057144.s b/asm/code_8057144.s index 795e7cf..efe2728 100644 --- a/asm/code_8057144.s +++ b/asm/code_8057144.s @@ -392,7 +392,7 @@ IsMoveUsable_2: cmp r1, 0x5 bne _08057414 adds r0, r4, 0 - bl GetMoveDealsDirectDamage + bl MoveDealsDirectDamage lsls r0, 24 cmp r0, 0 beq _0805743E @@ -460,7 +460,7 @@ sub_805744C: cmp r1, 0x5 bne _0805748E adds r0, r4, 0 - bl GetMoveDealsDirectDamage + bl MoveDealsDirectDamage lsls r0, 24 cmp r0, 0 beq _080574B6 @@ -932,7 +932,7 @@ _080577C8: .4byte gUnknown_80FD14C _080577CC: adds r0, r4, 0 adds r1, r6, 0 - bl sub_80570AC + bl MoveMatchesChargingStatus lsls r0, 24 cmp r0, 0 beq _080577F8 |