diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-19 10:58:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 10:58:44 -0500 |
| commit | 89dc26755ad2818c10b37a34ed46f5c79dc571c8 (patch) | |
| tree | abd075a205c401b3a5406efb37378544e94c9190 /src/rock.c | |
| parent | 83cba310335678aa8ecac24b58708b3c924b581a (diff) | |
| parent | 63f8834b6bc2d6413da606d7df88a304edc3c625 (diff) | |
Merge pull request #138 from jiangzhengwenjz/battle
battle (4th take)
Diffstat (limited to 'src/rock.c')
| -rw-r--r-- | src/rock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rock.c b/src/rock.c index 4db903344..c4b668941 100644 --- a/src/rock.c +++ b/src/rock.c @@ -87,8 +87,8 @@ const struct SpriteTemplate gUnknown_83E73E4 = static const union AffineAnimCmd gUnknown_83E73FC[] = { AFFINEANIMCMD_FRAME(0xC0, 0xC0, 0, 0), - AFFINEANIMCMD_FRAME(0x2, 0xFFFD, 0, 5), - AFFINEANIMCMD_FRAME(0xFFFE, 0x3, 0, 5), + AFFINEANIMCMD_FRAME(0x2, -0x3, 0, 5), + AFFINEANIMCMD_FRAME(-0x2, 0x3, 0, 5), AFFINEANIMCMD_JUMP(1), }; @@ -152,7 +152,7 @@ static const struct Subsprite gUnknown_83E7468[] = static const struct SubspriteTable gUnknown_83E7470[] = { - { ARRAY_COUNT(gUnknown_83E7468), gUnknown_83E7468 }, + { NELEMS(gUnknown_83E7468), gUnknown_83E7468 }, }; static const union AnimCmd gUnknown_83E7478[] = @@ -588,7 +588,7 @@ void sub_80B4BD0(u8 taskId) task->data[13] = pan1; task->data[14] = (pan2 - pan1) / task->data[8]; task->data[1] = var4; - task->data[15] = GetAnimBattlerSpriteId(0); + task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->func = sub_80B4D00; } |