From facd83811272d156dfef186d472dccd65719be61 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 18 Sep 2018 21:51:10 +0200 Subject: [PATCH] Add debug controller to all controllers --- src/battle_controller_link_opponent.c | 7 +++++++ src/battle_controller_link_partner.c | 7 +++++++ src/battle_controller_player_partner.c | 7 +++++++ src/battle_controller_recorded_opponent.c | 7 +++++++ src/battle_controller_safari.c | 7 +++++++ src/battle_controller_wally.c | 7 +++++++ 6 files changed, 42 insertions(+) diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 637b8c702..12350496c 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -95,6 +95,7 @@ static void LinkOpponentHandleBattleAnimation(void); static void LinkOpponentHandleLinkStandbyMsg(void); static void LinkOpponentHandleResetActionMoveSelection(void); static void LinkOpponentHandleCmd55(void); +static void LinkOpponentHandleBattleDebug(void); static void nullsub_92(void); static void LinkOpponentBufferRunCommand(void); @@ -167,6 +168,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkOpponentHandleLinkStandbyMsg, LinkOpponentHandleResetActionMoveSelection, LinkOpponentHandleCmd55, + LinkOpponentHandleBattleDebug, nullsub_92 }; @@ -1860,6 +1862,11 @@ static void LinkOpponentHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } +static void LinkOpponentHandleBattleDebug(void) +{ + LinkOpponentBufferExecCompleted(); +} + static void nullsub_92(void) { } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index bfaaf9e82..54172fd48 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -94,6 +94,7 @@ static void LinkPartnerHandleBattleAnimation(void); static void LinkPartnerHandleLinkStandbyMsg(void); static void LinkPartnerHandleResetActionMoveSelection(void); static void LinkPartnerHandleCmd55(void); +static void LinkPartnerHandleBattleDebug(void); static void nullsub_113(void); static void LinkPartnerBufferRunCommand(void); @@ -165,6 +166,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = LinkPartnerHandleLinkStandbyMsg, LinkPartnerHandleResetActionMoveSelection, LinkPartnerHandleCmd55, + LinkPartnerHandleBattleDebug, nullsub_113 }; @@ -1691,6 +1693,11 @@ static void LinkPartnerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } +static void LinkPartnerHandleBattleDebug(void) +{ + LinkPartnerBufferExecCompleted(); +} + static void nullsub_113(void) { } diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 7795c5656..163af3c19 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -95,6 +95,7 @@ static void PlayerPartnerHandleBattleAnimation(void); static void PlayerPartnerHandleLinkStandbyMsg(void); static void PlayerPartnerHandleResetActionMoveSelection(void); static void PlayerPartnerHandleCmd55(void); +static void PlayerPartnerHandleBattleDebug(void); static void nullsub_128(void); static void PlayerPartnerBufferRunCommand(void); @@ -172,6 +173,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = PlayerPartnerHandleLinkStandbyMsg, PlayerPartnerHandleResetActionMoveSelection, PlayerPartnerHandleCmd55, + PlayerPartnerHandleBattleDebug, nullsub_128 }; @@ -1933,6 +1935,11 @@ static void PlayerPartnerHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } +static void PlayerPartnerHandleBattleDebug(void) +{ + PlayerPartnerBufferExecCompleted(); +} + static void nullsub_128(void) { } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 963c535db..9ed985fac 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -97,6 +97,7 @@ static void RecordedOpponentHandleBattleAnimation(void); static void RecordedOpponentHandleLinkStandbyMsg(void); static void RecordedOpponentHandleResetActionMoveSelection(void); static void RecordedOpponentHandleCmd55(void); +static void RecordedOpponentHandleBattleDebug(void); static void nullsub_119(void); static void RecordedOpponentBufferRunCommand(void); @@ -169,6 +170,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void RecordedOpponentHandleLinkStandbyMsg, RecordedOpponentHandleResetActionMoveSelection, RecordedOpponentHandleCmd55, + RecordedOpponentHandleBattleDebug, nullsub_119 }; @@ -1797,6 +1799,11 @@ static void RecordedOpponentHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } +static void RecordedOpponentHandleBattleDebug(void) +{ + RecordedOpponentBufferExecCompleted(); +} + static void nullsub_119(void) { } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index aab804b41..e158e08ca 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -87,6 +87,7 @@ static void SafariHandleBattleAnimation(void); static void SafariHandleLinkStandbyMsg(void); static void SafariHandleResetActionMoveSelection(void); static void SafariHandleCmd55(void); +static void SafariHandleBattleDebug(void); static void nullsub_115(void); static void SafariBufferRunCommand(void); @@ -151,6 +152,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = SafariHandleLinkStandbyMsg, SafariHandleResetActionMoveSelection, SafariHandleCmd55, + SafariHandleBattleDebug, nullsub_115 }; @@ -691,6 +693,11 @@ static void SafariHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_81595E4; } +static void SafariHandleBattleDebug(void) +{ + SafariBufferExecCompleted(); +} + static void nullsub_115(void) { } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 747aa2987..8276f1b5c 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -97,6 +97,7 @@ static void WallyHandleBattleAnimation(void); static void WallyHandleLinkStandbyMsg(void); static void WallyHandleResetActionMoveSelection(void); static void WallyHandleCmd55(void); +static void WallyHandleBattleDebug(void); static void nullsub_118(void); static void WallyBufferRunCommand(void); @@ -166,6 +167,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = WallyHandleLinkStandbyMsg, WallyHandleResetActionMoveSelection, WallyHandleCmd55, + WallyHandleBattleDebug, nullsub_118 }; @@ -1564,6 +1566,11 @@ static void WallyHandleCmd55(void) gBattlerControllerFuncs[gActiveBattler] = sub_80587B0; } +static void WallyHandleBattleDebug(void) +{ + WallyBufferExecCompleted(); +} + static void nullsub_118(void) { }