Skip to content

Commit 76b9a69

Browse files
AsparagusEduardoAsparagusEduardo
authored
Use missing constants with GetBattlerSpriteCoord (#6778)
1 parent c8fa444 commit 76b9a69

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎src/battle_anim_fire.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,8 @@ const struct SpriteTemplate gTwisterEmberSpriteTemplate =
541541

542542
static void AnimLavaPlumeOrbitScatter(struct Sprite *sprite)
543543
{
544-
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
545-
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
544+
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
545+
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
546546
sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
547547
sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
548548
sprite->callback = AnimLavaPlumeOrbitScatterStep;

‎src/battle_anim_ghost.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,14 +1465,14 @@ void AnimTask_PulverizingPancakeWhiteShadow(u8 taskId)
14651465
task->data[9] = 16;
14661466
task->data[10] = gBattleAnimArgs[0];
14671467

1468-
baseX = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
1468+
baseX = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
14691469
baseY = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_BOTTOM);
14701470
if (!IsContest())
14711471
{
14721472
spriteId = CreateSprite(&gDestinyBondWhiteShadowSpriteTemplate, baseX, baseY, 55);
14731473
if (spriteId != MAX_SPRITES)
14741474
{
1475-
x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
1475+
x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
14761476
y = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_BOTTOM);
14771477
gSprites[spriteId].data[0] = baseX << 4;
14781478
gSprites[spriteId].data[1] = baseY << 4;

‎src/battle_anim_new.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7580,8 +7580,8 @@ static void SpriteCB_SpriteOnMonForDuration(struct Sprite *sprite)
75807580
}
75817581
else
75827582
{
7583-
sprite->x = GetBattlerSpriteCoord(target, 0);
7584-
sprite->y = GetBattlerSpriteCoord(target, 1);
7583+
sprite->x = GetBattlerSpriteCoord(target, BATTLER_COORD_X);
7584+
sprite->y = GetBattlerSpriteCoord(target, BATTLER_COORD_Y);
75857585
sprite->x += gBattleAnimArgs[1];
75867586
sprite->y += gBattleAnimArgs[2];
75877587
sprite->data[0] = 0;
@@ -7613,8 +7613,8 @@ static void SpriteCB_GrowingSuperpower(struct Sprite *sprite)
76137613

76147614
if (gBattleAnimArgs[0] == 0)
76157615
{
7616-
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
7617-
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
7616+
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
7617+
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
76187618
battler = gBattleAnimTarget;
76197619
sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
76207620
}
@@ -7629,9 +7629,9 @@ static void SpriteCB_GrowingSuperpower(struct Sprite *sprite)
76297629

76307630
sprite->data[0] = 16;
76317631
sprite->data[1] = sprite->x;
7632-
sprite->data[2] = GetBattlerSpriteCoord(battler, 2);
7632+
sprite->data[2] = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2);
76337633
sprite->data[3] = sprite->y;
7634-
sprite->data[4] = GetBattlerSpriteCoord(battler, 3);
7634+
sprite->data[4] = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET);
76357635

76367636
InitAnimLinearTranslation(sprite);
76377637
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -7836,8 +7836,8 @@ static void SpriteCB_MindBlownBall(struct Sprite *sprite)
78367836
{
78377837
s16 oldPosX = sprite->x;
78387838
s16 oldPosY = sprite->y;
7839-
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
7840-
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
7839+
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
7840+
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
78417841
sprite->data[0] = 0;
78427842
sprite->data[1] = gBattleAnimArgs[0];
78437843
sprite->data[2] = gBattleAnimArgs[1];
@@ -8212,8 +8212,8 @@ static void SpriteCB_AnimSpriteOnSelectedMonPos(struct Sprite *sprite)
82128212

82138213
static void SpriteCB_SurroundingRing(struct Sprite *sprite)
82148214
{
8215-
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
8216-
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 40;
8215+
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X);
8216+
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + 40;
82178217

82188218
sprite->data[0] = 13;
82198219
sprite->data[2] = sprite->x;
@@ -8327,8 +8327,8 @@ static void AnimHappyHourCoinShower(struct Sprite *sprite)
83278327
//arg 2: initial y pixel offset
83288328
static void SpriteCB_Geyser(struct Sprite *sprite)
83298329
{
8330-
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
8331-
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
8330+
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
8331+
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
83328332

83338333
sprite->data[0] = gBattleAnimArgs[1] > 0 ? 1 : -1;
83348334
sprite->callback = AnimMudSportDirtRising;
@@ -8340,8 +8340,8 @@ static void SpriteCB_Geyser(struct Sprite *sprite)
83408340
//arg 2: initial y pixel offset
83418341
static void SpriteCB_GeyserTarget(struct Sprite *sprite)
83428342
{
8343-
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1];
8344-
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2];
8343+
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
8344+
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
83458345

83468346
sprite->data[0] = gBattleAnimArgs[1] > 0 ? 1 : -1;
83478347
sprite->callback = AnimMudSportDirtRising;
@@ -8965,13 +8965,13 @@ static void SpriteCB_MoveSpriteUpwardsForDuration(struct Sprite* sprite)
89658965
{
89668966
if (gBattleAnimArgs[0] == ANIM_ATTACKER)
89678967
{
8968-
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
8969-
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2];
8968+
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[1];
8969+
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[2];
89708970
}
89718971
else
89728972
{
8973-
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
8974-
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2];
8973+
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[1];
8974+
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + gBattleAnimArgs[2];
89758975
}
89768976

89778977
sprite->data[0] = 0;

‎src/battle_anim_poison.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,9 @@ static void AnimGunkShotParticles(struct Sprite *sprite)
442442
InitSpritePosToAnimAttacker(sprite, TRUE);
443443
sprite->data[0] = 30;
444444
sprite->data[1] = sprite->x;
445-
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
445+
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
446446
sprite->data[3] = sprite->y;
447-
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
447+
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
448448
InitAnimLinearTranslation(sprite);
449449
sprite->data[5] = 0xD200 / sprite->data[0];
450450
sprite->data[7] = gBattleAnimArgs[3];

‎src/battle_anim_psychic.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,8 @@ static void AnimPsychoCut(struct Sprite *sprite)
518518

519519
InitSpritePosToAnimAttacker(sprite, 1);
520520

521-
lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
522-
lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
521+
lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2];
522+
lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3];
523523
rot = ArcTan2Neg(lVarX - sprite->x, lVarY - sprite->y);
524524
rot += 0xC000;
525525
TrySetSpriteRotScale(sprite, FALSE, 0x100, 0x100, rot);
@@ -536,13 +536,13 @@ static void AnimateZenHeadbutt(struct Sprite *sprite)
536536
{
537537
if (gBattleAnimArgs[0] == 0)
538538
{
539-
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
540-
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18;
539+
sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
540+
sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + 18;
541541
}
542542
else
543543
{
544-
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
545-
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 18;
544+
sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
545+
sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + 18;
546546
}
547547

548548
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);

‎src/battle_anim_rock.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -737,10 +737,10 @@ void AnimTask_TectonicRageRollout(u8 taskId)
737737

738738
task = &gTasks[taskId];
739739

740-
var0 = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
741-
var1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 24;
742-
var2 = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
743-
var3 = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 24;
740+
var0 = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
741+
var1 = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + 24;
742+
var2 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
743+
var3 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 24;
744744

745745
if (BATTLE_PARTNER(gBattleAnimAttacker) == gBattleAnimTarget)
746746
var3 = var1;

0 commit comments

Comments
 (0)