summaryrefslogtreecommitdiff
path: root/src/battle_controllers.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_controllers.c')
-rw-r--r--src/battle_controllers.c178
1 files changed, 89 insertions, 89 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index c28b6ef3b..499d816be 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -16,10 +16,10 @@ extern u32 gBattleTypeFlags;
extern u32 gBattleExecBuffer;
extern void (*gBattleMainFunc)(void);
extern void (*gBattleBankFunc[BATTLE_BANKS_COUNT])(void);
-extern u8 gBanksByIdentity[BATTLE_BANKS_COUNT];
+extern u8 gBankPositions[BATTLE_BANKS_COUNT];
extern u8 gActionSelectionCursor[BATTLE_BANKS_COUNT];
extern u8 gMoveSelectionCursor[BATTLE_BANKS_COUNT];
-extern u8 gNoOfAllBanks;
+extern u8 gBattleBanksCount;
extern u8 gActiveBank;
extern u8 gUnknown_0202428C;
extern u32 gUnknown_02022FF4;
@@ -32,7 +32,7 @@ extern u8 gUnknown_02022D08;
extern u8 gUnknown_02022D09;
extern u8 gUnknown_02022D0A;
extern u8 gBankAttacker;
-extern u8 gBankTarget;
+extern u8 gBankDefender;
extern u8 gAbsentBankFlags;
extern u8 gEffectBank;
extern u16 gBattleWeather;
@@ -79,7 +79,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
for (i = 0; i < BATTLE_BANKS_COUNT; i++)
{
gBattleBankFunc[i] = nullsub_21;
- gBanksByIdentity[i] = 0xFF;
+ gBankPositions[i] = 0xFF;
gActionSelectionCursor[i] = 0;
gMoveSelectionCursor[i] = 0;
}
@@ -124,7 +124,7 @@ void sub_8032768(void)
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{
- for (i = 0; i < gNoOfAllBanks; i++)
+ for (i = 0; i < gBattleBanksCount; i++)
sub_81B8D64(i, 0);
}
@@ -146,33 +146,33 @@ static void SetControllersVariables(void)
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
{
gBattleBankFunc[0] = SetControllerToRecordedPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[2] = SetControllerToPlayerPartner;
- gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+ gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
gBattleBankFunc[3] = SetControllerToOpponent;
- gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
}
else
{
gBattleBankFunc[0] = SetControllerToPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[2] = SetControllerToPlayerPartner;
- gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+ gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
gBattleBankFunc[3] = SetControllerToOpponent;
- gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
}
- gNoOfAllBanks = 4;
+ gBattleBanksCount = 4;
sub_81B8D64(0, 0);
sub_81B8D64(1, 0);
@@ -195,12 +195,12 @@ static void SetControllersVariables(void)
else
gBattleBankFunc[0] = SetControllerToPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
- gNoOfAllBanks = 2;
+ gBattleBanksCount = 2;
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
{
@@ -211,31 +211,31 @@ static void SetControllersVariables(void)
gBattleMainFunc = BeginBattleIntro;
gBattleBankFunc[0] = SetControllerToRecordedPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToRecordedOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
- gNoOfAllBanks = 2;
+ gBattleBanksCount = 2;
}
else // see how the banks are switched
{
gBattleBankFunc[1] = SetControllerToRecordedPlayer;
- gBanksByIdentity[1] = IDENTITY_PLAYER_MON1;
+ gBankPositions[1] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[0] = SetControllerToRecordedOpponent;
- gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
- gNoOfAllBanks = 2;
+ gBattleBanksCount = 2;
}
}
else
{
gBattleBankFunc[0] = SetControllerToRecordedPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
}
}
}
@@ -244,18 +244,18 @@ static void SetControllersVariables(void)
gBattleMainFunc = BeginBattleIntro;
gBattleBankFunc[0] = SetControllerToPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[2] = SetControllerToPlayer;
- gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+ gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
gBattleBankFunc[3] = SetControllerToOpponent;
- gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
- gNoOfAllBanks = 4;
+ gBattleBanksCount = 4;
if (gBattleTypeFlags & BATTLE_TYPE_RECORDED)
{
@@ -264,18 +264,18 @@ static void SetControllersVariables(void)
gBattleMainFunc = BeginBattleIntro;
gBattleBankFunc[0] = SetControllerToRecordedPlayer;
- gBanksByIdentity[0] = 0;
+ gBankPositions[0] = 0;
gBattleBankFunc[1] = SetControllerToOpponent;
- gBanksByIdentity[1] = 1;
+ gBankPositions[1] = 1;
gBattleBankFunc[2] = SetControllerToRecordedPlayer;
- gBanksByIdentity[2] = 2;
+ gBankPositions[2] = 2;
gBattleBankFunc[3] = SetControllerToOpponent;
- gBanksByIdentity[3] = 3;
+ gBankPositions[3] = 3;
- gNoOfAllBanks = 4;
+ gBattleBanksCount = 4;
sub_81B8D64(0, 0);
sub_81B8D64(1, 0);
@@ -312,12 +312,12 @@ static void SetControllersVariables(void)
{
case 0:
case 3:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_PLAYER_MON1;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
break;
case 1:
case 2:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_PLAYER_MON2;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
break;
}
@@ -330,12 +330,12 @@ static void SetControllersVariables(void)
{
case 0:
case 3:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_PLAYER_MON1;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
break;
case 1:
case 2:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_PLAYER_MON2;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
break;
}
@@ -347,12 +347,12 @@ static void SetControllersVariables(void)
{
case 0:
case 3:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_LEFT;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
break;
case 1:
case 2:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_RIGHT;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
break;
}
@@ -362,51 +362,51 @@ static void SetControllersVariables(void)
else if (gBattleTypeFlags & BATTLE_TYPE_WILD)
{
gBattleBankFunc[0] = SetControllerToRecordedPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[2] = SetControllerToRecordedPlayer;
- gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+ gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
{
gBattleBankFunc[1] = SetControllerToRecordedOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[3] = SetControllerToRecordedOpponent;
- gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
}
else
{
gBattleBankFunc[1] = SetControllerToOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[3] = SetControllerToOpponent;
- gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
}
}
else
{
gBattleBankFunc[1] = SetControllerToRecordedPlayer;
- gBanksByIdentity[1] = IDENTITY_PLAYER_MON1;
+ gBankPositions[1] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[3] = SetControllerToRecordedPlayer;
- gBanksByIdentity[3] = IDENTITY_PLAYER_MON2;
+ gBankPositions[3] = B_POSITION_PLAYER_RIGHT;
if (gBattleTypeFlags & BATTLE_TYPE_x2000000)
{
gBattleBankFunc[0] = SetControllerToRecordedOpponent;
- gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[2] = SetControllerToRecordedOpponent;
- gBanksByIdentity[2] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
}
else
{
gBattleBankFunc[0] = SetControllerToOpponent;
- gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[2] = SetControllerToOpponent;
- gBanksByIdentity[2] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
}
}
}
@@ -425,22 +425,22 @@ static void SetControllersVariablesInLinkBattle(void)
gBattleMainFunc = BeginBattleIntro;
gBattleBankFunc[0] = SetControllerToPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToLinkOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
- gNoOfAllBanks = 2;
+ gBattleBanksCount = 2;
}
else
{
gBattleBankFunc[1] = SetControllerToPlayer;
- gBanksByIdentity[1] = IDENTITY_PLAYER_MON1;
+ gBankPositions[1] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[0] = SetControllerToLinkOpponent;
- gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
- gNoOfAllBanks = 2;
+ gBattleBanksCount = 2;
}
}
else if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -450,34 +450,34 @@ static void SetControllersVariablesInLinkBattle(void)
gBattleMainFunc = BeginBattleIntro;
gBattleBankFunc[0] = SetControllerToPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToLinkOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[2] = SetControllerToPlayer;
- gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+ gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
gBattleBankFunc[3] = SetControllerToLinkOpponent;
- gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
- gNoOfAllBanks = 4;
+ gBattleBanksCount = 4;
}
else
{
gBattleBankFunc[1] = SetControllerToPlayer;
- gBanksByIdentity[1] = IDENTITY_PLAYER_MON1;
+ gBankPositions[1] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[0] = SetControllerToLinkOpponent;
- gBanksByIdentity[0] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[0] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[3] = SetControllerToPlayer;
- gBanksByIdentity[3] = IDENTITY_PLAYER_MON2;
+ gBankPositions[3] = B_POSITION_PLAYER_RIGHT;
gBattleBankFunc[2] = SetControllerToLinkOpponent;
- gBanksByIdentity[2] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[2] = B_POSITION_OPPONENT_RIGHT;
- gNoOfAllBanks = 4;
+ gBattleBanksCount = 4;
}
}
else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)
@@ -487,34 +487,34 @@ static void SetControllersVariablesInLinkBattle(void)
gBattleMainFunc = BeginBattleIntro;
gBattleBankFunc[0] = SetControllerToPlayer;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[2] = SetControllerToLinkPartner;
- gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+ gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
gBattleBankFunc[3] = SetControllerToOpponent;
- gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
- gNoOfAllBanks = 4;
+ gBattleBanksCount = 4;
}
else
{
gBattleBankFunc[0] = SetControllerToLinkPartner;
- gBanksByIdentity[0] = IDENTITY_PLAYER_MON1;
+ gBankPositions[0] = B_POSITION_PLAYER_LEFT;
gBattleBankFunc[1] = SetControllerToLinkOpponent;
- gBanksByIdentity[1] = IDENTITY_OPPONENT_MON1;
+ gBankPositions[1] = B_POSITION_OPPONENT_LEFT;
gBattleBankFunc[2] = SetControllerToPlayer;
- gBanksByIdentity[2] = IDENTITY_PLAYER_MON2;
+ gBankPositions[2] = B_POSITION_PLAYER_RIGHT;
gBattleBankFunc[3] = SetControllerToLinkOpponent;
- gBanksByIdentity[3] = IDENTITY_OPPONENT_MON2;
+ gBankPositions[3] = B_POSITION_OPPONENT_RIGHT;
- gNoOfAllBanks = 4;
+ gBattleBanksCount = 4;
}
sub_81B8D64(0, 0);
@@ -554,12 +554,12 @@ static void SetControllersVariablesInLinkBattle(void)
{
case 0:
case 3:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 0;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = 0;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
break;
case 1:
case 2:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 2;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = 2;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
break;
}
@@ -574,12 +574,12 @@ static void SetControllersVariablesInLinkBattle(void)
{
case 0:
case 3:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 0;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = 0;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
break;
case 1:
case 2:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 2;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = 2;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
break;
}
@@ -591,12 +591,12 @@ static void SetControllersVariablesInLinkBattle(void)
{
case 0:
case 3:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 1;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = 1;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 0;
break;
case 1:
case 2:
- gBanksByIdentity[gLinkPlayers[i].lp_field_18] = 3;
+ gBankPositions[gLinkPlayers[i].lp_field_18] = 3;
gBattlePartyID[gLinkPlayers[i].lp_field_18] = 3;
break;
}
@@ -604,7 +604,7 @@ static void SetControllersVariablesInLinkBattle(void)
}
}
- gNoOfAllBanks = 4;
+ gBattleBanksCount = 4;
}
}
@@ -614,7 +614,7 @@ static void SetBattlePartyIds(void)
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{
- for (i = 0; i < gNoOfAllBanks; i++)
+ for (i = 0; i < gBattleBanksCount; i++)
{
for (j = 0; j < 6; j++)
{
@@ -753,7 +753,7 @@ void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data)
gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_BUFFER_ID] = bufferId;
gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ACTIVE_BANK] = gActiveBank;
gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ATTACKER] = gBankAttacker;
- gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBankTarget;
+ gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_TARGET] = gBankDefender;
gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_LO] = alignedSize;
gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_SIZE_HI] = (alignedSize & 0x0000FF00) >> 8;
gLinkBattleSendBuffer[gTasks[gUnknown_02022D08].data[14] + LINK_BUFF_ABSENT_BANK_FLAGS] = gAbsentBankFlags;
@@ -921,7 +921,7 @@ static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)
if (!(gBattleTypeFlags & BATTLE_TYPE_WILD))
{
gBankAttacker = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 2];
- gBankTarget = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
+ gBankDefender = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 3];
gAbsentBankFlags = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 6];
gEffectBank = gLinkBattleRecvBuffer[gTasks[taskId].data[15] + 7];
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 23:43:09 +0000