diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /engine/movement.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'engine/movement.asm')
| -rw-r--r-- | engine/movement.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/movement.asm b/engine/movement.asm index a701ff6f9..3dbb0b83a 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -838,7 +838,7 @@ JumpStep: ; 548a ld hl, OBJECT_FLAGS2 add hl, bc - res 3, [hl] + res OVERHEAD, [hl] ld hl, OBJECT_ACTION add hl, bc |