summaryrefslogtreecommitdiff
path: root/data/sprites/map_objects.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-05-23 22:01:21 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-05-23 22:01:21 -0400
commit1840af8b4f02d6b8f748ea917344c64cb1c5ff2d (patch)
tree2e7d6719c20d82600bccec3bc394db9b6dd0854b /data/sprites/map_objects.asm
parent85f7328bf853d30c23149151718c2ccef337ced5 (diff)
Identify more sprite move data flag bits
Diffstat (limited to 'data/sprites/map_objects.asm')
-rw-r--r--data/sprites/map_objects.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index c6070272b..cf577869a 100644
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -5,7 +5,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_00 ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db 1 << 1 ; flags1
+ db WONT_DELETE ; flags1
db 0 ; flags2
db 0 ; palette flags
@@ -93,7 +93,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_OBEY_DPAD ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db 1 << 1 ; flags1
+ db WONT_DELETE ; flags1
db 0 ; flags2
db 0 ; palette flags
@@ -157,7 +157,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_FOLLOW ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db 1 << 1 ; flags1
+ db WONT_DELETE ; flags1
db 0 ; flags2
db 0 ; palette flags
@@ -165,7 +165,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_SCRIPTED ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db 1 << 1 ; flags1
+ db WONT_DELETE ; flags1
db 0 ; flags2
db 0 ; palette flags
@@ -173,7 +173,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_BIG_SNORLAX ; movement function
db DOWN ; facing
db OBJECT_ACTION_BIG_DOLL_SYM ; action
- db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
db LOW_PRIORITY ; flags2
db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
@@ -181,7 +181,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_BOUNCE ; movement function
db DOWN ; facing
db OBJECT_ACTION_BOUNCE ; action
- db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
db 0 ; flags2
db 0 ; palette flags
@@ -197,7 +197,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_STANDING ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
db USE_OBP1 ; flags2
db 0 ; palette flags
@@ -205,7 +205,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_STRENGTH ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
db 0 ; flags2
db STRENGTH_BOULDER ; palette flags
@@ -213,7 +213,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_FOLLOWNOTEXACT ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db 1 << 1 ; flags1
+ db WONT_DELETE ; flags1
db 0 ; flags2
db 0 ; palette flags
@@ -221,7 +221,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_SHADOW ; movement function
db DOWN ; facing
db OBJECT_ACTION_00 ; action
- db 1 << 1 | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
db LOW_PRIORITY ; flags2
db 0 ; palette flags
@@ -229,7 +229,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_EMOTE ; movement function
db DOWN ; facing
db OBJECT_ACTION_EMOTE ; action
- db 1 << 1 | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
db HIGH_PRIORITY ; flags2
db 0 ; palette flags
@@ -237,7 +237,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_SCREENSHAKE ; movement function
db DOWN ; facing
db OBJECT_ACTION_00 ; action
- db 1 << 1 | EMOTE_OBJECT ; flags1
+ db WONT_DELETE | EMOTE_OBJECT ; flags1
db 0 ; flags2
db 0 ; palette flags
@@ -261,7 +261,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_STRENGTH ; movement function
db DOWN ; facing
db OBJECT_ACTION_BIG_DOLL_ASYM ; action
- db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
db LOW_PRIORITY ; flags2
db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
@@ -269,7 +269,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_STRENGTH ; movement function
db DOWN ; facing
db OBJECT_ACTION_BIG_DOLL ; action
- db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
db LOW_PRIORITY ; flags2
db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
@@ -277,7 +277,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_BOULDERDUST ; movement function
db DOWN ; facing
db OBJECT_ACTION_BOULDER_DUST ; action
- db 1 << 1 | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
db LOW_PRIORITY ; flags2
db 0 ; palette flags
@@ -285,7 +285,7 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_GRASS ; movement function
db DOWN ; facing
db OBJECT_ACTION_GRASS_SHAKE ; action
- db 1 << 1 | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+ db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
db HIGH_PRIORITY ; flags2
db 0 ; palette flags