From f724213a040f3c6a2f9685d52ae4e06d57aa0c41 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 31 Oct 2017 18:52:18 +0100
Subject: [PATCH] review change 3 battle controllers

---
 src/battle_controller_link_opponent.c     | 2 +-
 src/battle_controller_link_partner.c      | 2 +-
 src/battle_controller_opponent.c          | 2 +-
 src/battle_controller_player.c            | 2 +-
 src/battle_controller_player_partner.c    | 2 +-
 src/battle_controller_recorded_opponent.c | 2 +-
 src/battle_controller_recorded_player.c   | 2 +-
 src/battle_controller_safari.c            | 2 +-
 src/battle_controller_wally.c             | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index a7e7ad0223..968f6d49fb 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 33fa7abd5d..4a70a4dc1a 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 4772cba507..7ffd9d64b4 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 ffd0a6ce30..10d361cb9b 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 df35e54c42..34fd8a3eb7 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 feb8aef19a..0dc7631ce8 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 ca9fcda527..a3343a3913 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 61097b1904..0c5b698cfe 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 9ff6044c47..c2addd30c0 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
     {