summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-06 16:02:31 -0700
committerMarcus Huderle <huderlem@gmail.com>2018-04-06 16:02:31 -0700
commit818801cf5ab0c696f2460922753f921726aac6bb (patch)
tree9dde82014d4bc9949d1548d7c04c93227419eb2c /src
parentcbf2c5c2a9539f74d57f141f233b47923566e838 (diff)
Finish decompiling battle_9
Diffstat (limited to 'src')
-rw-r--r--src/battle/anim/alert.c2
-rw-r--r--src/battle/anim/anger.c2
-rw-r--r--src/battle/anim/aurora.c2
-rw-r--r--src/battle/anim/beta_beat_up.c2
-rw-r--r--src/battle/anim/breath.c2
-rw-r--r--src/battle/anim/bubble.c4
-rw-r--r--src/battle/anim/bug.c14
-rw-r--r--src/battle/anim/copy_orb.c2
-rw-r--r--src/battle/anim/cutter.c4
-rw-r--r--src/battle/anim/cyclone.c2
-rw-r--r--src/battle/anim/dark.c6
-rw-r--r--src/battle/anim/dragon.c6
-rw-r--r--src/battle/anim/egg.c4
-rw-r--r--src/battle/anim/energy_wave.c6
-rw-r--r--src/battle/anim/espeed.c2
-rw-r--r--src/battle/anim/fight.c12
-rw-r--r--src/battle/anim/fire.c6
-rw-r--r--src/battle/anim/fire_2.c6
-rw-r--r--src/battle/anim/flying_path.c2
-rw-r--r--src/battle/anim/flying_petals.c2
-rw-r--r--src/battle/anim/heated_rock.c2
-rw-r--r--src/battle/anim/hop.c2
-rw-r--r--src/battle/anim/leaf.c2
-rw-r--r--src/battle/anim/lunge_1.c10
-rw-r--r--src/battle/anim/lunge_2.c2
-rw-r--r--src/battle/anim/money.c4
-rw-r--r--src/battle/anim/noise.c2
-rw-r--r--src/battle/anim/note_rain.c2
-rw-r--r--src/battle/anim/note_scatter.c2
-rw-r--r--src/battle/anim/orbs.c2
-rw-r--r--src/battle/anim/poison.c6
-rw-r--r--src/battle/anim/powder.c2
-rw-r--r--src/battle/anim/psychic.c14
-rw-r--r--src/battle/anim/ring.c6
-rw-r--r--src/battle/anim/rock.c8
-rw-r--r--src/battle/anim/scary_face.c2
-rw-r--r--src/battle/anim/seed.c2
-rw-r--r--src/battle/anim/sfx.c2
-rw-r--r--src/battle/anim/shield.c2
-rw-r--r--src/battle/anim/shock.c2
-rw-r--r--src/battle/anim/silhouette.c2
-rw-r--r--src/battle/anim/sleep.c2
-rw-r--r--src/battle/anim/slice.c4
-rw-r--r--src/battle/anim/sonic.c2
-rw-r--r--src/battle/anim/strike.c2
-rw-r--r--src/battle/anim/taunt_finger.c2
-rw-r--r--src/battle/anim/thought.c4
-rw-r--r--src/battle/anim/thrashing.c2
-rw-r--r--src/battle/anim/thunder.c2
-rw-r--r--src/battle/anim/tile_out.c4
-rw-r--r--src/battle/anim/unused_2.c2
-rw-r--r--src/battle/anim/unused_3.c2
-rw-r--r--src/battle/anim/unused_4.c2
-rw-r--r--src/battle/anim/unused_7.c2
-rw-r--r--src/battle/anim/water.c4
-rw-r--r--src/battle/anim/whip.c4
-rw-r--r--src/battle/anim/wisp_fire.c2
-rw-r--r--src/battle/anim/wisp_orb.c4
-rw-r--r--src/battle/anim/withdraw.c2
-rw-r--r--src/battle/battle_2.c56
-rw-r--r--src/battle/battle_4.c112
-rw-r--r--src/battle/battle_7.c12
-rw-r--r--src/battle/battle_ai.c46
-rwxr-xr-xsrc/battle/battle_ai_switch_items.c (renamed from src/battle/battle_9.c)145
-rw-r--r--src/battle/battle_anim.c28
-rw-r--r--src/battle/battle_anim_80A7E7C.c24
-rw-r--r--src/battle/battle_controller_linkopponent.c6
-rw-r--r--src/battle/battle_controller_linkpartner.c4
-rw-r--r--src/battle/battle_controller_opponent.c6
-rw-r--r--src/battle/battle_controller_player.c8
-rw-r--r--src/battle/battle_controller_safari.c6
-rw-r--r--src/battle/battle_controller_wally.c6
-rw-r--r--src/battle/battle_interface.c56
-rw-r--r--src/battle/battle_message.c38
-rw-r--r--src/battle/battle_party_menu.c4
-rw-r--r--src/battle/battle_util.c52
-rw-r--r--src/battle/calculate_base_damage.c10
-rw-r--r--src/battle/pokeball.c8
-rw-r--r--src/battle/reshow_battle_screen.c8
-rw-r--r--src/pokemon_2.c6
-rw-r--r--src/pokemon_3.c2
-rw-r--r--src/pokemon_item_effect.c12
-rw-r--r--src/rom_8077ABC.c44
83 files changed, 529 insertions, 384 deletions
diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c
index 7cd42c17b..72f8ec947 100644
--- a/src/battle/anim/alert.c
+++ b/src/battle/anim/alert.c
@@ -16,7 +16,7 @@ void sub_80CF610(struct Sprite* sprite)
sub_8078650(sprite);
sub_807867C(sprite, gBattleAnimArgs[0]);
sprite->pos1.y += gBattleAnimArgs[1];
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->hFlip = 1;
if (gBattleAnimArgs[2] != 0)
diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c
index 011aa68ce..0f1984f90 100644
--- a/src/battle/anim/anger.c
+++ b/src/battle/anim/anger.c
@@ -19,7 +19,7 @@ void sub_80D09C0(struct Sprite* sprite)
else
bank = gAnimBankTarget;
- if (GetBankSide(bank) == 1)
+ if (GetBattlerSide(bank) == 1)
{
gBattleAnimArgs[1] *= -1;
}
diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c
index b24809264..4041dd3bf 100644
--- a/src/battle/anim/aurora.c
+++ b/src/battle/anim/aurora.c
@@ -17,7 +17,7 @@ void sub_80D33B4(struct Sprite *sprite)
s16 r6;
InitAnimSpritePos(sprite, 1);
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
r6 = -gBattleAnimArgs[2];
else
r6 = gBattleAnimArgs[2];
diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c
index 3af6dd926..ee889492c 100644
--- a/src/battle/anim/beta_beat_up.c
+++ b/src/battle/anim/beta_beat_up.c
@@ -13,7 +13,7 @@ static void sub_80D6278(struct Sprite *);
void sub_80D6234(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
}
diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c
index 831b222ad..948a855b8 100644
--- a/src/battle/anim/breath.c
+++ b/src/battle/anim/breath.c
@@ -13,7 +13,7 @@ extern u8 gAnimBankTarget;
void sub_80D0930(struct Sprite* sprite)
{
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
{
StartSpriteAnim(sprite, 0);
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + 32;
diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c
index d6ec06be9..b118b5f90 100644
--- a/src/battle/anim/bubble.c
+++ b/src/battle/anim/bubble.c
@@ -19,7 +19,7 @@ void sub_80D31C8(struct Sprite* sprite)
{
u8 newSpriteId;
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) - gBattleAnimArgs[0];
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[1];
@@ -32,7 +32,7 @@ void sub_80D31C8(struct Sprite* sprite)
sprite->animPaused = 1;
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c
index b9e9da27f..64021f499 100644
--- a/src/battle/anim/bug.c
+++ b/src/battle/anim/bug.c
@@ -24,7 +24,7 @@ void sub_80DC824(struct Sprite *sprite)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
}
- else if (!GetBankSide(gAnimBankTarget))
+ else if (!GetBattlerSide(gAnimBankTarget))
{
StartSpriteAffineAnim(sprite, 1);
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -52,7 +52,7 @@ void sub_80DC8F4(struct Sprite *sprite)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
StartSpriteAffineAnim(sprite, 2);
}
- else if (!GetBankSide(gAnimBankTarget))
+ else if (!GetBattlerSide(gAnimBankTarget))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
@@ -112,13 +112,13 @@ static void sub_80DCA38(struct Sprite *sprite)
void sub_80DCA70(struct Sprite *sprite)
{
SetAverageBattlerPositions(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
sprite->pos1.x -= gBattleAnimArgs[0];
else
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
- if (!GetBankSide(gAnimBankTarget))
+ if (!GetBattlerSide(gAnimBankTarget))
sprite->pos1.y += 8;
sprite->callback = sub_80DCAEC;
@@ -193,7 +193,7 @@ void AnimTranslateStinger(struct Sprite *sprite)
}
else
{
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -203,7 +203,7 @@ void AnimTranslateStinger(struct Sprite *sprite)
if (!IsContest())
{
- if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
+ if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
{
if (GetBattlerPosition(gAnimBankTarget) == 0 || GetBattlerPosition(gAnimBankTarget) == 1)
{
@@ -247,7 +247,7 @@ void AnimMissileArc(struct Sprite *sprite)
{
InitAnimSpritePos(sprite, 1);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c
index 4fa8ea163..9c583670b 100644
--- a/src/battle/anim/copy_orb.c
+++ b/src/battle/anim/copy_orb.c
@@ -16,7 +16,7 @@ void sub_80CB4CC(struct Sprite* sprite)
{
case 0:
{
- if (GetBankSide(gAnimBankTarget) == 0)
+ if (GetBattlerSide(gAnimBankTarget) == 0)
{
s16 a = gBattleAnimArgs[0];
gBattleAnimArgs[0] = -a;
diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c
index a750ee2c1..80411f70d 100644
--- a/src/battle/anim/cutter.c
+++ b/src/battle/anim/cutter.c
@@ -24,7 +24,7 @@ static void AnimMoveTwisterParticleStep(struct Sprite* sprite);
void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
{
InitAnimSpritePos(sprite, 1);
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
@@ -44,7 +44,7 @@ void AnimTranslateLinearSingleSineWave(struct Sprite* sprite)
sprite->data[5] = gBattleAnimArgs[5];
InitAnimSpriteTranslationOverDuration(sprite);
- if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
+ if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
{
sprite->data[0] = 1;
}
diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c
index b1210bc54..9bfa95e92 100644
--- a/src/battle/anim/cyclone.c
+++ b/src/battle/anim/cyclone.c
@@ -14,7 +14,7 @@ extern u8 gAnimBankTarget;
void sub_80D0118(struct Sprite* sprite)
{
InitAnimSpritePos(sprite, 0);
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
sprite->pos1.y += 16;
sprite->data[0] = gBattleAnimArgs[4];
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index b70d27d1d..aeb74a7d5 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -267,7 +267,7 @@ void sub_80E00EC(u8 taskId)
task->data[14] = pos - 32;
task->data[15] = pos + 32;
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
task->data[8] = -12;
else
task->data[8] = -64;
@@ -442,7 +442,7 @@ void sub_80E03BC(u8 taskId)
task->data[14] = pos - 4;
task->data[15] = pos + 4;
- if (GetBankSide(gAnimBankTarget) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
task->data[8] = -12;
else
task->data[8] = -64;
@@ -864,7 +864,7 @@ void sub_80E0A4C(u8 taskId)
}
else
{
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
else
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gAnimBankAttacker]], MON_DATA_SPECIES);
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index e8e07c443..edb07af01 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -27,7 +27,7 @@ void sub_80DF5A0(struct Sprite *sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[0];
gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@@ -52,7 +52,7 @@ void sub_80DF63C(struct Sprite *sprite)
sub_8078650(sprite);
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2);
sprite->data[4] = GetBankPosition(gAnimBankTarget, 3);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[1];
sprite->pos1.y += gBattleAnimArgs[1];
@@ -96,7 +96,7 @@ void sub_80DF6F0(struct Sprite *sprite)
void sub_80DF760(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
StartSpriteAffineAnim(sprite, 1);
sub_80DF63C(sprite);
}
diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c
index b3de1dbb1..44ff484f2 100644
--- a/src/battle/anim/egg.c
+++ b/src/battle/anim/egg.c
@@ -23,7 +23,7 @@ void sub_80D1368(struct Sprite* sprite)
{
s16 r1;
InitAnimSpritePos(sprite, 0);
- r1 = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
+ r1 = (GetBattlerSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
sprite->data[0] = 0x380;
sprite->data[1] = r1;
sprite->data[7] = gBattleAnimArgs[2];
@@ -36,7 +36,7 @@ void sub_80D13AC(struct Sprite* sprite)
sprite->pos2.y -= (sprite->data[0] >> 8);
sprite->pos2.x = sprite->data[1] >> 8;
sprite->data[0] -= 32;
- add = (GetBankSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
+ add = (GetBattlerSide(gAnimBankAttacker)) ? -0xA0 : 0xA0;
sprite->data[1] += add;
if (sprite->pos2.y > 0)
{
diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c
index 1889cfc67..029344428 100644
--- a/src/battle/anim/energy_wave.c
+++ b/src/battle/anim/energy_wave.c
@@ -94,7 +94,7 @@ void sub_80D3698(struct Sprite *sprite)
if (!IsContest())
{
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
{
sprite->pos2.x = 10;
sprite->subpriority = subpriority + 2;
@@ -126,7 +126,7 @@ void sub_80D3728(struct Sprite *sprite)
{
int var1, var2;
- if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
+ if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
{
gBattleAnimArgs[0] *= -1;
@@ -149,7 +149,7 @@ void sub_80D3728(struct Sprite *sprite)
InitAnimSpritePos(sprite, var1);
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c
index 469522092..a69c04330 100644
--- a/src/battle/anim/espeed.c
+++ b/src/battle/anim/espeed.c
@@ -51,7 +51,7 @@ void sub_80D1638(u8 taskId)
task->data[2] = 0;
task->data[3] = 0;
task->data[12] = 3;
- if (GetBankSide(gAnimBankTarget) == 0)
+ if (GetBattlerSide(gAnimBankTarget) == 0)
{
task->data[13] = 0xFFFF;
task->data[14] = 8;
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 36a8a5008..4210b751c 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -50,7 +50,7 @@ void sub_080B08A0(struct Sprite *sprite)
void sub_80D902C(struct Sprite *sprite)
{
- if (gBattleAnimArgs[7] == 1 && GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@@ -201,7 +201,7 @@ void sub_80D9378(struct Sprite *sprite)
sub_8078764(sprite, 1);
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[3];
@@ -538,7 +538,7 @@ void sub_80D9A38(struct Sprite *sprite)
if (IsContest())
sprite->oam.matrixNum |= 0x8;
- else if (GetBankSide(bank) == B_SIDE_PLAYER)
+ else if (GetBattlerSide(bank) == B_SIDE_PLAYER)
sprite->oam.matrixNum |= 0x18;
sprite->data[0] = 16;
@@ -572,7 +572,7 @@ void sub_80D9B48(struct Sprite *sprite)
sprite->data[4] = gBattleAnimArgs[2];
turn = gAnimMoveTurn;
- if (GetBankSide(gAnimBankTarget) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
turn++;
if (turn & 1)
@@ -598,7 +598,7 @@ void sub_80D9BD4(struct Sprite *sprite)
{
StartSpriteAnim(sprite, 2);
}
- else if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ else if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
{
StartSpriteAnim(sprite, 1);
}
@@ -644,7 +644,7 @@ void sub_80D9C80(u8 taskId)
task->data[10] += 2816;
- if (GetBankSide(gAnimBankTarget) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
gBattle_BG3_X += task->data[9] >> 8;
else
gBattle_BG3_X -= task->data[9] >> 8;
diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c
index 253236805..0939c938c 100644
--- a/src/battle/anim/fire.c
+++ b/src/battle/anim/fire.c
@@ -40,7 +40,7 @@ void sub_80D4F5C(struct Sprite *sprite)
{
sub_8078650(sprite);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
@@ -62,7 +62,7 @@ void sub_80D4F5C(struct Sprite *sprite)
void sub_80D4FCC(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
@@ -98,7 +98,7 @@ void sub_80D5074(struct Sprite *sprite)
{
sub_8078650(sprite);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[0];
}
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c
index 4378ff298..6d95475d0 100644
--- a/src/battle/anim/fire_2.c
+++ b/src/battle/anim/fire_2.c
@@ -33,7 +33,7 @@ void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3);
// arg 6: ? (todo: something related to which mon the pixel offsets are based on)
void AnimEmberFlare(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)
+ if (GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget)
&& (gAnimBankAttacker == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)
|| gAnimBankAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)))
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
@@ -191,7 +191,7 @@ void sub_80D5470(u8 taskId) // initialize animation task for Move_ERUPTION?
task->data[2] = 0;
task->data[3] = 0;
task->data[4] = gSprites[task->data[15]].pos1.y;
- task->data[5] = GetBankSide(gAnimBankAttacker);
+ task->data[5] = GetBattlerSide(gAnimBankAttacker);
task->data[6] = 0;
sub_8078E70(task->data[15], 0);
@@ -317,7 +317,7 @@ void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3)
u16 y = sub_80D5940(spriteId);
u16 x = gSprites[spriteId].pos1.x;
- if(!GetBankSide(gAnimBankAttacker))
+ if(!GetBattlerSide(gAnimBankAttacker))
{
x -= 0xC;
sign = 1;
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c
index 70c418afc..8145446ad 100644
--- a/src/battle/anim/flying_path.c
+++ b/src/battle/anim/flying_path.c
@@ -27,7 +27,7 @@ void sub_80CBDF4(u8 taskId)
task->data[7] = GetBankPosition(gAnimBankTarget, 3);
task->data[10] = sub_807A100(gAnimBankTarget, 1);
task->data[11] = sub_807A100(gAnimBankTarget, 0);
- task->data[5] = (GetBankSide(gAnimBankTarget) == 1) ? 1 : -1;
+ task->data[5] = (GetBattlerSide(gAnimBankTarget) == 1) ? 1 : -1;
task->data[9] = 0x38 - (task->data[5] * 64);
task->data[8] = task->data[7] - task->data[9] + task->data[6];
task->data[2] = CreateSprite(&gSpriteTemplate_83D6884, task->data[8], task->data[9], task->data[4]);
diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c
index 4eeaa5215..681b0ba1f 100644
--- a/src/battle/anim/flying_petals.c
+++ b/src/battle/anim/flying_petals.c
@@ -21,7 +21,7 @@ void sub_80CC474(struct Sprite* sprite)
else
bank = gAnimBankTarget;
- if (GetBankSide(bank) != 0)
+ if (GetBattlerSide(bank) != 0)
{
sprite->data[4] = 0;
sprite->data[2] = gBattleAnimArgs[3];
diff --git a/src/battle/anim/heated_rock.c b/src/battle/anim/heated_rock.c
index 055960f40..6f1a1344a 100644
--- a/src/battle/anim/heated_rock.c
+++ b/src/battle/anim/heated_rock.c
@@ -28,7 +28,7 @@ u16 sub_80D5940(u8 spriteId)
{
u16 var1 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY;
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
{
var1 = ((var1 << 16) + 0x4A0000) >> 16;
}
diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c
index 0697e83a0..c76863f4a 100644
--- a/src/battle/anim/hop.c
+++ b/src/battle/anim/hop.c
@@ -136,7 +136,7 @@ void sub_80CB9C4(struct Sprite* sprite)
void sub_80CBA28(struct Sprite* sprite)
{
s16 e = GetBankPosition(gAnimBankTarget, 1);
- if (GetBankSide(gAnimBankTarget) == 0)
+ if (GetBattlerSide(gAnimBankTarget) == 0)
{
sprite->data[6] = 0;
sprite->data[7] = e + 10;
diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c
index 676734717..c39a52ff1 100644
--- a/src/battle/anim/leaf.c
+++ b/src/battle/anim/leaf.c
@@ -51,7 +51,7 @@ void sub_80CAF20(struct Sprite* sprite)
void sub_80CAF6C(struct Sprite* sprite)
{
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos2.x = -Sin(sprite->data[0], 0x19);
}
diff --git a/src/battle/anim/lunge_1.c b/src/battle/anim/lunge_1.c
index a3b5f19c5..949fb89f4 100644
--- a/src/battle/anim/lunge_1.c
+++ b/src/battle/anim/lunge_1.c
@@ -44,7 +44,7 @@ void sub_80CD774(struct Sprite* sprite)
void sub_80CD7CC(struct Sprite* sprite)
{
sprite->data[0] = 6;
- sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? 2 : -2;
+ sprite->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? 2 : -2;
sprite->data[2] = 0;
sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
StoreSpriteCallbackInData(sprite, sub_80CD81C);
@@ -57,7 +57,7 @@ void sub_80CD81C(struct Sprite* sprite)
{
sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
sub_8078E70(sprite->data[3], 0);
- sprite->data[4] = (sprite->data[6] = GetBankSide(gAnimBankAttacker)) ? 0x300 : 0xFFFFFD00;
+ sprite->data[4] = (sprite->data[6] = GetBattlerSide(gAnimBankAttacker)) ? 0x300 : 0xFFFFFD00;
sprite->data[5] = 0;
}
@@ -74,7 +74,7 @@ void sub_80CD81C(struct Sprite* sprite)
void sub_80CD8A8(struct Sprite* sprite)
{
sprite->data[0] = 4;
- sprite->data[1] = (GetBankSide(gAnimBankAttacker)) ? -3 : 3;
+ sprite->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? -3 : 3;
sprite->data[2] = 0;
sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
StoreSpriteCallbackInData(sprite, sub_80CD9B8);
@@ -95,8 +95,8 @@ void sub_80CD91C(struct Sprite* sprite)
if (sprite->data[0] == 0)
{
sprite->data[3] = gBankSpriteIds[gAnimBankAttacker];
- sprite->data[6] = GetBankSide(gAnimBankAttacker);
- if (GetBankSide(gAnimBankAttacker))
+ sprite->data[6] = GetBattlerSide(gAnimBankAttacker);
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->data[4] = 0xFC00;
sprite->data[5] = 0xC00;
diff --git a/src/battle/anim/lunge_2.c b/src/battle/anim/lunge_2.c
index f222b291d..c0100922c 100644
--- a/src/battle/anim/lunge_2.c
+++ b/src/battle/anim/lunge_2.c
@@ -21,7 +21,7 @@ void sub_80CDAC8(u8 taskId)
u8 a;
gTasks[taskId].data[0] = gBankSpriteIds[gAnimBankAttacker];
- a = GetBankSide(gAnimBankAttacker);
+ a = GetBattlerSide(gAnimBankAttacker);
gTasks[taskId].data[1] = a;
gTasks[taskId].data[2] = 0;
switch (gBattleAnimArgs[0])
diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c
index c3d130750..093c406a0 100644
--- a/src/battle/anim/money.c
+++ b/src/battle/anim/money.c
@@ -22,7 +22,7 @@ void sub_80CFE9C(struct Sprite* sprite)
InitAnimSpritePos(sprite, 1);
r6 = GetBankPosition(gAnimBankTarget, 2);
r7 = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3];
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
r6 += gBattleAnimArgs[2];
@@ -47,7 +47,7 @@ void sub_80CFF68(struct Sprite* sprite)
{
sprite->data[0] += 0x80;
sprite->pos2.x = sprite->data[0] >> 8;
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
sprite->pos2.x = -sprite->pos2.x;
sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]);
diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c
index 369650d82..dab6c698f 100644
--- a/src/battle/anim/noise.c
+++ b/src/battle/anim/noise.c
@@ -16,7 +16,7 @@ void sub_80D2D68(struct Sprite* sprite)
int var1;
u8 slot = gBattleAnimArgs[0] == 0 ? gAnimBankAttacker : gAnimBankTarget;
- if (GetBankSide(slot) == 1)
+ if (GetBattlerSide(slot) == 1)
{
gBattleAnimArgs[1] *= -1;
}
diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c
index 44817b0a0..5574d5b98 100644
--- a/src/battle/anim/note_rain.c
+++ b/src/battle/anim/note_rain.c
@@ -25,7 +25,7 @@ void sub_80D1BA8(struct Sprite* sprite, u8 a, u8 b)
void sub_80D1C08(struct Sprite* sprite)
{
InitAnimSpritePos(sprite, 0);
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
diff --git a/src/battle/anim/note_scatter.c b/src/battle/anim/note_scatter.c
index 8564c58fe..5820da571 100644
--- a/src/battle/anim/note_scatter.c
+++ b/src/battle/anim/note_scatter.c
@@ -16,7 +16,7 @@ static void sub_80CED78(struct Sprite* sprite);
void sub_80CECE8(struct Sprite* sprite)
{
int a;
- if (GetBankSide(gAnimBankAttacker) == 1)
+ if (GetBattlerSide(gAnimBankAttacker) == 1)
{
a = gBattleAnimArgs[1];
(u16)gBattleAnimArgs[1] = -a;
diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c
index 6f1bba9c3..1c98da012 100644
--- a/src/battle/anim/orbs.c
+++ b/src/battle/anim/orbs.c
@@ -117,7 +117,7 @@ void sub_80CAA14(struct Sprite* sprite)
StartSpriteAnim(sprite, a & 7);
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= 20;
}
diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c
index 3a7477a57..3bdac02da 100644
--- a/src/battle/anim/poison.c
+++ b/src/battle/anim/poison.c
@@ -44,7 +44,7 @@ void sub_80D9DF0(struct Sprite *sprite)
InitAnimSpritePos(sprite, 1);
SetAverageBattlerPositions(gAnimBankTarget, 1, &l1, &l2);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
gBattleAnimArgs[4] = -gBattleAnimArgs[4];
sprite->data[0] = gBattleAnimArgs[2];
@@ -94,7 +94,7 @@ void sub_80D9F14(struct Sprite *sprite)
{
SetAverageBattlerPositions(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
sprite->pos1.x += gBattleAnimArgs[0];
@@ -124,7 +124,7 @@ void AnimBubbleEffect(struct Sprite *sprite)
{
SetAverageBattlerPositions(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
sprite->pos1.x += gBattleAnimArgs[0];
diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c
index 5d67311dc..88339522e 100644
--- a/src/battle/anim/powder.c
+++ b/src/battle/anim/powder.c
@@ -23,7 +23,7 @@ void AnimMovePowderParticle(struct Sprite* sprite)
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[1] = gBattleAnimArgs[3];
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->data[3] = -gBattleAnimArgs[4];
}
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 2a9cd364e..294069efe 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -38,7 +38,7 @@ void sub_80DC5F4(u8 taskId);
void sub_80DB74C(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER || IsContest())
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER || IsContest())
{
sprite->oam.priority = 2;
sprite->subpriority = 200;
@@ -62,7 +62,7 @@ void sub_80DB74C(struct Sprite *sprite)
if (!IsContest() && IsDoubleBattle())
{
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
{
sprite->pos1.x = 72;
sprite->pos1.y = 80;
@@ -75,7 +75,7 @@ void sub_80DB74C(struct Sprite *sprite)
}
else
{
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[0] = -gBattleAnimArgs[0];
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
@@ -178,7 +178,7 @@ void sub_80DBA4C(struct Sprite *sprite)
if (!IsContest() && IsDoubleBattle())
{
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
{
sprite->pos1.x = 72 - gBattleAnimArgs[0];
sprite->pos1.y = gBattleAnimArgs[1] + 80;
@@ -211,7 +211,7 @@ void sub_80DBAF4(struct Sprite *sprite)
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
{
StartSpriteAnim(sprite, 1);
sprite->pos1.x -= 40;
@@ -234,7 +234,7 @@ void sub_80DBB70(struct Sprite *sprite)
s16 x = sub_807A100(gAnimBankAttacker, 1) / 2;
s16 y = sub_807A100(gAnimBankAttacker, 0) / -2;
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
{
x = -x;
}
@@ -306,7 +306,7 @@ void sub_80DBCFC(u8 taskId)
task->data[0] = spriteId;
task->data[1] = 0;
task->data[2] = 0;
- task->data[3] = GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER ? 4 : 8;
+ task->data[3] = GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER ? 4 : 8;
sub_80798F4(task, task->data[0], &gUnknown_083DA8C4);
task->func = sub_80DBD58;
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 86b2c4659..7516d74e5 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -38,7 +38,7 @@ void sub_80D0FD8(struct Sprite* sprite)
else
r4 = GetBankPosition(bank, 2);
- if (GetBankSide(bank) != 0)
+ if (GetBattlerSide(bank) != 0)
gBattleAnimArgs[0] -= (sp0 - r4) - gBattleAnimArgs[0]; // This is weird.
else
gBattleAnimArgs[0] = sp0 - r4;
@@ -90,7 +90,7 @@ void sub_80D10B8(struct Sprite* sprite)
sp4 = 3;
}
- if (GetBankSide(bankr7) != 0)
+ if (GetBattlerSide(bankr7) != 0)
{
r9 = GetBankPosition(bankr7, r10) + gBattleAnimArgs[0];
if (IsAnimBankSpriteVisible(bankr8 ^ 2))
@@ -126,7 +126,7 @@ void sub_80D10B8(struct Sprite* sprite)
sp1 = GetBankPosition(bankr8, sp4);
}
- if (GetBankSide(bankr8))
+ if (GetBattlerSide(bankr8))
sp0 += gBattleAnimArgs[3];
else
sp0 -= gBattleAnimArgs[3];
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index a9e9afb71..4254c551c 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -78,7 +78,7 @@ void sub_80DCF60(struct Sprite *sprite)
StartSpriteAnim(sprite, gBattleAnimArgs[5]);
AnimateSprite(sprite);
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
sprite->pos1.x -= gBattleAnimArgs[0];
else
sprite->pos1.x += gBattleAnimArgs[0];
@@ -154,7 +154,7 @@ void do_boulder_dust(u8 taskId)
if (IsContest())
sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0);
- if (gBattleAnimArgs[0] != 0 && GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (gBattleAnimArgs[0] != 0 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
var0 = 1;
gTasks[taskId].data[0] = var0;
@@ -231,7 +231,7 @@ void sub_80DD3AC(struct Sprite *sprite)
{
if (sprite->data[0] == 0)
{
- if (gBattleAnimArgs[3] != 0 && GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
{
sprite->pos1.x = 304;
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
@@ -514,7 +514,7 @@ static void sub_80DD928(struct Sprite *sprite)
void sub_80DD978(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+ if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
StartSpriteAffineAnim(sprite, 1);
TranslateAnimSpriteToTargetMonLocation(sprite);
diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c
index 8bc7bbd07..5a2c52825 100644
--- a/src/battle/anim/scary_face.c
+++ b/src/battle/anim/scary_face.c
@@ -43,7 +43,7 @@ void sub_80D23B4(u8 taskId)
DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000);
if (IsContest())
LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceContest, subStruct.field_4);
- else if (GetBankSide(gAnimBankTarget) == 1)
+ else if (GetBattlerSide(gAnimBankTarget) == 1)
LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFacePlayer, subStruct.field_4);
else
LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceOpponent, subStruct.field_4);
diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c
index 7f8154504..2bce9df41 100644
--- a/src/battle/anim/seed.c
+++ b/src/battle/anim/seed.c
@@ -21,7 +21,7 @@ static void AnimLeechSeedSprouts(struct Sprite* sprite);
void AnimLeechSeed(struct Sprite* sprite)
{
InitAnimSpritePos(sprite, 1);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index afe7c90b6..6d47f0b46 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -175,7 +175,7 @@ void sub_812B18C(u8 taskId)
}
}
- if (GetBankSide(bank))
+ if (GetBattlerSide(bank))
species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], 0xB);
else
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], 0xB);
diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c
index 676318545..323df4ab2 100644
--- a/src/battle/anim/shield.c
+++ b/src/battle/anim/shield.c
@@ -23,7 +23,7 @@ void sub_80CCD24(struct Sprite* sprite)
sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
- if (GetBankSide(gAnimBankAttacker) == 0 || IsContest())
+ if (GetBattlerSide(gAnimBankAttacker) == 0 || IsContest())
sprite->oam.priority = sub_8079ED4(gAnimBankAttacker) + 1;
else
sprite->oam.priority = sub_8079ED4(gAnimBankAttacker);
diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c
index 16e04c9db..50bd78379 100644
--- a/src/battle/anim/shock.c
+++ b/src/battle/anim/shock.c
@@ -18,7 +18,7 @@ void sub_80D6294(struct Sprite *sprite)
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3);
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
sprite->pos1.y -= gBattleAnimArgs[1];
diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c
index a3147f598..b34eaf0b5 100644
--- a/src/battle/anim/silhouette.c
+++ b/src/battle/anim/silhouette.c
@@ -35,7 +35,7 @@ void sub_80CB3A8(u8 taskId)
u8 spriteId = GetAnimBankSpriteId(1);
gTasks[taskId].data[10] += gTasks[taskId].data[0];
gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8;
- if (GetBankSide(gAnimBankTarget))
+ if (GetBattlerSide(gAnimBankTarget))
{
gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
}
diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c
index 0f0e54f80..cc3518395 100644
--- a/src/battle/anim/sleep.c
+++ b/src/battle/anim/sleep.c
@@ -16,7 +16,7 @@ static void sub_80CD394(struct Sprite* sprite);
void sub_80CD328(struct Sprite* sprite)
{
sub_8078650(sprite);
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
{
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c
index 80c58dddf..814aa46ac 100644
--- a/src/battle/anim/slice.c
+++ b/src/battle/anim/slice.c
@@ -19,7 +19,7 @@ void AnimCuttingSlice(struct Sprite* sprite)
{
sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0);
sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1);
- if (GetBankSide(gAnimBankTarget) == 0)
+ if (GetBattlerSide(gAnimBankTarget) == 0)
sprite->pos1.y += 8;
sprite->callback = AnimSliceStep;
@@ -69,7 +69,7 @@ void sub_80CC9BC(struct Sprite* sprite)
sprite->pos1.x = a;
sprite->pos1.y = b;
- if (GetBankSide(gAnimBankTarget) == 0)
+ if (GetBattlerSide(gAnimBankTarget) == 0)
sprite->pos1.y += 8;
sprite->callback = AnimSliceStep;
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c
index 1501f51f1..b89338a26 100644
--- a/src/battle/anim/sonic.c
+++ b/src/battle/anim/sonic.c
@@ -26,7 +26,7 @@ void AnimSonicBoomProjectile(struct Sprite* sprite)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
}
- else if (GetBankSide(gAnimBankAttacker) != 0)
+ else if (GetBattlerSide(gAnimBankAttacker) != 0)
{
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c
index bfa1dc4f7..832abe694 100644
--- a/src/battle/anim/strike.c
+++ b/src/battle/anim/strike.c
@@ -37,7 +37,7 @@ void sub_80CE670(struct Sprite* sprite)
sprite->data[4] = sprite->pos1.y << 7;
sprite->data[5] = -0xA00 / sprite->data[1];
}
- else if (GetBankSide(gAnimBankAttacker) == 0)
+ else if (GetBattlerSide(gAnimBankAttacker) == 0)
{
sprite->pos1.x -= 40;
sprite->pos1.y += 20;
diff --git a/src/battle/anim/taunt_finger.c b/src/battle/anim/taunt_finger.c
index 023e14e45..c512f8cf4 100644
--- a/src/battle/anim/taunt_finger.c
+++ b/src/battle/anim/taunt_finger.c
@@ -24,7 +24,7 @@ void sub_80CF1C8(struct Sprite* sprite)
bank = gAnimBankTarget;
sub_80CEF44(bank, sprite);
- if (GetBankSide(bank) == 0)
+ if (GetBattlerSide(bank) == 0)
{
StartSpriteAnim(sprite, 0);
sprite->data[0] = 2;
diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c
index c3ab6f82c..fbd7dfaee 100644
--- a/src/battle/anim/thought.c
+++ b/src/battle/anim/thought.c
@@ -15,7 +15,7 @@ static void sub_80CF008(struct Sprite* sprite);
void sub_80CEF44(u8 bank, struct Sprite* sprite)
{
- if (GetBankSide(bank) == 0)
+ if (GetBattlerSide(bank) == 0)
sprite->pos1.x = sub_807A100(bank, 5) + 8;
else
sprite->pos1.x = sub_807A100(bank, 4) - 8;
@@ -33,7 +33,7 @@ void sub_80CEF9C(struct Sprite* sprite)
bank = gAnimBankTarget;
sub_80CEF44(bank, sprite);
- a = (GetBankSide(bank) == 0) ? 0 : 1;
+ a = (GetBattlerSide(bank) == 0) ? 0 : 1;
sprite->data[0] = gBattleAnimArgs[1];
sprite->data[1] = a + 2;
StartSpriteAnim(sprite, a);
diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c
index 3fde815ae..34089de31 100644
--- a/src/battle/anim/thrashing.c
+++ b/src/battle/anim/thrashing.c
@@ -48,7 +48,7 @@ void sub_80D0AB8(u8 taskId)
task->data[7] = 0;
task->data[8] = 0;
task->data[9] = 2;
- if (GetBankSide(gAnimBankAttacker) == 1)
+ if (GetBattlerSide(gAnimBankAttacker) == 1)
task->data[2] *= -1;
task->func = sub_80D0B3C;
diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c
index 2ed073221..70d4dc232 100644
--- a/src/battle/anim/thunder.c
+++ b/src/battle/anim/thunder.c
@@ -14,7 +14,7 @@ static void sub_80D6218(struct Sprite *);
void sub_80D61C8(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
}
diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c
index 39d4ff01f..f253c2524 100644
--- a/src/battle/anim/tile_out.c
+++ b/src/battle/anim/tile_out.c
@@ -59,10 +59,10 @@ void unref_sub_80CE260(u8 taskId)
u8 i;
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (gBattleAnimArgs[0] == 1 && GetBankSide(i) == 0)
+ if (gBattleAnimArgs[0] == 1 && GetBattlerSide(i) == 0)
sub_8043DB0(gHealthboxIDs[i]);
- if (gBattleAnimArgs[1] == 1 && GetBankSide(i) == 1)
+ if (gBattleAnimArgs[1] == 1 && GetBattlerSide(i) == 1)
sub_8043DB0(gHealthboxIDs[i]);
}
diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c
index 122f39e02..71e5e92d7 100644
--- a/src/battle/anim/unused_2.c
+++ b/src/battle/anim/unused_2.c
@@ -49,7 +49,7 @@ void unref_sub_80CCB6C(struct Sprite* sprite)
void sub_80CCC50(struct Sprite* sprite)
{
sprite->data[0] = gBattleAnimArgs[2];
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
sprite->pos1.x -= gBattleAnimArgs[0];
else
sprite->pos1.x += gBattleAnimArgs[0];
diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c
index 6dbcbfefe..a89ed0246 100644
--- a/src/battle/anim/unused_3.c
+++ b/src/battle/anim/unused_3.c
@@ -16,7 +16,7 @@ static void sub_80CD2D4(struct Sprite* sprite);
void sub_80CD274(struct Sprite* sprite)
{
sub_8078650(sprite);
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
{
sprite->pos1.x += gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
diff --git a/src/battle/anim/unused_4.c b/src/battle/anim/unused_4.c
index 50ffaba4a..63940f3e1 100644
--- a/src/battle/anim/unused_4.c
+++ b/src/battle/anim/unused_4.c
@@ -28,7 +28,7 @@ void sub_80CD9D4(struct Sprite* sprite)
case 0:
sprite->data[1] = 0;
sprite->data[2] = gBankSpriteIds[gAnimBankAttacker];
- sprite->data[3] = GetBankSide(gAnimBankAttacker);
+ sprite->data[3] = GetBattlerSide(gAnimBankAttacker);
sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200;
sprite->data[5] = 0;
sub_8078E70(sprite->data[2], 0);
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index 5a2de33c3..eea10aaa2 100644
--- a/src/battle/anim/unused_7.c
+++ b/src/battle/anim/unused_7.c
@@ -33,7 +33,7 @@ void sub_80CF3C4(struct Sprite* sprite)
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
a = gBankSpriteIds[gAnimBankTarget];
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
}
diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c
index e6945f9b2..2700bfd27 100644
--- a/src/battle/anim/water.c
+++ b/src/battle/anim/water.c
@@ -153,7 +153,7 @@ _080D3920:\n\
strb r0, [r2]\n\
ldr r0, _080D39A0 @ =gAnimBankAttacker\n\
ldrb r0, [r0]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r0, 24\n\
cmp r0, 0x1\n\
@@ -276,7 +276,7 @@ _080D3A90: .4byte gBattle_BG1_Y\n\
_080D3A94:\n\
ldr r0, _080D3AC4 @ =gAnimBankAttacker\n\
ldrb r0, [r0]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r1, r0, 24\n\
cmp r1, 0x1\n\
diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c
index cb3ce327e..08b24369d 100644
--- a/src/battle/anim/whip.c
+++ b/src/battle/anim/whip.c
@@ -20,7 +20,7 @@ void sub_80CC810(struct Sprite* sprite)
// unused, beta effect for diagonal sprite movement?
void sub_80CC82C(struct Sprite* sprite)
{
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
@@ -37,7 +37,7 @@ void sub_80CC82C(struct Sprite* sprite)
void sub_80CC884(struct Sprite* sprite)
{
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
StartSpriteAnim(sprite, 1);
sprite->callback = sub_80CC810;
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
index 24cecb60c..36fc655c3 100644
--- a/src/battle/anim/wisp_fire.c
+++ b/src/battle/anim/wisp_fire.c
@@ -58,7 +58,7 @@ void sub_80D5DDC(u8 taskId)
{
struct Task *task = &gTasks[taskId];
- task->data[12] = !GetBankSide(gAnimBankAttacker) ? 1 : -1;
+ task->data[12] = !GetBattlerSide(gAnimBankAttacker) ? 1 : -1;
task->data[13] = IsAnimBankSpriteVisible(gAnimBankTarget ^ 2) + 1;
task->data[14] = GetAnimBankSpriteId(1);
task->data[15] = GetAnimBankSpriteId(3);
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index 7c22b7f13..cd91080ba 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -25,7 +25,7 @@ void sub_80D5B0C(struct Sprite *sprite)
StartSpriteAnim(sprite, gBattleAnimArgs[2]);
sprite->data[7] = gBattleAnimArgs[2];
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->data[4] = 4;
}
@@ -39,7 +39,7 @@ void sub_80D5B0C(struct Sprite *sprite)
break;
case 1:
sprite->data[1] += 192;
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
{
sprite->pos2.y = -(sprite->data[1] >> 8);
}
diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c
index 933c97fa9..baf5d9b94 100644
--- a/src/battle/anim/withdraw.c
+++ b/src/battle/anim/withdraw.c
@@ -25,7 +25,7 @@ void sub_80CF514(u8 taskId)
{
u8 a = gBankSpriteIds[gAnimBankAttacker];
s16 b;
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
{
b = -gTasks[taskId].data[0];
}
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index ac4d791d5..4abf89bf1 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -3558,7 +3558,7 @@ void sub_8010800(void)
#if DEBUG
void debug_sub_80138CC(void)
{
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
{
switch (gSharedMem[0x160FD])
{
@@ -3755,7 +3755,7 @@ void SwitchInClearSetData(void)
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (GetBankSide(gActiveBattler) != GetBankSide(i)
+ if (GetBattlerSide(gActiveBattler) != GetBattlerSide(i)
&& (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
&& (gDisableStructs[i].bankWithSureHit == gActiveBattler))
{
@@ -3924,7 +3924,7 @@ void sub_8011384(void)
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
{
if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI)
- && GetBankSide(gActiveBattler) == 0)
+ && GetBattlerSide(gActiveBattler) == 0)
{
MEMSET_ALT(&gBattleMons[gActiveBattler], 0, 0x58, i, ptr);
}
@@ -3936,7 +3936,7 @@ void sub_8011384(void)
gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility);
- r0 = GetBankSide(gActiveBattler);
+ r0 = GetBattlerSide(gActiveBattler);
ewram160BC[r0] = gBattleMons[gActiveBattler].hp;
for (i = 0; i < 8; i++)
gBattleMons[gActiveBattler].statStages[i] = 6;
@@ -3956,13 +3956,13 @@ void sub_8011384(void)
EmitTrainerThrow(0);
MarkBufferBankForExecution(gActiveBattler);
}
- if (GetBankSide(gActiveBattler) == 1
+ if (GetBattlerSide(gActiveBattler) == 1
&& !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2);
}
else
{
- if (GetBankSide(gActiveBattler) == 1
+ if (GetBattlerSide(gActiveBattler) == 1
&& !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
{
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2);
@@ -4114,7 +4114,7 @@ void bc_801362C(void)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
{
- if (GetBankSide(gActiveBattler) == 1
+ if (GetBattlerSide(gActiveBattler) == 1
&& !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)))
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2);
}
@@ -4169,7 +4169,7 @@ void unref_sub_8011A68(void)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
{
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
{
EmitSendOutPoke(0, gBattlerPartyIndexes[gActiveBattler], 0);
MarkBufferBankForExecution(gActiveBattler);
@@ -4348,10 +4348,10 @@ u8 CanRunFromBattle(void)
return 0;
if (gBattleMons[gActiveBattler].ability == ABILITY_RUN_AWAY)
return 0;
- r6 = GetBankSide(gActiveBattler);
+ r6 = GetBattlerSide(gActiveBattler);
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (r6 != GetBankSide(i)
+ if (r6 != GetBattlerSide(i)
&& gBattleMons[i].ability == ABILITY_SHADOW_TAG)
{
ewram16003 = i;
@@ -4359,7 +4359,7 @@ u8 CanRunFromBattle(void)
gBattleCommunication[5] = 2;
return 2;
}
- if (r6 != GetBankSide(i)
+ if (r6 != GetBattlerSide(i)
&& gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE
&& gBattleMons[gActiveBattler].type1 != 2
&& gBattleMons[gActiveBattler].type2 != 2
@@ -6017,7 +6017,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreMovePriorities)
}
// Only give badge speed boost to the player's mon.
- if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && FlagGet(FLAG_BADGE03_GET) && GetBankSide(bank1) == 0)
+ if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && FlagGet(FLAG_BADGE03_GET) && GetBattlerSide(bank1) == 0)
bank1AdjustedSpeed = (bank1AdjustedSpeed * 110) / 100;
if (heldItemEffect == HOLD_EFFECT_MACHO_BRACE)
@@ -6045,7 +6045,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreMovePriorities)
}
// Only give badge speed boost to the player's mon.
- if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && FlagGet(FLAG_BADGE03_GET) && GetBankSide(bank2) == 0)
+ if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && FlagGet(FLAG_BADGE03_GET) && GetBattlerSide(bank2) == 0)
{
bank2AdjustedSpeed = (bank2AdjustedSpeed * 110) / 100;
}
@@ -6427,7 +6427,7 @@ void HandleEndTurn_FinishBattle(void)
{
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
{
- if (GetBankSide(gActiveBattler) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
if (gBattleResults.poke1Species == SPECIES_NONE)
{
@@ -6618,16 +6618,16 @@ void HandleAction_UseMove(void)
gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
}
- if (GetBankSide(gBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gBankAttacker) == B_SIDE_PLAYER)
gBattleResults.lastUsedMove = gCurrentMove;
else
gBattleResults.opponentMove = gCurrentMove;
// choose target
- side = GetBankSide(gBankAttacker) ^ BIT_SIDE;
+ side = GetBattlerSide(gBankAttacker) ^ BIT_SIDE;
if (gSideTimers[side].followmeTimer != 0
&& gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED
- && GetBankSide(gBankAttacker) != GetBankSide(gSideTimers[side].followmeTarget)
+ && GetBattlerSide(gBankAttacker) != GetBattlerSide(gSideTimers[side].followmeTarget)
&& gBattleMons[gSideTimers[side].followmeTarget].hp != 0)
{
gBankTarget = gSideTimers[side].followmeTarget;
@@ -6639,10 +6639,10 @@ void HandleAction_UseMove(void)
&& gBattleMons[ewram16010arr(gBankAttacker)].ability != ABILITY_LIGHTNING_ROD
&& gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC)
{
- side = GetBankSide(gBankAttacker);
+ side = GetBattlerSide(gBankAttacker);
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
{
- if (side != GetBankSide(gActiveBattler)
+ if (side != GetBattlerSide(gActiveBattler)
&& ewram16010arr(gBankAttacker) != gActiveBattler
&& gBattleMons[gActiveBattler].ability == ABILITY_LIGHTNING_ROD
&& BankGetTurnOrder(gActiveBattler) < var)
@@ -6654,7 +6654,7 @@ void HandleAction_UseMove(void)
{
if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
{
- if (GetBankSide(gBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gBankAttacker) == B_SIDE_PLAYER)
{
if (Random() & 1)
gBankTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
@@ -6676,7 +6676,7 @@ void HandleAction_UseMove(void)
if (gAbsentBattlerFlags & gBitTable[gBankTarget])
{
- if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+ if (GetBattlerSide(gBankAttacker) != GetBattlerSide(gBankTarget))
{
gBankTarget = GetBattlerAtPosition(GetBattlerPosition(gBankTarget) ^ BIT_FLANK);
}
@@ -6699,7 +6699,7 @@ void HandleAction_UseMove(void)
else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
&& gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
{
- if (GetBankSide(gBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gBankAttacker) == B_SIDE_PLAYER)
{
if (Random() & 1)
gBankTarget = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
@@ -6715,7 +6715,7 @@ void HandleAction_UseMove(void)
}
if (gAbsentBattlerFlags & gBitTable[gBankTarget]
- && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+ && GetBattlerSide(gBankAttacker) != GetBattlerSide(gBankTarget))
{
gBankTarget = GetBattlerAtPosition(GetBattlerPosition(gBankTarget) ^ BIT_FLANK);
}
@@ -6725,7 +6725,7 @@ void HandleAction_UseMove(void)
gBankTarget = ewram16010arr(gBankAttacker);
if (gAbsentBattlerFlags & gBitTable[gBankTarget])
{
- if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget))
+ if (GetBattlerSide(gBankAttacker) != GetBattlerSide(gBankTarget))
{
gBankTarget = GetBattlerAtPosition(GetBattlerPosition(gBankTarget) ^ BIT_FLANK);
}
@@ -6777,7 +6777,7 @@ void HandleAction_UseItem(void)
{
gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0];
}
- else if (GetBankSide(gBankAttacker) == B_SIDE_PLAYER)
+ else if (GetBattlerSide(gBankAttacker) == B_SIDE_PLAYER)
{
gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0];
}
@@ -6919,7 +6919,7 @@ _08014844: .4byte gBattlescriptCurrInstr\n\
_08014848: .4byte gBattlescriptsForRunningByItem\n\
_0801484C:\n\
ldrb r0, [r4]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _0801486C\n\
@@ -7272,7 +7272,7 @@ void HandleAction_Run(void)
for (gActiveBattler = 0; gActiveBattler < gNoOfAllBanks; gActiveBattler++)
{
- if (GetBankSide(gActiveBattler) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
{
if (gActionForBanks[gActiveBattler] == ACTION_RUN)
gBattleOutcome |= BATTLE_LOST;
@@ -7288,7 +7288,7 @@ void HandleAction_Run(void)
}
else
{
- if (GetBankSide(gBankAttacker) == B_SIDE_PLAYER)
+ if (GetBattlerSide(gBankAttacker) == B_SIDE_PLAYER)
{
if (!TryRunFromBattle(gBankAttacker)) // failed to run away
{
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index e1cc515ec..9c6d3bbd4 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -193,7 +193,7 @@ static bool8 IsTwoTurnsMove(u16 move);
static void TrySetDestinyBondToHappen(void);
static void CheckWonderGuardAndLevitate(void);
u8 GetBattlerPosition(u8 bank);
-u8 GetBankSide(u8 bank);
+u8 GetBattlerSide(u8 bank);
u8 GetBattleBank(u8 bankValue);
s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 a4, u16 powerOverride, u8 typeOverride, u8 bank_atk, u8 bank_def);
static u8 AttacksThisTurn(u8 bank, u16 move); //Note: returns 1 if it's a charging turn, otherwise 2
@@ -1999,7 +1999,7 @@ static void atk0B_healthbarupdate(void)
EmitHealthBarUpdate(0, gBattleMoveDamage);
MarkBufferBankForExecution(gActiveBattler);
- if (GetBankSide(gActiveBattler) == B_SIDE_PLAYER && gBattleMoveDamage > 0)
+ if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleMoveDamage > 0)
gBattleResults.unk5_0 = 1;
}
}
@@ -2729,8 +2729,8 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
break;
case 31: //item steal
{
- u8 side = GetBankSide(gBankAttacker);
- if (GetBankSide(gBankAttacker) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)) && gTrainerBattleOpponent != 0x400)
+ u8 side = GetBattlerSide(gBankAttacker);
+ if (GetBattlerSide(gBankAttacker) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)) && gTrainerBattleOpponent != 0x400)
{gBattlescriptCurrInstr++; return;}
if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK)) && gTrainerBattleOpponent != 0x400 && (gWishFutureKnock.knockedOffPokes[side] & gBitTable[gBattlerPartyIndexes[gBankAttacker]]))
{gBattlescriptCurrInstr++; return;}
@@ -2832,7 +2832,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
{gBattlescriptCurrInstr++; return;}
else
{
- u8 side = GetBankSide(gEffectBank);
+ u8 side = GetBattlerSide(gEffectBank);
gLastUsedItem = gBattleMons[gEffectBank].item;
gBattleMons[gEffectBank].item = 0;
gWishFutureKnock.knockedOffPokes[side] |= gBitTable[gBattlerPartyIndexes[gEffectBank]];
@@ -4499,11 +4499,11 @@ _0801F1A0: .4byte gBankAttacker\n\
_0801F1A4:\n\
ldr r4, _0801F254 @ =gBankAttacker\n\
ldrb r0, [r4]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r6, r0, 24\n\
ldrb r0, [r4]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r0, 24\n\
cmp r0, 0x1\n\
@@ -4924,7 +4924,7 @@ _0801F540:\n\
cmp r0, 0\n\
beq _0801F5DC\n\
adds r0, r3, 0\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r6, r0, 24\n\
ldr r1, _0801F5B8 @ =gLastUsedItem\n\
@@ -5090,7 +5090,7 @@ static void atk19_tryfaintmon(void)
BattleScriptPop();
gBattlescriptCurrInstr = r4;
- gSideAffecting[GetBankSide(gActiveBattler)] &= ~SIDE_STATUS_SPIKES_DAMAGED;
+ gSideAffecting[GetBattlerSide(gActiveBattler)] &= ~SIDE_STATUS_SPIKES_DAMAGED;
}
else
{
@@ -5126,7 +5126,7 @@ static void atk19_tryfaintmon(void)
gHitMarker |= HITMARKER_FAINTED(gActiveBattler);
BattleScriptPush(gBattlescriptCurrInstr + 7);
gBattlescriptCurrInstr = r4;
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
{
gHitMarker |= HITMARKER_x400000;
if (gBattleResults.playerFaintCounter < 0xFF)
@@ -5153,7 +5153,7 @@ static void atk19_tryfaintmon(void)
}
if ((gStatuses3[gBankTarget] & STATUS3_GRUDGE)
&& !(gHitMarker & HITMARKER_GRUDGE)
- && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget)
+ && GetBattlerSide(gBankAttacker) != GetBattlerSide(gBankTarget)
&& gBattleMons[gBankAttacker].hp != 0
&& gCurrentMove != MOVE_STRUGGLE)
{
@@ -5382,7 +5382,7 @@ static void atk23_getexp(void)
switch (gBattleStruct->getexpStateTracker)
{
case 0: // check if should receive exp at all
- if (GetBankSide(gBank1) != B_SIDE_OPPONENT || (gBattleTypeFlags &
+ if (GetBattlerSide(gBank1) != B_SIDE_OPPONENT || (gBattleTypeFlags &
(BATTLE_TYPE_LINK
| BATTLE_TYPE_SAFARI
| BATTLE_TYPE_BATTLE_TOWER
@@ -6783,7 +6783,7 @@ static void atk49_moveend(void)
case 0: //rage check
if (gBattleMons[gBankTarget].status2 & STATUS2_RAGE
&& gBattleMons[gBankTarget].hp && gBankAttacker != gBankTarget
- && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget)
+ && GetBattlerSide(gBankAttacker) != GetBattlerSide(gBankTarget)
&& !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED
&& gBattleMoves[gCurrentMove].power && gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK] <= 0xB)
{
@@ -7070,11 +7070,11 @@ _08021958:\n\
cmp r1, r4\n\
beq _080219FE\n\
adds r0, r1, 0\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
adds r4, r0, 0\n\
ldr r1, _08021A0C @ =gBankTarget\n\
ldrb r0, [r1]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r4, 24\n\
lsls r0, 24\n\
cmp r4, r0\n\
@@ -8327,7 +8327,7 @@ static void atk4D_switchindataupdate(void)
gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].altAbility);
// check knocked off item
- i = GetBankSide(gActiveBattler);
+ i = GetBattlerSide(gActiveBattler);
if (gWishFutureKnock.knockedOffPokes[i] & gBitTable[gBattlerPartyIndexes[gActiveBattler]])
{
gBattleMons[gActiveBattler].item = 0;
@@ -8357,7 +8357,7 @@ static void atk4E_switchinanim(void)
return;
gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
- if (GetBankSide(gActiveBattler) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER)))
+ if (GetBattlerSide(gActiveBattler) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER)))
{
GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2);
}
@@ -8383,7 +8383,7 @@ static void atk4F_jumpifcantswitch(void)
}
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
- if (GetBankSide(gActiveBattler) == 1)
+ if (GetBattlerSide(gActiveBattler) == 1)
party = gEnemyParty;
else
party = gPlayerParty;
@@ -8405,7 +8405,7 @@ static void atk4F_jumpifcantswitch(void)
}
else
{
- if (GetBankSide(gActiveBattler) == 1)
+ if (GetBattlerSide(gActiveBattler) == 1)
{
r7 = GetBattlerAtPosition(1);
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -9575,14 +9575,14 @@ static void atk52_switchineffects(void)
gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
gSpecialStatuses[gActiveBattler].flag40 = 0;
- if (!(gSideAffecting[GetBankSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED) && (gSideAffecting[GetBankSide(gActiveBattler)] & SIDE_STATUS_SPIKES)
+ if (!(gSideAffecting[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED) && (gSideAffecting[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES)
&& gBattleMons[gActiveBattler].type1 != TYPE_FLYING && gBattleMons[gActiveBattler].type2 != TYPE_FLYING && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE)
{
u8 spikesDmg;
- gSideAffecting[GetBankSide(gActiveBattler)] |= SIDE_STATUS_SPIKES_DAMAGED;
+ gSideAffecting[GetBattlerSide(gActiveBattler)] |= SIDE_STATUS_SPIKES_DAMAGED;
- spikesDmg = (5 - gSideTimers[GetBankSide(gActiveBattler)].spikesAmount) * 2;
+ spikesDmg = (5 - gSideTimers[GetBattlerSide(gActiveBattler)].spikesAmount) * 2;
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (spikesDmg);
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
@@ -9606,7 +9606,7 @@ static void atk52_switchineffects(void)
if (AbilityBattleEffects(0, gActiveBattler, 0, 0, 0) == 0 && ItemBattleEffects(0, gActiveBattler, 0) == 0)
{
- gSideAffecting[GetBankSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
+ gSideAffecting[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
for (i = 0; i < gNoOfAllBanks; i++)
{
@@ -9616,7 +9616,7 @@ static void atk52_switchineffects(void)
for (i = 0; i < gNoOfAllBanks; i++)
{
- *(HP_ON_SWITCHOUT + GetBankSide(i)) = gBattleMons[i].hp;
+ *(HP_ON_SWITCHOUT + GetBattlerSide(i)) = gBattleMons[i].hp;
}
if (T2_READ_8(gBattlescriptCurrInstr + 1) == 5)
@@ -10275,7 +10275,7 @@ static void atk5F_8025B24(void)
static void atk60_incrementgamestat(void)
{
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
{
IncrementGameStat(T2_READ_8(gBattlescriptCurrInstr + 1));
}
@@ -10291,7 +10291,7 @@ static void atk61_drawpartystatussummary(void)
return;
gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
party = gPlayerParty;
else
party = gEnemyParty;
@@ -11004,7 +11004,7 @@ static void atk74_hpthresholds2(void)
{
gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
opposing_bank = gActiveBattler ^ 1;
- hp_switchout = ewram160BCarr(GetBankSide(opposing_bank)); //gBattleStruct->HP_OnSwitchout[GetBankSide(opposing_bank)];
+ hp_switchout = ewram160BCarr(GetBattlerSide(opposing_bank)); //gBattleStruct->HP_OnSwitchout[GetBattlerSide(opposing_bank)];
result = (hp_switchout - gBattleMons[opposing_bank].hp) * 100 / hp_switchout;
if (gBattleMons[opposing_bank].hp >= hp_switchout)
@@ -11039,7 +11039,7 @@ static void atk76_various(void)
{
u8 side;
gBankAttacker = gBankTarget;
- side = GetBankSide(gBankAttacker) ^ 1;
+ side = GetBattlerSide(gBankAttacker) ^ 1;
if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
gBankTarget = gSideTimers[side].followmeTarget;
else
@@ -11757,7 +11757,7 @@ static void atk8F_forcerandomswitch(void)
struct Pokemon* party;
u8 valid;
u8 val;
- if (!GetBankSide(gBankTarget))
+ if (!GetBattlerSide(gBankTarget))
party = gPlayerParty;
else
party = gEnemyParty;
@@ -12413,12 +12413,12 @@ static void atk97_tryinfatuating(void)
struct Pokemon *attacker, *target;
u16 atk_species, def_species;
u32 atk_pid, def_pid;
- if (!GetBankSide(gBankAttacker))
+ if (!GetBattlerSide(gBankAttacker))
attacker = &gPlayerParty[gBattlerPartyIndexes[gBankAttacker]];
else
attacker = &gEnemyParty[gBattlerPartyIndexes[gBankAttacker]];
- if (!GetBankSide(gBankTarget))
+ if (!GetBattlerSide(gBankTarget))
target = &gPlayerParty[gBattlerPartyIndexes[gBankTarget]];
else
target = &gEnemyParty[gBattlerPartyIndexes[gBankTarget]];
@@ -12937,8 +12937,8 @@ static void atkA0_psywavedamageeffect(void)
static void atkA1_counterdamagecalculator(void)
{
- u8 atk_side = GetBankSide(gBankAttacker);
- u8 def_side = GetBankSide(gProtectStructs[gBankAttacker].physicalBank);
+ u8 atk_side = GetBattlerSide(gBankAttacker);
+ u8 def_side = GetBattlerSide(gProtectStructs[gBankAttacker].physicalBank);
if (gProtectStructs[gBankAttacker].physicalDmg && atk_side != def_side && gBattleMons[gProtectStructs[gBankAttacker].physicalBank].hp)
{
gBattleMoveDamage = gProtectStructs[gBankAttacker].physicalDmg * 2;
@@ -12957,8 +12957,8 @@ static void atkA1_counterdamagecalculator(void)
static void atkA2_mirrorcoatdamagecalculator(void) //a copy of atkA1 with the physical -> special field changes
{
- u8 atk_side = GetBankSide(gBankAttacker);
- u8 def_side = GetBankSide(gProtectStructs[gBankAttacker].specialBank);
+ u8 atk_side = GetBattlerSide(gBankAttacker);
+ u8 def_side = GetBattlerSide(gProtectStructs[gBankAttacker].specialBank);
if (gProtectStructs[gBankAttacker].specialDmg && atk_side != def_side && gBattleMons[gProtectStructs[gBankAttacker].specialBank].hp)
{
gBattleMoveDamage = gProtectStructs[gBankAttacker].specialDmg * 2;
@@ -13478,8 +13478,8 @@ static void atkAA_setdestinybond(void)
static void TrySetDestinyBondToHappen(void)
{
- u8 atk_side = GetBankSide(gBankAttacker);
- u8 def_side = GetBankSide(gBankTarget);
+ u8 atk_side = GetBattlerSide(gBankAttacker);
+ u8 def_side = GetBattlerSide(gBankTarget);
if (gBattleMons[gBankTarget].status2 & STATUS2_DESTINY_BOND && atk_side != def_side && !(gHitMarker & HITMARKER_GRUDGE))
gHitMarker |= HITMARKER_DESTINYBOND;
}
@@ -13560,7 +13560,7 @@ static void atkAE_healpartystatus(void)
int i;
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
party = gPlayerParty;
else
party = gEnemyParty;
@@ -13644,7 +13644,7 @@ static void atkAF_cursetarget(void)
static void atkB0_trysetspikes(void)
{
- u8 side = GetBankSide(gBankAttacker) ^ 1;
+ u8 side = GetBattlerSide(gBankAttacker) ^ 1;
if (gSideTimers[side].spikesAmount == 3)
{
gSpecialStatuses[gBankAttacker].flag20 = 1;
@@ -13860,14 +13860,14 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
{
if (gMultiHitCounter == 1)
{
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
gBankTarget = GetBattlerAtPosition(1);
else
gBankTarget = GetBattlerAtPosition(0);
}
else
{
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
gBankTarget = GetBattlerAtPosition(3);
else
gBankTarget = GetBattlerAtPosition(2);
@@ -13958,10 +13958,10 @@ static void atkBE_rapidspinfree(void) //rapid spin
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_LeechSeedFree;
}
- else if (gSideAffecting[GetBankSide(gBankAttacker)] & SIDE_STATUS_SPIKES)
+ else if (gSideAffecting[GetBattlerSide(gBankAttacker)] & SIDE_STATUS_SPIKES)
{
- gSideAffecting[GetBankSide(gBankAttacker)] &= ~(SIDE_STATUS_SPIKES);
- gSideTimers[GetBankSide(gBankAttacker)].spikesAmount = 0;
+ gSideAffecting[GetBattlerSide(gBankAttacker)] &= ~(SIDE_STATUS_SPIKES);
+ gSideTimers[GetBattlerSide(gBankAttacker)].spikesAmount = 0;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_SpikesFree;
}
@@ -14189,7 +14189,7 @@ static void atkC3_trysetfutureattack(void)
static void atkC4_trydobeatup(void)
{
register struct Pokemon* party asm("r7");
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
party = gPlayerParty;
else
party = gEnemyParty;
@@ -14241,7 +14241,7 @@ static void atkC4_trydobeatup(void)
push {r6,r7}\n\
ldr r0, _08029A8C @ =gBankAttacker\n\
ldrb r0, [r0]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
ldr r7, _08029A90 @ =gEnemyParty\n\
cmp r0, 0\n\
@@ -14562,8 +14562,8 @@ static void atkC9_jumpifattackandspecialattackcannotfall(void) //memento
static void atkCA_setforcedtarget(void) //follow me
{
- gSideTimers[GetBankSide(gBankAttacker)].followmeTimer = 1;
- gSideTimers[GetBankSide(gBankAttacker)].followmeTarget = gBankAttacker;
+ gSideTimers[GetBattlerSide(gBankAttacker)].followmeTimer = 1;
+ gSideTimers[GetBattlerSide(gBankAttacker)].followmeTarget = gBankAttacker;
gBattlescriptCurrInstr++;
}
@@ -14645,9 +14645,9 @@ static void atkD1_trysethelpinghand(void)
#ifdef NONMATCHING
static void atkD2_tryswapitems(void)
{
- if ((GetBankSide(gBankAttacker) != 1 || gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER) || gTrainerBattleOpponent == 0x400))
+ if ((GetBattlerSide(gBankAttacker) != 1 || gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER) || gTrainerBattleOpponent == 0x400))
{
- u8 side = GetBankSide(gBankAttacker);
+ u8 side = GetBattlerSide(gBankAttacker);
if (gBattleTypeFlags)
}
@@ -14667,7 +14667,7 @@ static void atkD2_tryswapitems(void)
sub sp, 0x4\n\
ldr r0, _0802A30C @ =gBankAttacker\n\
ldrb r0, [r0]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r0, 24\n\
cmp r0, 0x1\n\
@@ -14687,7 +14687,7 @@ static void atkD2_tryswapitems(void)
_0802A24C:\n\
ldr r4, _0802A30C @ =gBankAttacker\n\
ldrb r0, [r4]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r2, r0, 24\n\
ldr r0, _0802A310 @ =gBattleTypeFlags\n\
@@ -15102,7 +15102,7 @@ static void atkDB_tryimprision(void)
PressurePPLoseOnUsingImprision(gBankAttacker);
for (bank = 0; bank < gNoOfAllBanks; bank++)
{
- if (r8 != GetBankSide(bank))
+ if (r8 != GetBattlerSide(bank))
{
int j;
for (j = 0; j < 4; j++)
@@ -15427,7 +15427,7 @@ static void atkE1_trygetintimidatetarget(void)
u8 side;
gBattleStruct->scriptingActive = ewram160DD;
- side = GetBankSide(gBattleStruct->scriptingActive);
+ side = GetBattlerSide(gBattleStruct->scriptingActive);
gBattleTextBuff1[0] = 0xFD;
gBattleTextBuff1[1] = 9;
gBattleTextBuff1[2] = gBattleMons[gBattleStruct->scriptingActive].ability;
@@ -15435,7 +15435,7 @@ static void atkE1_trygetintimidatetarget(void)
for (;gBankTarget < gNoOfAllBanks; gBankTarget++)
{
- if (GetBankSide(gBankTarget) == side)
+ if (GetBattlerSide(gBankTarget) == side)
continue;
if (!(gAbsentBattlerFlags & gBitTable[gBankTarget]))
break;
@@ -15665,7 +15665,7 @@ static void atkED_snatchsetbanks(void)
static void atkEE_removelightscreenreflect(void) //brick break
{
- u8 side = GetBankSide(gBankAttacker) ^ 1;
+ u8 side = GetBattlerSide(gBankAttacker) ^ 1;
if (gSideTimers[side].reflectTimer || gSideTimers[side].lightscreenTimer)
{
gSideAffecting[side] &= ~(SIDE_STATUS_REFLECT);
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index e691a5d29..70863a9fd 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -578,7 +578,7 @@ u8 battle_load_something(u8 *pState, u8 *b)
}
break;
case 5:
- if (GetBankSide(*b) == 0)
+ if (GetBattlerSide(*b) == 0)
{
if (!(gBattleTypeFlags & 0x80))
sub_8045A5C(gHealthboxIDs[*b], &gPlayerParty[gBattlerPartyIndexes[*b]], 0);
@@ -671,11 +671,11 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
else
{
r10 = GetBattlerPosition(a);
- if (GetBankSide(b) == 1)
+ if (GetBattlerSide(b) == 1)
species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[b]], MON_DATA_SPECIES);
else
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[b]], MON_DATA_SPECIES);
- if (GetBankSide(a) == 0)
+ if (GetBattlerSide(a) == 0)
{
personalityValue = GetMonData(&gPlayerParty[gBattlerPartyIndexes[a]], MON_DATA_PERSONALITY);
otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[a]], MON_DATA_OT_ID);
@@ -742,7 +742,7 @@ void BattleLoadSubstituteSprite(u8 a, u8 b)
r4 = GetBattlerPosition(a);
if (IsContest())
LZDecompressVram(gSubstituteDollTilemap, gUnknown_081FAF4C[r4]);
- else if (GetBankSide(a) != 0)
+ else if (GetBattlerSide(a) != 0)
LZDecompressVram(gSubstituteDollGfx, gUnknown_081FAF4C[r4]);
else
LZDecompressVram(gSubstituteDollTilemap, gUnknown_081FAF4C[r4]);
@@ -758,7 +758,7 @@ void BattleLoadSubstituteSprite(u8 a, u8 b)
{
if (!IsContest())
{
- if (GetBankSide(a) != 0)
+ if (GetBattlerSide(a) != 0)
BattleLoadOpponentMonSprite(&gEnemyParty[gBattlerPartyIndexes[a]], a);
else
BattleLoadPlayerMonSprite(&gPlayerParty[gBattlerPartyIndexes[a]], a);
@@ -921,7 +921,7 @@ void sub_8032978(struct Sprite *sprite)
void sub_8032984(u8 a, u16 b)
{
- if (GetBankSide(a) != 0)
+ if (GetBattlerSide(a) != 0)
{
if (ewram17800[a].transformedSpecies != 0)
b = ewram17800[a].transformedSpecies;
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 7b04446a0..134f6c18b 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -272,7 +272,7 @@ void BattleAI_HandleItemUseBeforeAISetup(void)
s32 i;
u8 *data;
- MEMSET_ALT(UNK_2016A00_STRUCT, 0, sizeof(struct UnkBattleStruct1), i, data);
+ MEMSET_ALT(AI_BATTLE_HISTORY, 0, sizeof(struct BattleHistory), i, data);
if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
&& gTrainerBattleOpponent != 0x400
@@ -282,8 +282,8 @@ void BattleAI_HandleItemUseBeforeAISetup(void)
{
if (gTrainers[gTrainerBattleOpponent].items[i] != 0)
{
- UNK_2016A00_STRUCT->items[UNK_2016A00_STRUCT->numOfItems] = gTrainers[gTrainerBattleOpponent].items[i];
- UNK_2016A00_STRUCT->numOfItems++;
+ AI_BATTLE_HISTORY->trainerItems[AI_BATTLE_HISTORY->numItems] = gTrainers[gTrainerBattleOpponent].items[i];
+ AI_BATTLE_HISTORY->numItems++;
}
}
}
@@ -446,9 +446,9 @@ void sub_810745C(void)
for (i = 0; i < 8; i++)
{
- if (UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] == 0)
+ if (AI_BATTLE_HISTORY->usedMoves[gBankTarget >> 1][i] == 0)
{
- UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] = gLastUsedMove[gBankTarget];
+ AI_BATTLE_HISTORY->usedMoves[gBankTarget >> 1][i] = gLastUsedMove[gBankTarget];
return;
}
}
@@ -459,19 +459,19 @@ void unref_sub_81074A0(u8 a)
s32 i;
for (i = 0; i < 8; i++)
- UNK_2016A00_STRUCT->movesUsed[a / 2][i] = 0;
+ AI_BATTLE_HISTORY->usedMoves[a / 2][i] = 0;
}
void RecordAbilityBattle(u8 a, u8 b)
{
- if (GetBankSide(a) == 0)
- UNK_2016A00_STRUCT->unk20[GetBattlerPosition(a) & 1] = b;
+ if (GetBattlerSide(a) == 0)
+ AI_BATTLE_HISTORY->abilities[GetBattlerPosition(a) & 1] = b;
}
void RecordItemBattle(u8 a, u8 b)
{
- if (GetBankSide(a) == 0)
- UNK_2016A00_STRUCT->unk22[GetBattlerPosition(a) & 1] = b;
+ if (GetBattlerSide(a) == 0)
+ AI_BATTLE_HISTORY->itemEffects[GetBattlerPosition(a) & 1] = b;
}
static void BattleAICmd_if_random_less_than(void)
@@ -1317,7 +1317,7 @@ static void BattleAICmd_count_alive_pokemon(void)
else
index = gBankTarget;
- if (GetBankSide(index) == 0)
+ if (GetBattlerSide(index) == 0)
party = gPlayerParty;
else
party = gEnemyParty;
@@ -1370,13 +1370,13 @@ static void BattleAICmd_get_ability(void)
else
index = gBankTarget;
- if (GetBankSide(index) == TARGET)
+ if (GetBattlerSide(index) == TARGET)
{
- u16 unk = GetBattlerPosition(index) & 1;
+ u16 side = GetBattlerPosition(index) & 1;
- if (UNK_2016A00_STRUCT->unk20[unk] != 0)
+ if (AI_BATTLE_HISTORY->abilities[side] != 0)
{
- AI_THINKING_STRUCT->funcResult = UNK_2016A00_STRUCT->unk20[unk];
+ AI_THINKING_STRUCT->funcResult = AI_BATTLE_HISTORY->abilities[side];
gAIScriptPtr += 2;
return;
}
@@ -1745,7 +1745,7 @@ static void BattleAICmd_if_has_move(void)
case 2:
for (i = 0; i < 8; i++)
{
- if (UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] == *temp_ptr)
+ if (AI_BATTLE_HISTORY->usedMoves[gBankTarget >> 1][i] == *temp_ptr)
break;
}
if (i == 8)
@@ -1779,7 +1779,7 @@ static void BattleAICmd_if_dont_have_move(void)
case 2:
for (i = 0; i < 8; i++)
{
- if (UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] == *temp_ptr)
+ if (AI_BATTLE_HISTORY->usedMoves[gBankTarget >> 1][i] == *temp_ptr)
break;
}
if (i != 8)
@@ -1812,7 +1812,7 @@ static void BattleAICmd_if_move_effect(void)
case 2:
for (i = 0; i < 8; i++)
{
- if (gBattleMons[gBankAttacker].moves[i] != 0 && gBattleMoves[UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i]].effect == gAIScriptPtr[2])
+ if (gBattleMons[gBankAttacker].moves[i] != 0 && gBattleMoves[AI_BATTLE_HISTORY->usedMoves[gBankTarget >> 1][i]].effect == gAIScriptPtr[2])
break;
}
gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@@ -1841,7 +1841,7 @@ static void BattleAICmd_if_not_move_effect(void)
case 2:
for (i = 0; i < 8; i++)
{
- if (UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i] != 0 && gBattleMoves[UNK_2016A00_STRUCT->movesUsed[gBankTarget >> 1][i]].effect == gAIScriptPtr[2])
+ if (AI_BATTLE_HISTORY->usedMoves[gBankTarget >> 1][i] != 0 && gBattleMoves[AI_BATTLE_HISTORY->usedMoves[gBankTarget >> 1][i]].effect == gAIScriptPtr[2])
break;
}
gAIScriptPtr += 7;
@@ -1929,17 +1929,17 @@ static void BattleAICmd_watch(void)
static void BattleAICmd_get_hold_effect(void)
{
u8 index;
- u16 status;
+ u16 side;
if (gAIScriptPtr[1] == USER)
index = gBankAttacker;
else
index = gBankTarget;
- if (GetBankSide(index) == 0)
+ if (GetBattlerSide(index) == 0)
{
- status = (GetBattlerPosition(index) & 1);
- AI_THINKING_STRUCT->funcResult = UNK_2016A00_STRUCT->unk22[status];
+ side = (GetBattlerPosition(index) & 1);
+ AI_THINKING_STRUCT->funcResult = AI_BATTLE_HISTORY->itemEffects[side];
}
else
AI_THINKING_STRUCT->funcResult = ItemId_GetHoldEffect(gBattleMons[index].item);
diff --git a/src/battle/battle_9.c b/src/battle/battle_ai_switch_items.c
index c8bb89a0a..fd1d23684 100755
--- a/src/battle/battle_9.c
+++ b/src/battle/battle_ai_switch_items.c
@@ -861,3 +861,148 @@ u8 GetMostSuitableMonToSwitchInto(void)
return bestMonId;
}
+
+// TODO: use PokemonItemEffect struct instead of u8 once it's documented
+/*static*/ u8 GetAI_ItemType(u8 itemId, const u8 *itemEffect) // NOTE: should take u16 as item Id argument
+{
+ if (itemId == ITEM_FULL_RESTORE)
+ return AI_ITEM_FULL_RESTORE;
+ if (itemEffect[4] & 4)
+ return AI_ITEM_HEAL_HP;
+ if (itemEffect[3] & 0x3F)
+ return AI_ITEM_CURE_CONDITION;
+ if (itemEffect[0] & 0x3F || itemEffect[1] != 0 || itemEffect[2] != 0)
+ return AI_ITEM_X_STAT;
+ if (itemEffect[3] & 0x80)
+ return AI_ITEM_GUARD_SPECS;
+
+ return AI_ITEM_NOT_RECOGNIZABLE;
+}
+
+/*static*/ bool8 ShouldUseItem(void)
+{
+ s32 i;
+ u8 validMons = 0;
+ bool8 shouldUse = FALSE;
+
+ for (i = 0; i < 6; i++)
+ {
+ if (GetMonData(&gEnemyParty[i], MON_DATA_HP) != 0
+ && GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) != SPECIES_NONE
+ && GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) != SPECIES_EGG)
+ {
+ validMons++;
+ }
+ }
+
+ for (i = 0; i < 4; i++)
+ {
+ u16 item;
+ const u8 *itemEffects;
+ u8 paramOffset;
+ u8 bankSide;
+
+ if (i != 0 && validMons > (AI_BATTLE_HISTORY->numItems - i) + 1)
+ continue;
+ item = AI_BATTLE_HISTORY->trainerItems[i];
+ if (item == ITEM_NONE)
+ continue;
+ if (gItemEffectTable[item - 13] == NULL)
+ continue;
+
+ if (item == ITEM_ENIGMA_BERRY)
+ itemEffects = gSaveBlock1.enigmaBerry.itemEffect;
+ else
+ itemEffects = gItemEffectTable[item - 13];
+
+ ewram160D8(gActiveBattler) = GetAI_ItemType(item, itemEffects);
+
+ switch (ewram160D8(gActiveBattler))
+ {
+ case AI_ITEM_FULL_RESTORE:
+ if (gBattleMons[gActiveBattler].hp >= gBattleMons[gActiveBattler].maxHP / 4)
+ break;
+ if (gBattleMons[gActiveBattler].hp == 0)
+ break;
+ shouldUse = TRUE;
+ break;
+ case AI_ITEM_HEAL_HP:
+ paramOffset = GetItemEffectParamOffset(item, 4, 4);
+ if (paramOffset == 0)
+ break;
+ if (gBattleMons[gActiveBattler].hp == 0)
+ break;
+ if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 4 || gBattleMons[gActiveBattler].maxHP - gBattleMons[gActiveBattler].hp > itemEffects[paramOffset])
+ shouldUse = TRUE;
+ break;
+ case AI_ITEM_CURE_CONDITION:
+ ewram160DA(gActiveBattler) = 0;
+ if (itemEffects[3] & 0x20 && gBattleMons[gActiveBattler].status1 & STATUS_SLEEP)
+ {
+ ewram160DA(gActiveBattler) |= 0x20;
+ shouldUse = TRUE;
+ }
+ if (itemEffects[3] & 0x10 && (gBattleMons[gActiveBattler].status1 & STATUS_POISON || gBattleMons[gActiveBattler].status1 & STATUS_TOXIC_POISON))
+ {
+ ewram160DA(gActiveBattler) |= 0x10;
+ shouldUse = TRUE;
+ }
+ if (itemEffects[3] & 0x8 && gBattleMons[gActiveBattler].status1 & STATUS_BURN)
+ {
+ ewram160DA(gActiveBattler) |= 0x8;
+ shouldUse = TRUE;
+ }
+ if (itemEffects[3] & 0x4 && gBattleMons[gActiveBattler].status1 & STATUS_FREEZE)
+ {
+ ewram160DA(gActiveBattler) |= 0x4;
+ shouldUse = TRUE;
+ }
+ if (itemEffects[3] & 0x2 && gBattleMons[gActiveBattler].status1 & STATUS_PARALYSIS)
+ {
+ ewram160DA(gActiveBattler) |= 0x2;
+ shouldUse = TRUE;
+ }
+ if (itemEffects[3] & 0x1 && gBattleMons[gActiveBattler].status2 & STATUS2_CONFUSION)
+ {
+ ewram160DA(gActiveBattler) |= 0x1;
+ shouldUse = TRUE;
+ }
+ break;
+ case AI_ITEM_X_STAT:
+ ewram160DA(gActiveBattler) = 0;
+ if (gDisableStructs[gActiveBattler].isFirstTurn == 0)
+ break;
+ if (itemEffects[0] & 0xF)
+ ewram160DA(gActiveBattler) |= 0x1;
+ if (itemEffects[1] & 0xF0)
+ ewram160DA(gActiveBattler) |= 0x2;
+ if (itemEffects[1] & 0xF)
+ ewram160DA(gActiveBattler) |= 0x4;
+ if (itemEffects[2] & 0xF)
+ ewram160DA(gActiveBattler) |= 0x8;
+ if (itemEffects[2] & 0xF0)
+ ewram160DA(gActiveBattler) |= 0x20;
+ if (itemEffects[0] & 0x30)
+ ewram160DA(gActiveBattler) |= 0x80;
+ shouldUse = TRUE;
+ break;
+ case AI_ITEM_GUARD_SPECS:
+ bankSide = GetBattlerSide(gActiveBattler);
+ if (gDisableStructs[gActiveBattler].isFirstTurn != 0 && gSideTimers[bankSide].mistTimer == 0)
+ shouldUse = TRUE;
+ break;
+ case AI_ITEM_NOT_RECOGNIZABLE:
+ return FALSE;
+ }
+
+ if (shouldUse)
+ {
+ Emitcmd33(1, B_ACTION_USE_ITEM, 0);
+ ewram160D4(gActiveBattler) = item;
+ AI_BATTLE_HISTORY->trainerItems[i] = 0;
+ return shouldUse;
+ }
+ }
+
+ return FALSE;
+}
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 90fff11ee..ca2431f15 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -1490,7 +1490,7 @@ void LaunchBattleAnimation(const u8 *const moveAnims[], u16 move, u8 isMoveAnim)
UpdateOamPriorityInAllHealthboxes(0);
for (i = 0; i < 4; i++)
{
- if (GetBankSide(i) != 0)
+ if (GetBattlerSide(i) != 0)
gAnimSpeciesByBanks[i] = GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_SPECIES);
else
gAnimSpeciesByBanks[i] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_SPECIES);
@@ -2369,7 +2369,7 @@ static void ScriptCmd_fadetobgfromset(void)
if (IsContest())
gTasks[taskId].tBackgroundId = bg3;
- else if (GetBankSide(gAnimBankTarget) == 0)
+ else if (GetBattlerSide(gAnimBankTarget) == 0)
gTasks[taskId].tBackgroundId = bg2;
else
gTasks[taskId].tBackgroundId = bg1;
@@ -2494,7 +2494,7 @@ s8 BattleAnimAdjustPanning(s8 a)
{
if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10))
{
- a = GetBankSide(gAnimBankAttacker) ? 0xC0 : 0x3F;
+ a = GetBattlerSide(gAnimBankAttacker) ? 0xC0 : 0x3F;
}
//_08076FDC
else
@@ -2513,9 +2513,9 @@ s8 BattleAnimAdjustPanning(s8 a)
//_08077004
else
{
- if (GetBankSide(gAnimBankAttacker) == 0)
+ if (GetBattlerSide(gAnimBankAttacker) == 0)
{
- if (GetBankSide(gAnimBankTarget) == 0)
+ if (GetBattlerSide(gAnimBankTarget) == 0)
}
//_08077042
else
@@ -2552,7 +2552,7 @@ s8 BattleAnimAdjustPanning(s8 a)
cmp r0, 0\n\
beq _08076FDC\n\
adds r0, r2, 0\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
movs r4, 0xC0\n\
cmp r0, 0\n\
@@ -2584,13 +2584,13 @@ _08077000: .4byte gAnimBankTarget\n\
_08077004:\n\
ldr r0, _0807702C @ =gAnimBankAttacker\n\
ldrb r0, [r0]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _08077042\n\
ldr r0, _08077030 @ =gAnimBankTarget\n\
ldrb r0, [r0]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _0807706E\n\
@@ -2614,7 +2614,7 @@ _08077034:\n\
_08077042:\n\
ldr r0, _08077064 @ =gAnimBankTarget\n\
ldrb r0, [r0]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r0, 24\n\
cmp r0, 0x1\n\
@@ -2662,14 +2662,14 @@ s8 BattleAnimAdjustPanning2(s8 pan)
{
if (!IsContest() && (EWRAM_17810[gAnimBankAttacker].unk0 & 0x10))
{
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
pan = 0x3F;
else
pan = 0xC0;
}
else
{
- if (GetBankSide(gAnimBankAttacker) != 0 || IsContest() != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0 || IsContest() != 0)
pan = -pan;
}
return pan;
@@ -3078,7 +3078,7 @@ static void ScriptCmd_monbgprio_2A(void)
wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1);
sBattleAnimScriptPtr += 2;
- if (GetBankSide(gAnimBankAttacker) != GetBankSide(gAnimBankTarget))
+ if (GetBattlerSide(gAnimBankAttacker) != GetBattlerSide(gAnimBankTarget))
{
if (wantedBank != 0)
bank = gAnimBankTarget;
@@ -3124,7 +3124,7 @@ static void ScriptCmd_doublebattle_2D(void)
wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1);
sBattleAnimScriptPtr += 2;
if (!IsContest() && IsDoubleBattle()
- && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
+ && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
{
if (wantedBank == 0)
{
@@ -3158,7 +3158,7 @@ static void ScriptCmd_doublebattle_2E(void)
wantedBank = T1_READ_8(sBattleAnimScriptPtr + 1);
sBattleAnimScriptPtr += 2;
if (!IsContest() && IsDoubleBattle()
- && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget))
+ && GetBattlerSide(gAnimBankAttacker) == GetBattlerSide(gAnimBankTarget))
{
if (wantedBank == 0)
{
diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index 15191a1ce..a504570ca 100644
--- a/src/battle/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
@@ -427,7 +427,7 @@ static void sub_80A8488(u8 taskId)
// arg 4: speed (valid values are 0-5)
void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId)
{
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
AnimTask_TranslateMonElliptical(taskId);
@@ -440,7 +440,7 @@ void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId)
static void DoHorizontalLunge(struct Sprite *sprite)
{
sprite->invisible = TRUE;
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
sprite->data[1] = -gBattleAnimArgs[1];
else
sprite->data[1] = gBattleAnimArgs[1];
@@ -572,7 +572,7 @@ static void SlideMonToOffset(struct Sprite *sprite)
battler = gAnimBankTarget;
monSpriteId = gBankSpriteIds[battler];
- if (GetBankSide(battler) != B_SIDE_PLAYER)
+ if (GetBattlerSide(battler) != B_SIDE_PLAYER)
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
if (gBattleAnimArgs[3] == 1)
@@ -609,7 +609,7 @@ static void sub_80A8818(struct Sprite *sprite)
v1 = gAnimBankTarget;
}
spriteId = gBankSpriteIds[v1];
- if (GetBankSide(v1))
+ if (GetBattlerSide(v1))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
if (gBattleAnimArgs[3] == 1)
@@ -659,7 +659,7 @@ static void sub_80A88F0(struct Sprite *sprite)
void AnimTask_WindUpLunge(u8 taskId)
{
s16 wavePeriod = 0x8000 / gBattleAnimArgs[3];
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
gBattleAnimArgs[5] = -gBattleAnimArgs[5];
@@ -741,7 +741,7 @@ void sub_80A8A80(u8 taskId)
return;
}
TASK.data[0] = spriteId;
- if (GetBankSide(gAnimBankTarget))
+ if (GetBattlerSide(gAnimBankTarget))
{
TASK.data[1] = gBattleAnimArgs[1];
}
@@ -774,7 +774,7 @@ static void sub_80A8B3C(u8 taskId)
void AnimTask_SwayMon(u8 taskId)
{
u8 spriteId;
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
spriteId = GetAnimBankSpriteId(gBattleAnimArgs[4]);
@@ -812,7 +812,7 @@ static void AnimTask_SwayMonStep(u8 taskId)
}
else
{
- if (GetBankSide(TASK.data[5]) == B_SIDE_PLAYER)
+ if (GetBattlerSide(TASK.data[5]) == B_SIDE_PLAYER)
{
gSprites[spriteId].pos2.y = (sineValue >= 0) ? sineValue : -sineValue;
}
@@ -909,11 +909,11 @@ void sub_80A8E04(u8 taskId)
{
if (gBattleAnimArgs[2] == 0)
{
- TASK.data[7] = !GetBankSide(gAnimBankAttacker);
+ TASK.data[7] = !GetBattlerSide(gAnimBankAttacker);
}
else
{
- TASK.data[7] = !GetBankSide(gAnimBankTarget);
+ TASK.data[7] = !GetBattlerSide(gAnimBankTarget);
}
}
if (TASK.data[7])
@@ -936,14 +936,14 @@ void sub_80A8EFC(u8 taskId)
TASK.data[2] = gBattleAnimArgs[0];
if (gBattleAnimArgs[2] == 0)
{
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
}
}
else
{
- if (GetBankSide(gAnimBankTarget))
+ if (GetBattlerSide(gAnimBankTarget))
{
gBattleAnimArgs[1] = -gBattleAnimArgs[1];
}
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index b1e711b05..f26ec399c 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -92,7 +92,7 @@ extern void sub_8037FAC(void);
extern void move_anim_start_t2_for_situation();
extern void dp01t_0F_4_move_anim(void);
extern void sub_8047858();
-extern u8 GetBankSide(u8);
+extern u8 GetBattlerSide(u8);
extern void StartBattleIntroAnim();
extern void sub_803A3A8(struct Sprite *);
extern void sub_8044CA0(u8);
@@ -1596,7 +1596,7 @@ void LinkOpponentHandleEffectivenessSound(void)
{
s8 pan;
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
pan = -64;
else
pan = 63;
@@ -1678,7 +1678,7 @@ void sub_803A3A8(struct Sprite *sprite)
void LinkOpponentHandlecmd48(void)
{
- if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
+ if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == 0)
{
LinkOpponentBufferExecCompleted();
return;
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 9d0181336..e8da4721a 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -1541,7 +1541,7 @@ void LinkPartnerHandleEffectivenessSound(void)
{
s8 pan;
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
pan = -64;
else
pan = 63;
@@ -1630,7 +1630,7 @@ void sub_812071C(u8 taskId)
void LinkPartnerHandlecmd48(void)
{
- if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
+ if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == 0)
{
LinkPartnerBufferExecCompleted();
return;
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index c87ffaf92..abdc9ccd0 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -108,7 +108,7 @@ void sub_8033494(void);
extern void move_anim_start_t2_for_situation();
extern void bx_blink_t7(void);
extern void sub_8047858();
-extern u8 GetBankSide(u8);
+extern u8 GetBattlerSide(u8);
extern void StartBattleIntroAnim();
extern void sub_8044CA0(u8);
extern void nullsub_45(void);
@@ -2188,7 +2188,7 @@ void OpponentHandleEffectivenessSound(void)
{
s8 pan;
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
pan = -64;
else
pan = 63;
@@ -2270,7 +2270,7 @@ void sub_8035C44(u8 taskId)
void OpponentHandlecmd48(void)
{
- if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
+ if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == 0)
{
OpponentBufferExecCompleted();
return;
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 83171a0e9..439888d38 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -101,7 +101,7 @@ extern bool8 mplay_80342A4(u8);
extern void move_anim_start_t2_for_situation();
extern void bx_blink_t1(void);
extern void sub_8047858();
-extern u8 GetBankSide(u8);
+extern u8 GetBattlerSide(u8);
extern void StartBattleIntroAnim();
extern void oamt_add_pos2_onto_pos1();
extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
@@ -2773,7 +2773,7 @@ void PlayerHandlePrintString(void)
void PlayerHandlePrintStringPlayerOnly(void)
{
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
PlayerHandlePrintString();
else
PlayerBufferExecCompleted();
@@ -3041,7 +3041,7 @@ void PlayerHandleEffectivenessSound(void)
{
s8 pan;
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
pan = -64;
else
pan = 63;
@@ -3139,7 +3139,7 @@ void task05_08033660(u8 taskId)
void PlayerHandlecmd48(void)
{
- if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
+ if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == 0)
{
PlayerBufferExecCompleted();
}
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 9e29fbf5c..53c4d71d7 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -40,7 +40,7 @@ extern u16 gBattlerPartyIndexes[];
extern u16 gUnknown_02024DE8;
extern u8 gBattleOutcome;
-extern u8 GetBankSide(u8);
+extern u8 GetBattlerSide(u8);
extern u8 GetBattlerAtPosition(u8);
extern u8 GetBattlerPosition(u8);
extern void LoadPlayerTrainerBankSprite();
@@ -471,7 +471,7 @@ void SafariHandlePrintString(void)
void SafariHandlePrintStringPlayerOnly(void)
{
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
SafariHandlePrintString();
else
SafariBufferExecCompleted();
@@ -629,7 +629,7 @@ void SafariHandleEffectivenessSound(void)
{
s8 pan;
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
pan = -64;
else
pan = 63;
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 1a11ee876..8ae61d0cb 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -82,7 +82,7 @@ extern void sub_80326EC();
extern void sub_8031F24(void);
extern void sub_80324BC();
extern void BufferStringBattle();
-extern u8 GetBankSide(u8);
+extern u8 GetBattlerSide(u8);
extern void sub_80304A8(void);
extern void sub_8047858();
extern void StartBattleIntroAnim();
@@ -1252,7 +1252,7 @@ void WallyHandlePrintString(void)
void WallyHandlePrintStringPlayerOnly(void)
{
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
WallyHandlePrintString();
else
WallyBufferExecCompleted();
@@ -1544,7 +1544,7 @@ void sub_8139A2C(u8 taskId)
void WallyHandlecmd48(void)
{
- if (gBattleBufferA[gActiveBattler][1] != 0 && GetBankSide(gActiveBattler) == 0)
+ if (gBattleBufferA[gActiveBattler][1] != 0 && GetBattlerSide(gActiveBattler) == 0)
{
WallyBufferExecCompleted();
}
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index 516b58b5e..823fba6d0 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -783,7 +783,7 @@ u8 battle_make_oam_normal_battle(u8 a)
if (!IsDoubleBattle())
{
- if (GetBankSide(a) == 0)
+ if (GetBattlerSide(a) == 0)
{
spriteId1 = CreateSprite(&gSpriteTemplates_820A4EC[0], 240, 160, 1);
spriteId2 = CreateSpriteAtEnd(&gSpriteTemplates_820A4EC[0], 240, 160, 1);
@@ -809,7 +809,7 @@ u8 battle_make_oam_normal_battle(u8 a)
//_08043A28
else
{
- if (GetBankSide(a) == 0)
+ if (GetBattlerSide(a) == 0)
{
spriteId1 = CreateSprite(&gSpriteTemplates_820A4EC[GetBattlerPosition(a) / 2], 240, 160, 1);
spriteId2 = CreateSpriteAtEnd(&gSpriteTemplates_820A4EC[GetBattlerPosition(a) / 2], 240, 160, 1);
@@ -838,7 +838,7 @@ u8 battle_make_oam_normal_battle(u8 a)
spriteId3 = CreateSpriteAtEnd(&gSpriteTemplates_820A56C[gBanksBySide[a]], 140, 60, 0);
sprite = &gSprites[spriteId3];
- SetSubspriteTables(sprite, &gSubspriteTables_820A684[GetBankSide(a)]);
+ SetSubspriteTables(sprite, &gSubspriteTables_820A684[GetBattlerSide(a)]);
sprite->subspriteMode = 2;
sprite->oam.priority = 1;
CpuCopy32(sub_8043CDC(1), OBJ_VRAM0 + sprite->oam.tileNum * 32, 64);
@@ -973,7 +973,7 @@ void sub_8043F44(u8 a)
if (!IsDoubleBattle())
{
- if (GetBankSide(a) != 0)
+ if (GetBattlerSide(a) != 0)
{
x = 44;
y = 30;
@@ -1027,14 +1027,14 @@ void sub_8043F44(u8 a)
memcpy(str, gUnknown_0820A81C, sizeof(str));
if (!IsDoubleBattle())
{
- if (GetBankSide(gSprites[a].data[6]) == 0)
+ if (GetBattlerSide(gSprites[a].data[6]) == 0)
r7 = gUnknown_0820A804;
else
r7 = gUnknown_0820A80C;
}
else
{
- if (GetBankSide(gSprites[a].data[6]) == 0)
+ if (GetBattlerSide(gSprites[a].data[6]) == 0)
r7 = gUnknown_0820A814;
else
r7 = gUnknown_0820A80C;
@@ -1084,7 +1084,7 @@ void sub_80440EC(u8 a, s16 b, u8 c)
memcpy(str, gUnknown_0820A864, sizeof(str));
foo = gSprites[a].data[6];
- if (IsDoubleBattle() == TRUE || GetBankSide(foo) == 1)
+ if (IsDoubleBattle() == TRUE || GetBattlerSide(foo) == 1)
{
//_08044136
sub_8044210(a, b, c);
@@ -1094,7 +1094,7 @@ void sub_80440EC(u8 a, s16 b, u8 c)
ptr = str + 6;
if (c == 0)
{
- if (GetBankSide(gSprites[a].data[6]) == 0)
+ if (GetBattlerSide(gSprites[a].data[6]) == 0)
r4 = gUnknown_0820A83C;
else
r4 = gUnknown_0820A848;
@@ -1106,7 +1106,7 @@ void sub_80440EC(u8 a, s16 b, u8 c)
}
else
{
- if (GetBankSide(gSprites[a].data[6]) == 0)
+ if (GetBattlerSide(gSprites[a].data[6]) == 0)
r4 = gUnknown_0820A854;
else
r4 = gUnknown_0820A85C;
@@ -1156,7 +1156,7 @@ void sub_80440EC(u8 a, s16 b, u8 c)
beq _08044136\n\
lsls r0, r5, 24\n\
lsrs r0, 24\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
lsrs r0, 24\n\
cmp r0, 0x1\n\
@@ -1180,7 +1180,7 @@ _0804414C:\n\
ldrh r0, [r4, 0x3A]\n\
lsls r0, 24\n\
lsrs r0, 24\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
ldr r4, _08044188 @ =gUnknown_0820A848\n\
cmp r0, 0\n\
@@ -1208,7 +1208,7 @@ _08044190:\n\
ldrh r0, [r4, 0x3A]\n\
lsls r0, 24\n\
lsrs r0, 24\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
ldr r4, _080441FC @ =gUnknown_0820A85C\n\
cmp r0, 0\n\
@@ -1297,7 +1297,7 @@ _0804420C: .4byte 0x04000008\n\
r7 = gUnknown_0820A894;
r10 = 2;
sub_8003504(ptr, b, 0xF, 1);
- if (GetBankSide(r4) == 0)
+ if (GetBattlerSide(r4) == 0)
{
CpuCopy32(sub_8043CDC(0x74), OBJ_VRAM0 + (gSprites[a].oam.tileNum + 0x34) * 32, 32);
}
@@ -1652,17 +1652,17 @@ void sub_804454C(void)
{
if (gSprites[gHealthboxIDs[i]].callback == SpriteCallbackDummy
#if DEBUG
- && (gUnknown_020297ED != 0 || GetBankSide(i) != 1)
+ && (gUnknown_020297ED != 0 || GetBattlerSide(i) != 1)
#else
- && GetBankSide(i) != 1
+ && GetBattlerSide(i) != 1
#endif
- && (IsDoubleBattle() || GetBankSide(i) != 0))
+ && (IsDoubleBattle() || GetBattlerSide(i) != 0))
{
u8 r6;
ewram17800[i].unk0_4 ^= 1;
r6 = ewram17800[i].unk0_4;
- if (GetBankSide(i) == 0)
+ if (GetBattlerSide(i) == 0)
{
if (!IsDoubleBattle())
@@ -1733,7 +1733,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
if (c == 0 || GetBattlerPosition(a) != 3)
{
- if (GetBankSide(a) == 0)
+ if (GetBattlerSide(a) == 0)
{
r7 = 0;
x = 136;
@@ -1826,7 +1826,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
gSprites[sp[i]].data[2] = r7;
}
//_08044A76
- if (GetBankSide(a) == 0)
+ if (GetBattlerSide(a) == 0)
{
for (i = 0; i < 6; i++) //_08044A9A
{
@@ -1954,7 +1954,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
beq _08044878\n\
_08044834:\n\
ldr r0, [sp, 0x8]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _08044854\n\
@@ -2236,7 +2236,7 @@ _08044A56:\n\
b _08044970\n\
_08044A76:\n\
ldr r0, [sp, 0x8]\n\
- bl GetBankSide\n\
+ bl GetBattlerSide\n\
lsls r0, 24\n\
cmp r0, 0\n\
bne _08044B5E\n\
@@ -2542,7 +2542,7 @@ void sub_8044CA0(u8 taskId)
{
for (i = 0; i < 6; i++)
{
- if (GetBankSide(sp8) != 0)
+ if (GetBattlerSide(sp8) != 0)
{
gSprites[sp[5 - i]].data[1] = 7 * i;
gSprites[sp[5 - i]].data[3] = 0;
@@ -2816,7 +2816,7 @@ void sub_8045180(struct Sprite *sprite)
for (; i < _7; i++)
CpuCopy32(sub_8043CDC(0x2B), ptr + 64 * i, 32);
- if (GetBankSide(gSprites[a].data[6]) == 0 && !IsDoubleBattle())
+ if (GetBattlerSide(gSprites[a].data[6]) == 0 && !IsDoubleBattle())
{
r1 = (u8 *const *)gUnknown_0820A8B4;
for (i = 0; i < _7; i++)
@@ -2834,7 +2834,7 @@ void sub_8045180(struct Sprite *sprite)
}
else
{
- if (GetBankSide(gSprites[a].data[6]) == 0)
+ if (GetBattlerSide(gSprites[a].data[6]) == 0)
r1 = (u8 *const *)gUnknown_0820A904;
else
r1 = (u8 *const *)gUnknown_0820A8DC;
@@ -2863,7 +2863,7 @@ static void sub_8045458(u8 a, u8 b)
return;
r4 = gSprites[a].data[6];
- if (GetBankSide(r4) != 0)
+ if (GetBattlerSide(r4) != 0)
{
u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[r4]], MON_DATA_SPECIES);
if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), 1) != 0)
@@ -2890,7 +2890,7 @@ static void sub_8045458(u8 a, u8 b)
r7 = gSprites[a].data[6];
r10 = gSprites[a].data[5];
- if (GetBankSide(r7) == 0)
+ if (GetBattlerSide(r7) == 0)
{
r4 = GetMonData(&gPlayerParty[gBattlerPartyIndexes[r7]], MON_DATA_STATUS);
if (!IsDoubleBattle())
@@ -2948,7 +2948,7 @@ static void sub_8045458(u8 a, u8 b)
FillPalette(r0[gBattleInterfaceStatusIcons_DynPal], r4_2 + 0x100, 2);
CpuCopy16(gPlttBufferUnfaded + 0x100 + r4_2, (void *)(OBJ_PLTT + r4_2 * 2), 2);
CpuCopy32(r6, OBJ_VRAM0 + (gSprites[a].oam.tileNum + r8) * 32, 96);
- if (IsDoubleBattle() == TRUE || GetBankSide(r7) == TRUE)
+ if (IsDoubleBattle() == TRUE || GetBattlerSide(r7) == TRUE)
{
if (!ewram17800[r7].unk0_4)
{
@@ -3074,7 +3074,7 @@ void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c)
u32 currhp;
r10 = gSprites[a].data[6];
- if (GetBankSide(r10) == 0)
+ if (GetBattlerSide(r10) == 0)
{
if (c == 3 || c == 0)
sub_8043FC0(a, GetMonData(pkmn, MON_DATA_LEVEL));
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index 01cfc73dd..f87e1f152 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -197,13 +197,13 @@ void sub_8121D1C(u8* textBuff);
void sub_8121D74(u8* textBuff);
void StrCpyDecodeBattleTextBuff(u8* src, u8* dst);
-u8 GetBankSide(u8 bank);
+u8 GetBattlerSide(u8 bank);
s32 sub_803FC34(u16);
void get_trainer_name(u8* dst);
u8 get_trainer_class_name_index(void);
u8 GetMultiplayerId(void);
u8 GetBattlerAtPosition(u8 ID);
-u8 GetBankSide(u8 bank);
+u8 GetBattlerSide(u8 bank);
u8 GetBattlerPosition(u8 bank);
#ifdef GERMAN
extern u8 *de_sub_804110C();
@@ -265,7 +265,7 @@ void BufferStringBattle(u16 stringID)
}
break;
case 1: // poke first send-out
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
@@ -305,7 +305,7 @@ void BufferStringBattle(u16 stringID)
}
break;
case 2: // sending poke to ball msg
- if (GetBankSide(gActiveBattler) == 0)
+ if (GetBattlerSide(gActiveBattler) == 0)
{
if (gBattleStruct->hpScale == 0)
stringPtr = BattleText_ComeBackSingle1;
@@ -335,7 +335,7 @@ void BufferStringBattle(u16 stringID)
}
break;
case 3: // switch-in msg
- if (GetBankSide(gBattleStruct->scriptingActive) == 0)
+ if (GetBattlerSide(gBattleStruct->scriptingActive) == 0)
{
if (gBattleStruct->hpScale == 0 || gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
stringPtr = BattleText_SentOutSingle7;
@@ -377,7 +377,7 @@ void BufferStringBattle(u16 stringID)
if (gBattleTextBuff1[0] & 0x80)
{
gBattleTextBuff1[0] &= ~(0x80);
- if (GetBankSide(gActiveBattler) == 1 && gBattleTextBuff1[0] != 3)
+ if (GetBattlerSide(gActiveBattler) == 1 && gBattleTextBuff1[0] != 3)
gBattleTextBuff1[0] ^= 3;
if (gBattleTextBuff1[0] == BATTLE_LOST || gBattleTextBuff1[0] == BATTLE_DREW)
stringPtr = BattleText_GotAwaySafely;
@@ -391,7 +391,7 @@ void BufferStringBattle(u16 stringID)
}
else
{
- if (GetBankSide(gActiveBattler) == 1 && gBattleTextBuff1[0] != 3)
+ if (GetBattlerSide(gActiveBattler) == 1 && gBattleTextBuff1[0] != 3)
gBattleTextBuff1[0] ^= 3;
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
@@ -483,7 +483,7 @@ extern u8 *de_sub_8041024(s32, u32);
#ifdef ENGLISH
#define HANDLE_NICKNAME_STRING_CASE(bank, monIndex) \
- if (GetBankSide(bank) != 0) \
+ if (GetBattlerSide(bank) != 0) \
{ \
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) \
toCpy = BattleText_Foe; \
@@ -505,7 +505,7 @@ extern u8 *de_sub_8041024(s32, u32);
toCpy = text;
#else
#define HANDLE_NICKNAME_STRING_CASE(bank, monIndex) \
- if (GetBankSide(bank) != 0) \
+ if (GetBattlerSide(bank) != 0) \
{ \
GetMonData(&gEnemyParty[monIndex], MON_DATA_NICKNAME, text); \
StringGetEnd10(text); \
@@ -618,7 +618,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
HANDLE_NICKNAME_STRING_CASE(gBankAttacker, gBattlerPartyIndexes[GetBattlerAtPosition(GetBattlerPosition(gBankAttacker) & 1)])
break;
case 11: // attacker partner name, only bank 0/1
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
GetMonData(&gPlayerParty[gBattlerPartyIndexes[GetBattlerAtPosition(GetBattlerPosition(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text);
else
GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetBattlerAtPosition(GetBattlerPosition(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text);
@@ -771,37 +771,37 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst)
toCpy = BattleText_Someone;
break;
case 38:
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
toCpy = BattleText_Ally2;
else
toCpy = BattleText_Foe3;
break;
case 39:
- if (GetBankSide(gBankTarget) == 0)
+ if (GetBattlerSide(gBankTarget) == 0)
toCpy = BattleText_Ally2;
else
toCpy = BattleText_Foe3;
break;
case 36:
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
toCpy = BattleText_Ally;
else
toCpy = BattleText_Foe2;
break;
case 37:
- if (GetBankSide(gBankTarget) == 0)
+ if (GetBattlerSide(gBankTarget) == 0)
toCpy = BattleText_Ally;
else
toCpy = BattleText_Foe2;
break;
case 40:
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
toCpy = BattleText_Ally3;
else
toCpy = BattleText_Foe4;
break;
case 41:
- if (GetBankSide(gBankTarget) == 0)
+ if (GetBattlerSide(gBankTarget) == 0)
toCpy = BattleText_Ally3;
else
toCpy = BattleText_Foe4;
@@ -884,7 +884,7 @@ void StrCpyDecodeBattleTextBuff(u8* src, u8* dst)
break;
case 4: // poke nick with prefix
#ifdef ENGLISH
- if (GetBankSide(src[srcID + 1]) == 0)
+ if (GetBattlerSide(src[srcID + 1]) == 0)
{
GetMonData(&gPlayerParty[src[srcID + 2]], MON_DATA_NICKNAME, text);
}
@@ -899,7 +899,7 @@ void StrCpyDecodeBattleTextBuff(u8* src, u8* dst)
StringGetEnd10(text);
StringAppend(dst, text);
#else
- if (GetBankSide(src[srcID + 1]) == 0)
+ if (GetBattlerSide(src[srcID + 1]) == 0)
{
GetMonData(&gPlayerParty[src[srcID + 2]], MON_DATA_NICKNAME, text);
StringGetEnd10(text);
@@ -927,7 +927,7 @@ void StrCpyDecodeBattleTextBuff(u8* src, u8* dst)
srcID += 3;
break;
case 7: // poke nick without prefix
- if (GetBankSide(src[srcID + 1]) == 0)
+ if (GetBattlerSide(src[srcID + 1]) == 0)
GetMonData(&gPlayerParty[src[srcID + 2]], MON_DATA_NICKNAME, dst);
else
GetMonData(&gEnemyParty[src[srcID + 2]], MON_DATA_NICKNAME, dst);
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index 9dc835d5c..be7269699 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -145,7 +145,7 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3)
{
int i, j;
u8 temp[6];
- if (!GetBankSide(arg3))
+ if (!GetBattlerSide(arg3))
{
i = GetBattlerAtPosition(0);
j = GetBattlerAtPosition(2);
@@ -664,7 +664,7 @@ static void Task_BattlePartyMenuShift(u8 taskId)
}
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (GetBankSide(i) == 0
+ if (GetBattlerSide(i) == 0
&& sub_8094C20(partySelection) == gBattlerPartyIndexes[i])
{
sub_806D5A4();
diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c
index 43364a24a..3441c0d14 100644
--- a/src/battle/battle_util.c
+++ b/src/battle/battle_util.c
@@ -79,7 +79,7 @@ extern const BattleCmdFunc gBattleScriptingCommandsTable[];
u8 IsImprisoned(u8 bank, u16 move);
u8 GetBattlerAtPosition(u8 ID);
u8 GetBattlerPosition(u8 bank);
-u8 GetBankSide(u8 bank);
+u8 GetBattlerSide(u8 bank);
void SetMoveEffect(bool8 primary, u8 certainArg);
bool8 UproarWakeUpCheck(u8 bank);
bool8 sub_8018018(u8 bank, u8, u8);
@@ -269,11 +269,11 @@ void PressurePPLoseOnUsingImprision(u8 bankAtk)
{
s32 i, j;
s32 imprisionPos = 4;
- u8 atkSide = GetBankSide(bankAtk);
+ u8 atkSide = GetBattlerSide(bankAtk);
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (atkSide != GetBankSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE)
+ if (atkSide != GetBattlerSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE)
{
for (j = 0; j < 4; j++)
{
@@ -427,7 +427,7 @@ void sub_8015740(u8 bank)
s32 i = 0;
u32 bits = 0;
- if (GetBankSide(bank) == B_SIDE_OPPONENT)
+ if (GetBattlerSide(bank) == B_SIDE_OPPONENT)
{
u8 id = ((bank & BIT_FLANK) >> 1);
gSentPokesToOpponent[id] = 0;
@@ -444,7 +444,7 @@ void sub_8015740(u8 bank)
void sub_80157C4(u8 bank)
{
- if (GetBankSide(bank) == B_SIDE_OPPONENT)
+ if (GetBattlerSide(bank) == B_SIDE_OPPONENT)
{
sub_8015740(bank);
}
@@ -582,11 +582,11 @@ bool8 AreAllMovesUnusable(void)
u8 IsImprisoned(u8 bank, u16 move)
{
u8 imprisionedMoves = 0;
- u8 bankSide = GetBankSide(bank);
+ u8 bankSide = GetBattlerSide(bank);
s32 i;
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (bankSide != GetBankSide(i) && gStatuses3[i] & STATUS3_IMPRISIONED)
+ if (bankSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISIONED)
{
s32 j;
for (j = 0; j < 4; j++)
@@ -1597,7 +1597,7 @@ bool8 sub_8018018(u8 bank, u8 r1, u8 r2)
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
r7 = sub_803FC34(bank);
- if (GetBankSide(bank) == 0)
+ if (GetBattlerSide(bank) == 0)
party = gPlayerParty;
else
party = gEnemyParty;
@@ -1611,7 +1611,7 @@ bool8 sub_8018018(u8 bank, u8 r1, u8 r2)
}
else
{
- if (GetBankSide(bank) == 1)
+ if (GetBattlerSide(bank) == 1)
{
r7 = GetBattlerAtPosition(1);
r6 = GetBattlerAtPosition(3);
@@ -1697,14 +1697,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
if (gBankAttacker >= gNoOfAllBanks)
gBankAttacker = bank;
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
pokeAtk = &gPlayerParty[gBattlerPartyIndexes[gBankAttacker]];
else
pokeAtk = &gEnemyParty[gBattlerPartyIndexes[gBankAttacker]];
if (gBankTarget >= gNoOfAllBanks)
gBankTarget = bank;
- if (GetBankSide(gBankTarget) == 0)
+ if (GetBattlerSide(gBankTarget) == 0)
pokeDef = &gPlayerParty[gBattlerPartyIndexes[gBankTarget]];
else
pokeDef = &gEnemyParty[gBattlerPartyIndexes[gBankTarget]];
@@ -2451,10 +2451,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
}
break;
case ABILITYEFFECT_CHECK_OTHER_SIDE: // 12
- side = GetBankSide(bank);
+ side = GetBattlerSide(bank);
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (GetBankSide(i) != side && gBattleMons[i].ability == ability)
+ if (GetBattlerSide(i) != side && gBattleMons[i].ability == ability)
{
gLastUsedAbility = ability;
effect = i + 1;
@@ -2462,10 +2462,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
}
break;
case ABILITYEFFECT_CHECK_BANK_SIDE: // 13
- side = GetBankSide(bank);
+ side = GetBattlerSide(bank);
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (GetBankSide(i) == side && gBattleMons[i].ability == ability)
+ if (GetBattlerSide(i) == side && gBattleMons[i].ability == ability)
{
gLastUsedAbility = ability;
effect = i + 1;
@@ -2522,10 +2522,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
}
break;
case ABILITYEFFECT_COUNT_OTHER_SIZE: // 16
- side = GetBankSide(bank);
+ side = GetBattlerSide(bank);
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (GetBankSide(i) != side && gBattleMons[i].ability == ability)
+ if (GetBattlerSide(i) != side && gBattleMons[i].ability == ability)
{
gLastUsedAbility = ability;
effect++;
@@ -2533,10 +2533,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
}
break;
case ABILITYEFFECT_COUNT_BANK_SIDE: // 17
- side = GetBankSide(bank);
+ side = GetBattlerSide(bank);
for (i = 0; i < gNoOfAllBanks; i++)
{
- if (GetBankSide(i) == side && gBattleMons[i].ability == ability)
+ if (GetBattlerSide(i) == side && gBattleMons[i].ability == ability)
{
gLastUsedAbility = ability;
effect++;
@@ -2692,7 +2692,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
u8 ppBonuses;
u16 move;
- if (GetBankSide(bank) == 0)
+ if (GetBattlerSide(bank) == 0)
poke = &gPlayerParty[gBattlerPartyIndexes[bank]];
else
poke = &gEnemyParty[gBattlerPartyIndexes[bank]];
@@ -3376,16 +3376,16 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target
switch (moveTarget)
{
case 0:
- side = GetBankSide(gBankAttacker) ^ 1;
+ side = GetBattlerSide(gBankAttacker) ^ 1;
if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
targetBank = gSideTimers[side].followmeTarget;
else
{
- side = GetBankSide(gBankAttacker);
+ side = GetBattlerSide(gBankAttacker);
do
{
targetBank = Random() % gNoOfAllBanks;
- } while (targetBank == gBankAttacker || side == GetBankSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]);
+ } while (targetBank == gBankAttacker || side == GetBattlerSide(targetBank) || gAbsentBattlerFlags & gBitTable[targetBank]);
if (gBattleMoves[move].type == TYPE_ELECTRIC
&& AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIZE, gBankAttacker, ABILITY_LIGHTNING_ROD, 0, 0)
&& gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD)
@@ -3405,12 +3405,12 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target
targetBank ^= 2;
break;
case 4:
- side = GetBankSide(gBankAttacker) ^ 1;
+ side = GetBattlerSide(gBankAttacker) ^ 1;
if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp)
targetBank = gSideTimers[side].followmeTarget;
else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & 4)
{
- if (GetBankSide(gBankAttacker) == 0)
+ if (GetBattlerSide(gBankAttacker) == 0)
{
if (Random() & 1)
targetBank = GetBattlerAtPosition(1);
@@ -3446,7 +3446,7 @@ u8 IsMonDisobedient(void)
s32 calc;
if (gBattleTypeFlags & BATTLE_TYPE_LINK
- || GetBankSide(gBankAttacker) == 1
+ || GetBattlerSide(gBankAttacker) == 1
|| !IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName))
return 0;
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index 217ab28a3..5e63ee92c 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
@@ -71,7 +71,7 @@ const u8 gHoldEffectToType[][2] =
{HOLD_EFFECT_NORMAL_POWER, TYPE_NORMAL}
};
-u8 GetBankSide(u8 bank);
+u8 GetBattlerSide(u8 bank);
#define APPLY_STAT_MOD(var, mon, stat, statIndex) \
{ \
@@ -137,7 +137,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
&& gTrainerBattleOpponent != 1024
&& FlagGet(FLAG_BADGE01_GET)
- && !GetBankSide(bankAtk))
+ && !GetBattlerSide(bankAtk))
attack = (110 * attack) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)))
@@ -145,7 +145,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
&& gTrainerBattleOpponent != 1024
&& FlagGet(FLAG_BADGE05_GET)
- && !GetBankSide(bankDef))
+ && !GetBattlerSide(bankDef))
defense = (110 * defense) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)))
@@ -153,7 +153,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
&& gTrainerBattleOpponent != 1024
&& FlagGet(FLAG_BADGE07_GET)
- && !GetBankSide(bankAtk))
+ && !GetBattlerSide(bankAtk))
spAttack = (110 * spAttack) / 100;
}
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)))
@@ -161,7 +161,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER)
&& gTrainerBattleOpponent != 1024
&& FlagGet(FLAG_BADGE07_GET)
- && !GetBankSide(bankDef))
+ && !GetBattlerSide(bankDef))
spDefense = (110 * spDefense) / 100;
}
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 606bc3e50..91754b4d3 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -357,7 +357,7 @@ static void sub_8046464(u8 taskId)
}
r8 = gTasks[taskId].data[2];
r5 = gTasks[taskId].data[3];
- if (GetBankSide(r5) != 0)
+ if (GetBattlerSide(r5) != 0)
ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[r5]], MON_DATA_POKEBALL);
else
ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[r5]], MON_DATA_POKEBALL);
@@ -711,7 +711,7 @@ static void sub_8046C78(struct Sprite *sprite)
u16 r4_2;
u8 taskId;
- if (GetBankSide(r5) != 0)
+ if (GetBattlerSide(r5) != 0)
{
pkmn = &gEnemyParty[gBattlerPartyIndexes[r5]];
r8 = 25;
@@ -1102,7 +1102,7 @@ void sub_804777C(u8 a)
sprite->pos2.x = 0x73;
sprite->pos2.y = 0;
sprite->callback = sub_8047830;
- if (GetBankSide(a) != 0)
+ if (GetBattlerSide(a) != 0)
{
sprite->data[0] = -sprite->data[0];
sprite->data[1] = -sprite->data[1];
@@ -1187,7 +1187,7 @@ void sub_804794C(u8 a)
static u16 sub_8047978(u8 a)
{
- if (GetBankSide(a) == 0)
+ if (GetBattlerSide(a) == 0)
return GetMonData(&gPlayerParty[gBattlerPartyIndexes[a]], MON_DATA_POKEBALL);
else
return GetMonData(&gEnemyParty[gBattlerPartyIndexes[a]], MON_DATA_POKEBALL);
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index bc25f8e15..fe80168fd 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -207,7 +207,7 @@ static bool8 LoadAppropiateBankSprite(u8 bank)
{
if (bank < gNoOfAllBanks)
{
- if (GetBankSide(bank))
+ if (GetBattlerSide(bank))
{
if (!ewram17800[bank].substituteSprite)
BattleLoadOpponentMonSprite(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
@@ -238,7 +238,7 @@ static void sub_807B184(u8 bank)
posY = sub_8077F7C(bank);
else
posY = sub_8077F68(bank);
- if (GetBankSide(bank))
+ if (GetBattlerSide(bank))
{
if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
return;
@@ -300,7 +300,7 @@ static void sub_807B508(u8 bank)
gHealthboxIDs[bank] = healthboxID;
sub_8043F44(bank);
sub_8043DFC(healthboxID);
- if (GetBankSide(bank))
+ if (GetBattlerSide(bank))
sub_8045A5C(gHealthboxIDs[bank], &gEnemyParty[gBattlerPartyIndexes[bank]], 0);
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
sub_8045A5C(gHealthboxIDs[bank], &gPlayerParty[gBattlerPartyIndexes[bank]], 10);
@@ -310,7 +310,7 @@ static void sub_807B508(u8 bank)
nullsub_11(gHealthboxIDs[bank], 1);
else
nullsub_11(gHealthboxIDs[bank], 0);
- if (GetBankSide(bank))
+ if (GetBattlerSide(bank))
{
if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
sub_8043DB0(healthboxID);
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index a618fdec5..9c60ea108 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -67,14 +67,14 @@ u8 CountAliveMons(u8 a1)
case 1:
for (i = 0; i < 4; i++)
{
- if (GetBankSide(i) == GetBankSide(gBankAttacker) && !(gAbsentBattlerFlags & gBitTable[i]))
+ if (GetBattlerSide(i) == GetBattlerSide(gBankAttacker) && !(gAbsentBattlerFlags & gBitTable[i]))
retVal++;
}
break;
case 2:
for (i = 0; i < 4; i++)
{
- if (GetBankSide(i) == GetBankSide(gBankTarget) && !(gAbsentBattlerFlags & gBitTable[i]))
+ if (GetBattlerSide(i) == GetBattlerSide(gBankTarget) && !(gAbsentBattlerFlags & gBitTable[i]))
retVal++;
}
break;
@@ -1226,7 +1226,7 @@ void CopyPlayerPartyMonToBattleData(u8 battleIndex, u8 partyIndex)
GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname);
StringCopy10(gBattleMons[battleIndex].nickname, nickname);
GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[battleIndex].otName);
- ewram160BC[GetBankSide(battleIndex)] = gBattleMons[battleIndex].hp;
+ ewram160BC[GetBattlerSide(battleIndex)] = gBattleMons[battleIndex].hp;
for (i = 0; i < 8; i++)
gBattleMons[battleIndex].statStages[i] = 6;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index d35551613..791dd5d2f 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1298,7 +1298,7 @@ void sub_8040B8C(void)
gBattleTextBuff1[1] = 4;
gBattleTextBuff1[2] = gBattleStruct->unk16054;
gBattleTextBuff1[4] = EOS;
- if (!GetBankSide(gBattleStruct->unk16054))
+ if (!GetBattlerSide(gBattleStruct->unk16054))
gBattleTextBuff1[3] = pokemon_order_func(gBattlerPartyIndexes[gBattleStruct->unk16054]);
else
gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->unk16054];
diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c
index 6f1e9dabb..aa6e49877 100644
--- a/src/pokemon_item_effect.c
+++ b/src/pokemon_item_effect.c
@@ -79,7 +79,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
if (gMain.inBattle)
{
gActiveBattler = gBankInMenu;
- cmdIndex = (GetBankSide(gActiveBattler) != 0);
+ cmdIndex = (GetBattlerSide(gActiveBattler) != 0);
while (cmdIndex < gNoOfAllBanks)
{
if (gBattlerPartyIndexes[cmdIndex] == partyIndex)
@@ -180,9 +180,9 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
break;
case 3:
if ((itemEffect[cmdIndex] & 0x80)
- && gSideTimers[GetBankSide(gActiveBattler)].mistTimer == 0)
+ && gSideTimers[GetBattlerSide(gActiveBattler)].mistTimer == 0)
{
- gSideTimers[GetBankSide(gActiveBattler)].mistTimer = 5;
+ gSideTimers[GetBattlerSide(gActiveBattler)].mistTimer = 5;
retVal = FALSE;
}
if ((itemEffect[cmdIndex] & 0x40) // raise level
@@ -280,13 +280,13 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
{
gAbsentBattlerFlags &= ~gBitTable[sp34];
CopyPlayerPartyMonToBattleData(sp34, pokemon_order_func(gBattlerPartyIndexes[sp34]));
- if (GetBankSide(gActiveBattler) == 0 && gBattleResults.unk4 < 255)
+ if (GetBattlerSide(gActiveBattler) == 0 && gBattleResults.unk4 < 255)
gBattleResults.unk4++;
}
else
{
gAbsentBattlerFlags &= ~gBitTable[gActiveBattler ^ 2];
- if (GetBankSide(gActiveBattler) == 0 && gBattleResults.unk4 < 255)
+ if (GetBattlerSide(gActiveBattler) == 0 && gBattleResults.unk4 < 255)
gBattleResults.unk4++;
}
}
@@ -325,7 +325,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
if (gMain.inBattle && sp34 != 4)
{
gBattleMons[sp34].hp = data;
- if (!(r10 & 0x10) && GetBankSide(gActiveBattler) == 0)
+ if (!(r10 & 0x10) && GetBattlerSide(gActiveBattler) == 0)
{
if (gBattleResults.unk3 < 255)
gBattleResults.unk3++;
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 2df2360dc..0a0c89cf4 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -186,7 +186,7 @@ u8 GetBankPosition(u8 slot, u8 a2)
}
else
{
- if (GetBankSide(slot))
+ if (GetBattlerSide(slot))
{
transform = &eTransformStatuses[slot];
if (!transform->species)
@@ -220,7 +220,7 @@ u8 sub_8077BFC(u8 slot, u16 species)
u8 ret;
u16 var;
- if (GetBankSide(slot) == 0 || IsContest())
+ if (GetBattlerSide(slot) == 0 || IsContest())
{
if (species == SPECIES_UNOWN)
{
@@ -294,7 +294,7 @@ u8 sub_8077BFC(u8 slot, u16 species)
u8 sub_8077DD8(u8 slot, u16 species)
{
u8 ret = 0;
- if (GetBankSide(slot) == 1)
+ if (GetBattlerSide(slot) == 1)
{
if (!IsContest())
{
@@ -314,7 +314,7 @@ u8 sub_8077E44(u8 slot, u16 species, u8 a3)
u16 offset;
u8 y;
- if (GetBankSide(slot) == 0 || IsContest())
+ if (GetBattlerSide(slot) == 0 || IsContest())
{
offset = sub_8077BFC(slot, species);
}
@@ -326,7 +326,7 @@ u8 sub_8077E44(u8 slot, u16 species, u8 a3)
y = offset + gUnknown_0837F578[IS_DOUBLE_BATTLE()][GetBattlerPosition(slot)].field_1;
if (a3)
{
- if (GetBankSide(slot) == 0)
+ if (GetBattlerSide(slot) == 0)
y += 8;
if (y > 104)
y = 104;
@@ -374,7 +374,7 @@ u8 sub_8077F68(u8 slot)
u8 sub_8077F7C(u8 slot)
{
u16 var;
- if (GetBankSide(slot) != 0)
+ if (GetBattlerSide(slot) != 0)
var = GetBankPosition(slot, 1) + 16;
else
var = GetBankPosition(slot, 1) + 17;
@@ -390,7 +390,7 @@ u8 sub_8077FC0(u8 slot)
r6 = GetBankPosition(slot, 1);
if (!IsContest())
{
- if (GetBankSide(slot) != 0)
+ if (GetBattlerSide(slot) != 0)
{
transform = &eTransformStatuses[slot];
if (!transform->species) {
@@ -407,7 +407,7 @@ u8 sub_8077FC0(u8 slot)
else
var = transform->species;
}
- if (GetBankSide(slot) != 0)
+ if (GetBattlerSide(slot) != 0)
r6 -= sub_8077DD8(slot, var);
}
return r6;
@@ -760,7 +760,7 @@ void sub_807867C(struct Sprite *sprite, s16 a2)
}
else
{
- if (GetBankSide(gAnimBankAttacker) != 0)
+ if (GetBattlerSide(gAnimBankAttacker) != 0)
sprite->pos1.x -= a2;
else
sprite->pos1.x += a2;
@@ -820,7 +820,7 @@ void InitAnimSpritePos(struct Sprite *sprite, u8 a2)
sprite->pos1.y += gBattleAnimArgs[1];
}
-u8 GetBankSide(u8 slot)
+u8 GetBattlerSide(u8 slot)
{
return gBanksBySide[slot] & 1;
}
@@ -856,7 +856,7 @@ bool8 IsBankSpritePresent(u8 slot)
{
if (gBanksBySide[slot] == 0xff)
return FALSE;
- if (GetBankSide(slot) != B_SIDE_PLAYER)
+ if (GetBattlerSide(slot) != B_SIDE_PLAYER)
{
if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0)
return TRUE;
@@ -1421,7 +1421,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
v2 = 1;
InitAnimSpritePos(sprite, v1);
- if (GetBankSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+ if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
@@ -1434,7 +1434,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
void sub_80794A8(struct Sprite *sprite)
{
InitAnimSpritePos(sprite, 1);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2];
@@ -1474,7 +1474,7 @@ void sub_8079534(struct Sprite *sprite)
sub_8078764(sprite, r4);
slot = gAnimBankTarget;
}
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sub_8078764(sprite, r4);
sprite->data[0] = gBattleAnimArgs[4];
@@ -1767,7 +1767,7 @@ u16 sub_8079B10(u8 sprite)
}
else
{
- if (!GetBankSide(i))
+ if (!GetBattlerSide(i))
{
transform = &eTransformStatuses[slot];
if (!transform->species)
@@ -2037,7 +2037,7 @@ s16 sub_807A100(u8 slot, u8 a2)
}
else
{
- if (!GetBankSide(slot))
+ if (!GetBattlerSide(slot))
{
transform = &eTransformStatuses[slot];
if (!transform->species)
@@ -2176,7 +2176,7 @@ u8 sub_807A4A0(int bank, u8 sprite, int species)
void sub_807A544(struct Sprite *sprite)
{
sub_8078650(sprite);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[0];
gBattleAnimArgs[3] = -gBattleAnimArgs[3];
@@ -2197,7 +2197,7 @@ void sub_807A544(struct Sprite *sprite)
void sub_807A5C4(struct Sprite *sprite)
{
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
{
sprite->pos1.x -= gBattleAnimArgs[0];
gBattleAnimArgs[3] *= -1;
@@ -2221,7 +2221,7 @@ void sub_807A5C4(struct Sprite *sprite)
void sub_807A63C(struct Sprite *sprite)
{
sub_8078650(sprite);
- if (GetBankSide(gAnimBankAttacker))
+ if (GetBattlerSide(gAnimBankAttacker))
sprite->pos1.x -= gBattleAnimArgs[0];
else
sprite->pos1.x += gBattleAnimArgs[0];
@@ -2238,7 +2238,7 @@ void sub_807A69C(u8 taskId)
u16 dest;
struct Task *task = &gTasks[taskId];
task->data[0] = GetAnimBankSpriteId(0);
- task->data[1] = (GetBankSide(gAnimBankAttacker)) ? -8 : 8;
+ task->data[1] = (GetBattlerSide(gAnimBankAttacker)) ? -8 : 8;
task->data[2] = 0;
task->data[3] = 0;
gSprites[task->data[0]].pos2.x -= task->data[0];
@@ -2320,7 +2320,7 @@ void sub_807A8D4(struct Sprite *sprite)
void sub_807A908(struct Sprite *sprite) {
sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
- if (!GetBankSide(gAnimBankAttacker))
+ if (!GetBattlerSide(gAnimBankAttacker))
sprite->data[0] = 5;
else
sprite->data[0] = -10;
@@ -2346,7 +2346,7 @@ void sub_807A9BC(struct Sprite *sprite)
sprite->data[0] = gBattleAnimArgs[2];
sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4];
sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5];
- if (!GetBankSide(gAnimBankTarget))
+ if (!GetBattlerSide(gAnimBankTarget))
{
x = (u16)gBattleAnimArgs[4] + 30;
sprite->pos1.x += x;