summaryrefslogtreecommitdiff
path: root/src/battle_gfx_sfx_util.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_gfx_sfx_util.c')
-rw-r--r--src/battle_gfx_sfx_util.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 10989231f..a2a48dd38 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -27,7 +27,7 @@ extern u8 gBattleBufferA[][0x200];
extern u8 gActiveBattler;
extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[];
-extern u8 gBanksBySide[];
+extern u8 gBattlerPositions[];
extern u8 gBattlerSpriteIds[];
extern u16 gUnknown_02024DE8;
extern u8 gDoingBattleAnim;
@@ -464,7 +464,7 @@ void unref_sub_8031BA0(void)
count = 4;
}
for (i = 0; i < count; i++)
- LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[i]]);
+ LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[i]]);
}
bool8 sub_8031C30(u8 a)
@@ -490,9 +490,9 @@ bool8 sub_8031C30(u8 a)
else if (a == 3)
LoadCompressedObjectPic(&gUnknown_0820A484);
else if (a == 4)
- LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[0]]);
+ LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[0]]);
else if (a == 5)
- LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[1]]);
+ LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[1]]);
else
retVal = TRUE;
}
@@ -507,13 +507,13 @@ bool8 sub_8031C30(u8 a)
else if (a == 5)
LoadCompressedObjectPic(&gUnknown_0820A49C[1]);
else if (a == 6)
- LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[0]]);
+ LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[0]]);
else if (a == 7)
- LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[1]]);
+ LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[1]]);
else if (a == 8)
- LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[2]]);
+ LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[2]]);
else if (a == 9)
- LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[3]]);
+ LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[3]]);
else
retVal = TRUE;
}
@@ -564,7 +564,7 @@ u8 battle_load_something(u8 *pState, u8 *b)
break;
case 4:
sub_8043F44(*b);
- if (gBanksBySide[*b] <= 1)
+ if (gBattlerPositions[*b] <= 1)
nullsub_11(gHealthboxSpriteIds[*b], 0);
else
nullsub_11(gHealthboxSpriteIds[*b], 1);