summaryrefslogtreecommitdiff
path: root/src/battle/reshow_battle_screen.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/reshow_battle_screen.c')
-rw-r--r--src/battle/reshow_battle_screen.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index 85aa78ca0..f602d4835 100644
--- a/src/battle/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
@@ -22,8 +22,8 @@ extern u16 gBattle_BG0_Y;
extern u8 gReservedSpritePaletteCount;
extern u8 gActionSelectionCursor[4];
extern u8 gBankInMenu;
-extern u16 gBattlePartyID[4];
-extern u8 gNoOfAllBanks;
+extern u16 gBattlerPartyIndexes[4];
+extern u8 gBattlersCount;
extern u16 gBattleTypeFlags;
extern u8 gBankSpriteIds[4];
extern u8 gBattleMonForms[4];
@@ -171,14 +171,14 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
sub_80327CC();
- opponentBank = GetBankByIdentity(1);
- species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
+ opponentBank = GetBattlerAtPosition(1);
+ species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBank]], MON_DATA_SPECIES);
sub_8032984(opponentBank, species);
if (IsDoubleBattle())
{
- opponentBank = GetBankByIdentity(3);
- species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES);
+ opponentBank = GetBattlerAtPosition(3);
+ species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[opponentBank]], MON_DATA_SPECIES);
sub_8032984(opponentBank, species);
}
sub_802E3E4(gActionSelectionCursor[gBankInMenu], 0);
@@ -205,12 +205,12 @@ static void sub_807B06C(void)
static bool8 LoadAppropiateBankSprite(u8 bank)
{
- if (bank < gNoOfAllBanks)
+ if (bank < gBattlersCount)
{
- if (GetBankSide(bank))
+ if (GetBattlerSide(bank))
{
if (!ewram17800[bank].substituteSprite)
- BattleLoadOpponentMonSprite(&gEnemyParty[gBattlePartyID[bank]], bank);
+ BattleLoadOpponentMonSprite(&gEnemyParty[gBattlerPartyIndexes[bank]], bank);
else
BattleLoadSubstituteSprite(bank, 0);
}
@@ -219,7 +219,7 @@ static bool8 LoadAppropiateBankSprite(u8 bank)
else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
LoadPlayerTrainerBankSprite(2, 0);
else if (!ewram17800[bank].substituteSprite)
- BattleLoadPlayerMonSprite(&gPlayerParty[gBattlePartyID[bank]], bank);
+ BattleLoadPlayerMonSprite(&gPlayerParty[gBattlerPartyIndexes[bank]], bank);
else
BattleLoadSubstituteSprite(bank, 0);
@@ -230,7 +230,7 @@ static bool8 LoadAppropiateBankSprite(u8 bank)
static void sub_807B184(u8 bank)
{
- if (bank < gNoOfAllBanks)
+ if (bank < gBattlersCount)
{
u8 posY;
@@ -238,21 +238,21 @@ static void sub_807B184(u8 bank)
posY = sub_8077F7C(bank);
else
posY = sub_8077F68(bank);
- if (GetBankSide(bank))
+ if (GetBattlerSide(bank))
{
- if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+ if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
return;
- GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
- gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
+ GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
+ gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, sub_8079E90(bank));
gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
gSprites[gBankSpriteIds[bank]].data[0] = bank;
- gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+ gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
}
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
{
- GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(0));
+ GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBattlerPosition(0));
gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
(8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
sub_8079E90(0));
@@ -262,7 +262,7 @@ static void sub_807B184(u8 bank)
}
else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
{
- GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(0));
+ GetMonSpriteTemplate_803C5A0(2, GetBattlerPosition(0));
gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
(8 - gTrainerBackPicCoords[2].coords) * 4 + 80,
sub_8079E90(0));
@@ -272,14 +272,14 @@ static void sub_807B184(u8 bank)
}
else
{
- if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+ if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
return;
- GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
- gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBankPosition(bank, 2), posY, sub_8079E90(bank));
+ GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES), GetBattlerPosition(bank));
+ gBankSpriteIds[bank] = CreateSprite(&gUnknown_02024E8C, GetBattlerSpriteCoord(bank, 2), posY, sub_8079E90(bank));
gSprites[gBankSpriteIds[bank]].oam.paletteNum = bank;
gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
gSprites[gBankSpriteIds[bank]].data[0] = bank;
- gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+ gSprites[gBankSpriteIds[bank]].data[2] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_SPECIES);
StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
}
gSprites[gBankSpriteIds[bank]].invisible = ewram17800[bank].invisible;
@@ -288,7 +288,7 @@ static void sub_807B184(u8 bank)
static void sub_807B508(u8 bank)
{
- if (bank < gNoOfAllBanks)
+ if (bank < gBattlersCount)
{
u8 healthboxID;
if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
@@ -300,24 +300,24 @@ static void sub_807B508(u8 bank)
gHealthboxIDs[bank] = healthboxID;
sub_8043F44(bank);
sub_8043DFC(healthboxID);
- if (GetBankSide(bank))
- sub_8045A5C(gHealthboxIDs[bank], &gEnemyParty[gBattlePartyID[bank]], 0);
+ if (GetBattlerSide(bank))
+ sub_8045A5C(gHealthboxIDs[bank], &gEnemyParty[gBattlerPartyIndexes[bank]], 0);
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
- sub_8045A5C(gHealthboxIDs[bank], &gPlayerParty[gBattlePartyID[bank]], 10);
+ sub_8045A5C(gHealthboxIDs[bank], &gPlayerParty[gBattlerPartyIndexes[bank]], 10);
else
- sub_8045A5C(gHealthboxIDs[bank], &gPlayerParty[gBattlePartyID[bank]], 0);
- if (GetBankIdentity(bank) == 3 || GetBankIdentity(bank) == 2)
+ sub_8045A5C(gHealthboxIDs[bank], &gPlayerParty[gBattlerPartyIndexes[bank]], 0);
+ if (GetBattlerPosition(bank) == 3 || GetBattlerPosition(bank) == 2)
nullsub_11(gHealthboxIDs[bank], 1);
else
nullsub_11(gHealthboxIDs[bank], 0);
- if (GetBankSide(bank))
+ if (GetBattlerSide(bank))
{
- if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+ if (GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
sub_8043DB0(healthboxID);
}
else if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
{
- if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+ if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], MON_DATA_HP) == 0)
sub_8043DB0(healthboxID);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 01:36:42 +0000