diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /macros/movement.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'macros/movement.asm')
| -rw-r--r-- | macros/movement.asm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/macros/movement.asm b/macros/movement.asm index fd4852e8a..b5aebdc89 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -281,7 +281,15 @@ fast_jump_step_right: macro db movement_fast_jump_step_right ; $37 endm -__enum__ = $3a + enum movement_remove_sliding +remove_sliding: macro + db movement_remove_sliding ; $38 + endm + + enum movement_set_sliding +set_sliding: macro + db movement_set_sliding ; $39 + endm enum movement_remove_fixed_facing remove_fixed_facing: macro @@ -425,7 +433,11 @@ step_shake: macro db \1 ; displacement endm -__enum__ = $57 + enum movement_tree_shake +tree_shake: macro + db movement_tree_shake + endm + enum movement_rock_smash rock_smash: macro db movement_rock_smash ; $57 |