summaryrefslogtreecommitdiff
path: root/data/map_objects.asm
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
committersurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
commit096afdcdaca0714612f3670a3c4a670f312c1c3f (patch)
tree0c0bedcd311ab83262e31cf6d9d4c37257143acc /data/map_objects.asm
parent98128cd4d8457948e7136a16e08bacff0bc3529d (diff)
parentf6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'data/map_objects.asm')
-rwxr-xr-xdata/map_objects.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/data/map_objects.asm b/data/map_objects.asm
index 9cc495b7f..6bf9aeaa1 100755
--- a/data/map_objects.asm
+++ b/data/map_objects.asm
@@ -1,10 +1,10 @@
-; entries correspond to SPRITEMOVEDATA_* constants
-
sprite_movement_data: macro
db \1, \2, \3, \4, \5
dn \6, 0
endm
+SpriteMovementData:: ; 4273
+; entries correspond to SPRITEMOVEDATA_* constants
; function, facing, action, flags1, flags2, palette flags
sprite_movement_data SPRITEMOVEFN_00, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 00
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $0c, $00, %0000 ; 01
@@ -44,3 +44,4 @@ endm
sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, PERSON_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; 23
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, PERSON_ACTION_STAND, $00, $00, %0010 ; 24
sprite_movement_data SPRITEMOVEFN_00, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 25
+; 4357