diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-26 15:02:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 15:02:38 -0400 |
| commit | 1016b239186097361ea20f2f91adf3932026f40c (patch) | |
| tree | 840a0f28046d3c66fcaf1c2bb8ab3228386a3a8a /src/fire.c | |
| parent | bb236b490d99fef02ed172e7ca86f6c70ef09527 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into rename-tablecmds
Diffstat (limited to 'src/fire.c')
| -rw-r--r-- | src/fire.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fire.c b/src/fire.c index 2998d46ca..fdbfb234e 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); } |