diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-02-27 08:43:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-27 08:43:59 -0800 |
| commit | ea1aa9c0c5c3a4167912d1078fffdd5e69cbbe98 (patch) | |
| tree | 1d3f29615f1683fae77ade7d8713e7bfe5a11c26 /asm/code_8057144.s | |
| parent | 0dd38993f6a4383d6d5743fd0ae0abc01210ae25 (diff) | |
| parent | a5296a2f994a0f8e4421c4afd6bac1cedcfb72be (diff) | |
Merge pull request #97 from AnonymousRandomPerson/master
More attack AI decomp
Diffstat (limited to 'asm/code_8057144.s')
| -rw-r--r-- | asm/code_8057144.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/code_8057144.s b/asm/code_8057144.s index efe2728..dc65f27 100644 --- a/asm/code_8057144.s +++ b/asm/code_8057144.s @@ -285,8 +285,8 @@ _08057340: bx r1 thumb_func_end sub_8057308 - thumb_func_start IsMoveUsable -IsMoveUsable: + thumb_func_start IsMoveUsable_1 +IsMoveUsable_1: push {r4-r7,lr} mov r7, r8 push {r7} @@ -357,7 +357,7 @@ _080573C0: pop {r4-r7} pop {r1} bx r1 - thumb_func_end IsMoveUsable + thumb_func_end IsMoveUsable_1 thumb_func_start IsMoveUsable_2 IsMoveUsable_2: @@ -909,9 +909,9 @@ sub_8057788: movs r0, 0 mov r9, r0 adds r0, r4, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 adds r5, r0, 0 - bl IsTileWater + bl IsTileGround lsls r0, 24 cmp r0, 0 beq _080577BA |