diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-23 13:15:07 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-23 13:15:07 -0400 |
| commit | c5d18de8ff9b587a7987cc2cde793386f1eaf217 (patch) | |
| tree | 5f5341f802eeaefe3d867a39742808ae441434ee /data | |
| parent | 32b92ca51c73f1ad9be169bef476b9c93687e2a4 (diff) | |
Use known sprite movement data flag constants
Diffstat (limited to 'data')
| -rw-r--r-- | data/sprites/map_objects.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm index 0e19b3787..9410caea4 100644 --- a/data/sprites/map_objects.asm +++ b/data/sprites/map_objects.asm @@ -13,7 +13,7 @@ SpriteMovementData:: ; 4273 db SPRITEMOVEFN_STANDING ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db 1 << 2 | 1 << 3 ; flags1 + db FIXED_FACING | SLIDING ; flags1 db 0 ; flags2 db 0 ; palette flags @@ -173,15 +173,15 @@ SpriteMovementData:: ; 4273 db SPRITEMOVEFN_BIG_SNORLAX ; movement function db DOWN ; facing db OBJECT_ACTION_BIG_DOLL_SYM ; action - db 1 << 1 | 1 << 2 | 1 << 3 | 1 << 5 ; flags1 - db 1 << 0 ; flags2 + db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 + db LOW_PRIORITY ; flags2 db 1 << 6 | 1 << 7 ; palette flags ; SPRITEMOVEDATA_POKEMON db SPRITEMOVEFN_BOUNCE ; movement function db DOWN ; facing db OBJECT_ACTION_BOUNCE ; action - db 1 << 1 | 1 << 2 | 1 << 3 | 1 << 5 ; flags1 + db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 db 0 ; flags2 db 0 ; palette flags @@ -189,7 +189,7 @@ SpriteMovementData:: ; 4273 db SPRITEMOVEFN_STANDING ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db 1 << 2 | 1 << 3 ; flags1 + db FIXED_FACING | SLIDING ; 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 | 1 << 2 | 1 << 3 | 1 << 5 ; flags1 + db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 db 1 << 4 ; 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 | 1 << 2 | 1 << 3 | 1 << 5 ; flags1 + db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 db 0 ; flags2 db 1 << 6 ; palette flags @@ -221,23 +221,23 @@ SpriteMovementData:: ; 4273 db SPRITEMOVEFN_SHADOW ; movement function db DOWN ; facing db OBJECT_ACTION_00 ; action - db 1 << 1 | 1 << 2 | 1 << 3 | 1 << 7 ; flags1 - db 1 << 0 ; flags2 + db 1 << 1 | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1 + db LOW_PRIORITY ; flags2 db 0 ; palette flags ; SPRITEMOVEDATA_EMOTE db SPRITEMOVEFN_EMOTE ; movement function db DOWN ; facing db OBJECT_ACTION_EMOTE ; action - db 1 << 1 | 1 << 2 | 1 << 3 | 1 << 7 ; flags1 - db 1 << 1 ; flags2 + db 1 << 1 | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1 + db HIGH_PRIORITY ; flags2 db 0 ; palette flags ; SPRITEMOVEDATA_SCREENSHAKE db SPRITEMOVEFN_SCREENSHAKE ; movement function db DOWN ; facing db OBJECT_ACTION_00 ; action - db 1 << 1 | 1 << 7 ; flags1 + db 1 << 1 | EMOTE_OBJECT ; flags1 db 0 ; flags2 db 0 ; palette flags @@ -261,32 +261,32 @@ SpriteMovementData:: ; 4273 db SPRITEMOVEFN_STRENGTH ; movement function db DOWN ; facing db OBJECT_ACTION_BIG_DOLL_ASYM ; action - db 1 << 1 | 1 << 2 | 1 << 3 | 1 << 5 ; flags1 - db 1 << 0 ; flags2 + db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 + db LOW_PRIORITY ; flags2 db 1 << 6 | 1 << 7 ; palette flags ; SPRITEMOVEDATA_BIGDOLL db SPRITEMOVEFN_STRENGTH ; movement function db DOWN ; facing db OBJECT_ACTION_BIG_DOLL ; action - db 1 << 1 | 1 << 2 | 1 << 3 | 1 << 5 ; flags1 - db 1 << 0 ; flags2 + db 1 << 1 | FIXED_FACING | SLIDING | 1 << 5 ; flags1 + db LOW_PRIORITY ; flags2 db 1 << 6 | 1 << 7 ; palette flags ; SPRITEMOVEDATA_BOULDERDUST db SPRITEMOVEFN_BOULDERDUST ; movement function db DOWN ; facing db OBJECT_ACTION_BOULDER_DUST ; action - db 1 << 1 | 1 << 2 | 1 << 3 | 1 << 7 ; flags1 - db 1 << 0 ; flags2 + db 1 << 1 | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1 + db LOW_PRIORITY ; flags2 db 0 ; palette flags ; SPRITEMOVEDATA_GRASS db SPRITEMOVEFN_GRASS ; movement function db DOWN ; facing db OBJECT_ACTION_GRASS_SHAKE ; action - db 1 << 1 | 1 << 2 | 1 << 3 | 1 << 7 ; flags1 - db 1 << 1 ; flags2 + db 1 << 1 | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1 + db HIGH_PRIORITY ; flags2 db 0 ; palette flags ; SPRITEMOVEDATA_SWIM_WANDER |