diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /data/map_objects.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'data/map_objects.asm')
| -rwxr-xr-x | data/map_objects.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/map_objects.asm b/data/map_objects.asm index af8b6d623..19a7c8d27 100755 --- a/data/map_objects.asm +++ b/data/map_objects.asm @@ -1,7 +1,7 @@ -sprite_movement_data: macro +sprite_movement_data: MACRO db \1, \2, \3, \4, \5 dn \6, 0 -endm +ENDM SpriteMovementData:: ; 4273 ; entries correspond to SPRITEMOVEDATA_* constants |