summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/anim/current.c234
-rw-r--r--src/battle/anim/dark.c14
-rw-r--r--src/battle/anim/dragon.c8
-rw-r--r--src/battle/anim/fight.c12
-rw-r--r--src/battle/anim/ghost.c4
-rw-r--r--src/battle/anim/ground.c4
-rw-r--r--src/battle/anim/ice.c2
-rw-r--r--src/battle/anim/lunge.c14
-rw-r--r--src/battle/anim/normal.c54
-rw-r--r--src/battle/anim/psychic.c6
-rw-r--r--src/battle/anim/ring.c14
-rw-r--r--src/battle/anim/tile.c8
-rw-r--r--src/battle/anim/unused_7.c4
-rw-r--r--src/battle/anim/wisp_fire.c4
-rw-r--r--src/battle/anim/withdraw.c6
15 files changed, 88 insertions, 300 deletions
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 23bf9373d..165bded09 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -484,12 +484,11 @@ void sub_80D681C(u8 taskId)
gTasks[taskId].func = sub_80D6874;
}
-#ifdef NONMATCHING // couldn't get the proper tail merging in the "CreateSprite" switch cases.
static void sub_80D6874(u8 taskId)
{
u16 r8;
+ u16 r2;
s16 r12;
- s16 r2;
u8 spriteId = 0;
u8 r7 = 0;
u8 sp = gTasks[taskId].data[2];
@@ -512,27 +511,31 @@ static void sub_80D6874(u8 taskId)
switch (gTasks[taskId].data[10])
{
case 0:
- r8 += r2 * 0;
- spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + (r12 * 1), 2);
+ r12 *= 1;
+ spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + r12, 2);
r7++;
break;
case 2:
+ r12 *= 2;
r8 += r2;
- spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + (r12 * 2), 2);
+ spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + r12, 2);
r7++;
break;
case 4:
+ r12 *= 3;
r8 += r2 * 2;
- spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + (r12 * 3), 2);
+ spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + r12, 2);
r7++;
break;
case 6:
+ r12 *= 4;
r8 += r2 * 3;
- spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + (r12 * 4), 2);
+ spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + r12, 2);
r7++;
break;
case 8:
- spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + (r12 * 5), 2);
+ r12 *= 5;
+ spriteId = CreateSprite(&gSpriteTemplate_83D9938, r4, r6 + r12, 2);
r7++;
break;
case 10:
@@ -549,221 +552,6 @@ static void sub_80D6874(u8 taskId)
gTasks[taskId].data[10]++;
}
-#else
-NAKED
-static void sub_80D6874(u8 taskId)
-{
- asm(".syntax unified\n\
- push {r4-r7,lr}\n\
- mov r7, r10\n\
- mov r6, r9\n\
- mov r5, r8\n\
- push {r5-r7}\n\
- sub sp, 0x4\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- mov r9, r0\n\
- movs r5, 0\n\
- movs r7, 0\n\
- ldr r1, _080D68B4 @ =gTasks\n\
- lsls r0, 2\n\
- add r0, r9\n\
- lsls r0, 3\n\
- adds r0, r1\n\
- ldrb r2, [r0, 0xC]\n\
- str r2, [sp]\n\
- ldrh r4, [r0, 0x8]\n\
- ldrh r6, [r0, 0xA]\n\
- movs r3, 0xC\n\
- ldrsh r0, [r0, r3]\n\
- mov r10, r1\n\
- cmp r0, 0\n\
- bne _080D68B8\n\
- movs r0, 0\n\
- mov r8, r0\n\
- movs r2, 0x1\n\
- movs r1, 0x10\n\
- mov r12, r1\n\
- b _080D68C2\n\
- .align 2, 0\n\
-_080D68B4: .4byte gTasks\n\
-_080D68B8:\n\
- movs r2, 0x10\n\
- mov r12, r2\n\
- movs r3, 0x8\n\
- mov r8, r3\n\
- movs r2, 0x4\n\
-_080D68C2:\n\
- mov r0, r9\n\
- lsls r1, r0, 2\n\
- adds r0, r1, r0\n\
- lsls r0, 3\n\
- add r0, r10\n\
- movs r3, 0x1C\n\
- ldrsh r0, [r0, r3]\n\
- mov r10, r1\n\
- cmp r0, 0xA\n\
- bhi _080D69B8\n\
- lsls r0, 2\n\
- ldr r1, _080D68E0 @ =_080D68E4\n\
- adds r0, r1\n\
- ldr r0, [r0]\n\
- mov pc, r0\n\
- .align 2, 0\n\
-_080D68E0: .4byte _080D68E4\n\
- .align 2, 0\n\
-_080D68E4:\n\
- .4byte _080D6910\n\
- .4byte _080D69B8\n\
- .4byte _080D6924\n\
- .4byte _080D69B8\n\
- .4byte _080D6944\n\
- .4byte _080D69B8\n\
- .4byte _080D695A\n\
- .4byte _080D69B8\n\
- .4byte _080D697C\n\
- .4byte _080D69B8\n\
- .4byte _080D69B0\n\
-_080D6910:\n\
- ldr r0, _080D6920 @ =gSpriteTemplate_83D9938\n\
- lsls r1, r4, 16\n\
- asrs r1, 16\n\
- lsls r2, r6, 16\n\
- asrs r2, 16\n\
- mov r4, r12\n\
- lsls r3, r4, 16\n\
- b _080D6992\n\
- .align 2, 0\n\
-_080D6920: .4byte gSpriteTemplate_83D9938\n\
-_080D6924:\n\
- mov r0, r12\n\
- lsls r3, r0, 17\n\
- mov r1, r8\n\
- adds r0, r1, r2\n\
- lsls r0, 16\n\
- lsrs r0, 16\n\
- mov r8, r0\n\
- ldr r0, _080D6940 @ =gSpriteTemplate_83D9938\n\
- lsls r1, r4, 16\n\
- asrs r1, 16\n\
- lsls r2, r6, 16\n\
- asrs r2, 16\n\
- b _080D6992\n\
- .align 2, 0\n\
-_080D6940: .4byte gSpriteTemplate_83D9938\n\
-_080D6944:\n\
- mov r3, r12\n\
- lsls r0, r3, 16\n\
- asrs r0, 16\n\
- lsls r3, r0, 1\n\
- adds r3, r0\n\
- lsls r0, r2, 1\n\
- add r0, r8\n\
- lsls r0, 16\n\
- lsrs r0, 16\n\
- mov r8, r0\n\
- b _080D6986\n\
-_080D695A:\n\
- mov r0, r12\n\
- lsls r3, r0, 18\n\
- lsls r0, r2, 1\n\
- adds r0, r2\n\
- add r0, r8\n\
- lsls r0, 16\n\
- lsrs r0, 16\n\
- mov r8, r0\n\
- ldr r0, _080D6978 @ =gSpriteTemplate_83D9938\n\
- lsls r1, r4, 16\n\
- asrs r1, 16\n\
- lsls r2, r6, 16\n\
- asrs r2, 16\n\
- b _080D6992\n\
- .align 2, 0\n\
-_080D6978: .4byte gSpriteTemplate_83D9938\n\
-_080D697C:\n\
- mov r1, r12\n\
- lsls r0, r1, 16\n\
- asrs r0, 16\n\
- lsls r3, r0, 2\n\
- adds r3, r0\n\
-_080D6986:\n\
- ldr r0, _080D69AC @ =gSpriteTemplate_83D9938\n\
- lsls r1, r4, 16\n\
- asrs r1, 16\n\
- lsls r2, r6, 16\n\
- asrs r2, 16\n\
- lsls r3, 16\n\
-_080D6992:\n\
- asrs r3, 16\n\
- adds r2, r3\n\
- lsls r2, 16\n\
- asrs r2, 16\n\
- movs r3, 0x2\n\
- bl CreateSprite\n\
- lsls r0, 24\n\
- lsrs r5, r0, 24\n\
- adds r0, r7, 0x1\n\
- lsls r0, 24\n\
- lsrs r7, r0, 24\n\
- b _080D69B8\n\
- .align 2, 0\n\
-_080D69AC: .4byte gSpriteTemplate_83D9938\n\
-_080D69B0:\n\
- mov r0, r9\n\
- bl DestroyAnimVisualTask\n\
- b _080D69FC\n\
-_080D69B8:\n\
- cmp r7, 0\n\
- beq _080D69EC\n\
- ldr r4, _080D6A0C @ =gSprites\n\
- lsls r3, r5, 4\n\
- adds r3, r5\n\
- lsls r3, 2\n\
- adds r0, r3, r4\n\
- ldrh r5, [r0, 0x4]\n\
- lsls r2, r5, 22\n\
- lsrs r2, 22\n\
- add r2, r8\n\
- ldr r6, _080D6A10 @ =0x000003ff\n\
- adds r1, r6, 0\n\
- ands r2, r1\n\
- ldr r1, _080D6A14 @ =0xfffffc00\n\
- ands r1, r5\n\
- orrs r1, r2\n\
- strh r1, [r0, 0x4]\n\
- mov r1, sp\n\
- ldrh r1, [r1]\n\
- strh r1, [r0, 0x2E]\n\
- adds r4, 0x1C\n\
- adds r3, r4\n\
- ldr r1, [r3]\n\
- bl _call_via_r1\n\
-_080D69EC:\n\
- ldr r0, _080D6A18 @ =gTasks\n\
- mov r1, r10\n\
- add r1, r9\n\
- lsls r1, 3\n\
- adds r1, r0\n\
- ldrh r0, [r1, 0x1C]\n\
- adds r0, 0x1\n\
- strh r0, [r1, 0x1C]\n\
-_080D69FC:\n\
- add sp, 0x4\n\
- pop {r3-r5}\n\
- mov r8, r3\n\
- mov r9, r4\n\
- mov r10, r5\n\
- pop {r4-r7}\n\
- pop {r0}\n\
- bx r0\n\
- .align 2, 0\n\
-_080D6A0C: .4byte gSprites\n\
-_080D6A10: .4byte 0x000003ff\n\
-_080D6A14: .4byte 0xfffffc00\n\
-_080D6A18: .4byte gTasks\n\
- .syntax divided\n");
-}
-#endif
void sub_80D6A1C(struct Sprite *sprite)
{
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index f98623ee6..d3d992bda 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -14,7 +14,7 @@
extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
extern u16 gBattle_BG2_X;
@@ -233,7 +233,7 @@ static void sub_80DFC9C(u8 taskId)
gTasks[taskId].data[2] = 0;
if (r2 == 16)
{
- gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible = 1;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = 1;
DestroyAnimVisualTask(taskId);
}
}
@@ -957,12 +957,12 @@ void sub_80E0918(u8 taskId)
{
u8 toBG2 = GetBattlerPosition_permutated(gBattleAnimAttacker) ^ 1 ? 1 : 0;
MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2);
- gSprites[gBankSpriteIds[gBattleAnimAttacker]].invisible = 0;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = 0;
if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
{
MoveBattlerSpriteToBG(gBattleAnimAttacker ^ 2, toBG2 ^ 1);
- gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].invisible = 0;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].invisible = 0;
}
DestroyAnimVisualTask(taskId);
@@ -1015,7 +1015,7 @@ void sub_80E0A4C(u8 taskId)
{
if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2) == TRUE)
{
- gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority--;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority--;
REG_BG1CNT_BITFIELD.priority = 1;
var0 = 1;
}
@@ -1101,7 +1101,7 @@ static void sub_80E0CD0(u8 taskId)
if (gTasks[taskIdCopy].data[6] == 1)
{
- gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++;
}
DestroyAnimVisualTask(taskIdCopy);
@@ -1149,7 +1149,7 @@ void sub_80E0E24(u8 taskId)
{
bank = GetBattlerAtPosition(identity);
if (IsAnimBankSpriteVisible(bank))
- spriteId = gBankSpriteIds[bank];
+ spriteId = gBattlerSpriteIds[bank];
else
spriteId = 0xFF;
}
diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c
index b59e8aff4..6ac0746a3 100644
--- a/src/battle/anim/dragon.c
+++ b/src/battle/anim/dragon.c
@@ -8,11 +8,11 @@
extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBankAttacker;
+extern u8 gBattlerAttacker;
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG2_X;
extern u16 gUnknown_03000730[];
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
void sub_80DF5A0(struct Sprite *sprite);
void sub_80DF760(struct Sprite *sprite);
@@ -286,8 +286,8 @@ void sub_80DF78C(struct Sprite *sprite)
sprite->data[4] = 0;
sprite->data[5] = 1;
sprite->data[6] = gBattleAnimArgs[0];
- r5 = GetBattlerSpriteCoordAttr(gBankAttacker, 0);
- r0 = GetBattlerSpriteCoordAttr(gBankAttacker, 1);
+ r5 = GetBattlerSpriteCoordAttr(gBattlerAttacker, 0);
+ r0 = GetBattlerSpriteCoordAttr(gBattlerAttacker, 1);
if (r5 > r0)
sprite->data[7] = r5 / 2;
else
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 6b8d8a3b5..8d045c42d 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -8,10 +8,10 @@
#include "constants/battle.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBankAttacker;
+extern u8 gBattlerAttacker;
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
extern u8 gBanksBySide[];
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
@@ -817,8 +817,8 @@ void sub_80D97CC(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
sprite->data[7] = gBattleAnimTarget;
}
@@ -919,8 +919,8 @@ void sub_80D9A38(struct Sprite *sprite)
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
bank = gBattleAnimTarget;
sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
}
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index d2db76975..4dea1ed1d 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -11,7 +11,7 @@
#include "constants/songs.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
extern u8 gUnknown_0202F7D2;
@@ -1302,7 +1302,7 @@ static void sub_80DF3D8(struct Sprite *sprite)
static void sub_80DF49C(struct Sprite *sprite)
{
sprite->invisible = 1;
- sprite->data[5] = gBankSpriteIds[gBattleAnimAttacker];
+ sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker];
sprite->data[0] = 128;
sprite->data[1] = 10;
sprite->data[2] = gBattleAnimArgs[0];
diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c
index 2828be7be..8d342a2f6 100644
--- a/src/battle/anim/ground.c
+++ b/src/battle/anim/ground.c
@@ -17,7 +17,7 @@ extern u16 gBattle_BG2_Y;
extern u16 gBattle_BG3_X;
extern u16 gBattle_BG3_Y;
extern u16 gAnimMovePower;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
static void AnimBonemerangProjectile(struct Sprite *sprite);
static void AnimBonemerangProjectileStep(struct Sprite *sprite);
@@ -593,7 +593,7 @@ void sub_80E1864(u8 taskId)
{
if (IsAnimBankSpriteVisible(i))
{
- task->data[task->data[13] + 9] = gBankSpriteIds[i];
+ task->data[task->data[13] + 9] = gBattlerSpriteIds[i];
task->data[13]++;
}
}
diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c
index 76300df4b..4002ceec1 100644
--- a/src/battle/anim/ice.c
+++ b/src/battle/anim/ice.c
@@ -15,7 +15,7 @@ extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
extern u8 gAnimVisualTaskCount;
extern u8 gBanksBySide[];
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
diff --git a/src/battle/anim/lunge.c b/src/battle/anim/lunge.c
index 381392e71..f23b34efc 100644
--- a/src/battle/anim/lunge.c
+++ b/src/battle/anim/lunge.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
void sub_80CD774(struct Sprite* sprite);
void sub_80CD9C4(struct Sprite* sprite);
@@ -73,7 +73,7 @@ static void sub_80CD7CC(struct Sprite* sprite)
sprite->data[0] = 6;
sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2;
sprite->data[2] = 0;
- sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+ sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
StoreSpriteCallbackInData(sprite, sub_80CD81C);
sprite->callback = TranslateMonBGUntil;
}
@@ -82,7 +82,7 @@ static void sub_80CD81C(struct Sprite* sprite)
{
if (sprite->data[0] == 0)
{
- sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+ sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
PrepareBattlerSpriteForRotScale(sprite->data[3], 0);
sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : 0xFFFFFD00;
sprite->data[5] = 0;
@@ -103,7 +103,7 @@ static void sub_80CD8A8(struct Sprite* sprite)
sprite->data[0] = 4;
sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3;
sprite->data[2] = 0;
- sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+ sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
StoreSpriteCallbackInData(sprite, sub_80CD9B8);
sprite->callback = TranslateMonBGUntil;
}
@@ -121,7 +121,7 @@ static void sub_80CD91C(struct Sprite* sprite)
{
if (sprite->data[0] == 0)
{
- sprite->data[3] = gBankSpriteIds[gBattleAnimAttacker];
+ sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
sprite->data[6] = GetBattlerSide(gBattleAnimAttacker);
if (GetBattlerSide(gBattleAnimAttacker))
{
@@ -162,7 +162,7 @@ static void sub_80CD9D4(struct Sprite* sprite)
{
case 0:
sprite->data[1] = 0;
- sprite->data[2] = gBankSpriteIds[gBattleAnimAttacker];
+ sprite->data[2] = gBattlerSpriteIds[gBattleAnimAttacker];
sprite->data[3] = GetBattlerSide(gBattleAnimAttacker);
sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200;
sprite->data[5] = 0;
@@ -196,7 +196,7 @@ void sub_80CDAC8(u8 taskId)
{
u8 a;
- gTasks[taskId].data[0] = gBankSpriteIds[gBattleAnimAttacker];
+ gTasks[taskId].data[0] = gBattlerSpriteIds[gBattleAnimAttacker];
a = GetBattlerSide(gBattleAnimAttacker);
gTasks[taskId].data[1] = a;
gTasks[taskId].data[2] = 0;
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index b611ca62e..ef7f50f00 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -16,14 +16,14 @@
extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gHealthboxIDs[];
+extern u8 gHealthboxSpriteIds[];
extern u8 gBattlersCount;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
extern u8 gBattleTerrain;
extern u16 gBattlerPartyIndexes[];
-extern u8 gBankTarget;
-extern u8 gEffectBank;
-extern u8 gBankAttacker;
+extern u8 gBattlerTarget;
+extern u8 gEffectBattler;
+extern u8 gBattlerAttacker;
extern u8 gAnimVisualTaskCount;
extern const u8 gUnknown_08D20A14[];
@@ -702,7 +702,7 @@ void unref_sub_80E23A8(u8 taskId)
if (gTasks[taskId].data[2] & 0x1)
{
- paletteIndex = IndexOfSpritePaletteTag(gSprites[gHealthboxIDs[attackerBattler]].template->paletteTag);
+ paletteIndex = IndexOfSpritePaletteTag(gSprites[gHealthboxSpriteIds[attackerBattler]].template->paletteTag);
selectedPalettes |= ((1 << paletteIndex) << 16);
}
@@ -781,7 +781,7 @@ static void sub_80E255C(struct Sprite *sprite)
if (var0 < 2)
{
for (i = 0; i < gBattlersCount; i++)
- gSprites[gBankSpriteIds[i]].coordOffsetEnabled = 0;
+ gSprites[gBattlerSpriteIds[i]].coordOffsetEnabled = 0;
}
DestroyAnimSprite(sprite);
@@ -790,20 +790,20 @@ static void sub_80E255C(struct Sprite *sprite)
static void sub_80E260C(void)
{
- gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 0;
- gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 0;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 0;
+ gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 0;
if (gBattleAnimArgs[4] == 2)
{
- gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1;
- gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1;
+ gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1;
}
else
{
if (gBattleAnimArgs[4] == 0)
- gSprites[gBankSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].coordOffsetEnabled = 1;
else
- gSprites[gBankSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1;
+ gSprites[gBattlerSpriteIds[gBattleAnimTarget]].coordOffsetEnabled = 1;
}
}
@@ -1206,7 +1206,7 @@ void sub_80E2F2C(u8 taskId)
{
if (IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2) == TRUE)
{
- gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority -= 1;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority -= 1;
REG_BG1CNT_BITFIELD.priority = 1;
var0 = 1;
}
@@ -1275,7 +1275,7 @@ static void sub_80E3194(u8 taskId)
sub_8078914(&subStruct);
DmaFill32Defvars(3, 0, subStruct.field_4, 0x800);
if (gTasks[taskId].data[6] == 1)
- gSprites[gBankSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++;
+ gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].oam.priority++;
REG_BG1CNT_BITFIELD.areaOverflowMode = 0;
do {} while(0); // needed to match. perhaps part of a debug macro
@@ -1343,7 +1343,7 @@ static void sub_80E3338(u8 taskId)
{
if (IsAnimBankSpriteVisible(battler2) == TRUE)
{
- gSprites[gBankSpriteIds[battler2]].oam.priority -= 1;
+ gSprites[gBattlerSpriteIds[battler2]].oam.priority -= 1;
REG_BG1CNT_BITFIELD.priority = 1;
var0 = 1;
}
@@ -1362,9 +1362,9 @@ static void sub_80E3338(u8 taskId)
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler1]], MON_DATA_SPECIES);
}
- spriteId = sub_807A4A0(battler1, gBankSpriteIds[battler1], species);
+ spriteId = sub_807A4A0(battler1, gBattlerSpriteIds[battler1], species);
if (taskData[3])
- spriteId2 = sub_807A4A0(battler2, gBankSpriteIds[battler2], species);
+ spriteId2 = sub_807A4A0(battler2, gBattlerSpriteIds[battler2], species);
sub_8078914(&subStruct);
if (taskData[0] == 0)
@@ -1422,7 +1422,7 @@ static void sub_80E3338(u8 taskId)
gTasks[taskId].data[2] = taskData[3];
gTasks[taskId].data[3] = spriteId2;
gTasks[taskId].data[6] = var0;
- gTasks[taskId].data[7] = gBankSpriteIds[battler2];
+ gTasks[taskId].data[7] = gBattlerSpriteIds[battler2];
gTasks[taskId].func = sub_80E3704;
if (taskData[0] == 0)
@@ -1648,7 +1648,7 @@ void sub_80E3BDC(u8 taskId)
for (i = 0; i < 4; i++)
{
if (i != gBattleAnimAttacker && IsAnimBankSpriteVisible(i))
- gSprites[gBankSpriteIds[i]].invisible = gBattleAnimArgs[0];
+ gSprites[gBattlerSpriteIds[i]].invisible = gBattleAnimArgs[0];
}
DestroyAnimVisualTask(taskId);
@@ -1692,9 +1692,9 @@ void sub_80E3C4C(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5,
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler1]], MON_DATA_SPECIES);
}
- spriteId = sub_807A4A0(battler1, gBankSpriteIds[battler1], species);
+ spriteId = sub_807A4A0(battler1, gBattlerSpriteIds[battler1], species);
if (arg4)
- spriteId2 = sub_807A4A0(battler2, gBankSpriteIds[battler2], species);
+ spriteId2 = sub_807A4A0(battler2, gBattlerSpriteIds[battler2], species);
sub_8078914(&subStruct);
LZDecompressVram(arg9, subStruct.field_4);
@@ -1884,8 +1884,8 @@ void sub_80E4200(u8 taskId)
void sub_80E4234(u8 taskId)
{
- gBattleAnimAttacker = gBankTarget;
- gBattleAnimTarget = gEffectBank;
+ gBattleAnimAttacker = gBattlerTarget;
+ gBattleAnimTarget = gEffectBattler;
DestroyAnimVisualTask(taskId);
}
@@ -1901,14 +1901,14 @@ void sub_80E4264(u8 taskId)
void sub_80E42B0(u8 taskId)
{
- gBattleAnimTarget = gBankTarget;
+ gBattleAnimTarget = gBattlerTarget;
DestroyAnimVisualTask(taskId);
}
void sub_80E42D0(u8 taskId)
{
- gBattleAnimAttacker = gBankAttacker;
- gBattleAnimTarget = gEffectBank;
+ gBattleAnimAttacker = gBattlerAttacker;
+ gBattleAnimTarget = gEffectBattler;
DestroyAnimVisualTask(taskId);
}
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 84673097e..84a7741e1 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -14,7 +14,7 @@ extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG2_X;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
void sub_80DB74C(struct Sprite *sprite);
void sub_80DBA4C(struct Sprite *sprite);
@@ -524,11 +524,11 @@ static void sub_80DB92C(struct Sprite *sprite)
u8 bank = bankCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
if (IsAnimBankSpriteVisible(bank))
- gSprites[gBankSpriteIds[bank]].invisible = 0;
+ gSprites[gBattlerSpriteIds[bank]].invisible = 0;
bank = bankCopy ^ 2;
if (IsAnimBankSpriteVisible(bank))
- gSprites[gBankSpriteIds[bank]].invisible = 0;
+ gSprites[gBattlerSpriteIds[bank]].invisible = 0;
}
sprite->invisible = 1;
diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c
index 398671249..69e903921 100644
--- a/src/battle/anim/ring.c
+++ b/src/battle/anim/ring.c
@@ -10,7 +10,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
void sub_80D0FD8(struct Sprite* sprite);
void sub_80D10B8(struct Sprite* sprite);
@@ -284,23 +284,23 @@ void sub_80D10B8(struct Sprite* sprite)
{
r9 = GetBattlerSpriteCoord(bankr7, r10) + gBattleAnimArgs[0];
if (IsAnimBankSpriteVisible(bankr8 ^ 2))
- sprite->subpriority = gSprites[gBankSpriteIds[bankr8 ^ 2]].subpriority - 1;
+ sprite->subpriority = gSprites[gBattlerSpriteIds[bankr8 ^ 2]].subpriority - 1;
else
- sprite->subpriority = gSprites[gBankSpriteIds[bankr8]].subpriority - 1;
+ sprite->subpriority = gSprites[gBattlerSpriteIds[bankr8]].subpriority - 1;
}
else
{
r9 = GetBattlerSpriteCoord(bankr7, r10) - gBattleAnimArgs[0];
if (gMain.inBattle && IsAnimBankSpriteVisible(bankr7 ^ 2))
{
- if (gSprites[gBankSpriteIds[bankr7]].pos1.x < gSprites[gBankSpriteIds[bankr7 ^ 2]].pos1.x)
- sprite->subpriority = gSprites[gBankSpriteIds[bankr7 ^ 2]].subpriority + 1;
+ if (gSprites[gBattlerSpriteIds[bankr7]].pos1.x < gSprites[gBattlerSpriteIds[bankr7 ^ 2]].pos1.x)
+ sprite->subpriority = gSprites[gBattlerSpriteIds[bankr7 ^ 2]].subpriority + 1;
else
- sprite->subpriority = gSprites[gBankSpriteIds[bankr7]].subpriority - 1;
+ sprite->subpriority = gSprites[gBattlerSpriteIds[bankr7]].subpriority - 1;
}
else
{
- sprite->subpriority = gSprites[gBankSpriteIds[bankr7]].subpriority - 1;
+ sprite->subpriority = gSprites[gBattlerSpriteIds[bankr7]].subpriority - 1;
}
}
diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c
index 34695ecf4..2775eba97 100644
--- a/src/battle/anim/tile.c
+++ b/src/battle/anim/tile.c
@@ -9,7 +9,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
extern u8 gBattlersCount;
-extern u8 gHealthboxIDs[];
+extern u8 gHealthboxSpriteIds[];
void sub_80CE09C(struct Sprite* sprite);
void sub_80CE17C(struct Sprite* sprite);
@@ -198,10 +198,10 @@ void unref_sub_80CE260(u8 taskId)
for (i = 0; i < gBattlersCount; i++)
{
if (gBattleAnimArgs[0] == 1 && GetBattlerSide(i) == 0)
- sub_8043DB0(gHealthboxIDs[i]);
+ sub_8043DB0(gHealthboxSpriteIds[i]);
if (gBattleAnimArgs[1] == 1 && GetBattlerSide(i) == 1)
- sub_8043DB0(gHealthboxIDs[i]);
+ sub_8043DB0(gHealthboxSpriteIds[i]);
}
DestroyAnimVisualTask(taskId);
@@ -212,7 +212,7 @@ void unref_sub_80CE2D4(u8 taskId)
u8 i;
for (i = 0; i < gBattlersCount; i++)
{
- sub_8043DFC(gHealthboxIDs[i]);
+ sub_8043DFC(gHealthboxSpriteIds[i]);
}
DestroyAnimVisualTask(taskId);
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index f4acbbf7e..1ab6663f1 100644
--- a/src/battle/anim/unused_7.c
+++ b/src/battle/anim/unused_7.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
void sub_80CF3C4(struct Sprite* sprite);
@@ -45,7 +45,7 @@ void sub_80CF3C4(struct Sprite* sprite)
u8 a;
sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
- a = gBankSpriteIds[gBattleAnimTarget];
+ a = gBattlerSpriteIds[gBattleAnimTarget];
if (GetBattlerSide(gBattleAnimAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c
index f089c799a..9c7f62c12 100644
--- a/src/battle/anim/wisp_fire.c
+++ b/src/battle/anim/wisp_fire.c
@@ -9,7 +9,7 @@
extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimTarget;
extern u8 gBattleAnimAttacker;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
void sub_80D5CC0(struct Sprite *sprite);
static void sub_80D5E4C(u8 taskId);
@@ -211,7 +211,7 @@ void sub_80D60B4(u8 taskId)
}
gTasks[taskId].data[0]++;
- spriteId = gBankSpriteIds[gBattleAnimTarget];
+ spriteId = gBattlerSpriteIds[gBattleAnimTarget];
if (!gTasks[taskId].data[4])
unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10];
diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c
index f5babd361..6c26fb891 100644
--- a/src/battle/anim/withdraw.c
+++ b/src/battle/anim/withdraw.c
@@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
static void sub_80CF514(u8 taskId);
@@ -17,13 +17,13 @@ static void sub_80CF514(u8 taskId);
void sub_80CF4D8(u8 taskId)
{
- PrepareBattlerSpriteForRotScale(gBankSpriteIds[gBattleAnimAttacker], 0);
+ PrepareBattlerSpriteForRotScale(gBattlerSpriteIds[gBattleAnimAttacker], 0);
gTasks[taskId].func = sub_80CF514;
}
void sub_80CF514(u8 taskId)
{
- u8 a = gBankSpriteIds[gBattleAnimAttacker];
+ u8 a = gBattlerSpriteIds[gBattleAnimAttacker];
s16 b;
if (GetBattlerSide(gBattleAnimAttacker) == 0)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 15:56:59 +0000