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_8040094.s | |
| parent | 0dd38993f6a4383d6d5743fd0ae0abc01210ae25 (diff) | |
| parent | a5296a2f994a0f8e4421c4afd6bac1cedcfb72be (diff) | |
Merge pull request #97 from AnonymousRandomPerson/master
More attack AI decomp
Diffstat (limited to 'asm/code_8040094.s')
| -rw-r--r-- | asm/code_8040094.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/code_8040094.s b/asm/code_8040094.s index 431c7ba..cdf03f4 100644 --- a/asm/code_8040094.s +++ b/asm/code_8040094.s @@ -232,7 +232,7 @@ _080402FC: _08040302: mov r0, r8 adds r1, r3, 0 - bl GetMapTileAtPosition + bl GetMapTile_1 mov r9, r0 ldrh r0, [r0] movs r5, 0x3 @@ -553,7 +553,7 @@ _0804056C: adds r1, r3, 0 adds r1, 0x1 mov r0, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -567,7 +567,7 @@ _0804058A: adds r1, r5, 0 subs r1, 0x1 mov r0, r8 - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -583,7 +583,7 @@ _080405AA: mov r0, r8 adds r0, 0x1 ldr r1, [sp] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -598,7 +598,7 @@ _080405CA: ble _080405E8 subs r0, 0x1 ldr r1, [sp] - bl GetMapTileAtPosition + bl GetMapTile_1 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -2523,8 +2523,8 @@ sub_80414C0: cmp r0, 0x9C bne _080414DC adds r0, r5, 0 - bl GetMapEntityForDungeonEntity - bl IsTileWater + bl GetMapTileForDungeonEntity_2 + bl IsTileGround lsls r0, 24 cmp r0, 0 bne _080414F2 @@ -2533,7 +2533,7 @@ _080414DC: cmp r0, 0x8 bne _080414F6 adds r0, r5, 0 - bl GetMapEntityForDungeonEntity + bl GetMapTileForDungeonEntity_2 ldrh r1, [r0] movs r0, 0x3 ands r0, r1 |