diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-30 20:07:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 20:07:35 -0800 |
| commit | bd1be092aa85e4eb1d368bef05c88eaae2a0ae84 (patch) | |
| tree | 66474a7515b56c90e1d0b94a0a39f42da6677d71 /asm/src | |
| parent | 37714644960c56650dd1067b86aafa685eaf01f4 (diff) | |
| parent | 201955ea052a5188f2e59bdcdbf6c52ff158ee66 (diff) | |
Merge pull request #681 from notyourav/em
create enemy struct and enemy flags
Diffstat (limited to 'asm/src')
| -rw-r--r-- | asm/src/code_08003FC4.s | 14 | ||||
| -rw-r--r-- | asm/src/enemy.s | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/asm/src/code_08003FC4.s b/asm/src/code_08003FC4.s index 25bfc6ec..362f7d8d 100644 --- a/asm/src/code_08003FC4.s +++ b/asm/src/code_08003FC4.s @@ -258,17 +258,17 @@ _08004162: ands r2, r4 pop {r4, pc} - thumb_func_start sub_08004168 -sub_08004168: @ 0x08004168 + thumb_func_start SnapToTile +SnapToTile: @ 0x08004168 ldr r3, _08004384 @ =0x000FFFFF ldr r1, _08004388 @ =0x00080000 - ldr r2, [r0, #0x2c] - bics r2, r3 - adds r2, r2, r1 + ldr r2, [r0, #0x2c] // x + bics r2, r3 // align to grid + adds r2, r1 // add half of a tile str r2, [r0, #0x2c] - ldr r2, [r0, #0x30] + ldr r2, [r0, #0x30] // y bics r2, r3 - adds r2, r2, r1 + adds r2, r1 str r2, [r0, #0x30] bx lr diff --git a/asm/src/enemy.s b/asm/src/enemy.s index a19f232f..52aacf91 100644 --- a/asm/src/enemy.s +++ b/asm/src/enemy.s @@ -105,7 +105,7 @@ GenericConfused: @ 0x08001242 cmp r2, #0x1c bne _08001282 push {r0} - bl sub_0804AA1C + bl EnemyDetachFX pop {r0} _08001282: ldr r1, _08001364 @ =0x00001800 |