diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
| commit | e638cdb74cabff705d4879568e74b8ed43da64e1 (patch) | |
| tree | 02869ee6058c1b7d00d554af86e6eb6b197cd660 /macros/map.asm | |
| parent | b8da3874bbc06e858b7b2d7a602fe33baa046e93 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
Merge remote-tracking branch 'origin/master' into pngs-kind-of
Conflicts:
INSTALL.md
Diffstat (limited to 'macros/map.asm')
| -rw-r--r-- | macros/map.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macros/map.asm b/macros/map.asm index a9d3209c1..6133f3075 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -18,8 +18,8 @@ ENDM person_event: macro db \1 ; sprite - db \2 ; y - db \3 ; x + db \2 + 4 ; y + db \3 + 4 ; x db \4 ; movement function dn \5, \6 ; radius: y, x db \7 ; clock_hour |