summaryrefslogtreecommitdiff
path: root/src/battle/anim/flying.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/anim/flying.c')
-rw-r--r--src/battle/anim/flying.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c
index 4ad4375e6..f9f328283 100644
--- a/src/battle/anim/flying.c
+++ b/src/battle/anim/flying.c
@@ -8,8 +8,8 @@
#include "random.h"
extern s16 gBattleAnimArgs[];
-extern u8 gAnimBankAttacker;
-extern u8 gAnimBankTarget;
+extern u8 gBattleAnimAttacker;
+extern u8 gBattleAnimTarget;
extern u8 gAnimVisualTaskCount;
extern struct OamMatrix gOamMatrices[];
extern u8 gBanksBySide[];
@@ -430,15 +430,15 @@ void sub_80DA0DC(u8 taskId)
void sub_80DA16C(struct Sprite *sprite)
{
InitAnimSpritePos(sprite, 1);
- if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[1] = sprite->pos1.x;
- sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2];
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
sprite->data[3] = sprite->pos1.y;
- sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3];
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
InitAnimLinearTranslation(sprite);
sprite->callback = sub_80785E4;
StoreSpriteCallbackInData(sprite, sub_80DA1EC);
@@ -454,7 +454,7 @@ void sub_80DA1EC(struct Sprite *sprite)
void sub_80DA208(struct Sprite *sprite)
{
- if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -468,20 +468,20 @@ void sub_80DA208(struct Sprite *sprite)
gBattleAnimArgs[3] = -gBattleAnimArgs[3];
}
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
sprite->data[0] = gBattleAnimArgs[4];
if (gBattleAnimArgs[6] == 0)
{
- sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
- sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
}
else
{
- SetAverageBattlerPositions(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]);
+ SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->data[2], &sprite->data[4]);
}
sprite->data[2] = sprite->data[2] + gBattleAnimArgs[2];
@@ -521,7 +521,7 @@ void sub_80DA348(struct Sprite *sprite)
void sub_80DA38C(struct Sprite *sprite)
{
- if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
{
sprite->pos1.x = 272;
sprite->pos1.y = -32;
@@ -535,9 +535,9 @@ void sub_80DA38C(struct Sprite *sprite)
sprite->data[0] = gBattleAnimArgs[0];
sprite->data[1] = sprite->pos1.x;
- sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+ sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
sprite->data[3] = sprite->pos1.y;
- sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+ sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
InitAnimLinearTranslation(sprite);
sprite->callback = sub_80DA410;
@@ -594,11 +594,11 @@ void sub_80DA4D8(struct Sprite *sprite)
if (gBattleAnimArgs[7] & 0x100)
{
- slot = gAnimBankAttacker;
+ slot = gBattleAnimAttacker;
}
else
{
- slot = gAnimBankTarget;
+ slot = gBattleAnimTarget;
}
if (GetBattlerSide(slot) == 0)
@@ -1881,9 +1881,9 @@ _080DAD2C: .4byte sub_80DA48C\n");
void sub_80DAD30(struct Sprite *sprite)
{
- sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+ sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
sprite->callback = TranslateAnimSpriteToTargetMonLocation;
}
@@ -1899,29 +1899,29 @@ void sub_80DAD84(struct Sprite * sprite)
if (gMain.inBattle)
{
- if (gBanksBySide[gAnimBankTarget] & 1)
+ if (gBanksBySide[gBattleAnimTarget] & 1)
{
- sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
+ sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
}
else
{
// 080dade0
- sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 40;
+ sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 40;
}
if (gBattleAnimArgs[4])
{
- sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1;
+ sprite->oam.priority = sub_8079ED4(gBattleAnimTarget) + 1;
// 080dae24
}
else
{
- sprite->oam.priority = sub_8079ED4(gAnimBankTarget);
+ sprite->oam.priority = sub_8079ED4(gBattleAnimTarget);
}
}
else
{
- sprite->data[7] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3];
+ sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
}
sprite->data[4] = gSineTable[sprite->data[1] & 0xff];
@@ -2181,8 +2181,8 @@ void sub_80DB000(struct Sprite *sprite)
sub_8078764(sprite, FALSE);
}
- if ((!gBattleAnimArgs[2] && !GetBattlerSide(gAnimBankAttacker))
- || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gAnimBankTarget)))
+ if ((!gBattleAnimArgs[2] && !GetBattlerSide(gBattleAnimAttacker))
+ || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gBattleAnimTarget)))
{
sprite->pos1.x += 8;
}
@@ -2229,8 +2229,8 @@ void sub_80DB0E8(u8 task)
gBattleAnimArgs[3] = 3;
CreateSpriteAndAnimate(&gBattleAnimSpriteTemplate_83DB538,
- GetBattlerSpriteCoord(gAnimBankTarget, 2),
- GetBattlerSpriteCoord(gAnimBankTarget, 3),
+ GetBattlerSpriteCoord(gBattleAnimTarget, 2),
+ GetBattlerSpriteCoord(gBattleAnimTarget, 3),
3);
}
@@ -2264,7 +2264,7 @@ void sub_80DB1F4(struct Sprite *sprite)
switch (sprite->data[0])
{
case 0:
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
sprite->pos2.y = -sprite->pos1.y - 32;
++sprite->data[0];
break;
@@ -2345,13 +2345,13 @@ void sub_80DB374(struct Sprite *sprite)
case 0:
if (!gBattleAnimArgs[0])
{
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
}
else
{
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
}
sprite->data[1] = 512;
@@ -2420,13 +2420,13 @@ _080DB388:\n\
ldrsh r0, [r0, r2]\n\
cmp r0, 0\n\
bne _080DB3A0\n\
- ldr r4, _080DB39C @ =gAnimBankAttacker\n\
+ ldr r4, _080DB39C @ =gBattleAnimAttacker\n\
b _080DB3A2\n\
.align 2, 0\n\
_080DB398: .4byte gBattleAnimArgs\n\
-_080DB39C: .4byte gAnimBankAttacker\n\
+_080DB39C: .4byte gBattleAnimAttacker\n\
_080DB3A0:\n\
- ldr r4, _080DB3DC @ =gAnimBankTarget\n\
+ ldr r4, _080DB3DC @ =gBattleAnimTarget\n\
_080DB3A2:\n\
ldrb r0, [r4]\n\
movs r1, 0\n\
@@ -2455,7 +2455,7 @@ _080DB3A2:\n\
strh r0, [r5, 0x2E]\n\
b _080DB44C\n\
.align 2, 0\n\
-_080DB3DC: .4byte gAnimBankTarget\n\
+_080DB3DC: .4byte gBattleAnimTarget\n\
_080DB3E0:\n\
movs r1, 0x32\n\
ldrsh r0, [r5, r1]\n\
@@ -2554,13 +2554,13 @@ void sub_80DB458(struct Sprite *sprite)
if (gBattleAnimArgs[1] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 32;
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32;
}
else
{
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0);
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + 32;
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32;
}
sprite->callback = sub_80DB508;
@@ -2628,8 +2628,8 @@ void sub_80DB5E4(struct Sprite *sprite)
posx = sprite->pos1.x;
posy = sprite->pos1.y;
- sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
sprite->data[4] = sprite->pos1.x << 4;
sprite->data[5] = sprite->pos1.y << 4;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 14:04:10 +0000