diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
| commit | c51968f0de6b8420c141dde27339e82a42837c5b (patch) | |
| tree | 782f2b25f21adacb48fd516694b8a82864fe0b99 /engine/map_objects.asm | |
| parent | c883ab4d34ecb4890010e808d6b6d533f5d8ad56 (diff) | |
| parent | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff) | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'engine/map_objects.asm')
| -rw-r--r-- | engine/map_objects.asm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 162ea22df..4b8adb75f 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1,7 +1,5 @@ - INCLUDE "data/facings.asm" - INCLUDE "data/map_objects.asm" |