diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
| commit | 096afdcdaca0714612f3670a3c4a670f312c1c3f (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /engine/map_objects.asm | |
| parent | 98128cd4d8457948e7136a16e08bacff0bc3529d (diff) | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/map_objects.asm')
| -rw-r--r-- | engine/map_objects.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 83147c168..162ea22df 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1,9 +1,10 @@ -INCLUDE "engine/facings.asm" +INCLUDE "data/facings.asm" + -SpriteMovementData:: ; 4273 INCLUDE "data/map_objects.asm" + ; 4357 DeleteMapObject:: ; 4357 push bc |