Merge branch 'master' into decompile_evolution_scene

1 files changed, 57 insertions, 57 deletions

diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index abfa3fef2..dd8c62cce 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -193,63 +193,63 @@ void OpponentHandlecmd56(void);
 typedef void (*BattleBufferCmd) (void);
 static const BattleBufferCmd gOpponentBufferCommands[] =
 {
-	OpponentHandleGetAttributes,
-	OpponentHandlecmd1,
-	OpponentHandleSetAttributes,
-	OpponentHandlecmd3,
-	OpponentHandleLoadPokeSprite,
-	OpponentHandleSendOutPoke,
-	OpponentHandleReturnPokeToBall,
-	OpponentHandleTrainerThrow,
-	OpponentHandleTrainerSlide,
-	OpponentHandleTrainerSlideBack,
-	OpponentHandlecmd10,
-	OpponentHandlecmd11,
-	OpponentHandlecmd12,
-	OpponentHandleBallThrow,
-	OpponentHandlePuase,
-	OpponentHandleMoveAnimation,
-	OpponentHandlePrintString,
-	OpponentHandlePrintStringPlayerOnly,
-	OpponentHandlecmd18,
-	OpponentHandlecmd19,
-	OpponentHandlecmd20,
-	OpponentHandleOpenBag,
-	OpponentHandlecmd22,
-	OpponentHandlecmd23,
-	OpponentHandleHealthBarUpdate,
-	OpponentHandleExpBarUpdate,
-	OpponentHandleStatusIconUpdate,
-	OpponentHandleStatusAnimation,
-	OpponentHandleStatusXor,
-	OpponentHandlecmd29,
-	OpponentHandleDMATransfer,
-	OpponentHandlecmd31,
-	OpponentHandlecmd32,
-	OpponentHandlecmd33,
-	OpponentHandlecmd34,
-	OpponentHandlecmd35,
-	OpponentHandlecmd36,
-	OpponentHandlecmd37,
-	OpponentHandlecmd38,
-	OpponentHandlecmd39,
-	OpponentHandlecmd40,
-	OpponentHandleHitAnimation,
-	OpponentHandlecmd42,
-	OpponentHandleEffectivenessSound,
-	OpponentHandlecmd44,
-	OpponentHandleFaintingCry,
-	OpponentHandleIntroSlide,
-	OpponentHandleTrainerBallThrow,
-	OpponentHandlecmd48,
-	OpponentHandlecmd49,
-	OpponentHandlecmd50,
-	OpponentHandleSpriteInvisibility,
-	OpponentHandleBattleAnimation,
-	OpponentHandleLinkStandbyMsg,
-	OpponentHandleResetActionMoveSelection,
-	OpponentHandlecmd55,
-	OpponentHandlecmd56,
+    OpponentHandleGetAttributes,
+    OpponentHandlecmd1,
+    OpponentHandleSetAttributes,
+    OpponentHandlecmd3,
+    OpponentHandleLoadPokeSprite,
+    OpponentHandleSendOutPoke,
+    OpponentHandleReturnPokeToBall,
+    OpponentHandleTrainerThrow,
+    OpponentHandleTrainerSlide,
+    OpponentHandleTrainerSlideBack,
+    OpponentHandlecmd10,
+    OpponentHandlecmd11,
+    OpponentHandlecmd12,
+    OpponentHandleBallThrow,
+    OpponentHandlePuase,
+    OpponentHandleMoveAnimation,
+    OpponentHandlePrintString,
+    OpponentHandlePrintStringPlayerOnly,
+    OpponentHandlecmd18,
+    OpponentHandlecmd19,
+    OpponentHandlecmd20,
+    OpponentHandleOpenBag,
+    OpponentHandlecmd22,
+    OpponentHandlecmd23,
+    OpponentHandleHealthBarUpdate,
+    OpponentHandleExpBarUpdate,
+    OpponentHandleStatusIconUpdate,
+    OpponentHandleStatusAnimation,
+    OpponentHandleStatusXor,
+    OpponentHandlecmd29,
+    OpponentHandleDMATransfer,
+    OpponentHandlecmd31,
+    OpponentHandlecmd32,
+    OpponentHandlecmd33,
+    OpponentHandlecmd34,
+    OpponentHandlecmd35,
+    OpponentHandlecmd36,
+    OpponentHandlecmd37,
+    OpponentHandlecmd38,
+    OpponentHandlecmd39,
+    OpponentHandlecmd40,
+    OpponentHandleHitAnimation,
+    OpponentHandlecmd42,
+    OpponentHandleEffectivenessSound,
+    OpponentHandlecmd44,
+    OpponentHandleFaintingCry,
+    OpponentHandleIntroSlide,
+    OpponentHandleTrainerBallThrow,
+    OpponentHandlecmd48,
+    OpponentHandlecmd49,
+    OpponentHandlecmd50,
+    OpponentHandleSpriteInvisibility,
+    OpponentHandleBattleAnimation,
+    OpponentHandleLinkStandbyMsg,
+    OpponentHandleResetActionMoveSelection,
+    OpponentHandlecmd55,
+    OpponentHandlecmd56,
 };
 
 static const u8 sUnknownBytes[] = {0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20};