Identify more sprite move data flag bits

2 files changed, 66 insertions, 66 deletions

diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm
index 166455707..c321ca462 100644
--- a/data/sprites/facings.asm
+++ b/data/sprites/facings.asm
@@ -50,24 +50,24 @@ FacingWeirdTree2: ; standing down
 	db 4 ; #
 	db  0,  0, 0, $00
 	db  0,  8, 0, $01
-	db  8,  0, 2, $02
-	db  8,  8, 2, $03
+	db  8,  0, RELATIVE_ATTRIBUTES, $02
+	db  8,  8, RELATIVE_ATTRIBUTES, $03
 ; 409c
 
 FacingStepDown1: ; walking down 1
 	db 4 ; #
 	db  0,  0, 0, $80
 	db  0,  8, 0, $81
-	db  8,  0, 2, $82
-	db  8,  8, 2, $83
+	db  8,  0, RELATIVE_ATTRIBUTES, $82
+	db  8,  8, RELATIVE_ATTRIBUTES, $83
 ; 40ad
 
 FacingStepDown3: ; walking down 2
 	db 4 ; #
 	db  0,  8, X_FLIP, $80
 	db  0,  0, X_FLIP, $81
-	db  8,  8, 2 | X_FLIP, $82
-	db  8,  0, 2 | X_FLIP, $83
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $82
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $83
 ; 40be
 
 FacingStepUp0:
@@ -75,24 +75,24 @@ FacingStepUp2: ; standing up
 	db 4 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
-	db  8,  0, 2, $06
-	db  8,  8, 2, $07
+	db  8,  0, RELATIVE_ATTRIBUTES, $06
+	db  8,  8, RELATIVE_ATTRIBUTES, $07
 ; 40cf
 
 FacingStepUp1: ; walking up 1
 	db 4 ; #
 	db  0,  0, 0, $84
 	db  0,  8, 0, $85
-	db  8,  0, 2, $86
-	db  8,  8, 2, $87
+	db  8,  0, RELATIVE_ATTRIBUTES, $86
+	db  8,  8, RELATIVE_ATTRIBUTES, $87
 ; 40e0
 
 FacingStepUp3: ; walking up 2
 	db 4 ; #
 	db  0,  8, X_FLIP, $84
 	db  0,  0, X_FLIP, $85
-	db  8,  8, 2 | X_FLIP, $86
-	db  8,  0, 2 | X_FLIP, $87
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $86
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $87
 ; 40f1
 
 FacingStepLeft0:
@@ -100,8 +100,8 @@ FacingStepLeft2: ; standing left
 	db 4 ; #
 	db  0,  0, 0, $08
 	db  0,  8, 0, $09
-	db  8,  0, 2, $0a
-	db  8,  8, 2, $0b
+	db  8,  0, RELATIVE_ATTRIBUTES, $0a
+	db  8,  8, RELATIVE_ATTRIBUTES, $0b
 ; 4102
 
 FacingStepRight0:
@@ -109,8 +109,8 @@ FacingStepRight2: ; standing right
 	db 4 ; #
 	db  0,  8, X_FLIP, $08
 	db  0,  0, X_FLIP, $09
-	db  8,  8, 2 | X_FLIP, $0a
-	db  8,  0, 2 | X_FLIP, $0b
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
 ; 4113
 
 FacingStepLeft1:
@@ -118,8 +118,8 @@ FacingStepLeft3: ; walking left
 	db 4 ; #
 	db  0,  0, 0, $88
 	db  0,  8, 0, $89
-	db  8,  0, 2, $8a
-	db  8,  8, 2, $8b
+	db  8,  0, RELATIVE_ATTRIBUTES, $8a
+	db  8,  8, RELATIVE_ATTRIBUTES, $8b
 ; 4124
 
 FacingStepRight1:
@@ -127,58 +127,58 @@ FacingStepRight3: ; walking right
 	db 4 ; #
 	db  0,  8, X_FLIP, $88
 	db  0,  0, X_FLIP, $89
-	db  8,  8, 2 | X_FLIP, $8a
-	db  8,  0, 2 | X_FLIP, $8b
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $8a
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $8b
 ; 4135
 
 FacingFishDown: ; fishing down
 	db 5 ; #
 	db  0,  0, 0, $00
 	db  0,  8, 0, $01
-	db  8,  0, 2, $02
-	db  8,  8, 2, $03
-	db 16,  0, 4, $fc
+	db  8,  0, RELATIVE_ATTRIBUTES, $02
+	db  8,  8, RELATIVE_ATTRIBUTES, $03
+	db 16,  0, ABSOLUTE_TILE_ID, $fc
 ; 414a
 
 FacingFishUp: ; fishing up
 	db 5 ; #
 	db  0,  0, 0, $04
 	db  0,  8, 0, $05
-	db  8,  0, 2, $06
-	db  8,  8, 2, $07
-	db -8,  0, 4, $fc
+	db  8,  0, RELATIVE_ATTRIBUTES, $06
+	db  8,  8, RELATIVE_ATTRIBUTES, $07
+	db -8,  0, ABSOLUTE_TILE_ID, $fc
 ; 415f
 
 FacingFishLeft: ; fishing left
 	db 5 ; #
 	db  0,  0, 0, $08
 	db  0,  8, 0, $09
-	db  8,  0, 2, $0a
-	db  8,  8, 2, $0b
-	db  5, -8, 4 | X_FLIP, $fd
+	db  8,  0, RELATIVE_ATTRIBUTES, $0a
+	db  8,  8, RELATIVE_ATTRIBUTES, $0b
+	db  5, -8, ABSOLUTE_TILE_ID | X_FLIP, $fd
 ; 4174
 
 FacingFishRight: ; fishing right
 	db 5 ; #
 	db  0,  8, X_FLIP, $08
 	db  0,  0, X_FLIP, $09
-	db  8,  8, 2 | X_FLIP, $0a
-	db  8,  0, 2 | X_FLIP, $0b
-	db  5, 16, 4, $fd
+	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
+	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
+	db  5, 16, ABSOLUTE_TILE_ID, $fd
 ; 4189
 
 FacingEmote: ; emote
 	db 4 ; #
-	db  0,  0, 4, $f8
-	db  0,  8, 4, $f9
-	db  8,  0, 4, $fa
-	db  8,  8, 4, $fb
+	db  0,  0, ABSOLUTE_TILE_ID, $f8
+	db  0,  8, ABSOLUTE_TILE_ID, $f9
+	db  8,  0, ABSOLUTE_TILE_ID, $fa
+	db  8,  8, ABSOLUTE_TILE_ID, $fb
 ; 419a
 
 FacingShadow: ; shadow
 	db 2 ; #
-	db  0,  0, 4, $fc
-	db  0,  8, 4 | X_FLIP, $fc
+	db  0,  0, ABSOLUTE_TILE_ID, $fc
+	db  0,  8, ABSOLUTE_TILE_ID | X_FLIP, $fc
 ; 41a3
 
 FacingBigDollSymmetric: ; big snorlax or lapras doll
@@ -237,28 +237,28 @@ FacingBigDollAsymmetric: ; big doll other than snorlax or lapras
 
 FacingBoulderDust1: ; boulder dust 1
 	db 4 ; #
-	db  0,  0, 4, $fe
-	db  0,  8, 4, $fe
-	db  8,  0, 4, $fe
-	db  8,  8, 4, $fe
+	db  0,  0, ABSOLUTE_TILE_ID, $fe
+	db  0,  8, ABSOLUTE_TILE_ID, $fe
+	db  8,  0, ABSOLUTE_TILE_ID, $fe
+	db  8,  8, ABSOLUTE_TILE_ID, $fe
 ; 4250
 
 FacingBoulderDust2: ; boulder dust 2
 	db 4 ; #
-	db  0,  0, 4, $ff
-	db  0,  8, 4, $ff
-	db  8,  0, 4, $ff
-	db  8,  8, 4, $ff
+	db  0,  0, ABSOLUTE_TILE_ID, $ff
+	db  0,  8, ABSOLUTE_TILE_ID, $ff
+	db  8,  0, ABSOLUTE_TILE_ID, $ff
+	db  8,  8, ABSOLUTE_TILE_ID, $ff
 ; 4261
 
 FacingGrass1: ; 4261
 	db 2 ; #
-	db  8,  0, 4, $fe
-	db  8,  8, 4 | X_FLIP, $fe
+	db  8,  0, ABSOLUTE_TILE_ID, $fe
+	db  8,  8, ABSOLUTE_TILE_ID | X_FLIP, $fe
 ; 426a
 
 FacingGrass2: ; 426a
 	db 2 ; #
-	db  9, -1, 4, $fe
-	db  9,  9, 4 | X_FLIP, $fe
+	db  9, -1, ABSOLUTE_TILE_ID, $fe
+	db  9,  9, ABSOLUTE_TILE_ID | X_FLIP, $fe
 ; 4273
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