From 4a0cad80b0b8193b840f34b6602ae6325ed95622 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Sep 2019 17:06:59 -0400 Subject: Use B_SIDE constants Also includes a CHAR_X constant use for X items --- src/ice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ice.c') diff --git a/src/ice.c b/src/ice.c index 8f0c97d82..4dbf5c4df 100644 --- a/src/ice.c +++ b/src/ice.c @@ -735,7 +735,7 @@ void AnimSwirlingSnowball_Step2(struct Sprite *sprite) void AnimSwirlingSnowball_Step3(struct Sprite *sprite) { s16 tempVar; - tempVar = GetBattlerSide(gBattleAnimAttacker) != 0 ? 20 : -20; + tempVar = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 20 : -20; if (sprite->data[5] <= 31) { -- cgit v1.2.3 From c647a8329f41c8329653f0017a20f247a8c80746 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Sep 2019 17:45:04 -0400 Subject: Use gBattlerPositions constants --- src/ice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ice.c') diff --git a/src/ice.c b/src/ice.c index 4dbf5c4df..522fb1bbf 100644 --- a/src/ice.c +++ b/src/ice.c @@ -1190,12 +1190,12 @@ void InitPoisonGasCloudAnim(struct Sprite *sprite) if (GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2)) sprite->data[7] = 0x8000; - if (!(gBattlerPositions[gBattleAnimTarget] & 1)) + if ((gBattlerPositions[gBattleAnimTarget] & BIT_SIDE) == B_SIDE_PLAYER) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; - if ((sprite->data[7] & 0x8000) && !(gBattlerPositions[gBattleAnimAttacker] & 1)) + if ((sprite->data[7] & 0x8000) && (gBattlerPositions[gBattleAnimAttacker] & BIT_SIDE) == B_SIDE_PLAYER) sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1; sprite->data[6] = 1; -- cgit v1.2.3