diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2019-09-04 17:06:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 17:06:59 -0400 |
| commit | 4a0cad80b0b8193b840f34b6602ae6325ed95622 (patch) | |
| tree | 11e47cdd912c84e8ebdac0b991ac6d1bbc4ab26d /src/fire.c | |
| parent | 5f457dd4590cfbb664e37357632918030b3c360f (diff) | |
Use B_SIDE constants
Also includes a CHAR_X constant use for X items
Diffstat (limited to 'src/fire.c')
| -rw-r--r-- | src/fire.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fire.c b/src/fire.c index 2998d46ca..f87a9e4bb 100644 --- a/src/fire.c +++ b/src/fire.c @@ -949,7 +949,7 @@ static u16 sub_8109930(u8 spriteId) { u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY; - if (GetBattlerSide(gBattleAnimAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { var1 = ((var1 << 16) + 0x4A0000) >> 16; } @@ -1059,7 +1059,7 @@ static void sub_8109AFC(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[7] = gBattleAnimArgs[2]; - if (GetBattlerSide(gBattleAnimAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { sprite->data[4] = 4; } @@ -1073,7 +1073,7 @@ static void sub_8109AFC(struct Sprite *sprite) break; case 1: sprite->data[1] += 192; - if (GetBattlerSide(gBattleAnimAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { sprite->pos2.y = -(sprite->data[1] >> 8); } @@ -1181,7 +1181,7 @@ void sub_8109DBC(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[12] = !GetBattlerSide(gBattleAnimAttacker) ? 1 : -1; + task->data[12] = !GetBattlerSide(gBattleAnimAttacker) ? B_SIDE_OPPONENT : -1; task->data[13] = IsBattlerSpriteVisible(gBattleAnimTarget ^ 2) + 1; task->data[14] = GetAnimBattlerSpriteId(1); task->data[15] = GetAnimBattlerSpriteId(3); |