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 /engine/movement.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/movement.asm')
| -rw-r--r-- | engine/movement.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/movement.asm b/engine/movement.asm index ca3ac55b5..5a05aab49 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -55,8 +55,8 @@ MovementPointers: ; 5075 dw Movement_fast_jump_step_up ; 35 dw Movement_fast_jump_step_left ; 36 dw Movement_fast_jump_step_right ; 37 - dw Movement_38 ; 38 - dw Movement_39 ; 39 + dw Movement_remove_sliding ; 38 + dw Movement_set_sliding ; 39 dw Movement_remove_fixed_facing ; 3a dw Movement_fix_facing ; 3b dw Movement_show_person ; 3c @@ -85,7 +85,7 @@ MovementPointers: ; 5075 dw Movement_hide_emote ; 53 dw Movement_show_emote ; 54 dw Movement_step_shake ; 55 - dw Movement_56 ; 56 + dw Movement_tree_shake ; 56 dw Movement_rock_smash ; 57 dw Movement_return_dig ; 58 dw Movement_skyfall_top ; 59 @@ -353,7 +353,7 @@ Movement_step_bump: ; 525f ret ; 5279 -Movement_56: ; 5279 +Movement_tree_shake: ; 5279 ld a, 24 ld hl, OBJECT_STEP_DURATION add hl, bc @@ -373,14 +373,14 @@ Movement_56: ; 5279 ret ; 5293 -Movement_38: ; 5293 +Movement_remove_sliding: ; 5293 ld hl, OBJECT_FLAGS1 add hl, bc res SLIDING, [hl] jp ContinueReadingMovement ; 529c -Movement_39: ; 529c +Movement_set_sliding: ; 529c ld hl, OBJECT_FLAGS1 add hl, bc set SLIDING, [hl] |