summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/anim/fight.c4
-rw-r--r--src/battle/anim/flying.c4
-rw-r--r--src/battle/anim/ice.c18
-rw-r--r--src/battle/anim/sonic.c4
4 files changed, 15 insertions, 15 deletions
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 8d045c42d..450844453 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -12,7 +12,7 @@ extern u8 gBattlerAttacker;
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
extern u8 gBattlerSpriteIds[];
-extern u8 gBanksBySide[];
+extern u8 gBattlerPositions[];
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
extern u16 gBattle_BG2_X;
@@ -516,7 +516,7 @@ void sub_80D90F4(struct Sprite *sprite)
if (Random() & 1)
y *= -1;
- if ((gBanksBySide[bank] & 1) == 0)
+ if ((gBattlerPositions[bank] & 1) == 0)
y += 0xFFF0;
sprite->pos1.x += x;
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c
index 1f36c933a..407c9a08f 100644
--- a/src/battle/anim/flying.c
+++ b/src/battle/anim/flying.c
@@ -12,7 +12,7 @@ extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
extern u8 gAnimVisualTaskCount;
extern struct OamMatrix gOamMatrices[];
-extern u8 gBanksBySide[];
+extern u8 gBattlerPositions[];
extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538;
void sub_80785E4(struct Sprite *sprite);
@@ -1899,7 +1899,7 @@ void sub_80DAD84(struct Sprite * sprite)
if (gMain.inBattle)
{
- if (gBanksBySide[gBattleAnimTarget] & 1)
+ if (gBattlerPositions[gBattleAnimTarget] & 1)
{
sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
}
diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c
index 4002ceec1..e41057d72 100644
--- a/src/battle/anim/ice.c
+++ b/src/battle/anim/ice.c
@@ -14,7 +14,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
extern u8 gAnimVisualTaskCount;
-extern u8 gBanksBySide[];
+extern u8 gBattlerPositions[];
extern u8 gBattlerSpriteIds[];
extern u16 gBattle_BG1_X;
@@ -1419,12 +1419,12 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite)
if (GetBattlerSpriteCoord(gBattleAnimAttacker, 2) < GetBattlerSpriteCoord(gBattleAnimTarget, 2))
sprite->data[7] = 0x8000;
- if (!(gBanksBySide[gBattleAnimTarget] & 1))
+ if (!(gBattlerPositions[gBattleAnimTarget] & 1))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
gBattleAnimArgs[3] = -gBattleAnimArgs[3];
- if ((sprite->data[7] & 0x8000) && !(gBanksBySide[gBattleAnimAttacker] & 1))
+ if ((sprite->data[7] & 0x8000) && !(gBattlerPositions[gBattleAnimAttacker] & 1))
sprite->subpriority = gSprites[GetAnimBattlerSpriteId(1)].subpriority + 1;
sprite->data[6] = 1;
@@ -1490,7 +1490,7 @@ static void sub_80D8874(struct Sprite *sprite)
sprite->data[3] = sprite->pos1.y;
sprite->data[4] = sprite->pos1.y + 29;
sprite->data[7]++;
- if (gMain.inBattle && gBanksBySide[gBattleAnimTarget] & 1)
+ if (gMain.inBattle && gBattlerPositions[gBattleAnimTarget] & 1)
sprite->data[5] = 204;
else
sprite->data[5] = value2;
@@ -1535,7 +1535,7 @@ static void sub_80D8874(struct Sprite *sprite)
sprite->data[1] = sprite->pos1.x += sprite->pos2.x;
sprite->data[3] = sprite->pos1.y += sprite->pos2.y;
sprite->data[4] = sprite->pos1.y + 4;
- if (gMain.inBattle && gBanksBySide[gBattleAnimTarget] & 1)
+ if (gMain.inBattle && gBattlerPositions[gBattleAnimTarget] & 1)
sprite->data[2] = 0x100;
else
sprite->data[2] = -0x10;
@@ -1646,7 +1646,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite)
"\tands r0, r1\n"
"\tcmp r0, 0\n"
"\tbeq _080D8938\n"
- "\tldr r1, _080D8934 @ =gBanksBySide\n"
+ "\tldr r1, _080D8934 @ =gBattlerPositions\n"
"\tldrb r0, [r6]\n"
"\tadds r0, r1\n"
"\tldrb r1, [r0]\n"
@@ -1661,7 +1661,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite)
"_080D8928: .4byte gBattleAnimTarget\n"
"_080D892C: .4byte gMain\n"
"_080D8930: .4byte 0x0000043d\n"
- "_080D8934: .4byte gBanksBySide\n"
+ "_080D8934: .4byte gBattlerPositions\n"
"_080D8938:\n"
"\tstrh r5, [r4, 0x38]\n"
"_080D893A:\n"
@@ -1806,7 +1806,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite)
"\tands r0, r1\n"
"\tcmp r0, 0\n"
"\tbeq _080D8A78\n"
- "\tldr r1, _080D8A70 @ =gBanksBySide\n"
+ "\tldr r1, _080D8A70 @ =gBattlerPositions\n"
"\tldr r0, _080D8A74 @ =gBattleAnimTarget\n"
"\tldrb r0, [r0]\n"
"\tadds r0, r1\n"
@@ -1821,7 +1821,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite)
"\t.align 2, 0\n"
"_080D8A68: .4byte gMain\n"
"_080D8A6C: .4byte 0x0000043d\n"
- "_080D8A70: .4byte gBanksBySide\n"
+ "_080D8A70: .4byte gBattlerPositions\n"
"_080D8A74: .4byte gBattleAnimTarget\n"
"_080D8A78:\n"
"\tldr r0, _080D8A90 @ =0x0000fff0\n"
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c
index 9cdda992f..cef255eda 100644
--- a/src/battle/anim/sonic.c
+++ b/src/battle/anim/sonic.c
@@ -9,7 +9,7 @@
extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBanksBySide[];
+extern u8 gBattlerPositions[];
extern u16 gBattleTypeFlags;
extern void sub_80D4CA4(struct Sprite *sprite);
@@ -296,7 +296,7 @@ void sub_80CFB04(u8 taskId)
}
else
{
- if ((gBanksBySide[gBattleAnimTarget] & 1) == 0)
+ if ((gBattlerPositions[gBattleAnimTarget] & 1) == 0)
{
gTasks[taskId].data[4] = 1;
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 18:59:08 +0000