diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /data/sprites/map_objects.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'data/sprites/map_objects.asm')
| -rw-r--r-- | data/sprites/map_objects.asm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm index cf577869a..10afaf57b 100644 --- a/data/sprites/map_objects.asm +++ b/data/sprites/map_objects.asm @@ -1,4 +1,4 @@ -SpriteMovementData:: ; 4273 +SpriteMovementData:: ; entries correspond to SPRITEMOVEDATA_* constants ; SPRITEMOVEDATA_00 @@ -304,5 +304,3 @@ SpriteMovementData:: ; 4273 db 0 ; flags1 db 0 ; flags2 db 0 ; palette flags - -; 4357 |