summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-31 18:52:18 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-31 18:52:18 +0100
commitf724213a040f3c6a2f9685d52ae4e06d57aa0c41 (patch)
tree32cba14641d7f357b07ae227459fd4b059e22267 /src
parent192817a7dcbfb4cab5eef0d57c95536cf5971584 (diff)
review change 3 battle controllers
Diffstat (limited to 'src')
-rw-r--r--src/battle_controller_link_opponent.c2
-rw-r--r--src/battle_controller_link_partner.c2
-rw-r--r--src/battle_controller_opponent.c2
-rw-r--r--src/battle_controller_player.c2
-rw-r--r--src/battle_controller_player_partner.c2
-rw-r--r--src/battle_controller_recorded_opponent.c2
-rw-r--r--src/battle_controller_recorded_player.c2
-rw-r--r--src/battle_controller_safari.c2
-rw-r--r--src/battle_controller_wally.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index a7e7ad022..968f6d49f 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -562,7 +562,7 @@ static void LinkOpponentBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 33fa7abd5..4a70a4dc1 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -433,7 +433,7 @@ static void LinkPartnerBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 4772cba50..7ffd9d64b 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -541,7 +541,7 @@ static void OpponentBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index ffd0a6ce3..10d361cb9 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -255,7 +255,7 @@ static void PlayerBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index df35e54c4..34fd8a3eb 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -620,7 +620,7 @@ static void PlayerPartnerBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index feb8aef19..0dc7631ce 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -547,7 +547,7 @@ static void RecordedOpponentBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index ca9fcda52..a3343a391 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -518,7 +518,7 @@ static void RecordedPlayerBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 61097b190..0c5b698cf 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -324,7 +324,7 @@ static void SafariBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index 9ff6044c4..c2addd30c 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -442,7 +442,7 @@ static void WallyBufferExecCompleted(void)
u8 playerId = GetMultiplayerId();
PrepareBufferDataTransferLink(2, 4, &playerId);
- gBattleBufferA[gActiveBank][0] = CONTROLLER_CMDS_COUNT - 1;
+ gBattleBufferA[gActiveBank][0] = CONTROLLER_TERMINATOR_NOP;
}
else
{