summaryrefslogtreecommitdiff
path: root/data/sprites/map_objects.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-05-23 19:06:04 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-05-23 19:06:04 -0400
commitc85b32ed8035ce51dd9d3bd52440cebd912ce92c (patch)
tree2c9e01c44041076a06f84c61438450995c0e45db /data/sprites/map_objects.asm
parentc5d18de8ff9b587a7987cc2cde793386f1eaf217 (diff)
More sprite movement data flag constants
Diffstat (limited to 'data/sprites/map_objects.asm')
-rw-r--r--data/sprites/map_objects.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index 9410caea4..8136fcdf8 100644
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -175,7 +175,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_BIG_DOLL_SYM ; action
db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
db LOW_PRIORITY ; flags2
- db 1 << 6 | 1 << 7 ; palette flags
+ db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_POKEMON
db SPRITEMOVEFN_BOUNCE ; movement function
@@ -207,7 +207,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_STAND ; action
db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
db 0 ; flags2
- db 1 << 6 ; palette flags
+ db STRENGTH_BOULDER ; palette flags
; SPRITEMOVEDATA_FOLLOWNOTEXACT
db SPRITEMOVEFN_FOLLOWNOTEXACT ; movement function
@@ -263,7 +263,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_BIG_DOLL_ASYM ; action
db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
db LOW_PRIORITY ; flags2
- db 1 << 6 | 1 << 7 ; palette flags
+ db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_BIGDOLL
db SPRITEMOVEFN_STRENGTH ; movement function
@@ -271,7 +271,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_BIG_DOLL ; action
db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
db LOW_PRIORITY ; flags2
- db 1 << 6 | 1 << 7 ; palette flags
+ db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_BOULDERDUST
db SPRITEMOVEFN_BOULDERDUST ; movement function
@@ -295,7 +295,7 @@ SpriteMovementData:: ; 4273
db OBJECT_ACTION_STAND ; action
db 0 ; flags1
db 0 ; flags2
- db 1 << 5 ; palette flags
+ db WALK_ON_WATER ; palette flags
; 25
db SPRITEMOVEFN_00 ; movement function