Merge branch 'master' into extern-cleanup

This commit is contained in:
Phlosioneer
2019-03-08 02:45:26 -05:00
229 changed files with 3431 additions and 3446 deletions

View File

@@ -95,7 +95,7 @@ static void OpponentHandleBattleAnimation(void);
static void OpponentHandleLinkStandbyMsg(void);
static void OpponentHandleResetActionMoveSelection(void);
static void OpponentHandleCmd55(void);
static void nullsub_91(void);
static void OpponentCmdEnd(void);
static void OpponentBufferRunCommand(void);
static void OpponentBufferExecCompleted(void);
@@ -167,7 +167,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
OpponentHandleLinkStandbyMsg,
OpponentHandleResetActionMoveSelection,
OpponentHandleCmd55,
nullsub_91
OpponentCmdEnd
};
// unknown unused data
@@ -2001,6 +2001,6 @@ static void OpponentHandleCmd55(void)
OpponentBufferExecCompleted();
}
static void nullsub_91(void)
static void OpponentCmdEnd(void)
{
}