From a4a44dd18e125974e784f5f2fcb4c1387a8de90a Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 9 Nov 2019 09:05:26 +0800 Subject: fire; update constants --- src/bug.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/bug.c') diff --git a/src/bug.c b/src/bug.c index 9b8935744..97b37e070 100644 --- a/src/bug.c +++ b/src/bug.c @@ -202,7 +202,7 @@ static void sub_80B3FAC(struct Sprite *sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } - else if (!GetBattlerSide(gBattleAnimTarget)) + else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) { StartSpriteAffineAnim(sprite, 1); gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -226,7 +226,7 @@ static void sub_80B407C(struct Sprite *sprite) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; StartSpriteAffineAnim(sprite, 2); } - else if (!GetBattlerSide(gBattleAnimTarget)) + else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -283,12 +283,12 @@ static void sub_80B41C0(struct Sprite *sprite) static void sub_80B41F8(struct Sprite *sprite) { SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); - if (GetBattlerSide(gBattleAnimAttacker)) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; - if (!GetBattlerSide(gBattleAnimTarget)) + if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) sprite->pos1.y += 8; sprite->callback = sub_80B4274; } @@ -356,7 +356,7 @@ static void AnimTranslateStinger(struct Sprite *sprite) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - else if (GetBattlerSide(gBattleAnimAttacker)) + else if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -399,7 +399,7 @@ static void AnimTranslateStinger(struct Sprite *sprite) static void AnimMissileArc(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, 1); - if (GetBattlerSide(gBattleAnimAttacker)) + if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; -- cgit v1.2.3 From 63f8834b6bc2d6413da606d7df88a304edc3c625 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 19 Nov 2019 23:45:59 +0800 Subject: resolve review comments --- src/bug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bug.c') diff --git a/src/bug.c b/src/bug.c index 97b37e070..b9f1795ab 100644 --- a/src/bug.c +++ b/src/bug.c @@ -172,7 +172,7 @@ static const union AffineAnimCmd gUnknown_83E733C[] = AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 18), AFFINEANIMCMD_LOOP(0), - AFFINEANIMCMD_FRAME(0xFFFB, 0xFFFB, 0, 8), + AFFINEANIMCMD_FRAME(-0x5, -0x5, 0, 8), AFFINEANIMCMD_FRAME(0x5, 0x5, 0, 8), AFFINEANIMCMD_LOOP(5), AFFINEANIMCMD_END, -- cgit v1.2.3