1 files changed, 20 insertions, 20 deletions

diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index de9b296698..cf7000700d 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -102,16 +102,16 @@ int ScummEngine_v90he::spriteInfoGet_flags_20(int spriteId) {
 	return ((_spriteTable[spriteId].flags & kSF20) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_22(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagYFlipped(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	return ((_spriteTable[spriteId].flags & kSF22) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSFYFlipped) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_23(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagXFlipped(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	return ((_spriteTable[spriteId].flags & kSF23) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSFXFlipped) != 0) ? 1 : 0;
 }
 
 int ScummEngine_v90he::spriteInfoGet_flags_31(int spriteId) {
@@ -492,22 +492,22 @@ void ScummEngine_v90he::spriteInfoSet_flag20(int spriteId, int value) {
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 }
 
-void ScummEngine_v90he::spriteInfoSet_flag22(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagYFlipped(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	if (value)
-		_spriteTable[spriteId].flags |= kSF22;
+		_spriteTable[spriteId].flags |= kSFYFlipped;
 	else
-		_spriteTable[spriteId].flags &= ~(kSFChanged | kSF22);
+		_spriteTable[spriteId].flags &= ~(kSFChanged | kSFYFlipped);
 }
 
-void ScummEngine_v90he::spriteInfoSet_flags23_26(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagXFlipped(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	if (value)
-		_spriteTable[spriteId].flags |= kSF23 | kSFBlitDirectly;
+		_spriteTable[spriteId].flags |= kSFXFlipped | kSFBlitDirectly;
 	else
-		_spriteTable[spriteId].flags &= ~(kSFChanged | kSF23 | kSFBlitDirectly);
+		_spriteTable[spriteId].flags &= ~(kSFChanged | kSFXFlipped | kSFBlitDirectly);
 }
 
 void ScummEngine_v90he::spriteInfoSet_flag31(int spriteId, int value) {
@@ -635,7 +635,7 @@ void ScummEngine_v90he::spriteAddImageToList(int spriteId, int imageNum, int *sp
 
 	if (_spriteTable[spriteId].res_id) {
 		_spriteTable[spriteId].res_wiz_states = getWizImageStates(_spriteTable[spriteId].res_id);
-		_spriteTable[spriteId].flags |= kSFActive | kSF22 | kSF23 | kSFBlitDirectly;
+		_spriteTable[spriteId].flags |= kSFActive | kSFYFlipped | kSFXFlipped | kSFBlitDirectly;
 
 		if (_spriteTable[spriteId].res_id == origResId &&
 			_spriteTable[spriteId].res_wiz_states == spriteId)
@@ -703,9 +703,9 @@ void ScummEngine_v90he::spriteGroupSet_case0_3(int spriteGroupId, int value) {
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId) {
 			if (value)
-				_spriteTable[i].flags |= kSF23 | kSFBlitDirectly;
+				_spriteTable[i].flags |= kSFXFlipped | kSFBlitDirectly;
 			else
-				_spriteTable[i].flags &= ~(kSFChanged | kSF23 | kSFBlitDirectly);
+				_spriteTable[i].flags &= ~(kSFChanged | kSFXFlipped | kSFBlitDirectly);
 		}
 	}
 }
@@ -736,9 +736,9 @@ void ScummEngine_v90he::spriteGroupSet_case0_6(int spriteGroupId, int value) {
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId) {
 			if (value)
-				_spriteTable[i].flags |= kSF22;
+				_spriteTable[i].flags |= kSFYFlipped;
 			else
-				_spriteTable[i].flags &= ~(kSFChanged | kSF22);
+				_spriteTable[i].flags &= ~(kSFChanged | kSFYFlipped);
 		}
 	}
 }
@@ -1026,7 +1026,7 @@ void ScummEngine_v90he::spritesMarkDirty(bool unkFlag) {
 	for (int i = 0; i < _numSpritesToProcess; ++i) {
 		SpriteInfo *spi = _activeSpritesTable[i];
 		if (!(spi->flags & (kSFNeedRedraw | kSF30))) {
-			if ((!unkFlag || spi->field_18 >= 0) && (spi->flags & kSF23)) {
+			if ((!unkFlag || spi->field_18 >= 0) && (spi->flags & kSFXFlipped)) {
 				bool needRedraw = false;
 				int lp = MIN(79, spi->bbox.left / 8);
 				int rp = MIN(79, (spi->bbox.right + 7) / 8);
@@ -1057,7 +1057,7 @@ void ScummEngine_v90he::spritesUpdateImages() {
 				spi->flags |= kSFChanged | kSFNeedRedraw;
 			}			
 		}
-		if (spi->flags & kSF22) {
+		if (spi->flags & kSFYFlipped) {
 			if (spi->field_78 != 0) {
 				--spi->field_64;
 				if (spi->field_64 != 0) {
@@ -1120,7 +1120,7 @@ void ScummEngine_v90he::spritesSortActiveSprites() {
 		SpriteInfo *spi = &_spriteTable[i];
 
 		if (spi->flags & kSFActive) {
-			if (!spi->flags & kSF23) {
+			if (!spi->flags & kSFXFlipped) {
 				if (!(spi->flags & kSF30))
 					spi->flags |= kSFNeedRedraw;
 				if (!(spi->flags & kSF31))
@@ -1237,9 +1237,9 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
 		}
 
 		wiz.img.flags = 0x10;
-		if (spr_flags & kSF23)
+		if (spr_flags & kSFXFlipped)
 			wiz.img.flags |= kWIFFlipX;
-		if (spr_flags & kSF22)
+		if (spr_flags & kSFYFlipped)
 			wiz.img.flags |= kWIFFlipY;
 		if (spr_flags & kSF21) {
 			wiz.img.flags &= ~(0x11);