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/tile_events.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/tile_events.asm')
| -rwxr-xr-x | engine/tile_events.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/tile_events.asm b/engine/tile_events.asm index a6794e817..c1ae93363 100755 --- a/engine/tile_events.asm +++ b/engine/tile_events.asm @@ -21,17 +21,17 @@ CheckDirectionalWarp:: ; 149af ; Else, set carry (immediate warp). ld a, [PlayerStandingTile] cp $70 ; Warp on down - jr z, .not_warp + jr z, .directional cp $76 ; Warp on left - jr z, .not_warp + jr z, .directional cp $78 ; Warp on up - jr z, .not_warp + jr z, .directional cp $7e ; Warp on right - jr z, .not_warp + jr z, .directional scf ret -.not_warp +.directional xor a ret ; 149c6 @@ -44,7 +44,7 @@ CheckWarpFacingDown: ; 149c6 ret ; 149d3 -.blocks: ; 149d3 +.blocks ; 149d3 db $71 ; door db $79 db $7a ; stairs @@ -65,7 +65,7 @@ CheckGrassCollision:: ; 149dd ret ; 149ea -.blocks: ; 149ea +.blocks ; 149ea db $08 db $18 ; tall grass db $14 ; tall grass @@ -87,7 +87,7 @@ CheckCutCollision: ; 149f5 ret ; 14a00 -.blocks: ; 14a00 +.blocks ; 14a00 db $12 ; cut tree db $1a ; cut tree db $10 ; tall grass |