remove empty controller functions

This commit is contained in:
DizzyEggg 2023-08-05 11:39:42 +02:00
parent 5a8b6c18ef
commit c4bfe40da6
6 changed files with 132 additions and 911 deletions

View File

@ -30,7 +30,6 @@
#include "recorded_battle.h"
static void LinkOpponentHandleGetMonData(void);
static void LinkOpponentHandleGetRawMonData(void);
static void LinkOpponentHandleSetMonData(void);
static void LinkOpponentHandleSetRawMonData(void);
static void LinkOpponentHandleLoadMonSprite(void);
@ -40,38 +39,16 @@ static void LinkOpponentHandleDrawTrainerPic(void);
static void LinkOpponentHandleTrainerSlide(void);
static void LinkOpponentHandleTrainerSlideBack(void);
static void LinkOpponentHandleFaintAnimation(void);
static void LinkOpponentHandlePaletteFade(void);
static void LinkOpponentHandleSuccessBallThrowAnim(void);
static void LinkOpponentHandleBallThrowAnim(void);
static void LinkOpponentHandlePause(void);
static void LinkOpponentHandleMoveAnimation(void);
static void LinkOpponentHandlePrintString(void);
static void LinkOpponentHandlePrintSelectionString(void);
static void LinkOpponentHandleChooseAction(void);
static void LinkOpponentHandleYesNoBox(void);
static void LinkOpponentHandleChooseMove(void);
static void LinkOpponentHandleChooseItem(void);
static void LinkOpponentHandleChoosePokemon(void);
static void LinkOpponentHandleCmd23(void);
static void LinkOpponentHandleHealthBarUpdate(void);
static void LinkOpponentHandleExpUpdate(void);
static void LinkOpponentHandleStatusIconUpdate(void);
static void LinkOpponentHandleStatusAnimation(void);
static void LinkOpponentHandleStatusXor(void);
static void LinkOpponentHandleDataTransfer(void);
static void LinkOpponentHandleDMA3Transfer(void);
static void LinkOpponentHandlePlayBGM(void);
static void LinkOpponentHandleCmd32(void);
static void LinkOpponentHandleTwoReturnValues(void);
static void LinkOpponentHandleChosenMonReturnValue(void);
static void LinkOpponentHandleOneReturnValue(void);
static void LinkOpponentHandleOneReturnValue_Duplicate(void);
static void LinkOpponentHandleClearUnkVar(void);
static void LinkOpponentHandleSetUnkVar(void);
static void LinkOpponentHandleClearUnkFlag(void);
static void LinkOpponentHandleToggleUnkFlag(void);
static void LinkOpponentHandleHitAnimation(void);
static void LinkOpponentHandleCantSwitch(void);
static void LinkOpponentHandlePlaySE(void);
static void LinkOpponentHandlePlayFanfareOrBGM(void);
static void LinkOpponentHandleFaintingCry(void);
@ -79,14 +56,10 @@ static void LinkOpponentHandleIntroSlide(void);
static void LinkOpponentHandleIntroTrainerBallThrow(void);
static void LinkOpponentHandleDrawPartyStatusSummary(void);
static void LinkOpponentHandleHidePartyStatusSummary(void);
static void LinkOpponentHandleEndBounceEffect(void);
static void LinkOpponentHandleSpriteInvisibility(void);
static void LinkOpponentHandleBattleAnimation(void);
static void LinkOpponentHandleLinkStandbyMsg(void);
static void LinkOpponentHandleResetActionMoveSelection(void);
static void LinkOpponentHandleEndLinkBattle(void);
static void LinkOpponentHandleBattleDebug(void);
static void LinkOpponentCmdEnd(void);
static void LinkOpponentBufferRunCommand(void);
static void LinkOpponentBufferExecCompleted(void);
@ -101,7 +74,7 @@ static void EndDrawPartyStatusSummary(void);
static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{
[CONTROLLER_GETMONDATA] = LinkOpponentHandleGetMonData,
[CONTROLLER_GETRAWMONDATA] = LinkOpponentHandleGetRawMonData,
[CONTROLLER_GETRAWMONDATA] = BtlController_Empty,
[CONTROLLER_SETMONDATA] = LinkOpponentHandleSetMonData,
[CONTROLLER_SETRAWMONDATA] = LinkOpponentHandleSetRawMonData,
[CONTROLLER_LOADMONSPRITE] = LinkOpponentHandleLoadMonSprite,
@ -111,38 +84,38 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_TRAINERSLIDE] = LinkOpponentHandleTrainerSlide,
[CONTROLLER_TRAINERSLIDEBACK] = LinkOpponentHandleTrainerSlideBack,
[CONTROLLER_FAINTANIMATION] = LinkOpponentHandleFaintAnimation,
[CONTROLLER_PALETTEFADE] = LinkOpponentHandlePaletteFade,
[CONTROLLER_SUCCESSBALLTHROWANIM] = LinkOpponentHandleSuccessBallThrowAnim,
[CONTROLLER_BALLTHROWANIM] = LinkOpponentHandleBallThrowAnim,
[CONTROLLER_PAUSE] = LinkOpponentHandlePause,
[CONTROLLER_PALETTEFADE] = BtlController_Empty,
[CONTROLLER_SUCCESSBALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_BALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_PAUSE] = BtlController_Empty,
[CONTROLLER_MOVEANIMATION] = LinkOpponentHandleMoveAnimation,
[CONTROLLER_PRINTSTRING] = LinkOpponentHandlePrintString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = LinkOpponentHandlePrintSelectionString,
[CONTROLLER_CHOOSEACTION] = LinkOpponentHandleChooseAction,
[CONTROLLER_YESNOBOX] = LinkOpponentHandleYesNoBox,
[CONTROLLER_CHOOSEMOVE] = LinkOpponentHandleChooseMove,
[CONTROLLER_OPENBAG] = LinkOpponentHandleChooseItem,
[CONTROLLER_CHOOSEPOKEMON] = LinkOpponentHandleChoosePokemon,
[CONTROLLER_23] = LinkOpponentHandleCmd23,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = BtlController_Empty,
[CONTROLLER_CHOOSEACTION] = BtlController_Empty,
[CONTROLLER_YESNOBOX] = BtlController_Empty,
[CONTROLLER_CHOOSEMOVE] = BtlController_Empty,
[CONTROLLER_OPENBAG] = BtlController_Empty,
[CONTROLLER_CHOOSEPOKEMON] = BtlController_Empty,
[CONTROLLER_23] = BtlController_Empty,
[CONTROLLER_HEALTHBARUPDATE] = LinkOpponentHandleHealthBarUpdate,
[CONTROLLER_EXPUPDATE] = LinkOpponentHandleExpUpdate,
[CONTROLLER_EXPUPDATE] = BtlController_Empty,
[CONTROLLER_STATUSICONUPDATE] = LinkOpponentHandleStatusIconUpdate,
[CONTROLLER_STATUSANIMATION] = LinkOpponentHandleStatusAnimation,
[CONTROLLER_STATUSXOR] = LinkOpponentHandleStatusXor,
[CONTROLLER_DATATRANSFER] = LinkOpponentHandleDataTransfer,
[CONTROLLER_DMA3TRANSFER] = LinkOpponentHandleDMA3Transfer,
[CONTROLLER_PLAYBGM] = LinkOpponentHandlePlayBGM,
[CONTROLLER_32] = LinkOpponentHandleCmd32,
[CONTROLLER_TWORETURNVALUES] = LinkOpponentHandleTwoReturnValues,
[CONTROLLER_CHOSENMONRETURNVALUE] = LinkOpponentHandleChosenMonReturnValue,
[CONTROLLER_ONERETURNVALUE] = LinkOpponentHandleOneReturnValue,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = LinkOpponentHandleOneReturnValue_Duplicate,
[CONTROLLER_STATUSXOR] = BtlController_Empty,
[CONTROLLER_DATATRANSFER] = BtlController_Empty,
[CONTROLLER_DMA3TRANSFER] = BtlController_Empty,
[CONTROLLER_PLAYBGM] = BtlController_Empty,
[CONTROLLER_32] = BtlController_Empty,
[CONTROLLER_TWORETURNVALUES] = BtlController_Empty,
[CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty,
[CONTROLLER_CLEARUNKVAR] = LinkOpponentHandleClearUnkVar,
[CONTROLLER_SETUNKVAR] = LinkOpponentHandleSetUnkVar,
[CONTROLLER_CLEARUNKFLAG] = LinkOpponentHandleClearUnkFlag,
[CONTROLLER_TOGGLEUNKFLAG] = LinkOpponentHandleToggleUnkFlag,
[CONTROLLER_HITANIMATION] = LinkOpponentHandleHitAnimation,
[CONTROLLER_CANTSWITCH] = LinkOpponentHandleCantSwitch,
[CONTROLLER_CANTSWITCH] = BtlController_Empty,
[CONTROLLER_PLAYSE] = LinkOpponentHandlePlaySE,
[CONTROLLER_PLAYFANFAREORBGM] = LinkOpponentHandlePlayFanfareOrBGM,
[CONTROLLER_FAINTINGCRY] = LinkOpponentHandleFaintingCry,
@ -150,14 +123,14 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_INTROTRAINERBALLTHROW] = LinkOpponentHandleIntroTrainerBallThrow,
[CONTROLLER_DRAWPARTYSTATUSSUMMARY] = LinkOpponentHandleDrawPartyStatusSummary,
[CONTROLLER_HIDEPARTYSTATUSSUMMARY] = LinkOpponentHandleHidePartyStatusSummary,
[CONTROLLER_ENDBOUNCE] = LinkOpponentHandleEndBounceEffect,
[CONTROLLER_ENDBOUNCE] = BtlController_Empty,
[CONTROLLER_SPRITEINVISIBILITY] = LinkOpponentHandleSpriteInvisibility,
[CONTROLLER_BATTLEANIMATION] = LinkOpponentHandleBattleAnimation,
[CONTROLLER_LINKSTANDBYMSG] = LinkOpponentHandleLinkStandbyMsg,
[CONTROLLER_RESETACTIONMOVESELECTION] = LinkOpponentHandleResetActionMoveSelection,
[CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty,
[CONTROLLER_ENDLINKBATTLE] = LinkOpponentHandleEndLinkBattle,
[CONTROLLER_DEBUGMENU] = LinkOpponentHandleBattleDebug,
[CONTROLLER_TERMINATOR_NOP] = LinkOpponentCmdEnd
[CONTROLLER_DEBUGMENU] = BtlController_Empty,
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop
};
static void LinkOpponentDummy(void)
@ -512,11 +485,6 @@ static void LinkOpponentHandleGetMonData(void)
BtlController_HandleGetMonData(gActiveBattler, gEnemyParty);
}
static void LinkOpponentHandleGetRawMonData(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleSetMonData(void)
{
BtlController_HandleSetMonData(gActiveBattler, gEnemyParty);
@ -674,26 +642,6 @@ static void LinkOpponentHandleFaintAnimation(void)
BtlController_HandleFaintAnimation(gActiveBattler);
}
static void LinkOpponentHandlePaletteFade(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleSuccessBallThrowAnim(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleBallThrowAnim(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandlePause(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleMoveAnimation(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -776,41 +724,6 @@ static void LinkOpponentHandlePrintString(void)
BattleTv_SetDataBasedOnString(*stringId);
}
static void LinkOpponentHandlePrintSelectionString(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleChooseAction(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleYesNoBox(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleChooseMove(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleChooseItem(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleChoosePokemon(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleCmd23(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleHealthBarUpdate(void)
{
s16 hpVal;
@ -835,11 +748,6 @@ static void LinkOpponentHandleHealthBarUpdate(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
}
static void LinkOpponentHandleExpUpdate(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleStatusIconUpdate(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -863,51 +771,6 @@ static void LinkOpponentHandleStatusAnimation(void)
}
}
static void LinkOpponentHandleStatusXor(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleDataTransfer(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleDMA3Transfer(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandlePlayBGM(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleCmd32(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleTwoReturnValues(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleChosenMonReturnValue(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleOneReturnValue(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleOneReturnValue_Duplicate(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleClearUnkVar(void)
{
gUnusedControllerStruct.unk = 0;
@ -947,11 +810,6 @@ static void LinkOpponentHandleHitAnimation(void)
}
}
static void LinkOpponentHandleCantSwitch(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandlePlaySE(void)
{
s8 pan;
@ -1098,11 +956,6 @@ static void LinkOpponentHandleHidePartyStatusSummary(void)
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleEndBounceEffect(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleSpriteInvisibility(void)
{
if (IsBattlerSpritePresent(gActiveBattler))
@ -1135,11 +988,6 @@ static void LinkOpponentHandleLinkStandbyMsg(void)
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleResetActionMoveSelection(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentHandleEndLinkBattle(void)
{
RecordedBattle_RecordAllBattlerData(&gBattleResources->bufferA[gActiveBattler][4]);
@ -1155,12 +1003,3 @@ static void LinkOpponentHandleEndLinkBattle(void)
LinkOpponentBufferExecCompleted();
gBattlerControllerFuncs[gActiveBattler] = SetBattleEndCallbacks;
}
static void LinkOpponentHandleBattleDebug(void)
{
LinkOpponentBufferExecCompleted();
}
static void LinkOpponentCmdEnd(void)
{
}

View File

@ -30,48 +30,24 @@
#include "recorded_battle.h"
static void LinkPartnerHandleGetMonData(void);
static void LinkPartnerHandleGetRawMonData(void);
static void LinkPartnerHandleSetMonData(void);
static void LinkPartnerHandleSetRawMonData(void);
static void LinkPartnerHandleLoadMonSprite(void);
static void LinkPartnerHandleSwitchInAnim(void);
static void LinkPartnerHandleReturnMonToBall(void);
static void LinkPartnerHandleDrawTrainerPic(void);
static void LinkPartnerHandleTrainerSlide(void);
static void LinkPartnerHandleTrainerSlideBack(void);
static void LinkPartnerHandleFaintAnimation(void);
static void LinkPartnerHandlePaletteFade(void);
static void LinkPartnerHandleSuccessBallThrowAnim(void);
static void LinkPartnerHandleBallThrowAnim(void);
static void LinkPartnerHandlePause(void);
static void LinkPartnerHandleMoveAnimation(void);
static void LinkPartnerHandlePrintString(void);
static void LinkPartnerHandlePrintSelectionString(void);
static void LinkPartnerHandleChooseAction(void);
static void LinkPartnerHandleYesNoBox(void);
static void LinkPartnerHandleChooseMove(void);
static void LinkPartnerHandleChooseItem(void);
static void LinkPartnerHandleChoosePokemon(void);
static void LinkPartnerHandleCmd23(void);
static void LinkPartnerHandleHealthBarUpdate(void);
static void LinkPartnerHandleExpUpdate(void);
static void LinkPartnerHandleStatusIconUpdate(void);
static void LinkPartnerHandleStatusAnimation(void);
static void LinkPartnerHandleStatusXor(void);
static void LinkPartnerHandleDataTransfer(void);
static void LinkPartnerHandleDMA3Transfer(void);
static void LinkPartnerHandlePlayBGM(void);
static void LinkPartnerHandleCmd32(void);
static void LinkPartnerHandleTwoReturnValues(void);
static void LinkPartnerHandleChosenMonReturnValue(void);
static void LinkPartnerHandleOneReturnValue(void);
static void LinkPartnerHandleOneReturnValue_Duplicate(void);
static void LinkPartnerHandleClearUnkVar(void);
static void LinkPartnerHandleSetUnkVar(void);
static void LinkPartnerHandleClearUnkFlag(void);
static void LinkPartnerHandleToggleUnkFlag(void);
static void LinkPartnerHandleHitAnimation(void);
static void LinkPartnerHandleCantSwitch(void);
static void LinkPartnerHandlePlaySE(void);
static void LinkPartnerHandlePlayFanfareOrBGM(void);
static void LinkPartnerHandleFaintingCry(void);
@ -79,14 +55,10 @@ static void LinkPartnerHandleIntroSlide(void);
static void LinkPartnerHandleIntroTrainerBallThrow(void);
static void LinkPartnerHandleDrawPartyStatusSummary(void);
static void LinkPartnerHandleHidePartyStatusSummary(void);
static void LinkPartnerHandleEndBounceEffect(void);
static void LinkPartnerHandleSpriteInvisibility(void);
static void LinkPartnerHandleBattleAnimation(void);
static void LinkPartnerHandleLinkStandbyMsg(void);
static void LinkPartnerHandleResetActionMoveSelection(void);
static void LinkPartnerHandleEndLinkBattle(void);
static void LinkPartnerHandleBattleDebug(void);
static void LinkPartnerCmdEnd(void);
static void LinkPartnerBufferRunCommand(void);
static void LinkPartnerBufferExecCompleted(void);
@ -100,48 +72,48 @@ static void EndDrawPartyStatusSummary(void);
static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{
[CONTROLLER_GETMONDATA] = LinkPartnerHandleGetMonData,
[CONTROLLER_GETRAWMONDATA] = LinkPartnerHandleGetRawMonData,
[CONTROLLER_GETRAWMONDATA] = BtlController_Empty,
[CONTROLLER_SETMONDATA] = LinkPartnerHandleSetMonData,
[CONTROLLER_SETRAWMONDATA] = LinkPartnerHandleSetRawMonData,
[CONTROLLER_LOADMONSPRITE] = LinkPartnerHandleLoadMonSprite,
[CONTROLLER_SWITCHINANIM] = LinkPartnerHandleSwitchInAnim,
[CONTROLLER_RETURNMONTOBALL] = LinkPartnerHandleReturnMonToBall,
[CONTROLLER_DRAWTRAINERPIC] = LinkPartnerHandleDrawTrainerPic,
[CONTROLLER_TRAINERSLIDE] = LinkPartnerHandleTrainerSlide,
[CONTROLLER_TRAINERSLIDE] = BtlController_Empty,
[CONTROLLER_TRAINERSLIDEBACK] = LinkPartnerHandleTrainerSlideBack,
[CONTROLLER_FAINTANIMATION] = LinkPartnerHandleFaintAnimation,
[CONTROLLER_PALETTEFADE] = LinkPartnerHandlePaletteFade,
[CONTROLLER_SUCCESSBALLTHROWANIM] = LinkPartnerHandleSuccessBallThrowAnim,
[CONTROLLER_BALLTHROWANIM] = LinkPartnerHandleBallThrowAnim,
[CONTROLLER_PAUSE] = LinkPartnerHandlePause,
[CONTROLLER_PALETTEFADE] = BtlController_Empty,
[CONTROLLER_SUCCESSBALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_BALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_PAUSE] = BtlController_Empty,
[CONTROLLER_MOVEANIMATION] = LinkPartnerHandleMoveAnimation,
[CONTROLLER_PRINTSTRING] = LinkPartnerHandlePrintString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = LinkPartnerHandlePrintSelectionString,
[CONTROLLER_CHOOSEACTION] = LinkPartnerHandleChooseAction,
[CONTROLLER_YESNOBOX] = LinkPartnerHandleYesNoBox,
[CONTROLLER_CHOOSEMOVE] = LinkPartnerHandleChooseMove,
[CONTROLLER_OPENBAG] = LinkPartnerHandleChooseItem,
[CONTROLLER_CHOOSEPOKEMON] = LinkPartnerHandleChoosePokemon,
[CONTROLLER_23] = LinkPartnerHandleCmd23,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = BtlController_Empty,
[CONTROLLER_CHOOSEACTION] = BtlController_Empty,
[CONTROLLER_YESNOBOX] = BtlController_Empty,
[CONTROLLER_CHOOSEMOVE] = BtlController_Empty,
[CONTROLLER_OPENBAG] = BtlController_Empty,
[CONTROLLER_CHOOSEPOKEMON] = BtlController_Empty,
[CONTROLLER_23] = BtlController_Empty,
[CONTROLLER_HEALTHBARUPDATE] = LinkPartnerHandleHealthBarUpdate,
[CONTROLLER_EXPUPDATE] = LinkPartnerHandleExpUpdate,
[CONTROLLER_EXPUPDATE] = BtlController_Empty,
[CONTROLLER_STATUSICONUPDATE] = LinkPartnerHandleStatusIconUpdate,
[CONTROLLER_STATUSANIMATION] = LinkPartnerHandleStatusAnimation,
[CONTROLLER_STATUSXOR] = LinkPartnerHandleStatusXor,
[CONTROLLER_DATATRANSFER] = LinkPartnerHandleDataTransfer,
[CONTROLLER_DMA3TRANSFER] = LinkPartnerHandleDMA3Transfer,
[CONTROLLER_PLAYBGM] = LinkPartnerHandlePlayBGM,
[CONTROLLER_32] = LinkPartnerHandleCmd32,
[CONTROLLER_TWORETURNVALUES] = LinkPartnerHandleTwoReturnValues,
[CONTROLLER_CHOSENMONRETURNVALUE] = LinkPartnerHandleChosenMonReturnValue,
[CONTROLLER_ONERETURNVALUE] = LinkPartnerHandleOneReturnValue,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = LinkPartnerHandleOneReturnValue_Duplicate,
[CONTROLLER_STATUSXOR] = BtlController_Empty,
[CONTROLLER_DATATRANSFER] = BtlController_Empty,
[CONTROLLER_DMA3TRANSFER] = BtlController_Empty,
[CONTROLLER_PLAYBGM] = BtlController_Empty,
[CONTROLLER_32] = BtlController_Empty,
[CONTROLLER_TWORETURNVALUES] = BtlController_Empty,
[CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty,
[CONTROLLER_CLEARUNKVAR] = LinkPartnerHandleClearUnkVar,
[CONTROLLER_SETUNKVAR] = LinkPartnerHandleSetUnkVar,
[CONTROLLER_CLEARUNKFLAG] = LinkPartnerHandleClearUnkFlag,
[CONTROLLER_TOGGLEUNKFLAG] = LinkPartnerHandleToggleUnkFlag,
[CONTROLLER_HITANIMATION] = LinkPartnerHandleHitAnimation,
[CONTROLLER_CANTSWITCH] = LinkPartnerHandleCantSwitch,
[CONTROLLER_CANTSWITCH] = BtlController_Empty,
[CONTROLLER_PLAYSE] = LinkPartnerHandlePlaySE,
[CONTROLLER_PLAYFANFAREORBGM] = LinkPartnerHandlePlayFanfareOrBGM,
[CONTROLLER_FAINTINGCRY] = LinkPartnerHandleFaintingCry,
@ -149,14 +121,14 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_INTROTRAINERBALLTHROW] = LinkPartnerHandleIntroTrainerBallThrow,
[CONTROLLER_DRAWPARTYSTATUSSUMMARY] = LinkPartnerHandleDrawPartyStatusSummary,
[CONTROLLER_HIDEPARTYSTATUSSUMMARY] = LinkPartnerHandleHidePartyStatusSummary,
[CONTROLLER_ENDBOUNCE] = LinkPartnerHandleEndBounceEffect,
[CONTROLLER_ENDBOUNCE] = BtlController_Empty,
[CONTROLLER_SPRITEINVISIBILITY] = LinkPartnerHandleSpriteInvisibility,
[CONTROLLER_BATTLEANIMATION] = LinkPartnerHandleBattleAnimation,
[CONTROLLER_LINKSTANDBYMSG] = LinkPartnerHandleLinkStandbyMsg,
[CONTROLLER_RESETACTIONMOVESELECTION] = LinkPartnerHandleResetActionMoveSelection,
[CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty,
[CONTROLLER_ENDLINKBATTLE] = LinkPartnerHandleEndLinkBattle,
[CONTROLLER_DEBUGMENU] = LinkPartnerHandleBattleDebug,
[CONTROLLER_TERMINATOR_NOP] = LinkPartnerCmdEnd
[CONTROLLER_DEBUGMENU] = BtlController_Empty,
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop
};
static void SpriteCB_Null2(void)
@ -402,11 +374,6 @@ static void LinkPartnerHandleGetMonData(void)
BtlController_HandleGetMonData(gActiveBattler, gPlayerParty);
}
static void LinkPartnerHandleGetRawMonData(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleSetMonData(void)
{
BtlController_HandleSetMonData(gActiveBattler, gPlayerParty);
@ -480,11 +447,6 @@ static void LinkPartnerHandleDrawTrainerPic(void)
#undef sSpeedX
static void LinkPartnerHandleTrainerSlide(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleTrainerSlideBack(void)
{
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
@ -501,26 +463,6 @@ static void LinkPartnerHandleFaintAnimation(void)
BtlController_HandleFaintAnimation(gActiveBattler);
}
static void LinkPartnerHandlePaletteFade(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleSuccessBallThrowAnim(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleBallThrowAnim(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandlePause(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleMoveAnimation(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -603,41 +545,6 @@ static void LinkPartnerHandlePrintString(void)
BattleTv_SetDataBasedOnString(*stringId);
}
static void LinkPartnerHandlePrintSelectionString(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleChooseAction(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleYesNoBox(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleChooseMove(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleChooseItem(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleChoosePokemon(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleCmd23(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleHealthBarUpdate(void)
{
s16 hpVal;
@ -662,11 +569,6 @@ static void LinkPartnerHandleHealthBarUpdate(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
}
static void LinkPartnerHandleExpUpdate(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleStatusIconUpdate(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -690,51 +592,6 @@ static void LinkPartnerHandleStatusAnimation(void)
}
}
static void LinkPartnerHandleStatusXor(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleDataTransfer(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleDMA3Transfer(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandlePlayBGM(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleCmd32(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleTwoReturnValues(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleChosenMonReturnValue(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleOneReturnValue(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleOneReturnValue_Duplicate(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleClearUnkVar(void)
{
gUnusedControllerStruct.unk = 0;
@ -774,11 +631,6 @@ static void LinkPartnerHandleHitAnimation(void)
}
}
static void LinkPartnerHandleCantSwitch(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandlePlaySE(void)
{
s8 pan;
@ -937,11 +789,6 @@ static void LinkPartnerHandleHidePartyStatusSummary(void)
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleEndBounceEffect(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleSpriteInvisibility(void)
{
if (IsBattlerSpritePresent(gActiveBattler))
@ -974,11 +821,6 @@ static void LinkPartnerHandleLinkStandbyMsg(void)
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleResetActionMoveSelection(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerHandleEndLinkBattle(void)
{
RecordedBattle_RecordAllBattlerData(&gBattleResources->bufferA[gActiveBattler][4]);
@ -989,12 +831,3 @@ static void LinkPartnerHandleEndLinkBattle(void)
LinkPartnerBufferExecCompleted();
gBattlerControllerFuncs[gActiveBattler] = SetBattleEndCallbacks;
}
static void LinkPartnerHandleBattleDebug(void)
{
LinkPartnerBufferExecCompleted();
}
static void LinkPartnerCmdEnd(void)
{
}

View File

@ -50,38 +50,20 @@ static void OpponentHandleDrawTrainerPic(void);
static void OpponentHandleTrainerSlide(void);
static void OpponentHandleTrainerSlideBack(void);
static void OpponentHandleFaintAnimation(void);
static void OpponentHandlePaletteFade(void);
static void OpponentHandleSuccessBallThrowAnim(void);
static void OpponentHandleBallThrow(void);
static void OpponentHandlePause(void);
static void OpponentHandleMoveAnimation(void);
static void OpponentHandlePrintString(void);
static void OpponentHandlePrintSelectionString(void);
static void OpponentHandleChooseAction(void);
static void OpponentHandleYesNoBox(void);
static void OpponentHandleChooseMove(void);
static void OpponentHandleChooseItem(void);
static void OpponentHandleChoosePokemon(void);
static void OpponentHandleCmd23(void);
static void OpponentHandleHealthBarUpdate(void);
static void OpponentHandleExpUpdate(void);
static void OpponentHandleStatusIconUpdate(void);
static void OpponentHandleStatusAnimation(void);
static void OpponentHandleStatusXor(void);
static void OpponentHandleDataTransfer(void);
static void OpponentHandleDMA3Transfer(void);
static void OpponentHandlePlayBGM(void);
static void OpponentHandleCmd32(void);
static void OpponentHandleTwoReturnValues(void);
static void OpponentHandleChosenMonReturnValue(void);
static void OpponentHandleOneReturnValue(void);
static void OpponentHandleOneReturnValue_Duplicate(void);
static void OpponentHandleClearUnkVar(void);
static void OpponentHandleSetUnkVar(void);
static void OpponentHandleClearUnkFlag(void);
static void OpponentHandleToggleUnkFlag(void);
static void OpponentHandleHitAnimation(void);
static void OpponentHandleCantSwitch(void);
static void OpponentHandlePlaySE(void);
static void OpponentHandlePlayFanfareOrBGM(void);
static void OpponentHandleFaintingCry(void);
@ -89,14 +71,9 @@ static void OpponentHandleIntroSlide(void);
static void OpponentHandleIntroTrainerBallThrow(void);
static void OpponentHandleDrawPartyStatusSummary(void);
static void OpponentHandleHidePartyStatusSummary(void);
static void OpponentHandleEndBounceEffect(void);
static void OpponentHandleSpriteInvisibility(void);
static void OpponentHandleBattleAnimation(void);
static void OpponentHandleLinkStandbyMsg(void);
static void OpponentHandleResetActionMoveSelection(void);
static void OpponentHandleEndLinkBattle(void);
static void OpponentHandleDebugMenu(void);
static void OpponentCmdEnd(void);
static u8 CountAIAliveNonEggMonsExcept(u8 slotToIgnore);
static void OpponentBufferRunCommand(void);
@ -122,38 +99,38 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_TRAINERSLIDE] = OpponentHandleTrainerSlide,
[CONTROLLER_TRAINERSLIDEBACK] = OpponentHandleTrainerSlideBack,
[CONTROLLER_FAINTANIMATION] = OpponentHandleFaintAnimation,
[CONTROLLER_PALETTEFADE] = OpponentHandlePaletteFade,
[CONTROLLER_SUCCESSBALLTHROWANIM] = OpponentHandleSuccessBallThrowAnim,
[CONTROLLER_BALLTHROWANIM] = OpponentHandleBallThrow,
[CONTROLLER_PAUSE] = OpponentHandlePause,
[CONTROLLER_PALETTEFADE] = BtlController_Empty,
[CONTROLLER_SUCCESSBALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_BALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_PAUSE] = BtlController_Empty,
[CONTROLLER_MOVEANIMATION] = OpponentHandleMoveAnimation,
[CONTROLLER_PRINTSTRING] = OpponentHandlePrintString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = OpponentHandlePrintSelectionString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = BtlController_Empty,
[CONTROLLER_CHOOSEACTION] = OpponentHandleChooseAction,
[CONTROLLER_YESNOBOX] = OpponentHandleYesNoBox,
[CONTROLLER_YESNOBOX] = BtlController_Empty,
[CONTROLLER_CHOOSEMOVE] = OpponentHandleChooseMove,
[CONTROLLER_OPENBAG] = OpponentHandleChooseItem,
[CONTROLLER_CHOOSEPOKEMON] = OpponentHandleChoosePokemon,
[CONTROLLER_23] = OpponentHandleCmd23,
[CONTROLLER_23] = BtlController_Empty,
[CONTROLLER_HEALTHBARUPDATE] = OpponentHandleHealthBarUpdate,
[CONTROLLER_EXPUPDATE] = OpponentHandleExpUpdate,
[CONTROLLER_EXPUPDATE] = BtlController_Empty,
[CONTROLLER_STATUSICONUPDATE] = OpponentHandleStatusIconUpdate,
[CONTROLLER_STATUSANIMATION] = OpponentHandleStatusAnimation,
[CONTROLLER_STATUSXOR] = OpponentHandleStatusXor,
[CONTROLLER_DATATRANSFER] = OpponentHandleDataTransfer,
[CONTROLLER_DMA3TRANSFER] = OpponentHandleDMA3Transfer,
[CONTROLLER_PLAYBGM] = OpponentHandlePlayBGM,
[CONTROLLER_32] = OpponentHandleCmd32,
[CONTROLLER_TWORETURNVALUES] = OpponentHandleTwoReturnValues,
[CONTROLLER_CHOSENMONRETURNVALUE] = OpponentHandleChosenMonReturnValue,
[CONTROLLER_ONERETURNVALUE] = OpponentHandleOneReturnValue,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = OpponentHandleOneReturnValue_Duplicate,
[CONTROLLER_STATUSXOR] = BtlController_Empty,
[CONTROLLER_DATATRANSFER] = BtlController_Empty,
[CONTROLLER_DMA3TRANSFER] = BtlController_Empty,
[CONTROLLER_PLAYBGM] = BtlController_Empty,
[CONTROLLER_32] = BtlController_Empty,
[CONTROLLER_TWORETURNVALUES] = BtlController_Empty,
[CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty,
[CONTROLLER_CLEARUNKVAR] = OpponentHandleClearUnkVar,
[CONTROLLER_SETUNKVAR] = OpponentHandleSetUnkVar,
[CONTROLLER_CLEARUNKFLAG] = OpponentHandleClearUnkFlag,
[CONTROLLER_TOGGLEUNKFLAG] = OpponentHandleToggleUnkFlag,
[CONTROLLER_HITANIMATION] = OpponentHandleHitAnimation,
[CONTROLLER_CANTSWITCH] = OpponentHandleCantSwitch,
[CONTROLLER_CANTSWITCH] = BtlController_Empty,
[CONTROLLER_PLAYSE] = OpponentHandlePlaySE,
[CONTROLLER_PLAYFANFAREORBGM] = OpponentHandlePlayFanfareOrBGM,
[CONTROLLER_FAINTINGCRY] = OpponentHandleFaintingCry,
@ -161,14 +138,14 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_INTROTRAINERBALLTHROW] = OpponentHandleIntroTrainerBallThrow,
[CONTROLLER_DRAWPARTYSTATUSSUMMARY] = OpponentHandleDrawPartyStatusSummary,
[CONTROLLER_HIDEPARTYSTATUSSUMMARY] = OpponentHandleHidePartyStatusSummary,
[CONTROLLER_ENDBOUNCE] = OpponentHandleEndBounceEffect,
[CONTROLLER_ENDBOUNCE] = BtlController_Empty,
[CONTROLLER_SPRITEINVISIBILITY] = OpponentHandleSpriteInvisibility,
[CONTROLLER_BATTLEANIMATION] = OpponentHandleBattleAnimation,
[CONTROLLER_LINKSTANDBYMSG] = OpponentHandleLinkStandbyMsg,
[CONTROLLER_RESETACTIONMOVESELECTION] = OpponentHandleResetActionMoveSelection,
[CONTROLLER_LINKSTANDBYMSG] = BtlController_Empty,
[CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty,
[CONTROLLER_ENDLINKBATTLE] = OpponentHandleEndLinkBattle,
[CONTROLLER_DEBUGMENU] = OpponentHandleDebugMenu,
[CONTROLLER_TERMINATOR_NOP] = OpponentCmdEnd
[CONTROLLER_DEBUGMENU] = BtlController_Empty,
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop
};
static void OpponentDummy(void)
@ -736,26 +713,6 @@ static void OpponentHandleFaintAnimation(void)
BtlController_HandleFaintAnimation(gActiveBattler);
}
static void OpponentHandlePaletteFade(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleSuccessBallThrowAnim(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleBallThrow(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandlePause(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleMoveAnimation(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -837,22 +794,12 @@ static void OpponentHandlePrintString(void)
BattleArena_DeductSkillPoints(gActiveBattler, *stringId);
}
static void OpponentHandlePrintSelectionString(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleChooseAction(void)
{
AI_TrySwitchOrUseItem();
OpponentBufferExecCompleted();
}
static void OpponentHandleYesNoBox(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleChooseMove(void)
{
u8 chosenMoveId;
@ -1050,11 +997,6 @@ static u8 CountAIAliveNonEggMonsExcept(u8 slotToIgnore)
return count;
}
static void OpponentHandleCmd23(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleHealthBarUpdate(void)
{
s16 hpVal;
@ -1079,11 +1021,6 @@ static void OpponentHandleHealthBarUpdate(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
}
static void OpponentHandleExpUpdate(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleStatusIconUpdate(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -1107,51 +1044,6 @@ static void OpponentHandleStatusAnimation(void)
}
}
static void OpponentHandleStatusXor(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleDataTransfer(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleDMA3Transfer(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandlePlayBGM(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleCmd32(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleTwoReturnValues(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleChosenMonReturnValue(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleOneReturnValue(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleOneReturnValue_Duplicate(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleClearUnkVar(void)
{
gUnusedControllerStruct.unk = 0;
@ -1191,11 +1083,6 @@ static void OpponentHandleHitAnimation(void)
}
}
static void OpponentHandleCantSwitch(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandlePlaySE(void)
{
s8 pan;
@ -1347,11 +1234,6 @@ static void OpponentHandleHidePartyStatusSummary(void)
OpponentBufferExecCompleted();
}
static void OpponentHandleEndBounceEffect(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleSpriteInvisibility(void)
{
if (IsBattlerSpritePresent(gActiveBattler))
@ -1376,16 +1258,6 @@ static void OpponentHandleBattleAnimation(void)
}
}
static void OpponentHandleLinkStandbyMsg(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleResetActionMoveSelection(void)
{
OpponentBufferExecCompleted();
}
static void OpponentHandleEndLinkBattle(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK && !(gBattleTypeFlags & BATTLE_TYPE_IS_MASTER))
@ -1396,12 +1268,3 @@ static void OpponentHandleEndLinkBattle(void)
}
OpponentBufferExecCompleted();
}
static void OpponentHandleDebugMenu(void)
{
OpponentBufferExecCompleted();
}
static void OpponentCmdEnd(void)
{
}

View File

@ -67,10 +67,8 @@ static void PlayerHandleExpUpdate(void);
static void PlayerHandleStatusIconUpdate(void);
static void PlayerHandleStatusAnimation(void);
static void PlayerHandleStatusXor(void);
static void PlayerHandleDataTransfer(void);
static void PlayerHandleDMA3Transfer(void);
static void PlayerHandlePlayBGM(void);
static void PlayerHandleCmd32(void);
static void PlayerHandleTwoReturnValues(void);
static void PlayerHandleChosenMonReturnValue(void);
static void PlayerHandleOneReturnValue(void);
@ -80,7 +78,6 @@ static void PlayerHandleSetUnkVar(void);
static void PlayerHandleClearUnkFlag(void);
static void PlayerHandleToggleUnkFlag(void);
static void PlayerHandleHitAnimation(void);
static void PlayerHandleCantSwitch(void);
static void PlayerHandlePlaySE(void);
static void PlayerHandlePlayFanfareOrBGM(void);
static void PlayerHandleFaintingCry(void);
@ -95,7 +92,6 @@ static void PlayerHandleLinkStandbyMsg(void);
static void PlayerHandleResetActionMoveSelection(void);
static void PlayerHandleEndLinkBattle(void);
static void PlayerHandleBattleDebug(void);
static void PlayerCmdEnd(void);
static void PlayerBufferRunCommand(void);
static void HandleInputChooseTarget(void);
@ -153,10 +149,10 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_STATUSICONUPDATE] = PlayerHandleStatusIconUpdate,
[CONTROLLER_STATUSANIMATION] = PlayerHandleStatusAnimation,
[CONTROLLER_STATUSXOR] = PlayerHandleStatusXor,
[CONTROLLER_DATATRANSFER] = PlayerHandleDataTransfer,
[CONTROLLER_DATATRANSFER] = BtlController_Empty,
[CONTROLLER_DMA3TRANSFER] = PlayerHandleDMA3Transfer,
[CONTROLLER_PLAYBGM] = PlayerHandlePlayBGM,
[CONTROLLER_32] = PlayerHandleCmd32,
[CONTROLLER_32] = BtlController_Empty,
[CONTROLLER_TWORETURNVALUES] = PlayerHandleTwoReturnValues,
[CONTROLLER_CHOSENMONRETURNVALUE] = PlayerHandleChosenMonReturnValue,
[CONTROLLER_ONERETURNVALUE] = PlayerHandleOneReturnValue,
@ -166,7 +162,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_CLEARUNKFLAG] = PlayerHandleClearUnkFlag,
[CONTROLLER_TOGGLEUNKFLAG] = PlayerHandleToggleUnkFlag,
[CONTROLLER_HITANIMATION] = PlayerHandleHitAnimation,
[CONTROLLER_CANTSWITCH] = PlayerHandleCantSwitch,
[CONTROLLER_CANTSWITCH] = BtlController_Empty,
[CONTROLLER_PLAYSE] = PlayerHandlePlaySE,
[CONTROLLER_PLAYFANFAREORBGM] = PlayerHandlePlayFanfareOrBGM,
[CONTROLLER_FAINTINGCRY] = PlayerHandleFaintingCry,
@ -181,7 +177,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_RESETACTIONMOVESELECTION] = PlayerHandleResetActionMoveSelection,
[CONTROLLER_ENDLINKBATTLE] = PlayerHandleEndLinkBattle,
[CONTROLLER_DEBUGMENU] = PlayerHandleBattleDebug,
[CONTROLLER_TERMINATOR_NOP] = PlayerCmdEnd
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop
};
void BattleControllerDummy(void)
@ -2303,11 +2299,6 @@ static void PlayerHandleStatusXor(void)
PlayerBufferExecCompleted();
}
static void PlayerHandleDataTransfer(void)
{
PlayerBufferExecCompleted();
}
static void PlayerHandleDMA3Transfer(void)
{
u32 dstArg = gBattleResources->bufferA[gActiveBattler][1]
@ -2341,11 +2332,6 @@ static void PlayerHandlePlayBGM(void)
PlayerBufferExecCompleted();
}
static void PlayerHandleCmd32(void)
{
PlayerBufferExecCompleted();
}
static void PlayerHandleTwoReturnValues(void)
{
BtlController_EmitTwoReturnValues(BUFFER_B, 0, 0);
@ -2409,11 +2395,6 @@ static void PlayerHandleHitAnimation(void)
}
}
static void PlayerHandleCantSwitch(void)
{
PlayerBufferExecCompleted();
}
static void PlayerHandlePlaySE(void)
{
s8 pan;
@ -2676,7 +2657,3 @@ static void PlayerHandleBattleDebug(void)
SetMainCallback2(CB2_BattleDebugMenu);
gBattlerControllerFuncs[gActiveBattler] = WaitForDebug;
}
static void PlayerCmdEnd(void)
{
}

View File

@ -33,48 +33,28 @@
#include "constants/trainers.h"
static void RecordedOpponentHandleGetMonData(void);
static void RecordedOpponentHandleGetRawMonData(void);
static void RecordedOpponentHandleSetMonData(void);
static void RecordedOpponentHandleSetRawMonData(void);
static void RecordedOpponentHandleLoadMonSprite(void);
static void RecordedOpponentHandleSwitchInAnim(void);
static void RecordedOpponentHandleReturnMonToBall(void);
static void RecordedOpponentHandleDrawTrainerPic(void);
static void RecordedOpponentHandleTrainerSlide(void);
static void RecordedOpponentHandleTrainerSlideBack(void);
static void RecordedOpponentHandleFaintAnimation(void);
static void RecordedOpponentHandlePaletteFade(void);
static void RecordedOpponentHandleSuccessBallThrowAnim(void);
static void RecordedOpponentHandleBallThrowAnim(void);
static void RecordedOpponentHandlePause(void);
static void RecordedOpponentHandleMoveAnimation(void);
static void RecordedOpponentHandlePrintString(void);
static void RecordedOpponentHandlePrintSelectionString(void);
static void RecordedOpponentHandleChooseAction(void);
static void RecordedOpponentHandleYesNoBox(void);
static void RecordedOpponentHandleChooseMove(void);
static void RecordedOpponentHandleChooseItem(void);
static void RecordedOpponentHandleChoosePokemon(void);
static void RecordedOpponentHandleCmd23(void);
static void RecordedOpponentHandleHealthBarUpdate(void);
static void RecordedOpponentHandleExpUpdate(void);
static void RecordedOpponentHandleStatusIconUpdate(void);
static void RecordedOpponentHandleStatusAnimation(void);
static void RecordedOpponentHandleStatusXor(void);
static void RecordedOpponentHandleDataTransfer(void);
static void RecordedOpponentHandleDMA3Transfer(void);
static void RecordedOpponentHandlePlayBGM(void);
static void RecordedOpponentHandleCmd32(void);
static void RecordedOpponentHandleTwoReturnValues(void);
static void RecordedOpponentHandleChosenMonReturnValue(void);
static void RecordedOpponentHandleOneReturnValue(void);
static void RecordedOpponentHandleOneReturnValue_Duplicate(void);
static void RecordedOpponentHandleClearUnkVar(void);
static void RecordedOpponentHandleSetUnkVar(void);
static void RecordedOpponentHandleClearUnkFlag(void);
static void RecordedOpponentHandleToggleUnkFlag(void);
static void RecordedOpponentHandleHitAnimation(void);
static void RecordedOpponentHandleCantSwitch(void);
static void RecordedOpponentHandlePlaySE(void);
static void RecordedOpponentHandlePlayFanfareOrBGM(void);
static void RecordedOpponentHandleFaintingCry(void);
@ -82,14 +62,9 @@ static void RecordedOpponentHandleIntroSlide(void);
static void RecordedOpponentHandleIntroTrainerBallThrow(void);
static void RecordedOpponentHandleDrawPartyStatusSummary(void);
static void RecordedOpponentHandleHidePartyStatusSummary(void);
static void RecordedOpponentHandleEndBounceEffect(void);
static void RecordedOpponentHandleSpriteInvisibility(void);
static void RecordedOpponentHandleBattleAnimation(void);
static void RecordedOpponentHandleLinkStandbyMsg(void);
static void RecordedOpponentHandleResetActionMoveSelection(void);
static void RecordedOpponentHandleEndLinkBattle(void);
static void RecordedOpponentHandleBattleDebug(void);
static void RecordedOpponentCmdEnd(void);
static void RecordedOpponentBufferRunCommand(void);
static void RecordedOpponentBufferExecCompleted(void);
@ -104,48 +79,48 @@ static void EndDrawPartyStatusSummary(void);
static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{
[CONTROLLER_GETMONDATA] = RecordedOpponentHandleGetMonData,
[CONTROLLER_GETRAWMONDATA] = RecordedOpponentHandleGetRawMonData,
[CONTROLLER_GETRAWMONDATA] = BtlController_Empty,
[CONTROLLER_SETMONDATA] = RecordedOpponentHandleSetMonData,
[CONTROLLER_SETRAWMONDATA] = RecordedOpponentHandleSetRawMonData,
[CONTROLLER_LOADMONSPRITE] = RecordedOpponentHandleLoadMonSprite,
[CONTROLLER_SWITCHINANIM] = RecordedOpponentHandleSwitchInAnim,
[CONTROLLER_RETURNMONTOBALL] = RecordedOpponentHandleReturnMonToBall,
[CONTROLLER_DRAWTRAINERPIC] = RecordedOpponentHandleDrawTrainerPic,
[CONTROLLER_TRAINERSLIDE] = RecordedOpponentHandleTrainerSlide,
[CONTROLLER_TRAINERSLIDE] = BtlController_Empty,
[CONTROLLER_TRAINERSLIDEBACK] = RecordedOpponentHandleTrainerSlideBack,
[CONTROLLER_FAINTANIMATION] = RecordedOpponentHandleFaintAnimation,
[CONTROLLER_PALETTEFADE] = RecordedOpponentHandlePaletteFade,
[CONTROLLER_SUCCESSBALLTHROWANIM] = RecordedOpponentHandleSuccessBallThrowAnim,
[CONTROLLER_BALLTHROWANIM] = RecordedOpponentHandleBallThrowAnim,
[CONTROLLER_PAUSE] = RecordedOpponentHandlePause,
[CONTROLLER_PALETTEFADE] = BtlController_Empty,
[CONTROLLER_SUCCESSBALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_BALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_PAUSE] = BtlController_Empty,
[CONTROLLER_MOVEANIMATION] = RecordedOpponentHandleMoveAnimation,
[CONTROLLER_PRINTSTRING] = RecordedOpponentHandlePrintString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = RecordedOpponentHandlePrintSelectionString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = BtlController_Empty,
[CONTROLLER_CHOOSEACTION] = RecordedOpponentHandleChooseAction,
[CONTROLLER_YESNOBOX] = RecordedOpponentHandleYesNoBox,
[CONTROLLER_YESNOBOX] = BtlController_Empty,
[CONTROLLER_CHOOSEMOVE] = RecordedOpponentHandleChooseMove,
[CONTROLLER_OPENBAG] = RecordedOpponentHandleChooseItem,
[CONTROLLER_CHOOSEPOKEMON] = RecordedOpponentHandleChoosePokemon,
[CONTROLLER_23] = RecordedOpponentHandleCmd23,
[CONTROLLER_23] = BtlController_Empty,
[CONTROLLER_HEALTHBARUPDATE] = RecordedOpponentHandleHealthBarUpdate,
[CONTROLLER_EXPUPDATE] = RecordedOpponentHandleExpUpdate,
[CONTROLLER_EXPUPDATE] = BtlController_Empty,
[CONTROLLER_STATUSICONUPDATE] = RecordedOpponentHandleStatusIconUpdate,
[CONTROLLER_STATUSANIMATION] = RecordedOpponentHandleStatusAnimation,
[CONTROLLER_STATUSXOR] = RecordedOpponentHandleStatusXor,
[CONTROLLER_DATATRANSFER] = RecordedOpponentHandleDataTransfer,
[CONTROLLER_DMA3TRANSFER] = RecordedOpponentHandleDMA3Transfer,
[CONTROLLER_PLAYBGM] = RecordedOpponentHandlePlayBGM,
[CONTROLLER_32] = RecordedOpponentHandleCmd32,
[CONTROLLER_TWORETURNVALUES] = RecordedOpponentHandleTwoReturnValues,
[CONTROLLER_CHOSENMONRETURNVALUE] = RecordedOpponentHandleChosenMonReturnValue,
[CONTROLLER_ONERETURNVALUE] = RecordedOpponentHandleOneReturnValue,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = RecordedOpponentHandleOneReturnValue_Duplicate,
[CONTROLLER_STATUSXOR] = BtlController_Empty,
[CONTROLLER_DATATRANSFER] = BtlController_Empty,
[CONTROLLER_DMA3TRANSFER] = BtlController_Empty,
[CONTROLLER_PLAYBGM] = BtlController_Empty,
[CONTROLLER_32] = BtlController_Empty,
[CONTROLLER_TWORETURNVALUES] = BtlController_Empty,
[CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty,
[CONTROLLER_CLEARUNKVAR] = RecordedOpponentHandleClearUnkVar,
[CONTROLLER_SETUNKVAR] = RecordedOpponentHandleSetUnkVar,
[CONTROLLER_CLEARUNKFLAG] = RecordedOpponentHandleClearUnkFlag,
[CONTROLLER_TOGGLEUNKFLAG] = RecordedOpponentHandleToggleUnkFlag,
[CONTROLLER_HITANIMATION] = RecordedOpponentHandleHitAnimation,
[CONTROLLER_CANTSWITCH] = RecordedOpponentHandleCantSwitch,
[CONTROLLER_CANTSWITCH] = BtlController_Empty,
[CONTROLLER_PLAYSE] = RecordedOpponentHandlePlaySE,
[CONTROLLER_PLAYFANFAREORBGM] = RecordedOpponentHandlePlayFanfareOrBGM,
[CONTROLLER_FAINTINGCRY] = RecordedOpponentHandleFaintingCry,
@ -153,14 +128,14 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void
[CONTROLLER_INTROTRAINERBALLTHROW] = RecordedOpponentHandleIntroTrainerBallThrow,
[CONTROLLER_DRAWPARTYSTATUSSUMMARY] = RecordedOpponentHandleDrawPartyStatusSummary,
[CONTROLLER_HIDEPARTYSTATUSSUMMARY] = RecordedOpponentHandleHidePartyStatusSummary,
[CONTROLLER_ENDBOUNCE] = RecordedOpponentHandleEndBounceEffect,
[CONTROLLER_ENDBOUNCE] = BtlController_Empty,
[CONTROLLER_SPRITEINVISIBILITY] = RecordedOpponentHandleSpriteInvisibility,
[CONTROLLER_BATTLEANIMATION] = RecordedOpponentHandleBattleAnimation,
[CONTROLLER_LINKSTANDBYMSG] = RecordedOpponentHandleLinkStandbyMsg,
[CONTROLLER_RESETACTIONMOVESELECTION] = RecordedOpponentHandleResetActionMoveSelection,
[CONTROLLER_LINKSTANDBYMSG] = BtlController_Empty,
[CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty,
[CONTROLLER_ENDLINKBATTLE] = RecordedOpponentHandleEndLinkBattle,
[CONTROLLER_DEBUGMENU] = RecordedOpponentHandleBattleDebug,
[CONTROLLER_TERMINATOR_NOP] = RecordedOpponentCmdEnd
[CONTROLLER_DEBUGMENU] = BtlController_Empty,
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop
};
static void RecordedOpponentDummy(void)
@ -501,11 +476,6 @@ static void RecordedOpponentHandleGetMonData(void)
BtlController_HandleGetMonData(gActiveBattler, gEnemyParty);
}
static void RecordedOpponentHandleGetRawMonData(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleSetMonData(void)
{
BtlController_HandleSetMonData(gActiveBattler, gEnemyParty);
@ -588,11 +558,6 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
#undef sSpeedX
static void RecordedOpponentHandleTrainerSlide(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleTrainerSlideBack(void)
{
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
@ -609,26 +574,6 @@ static void RecordedOpponentHandleFaintAnimation(void)
BtlController_HandleFaintAnimation(gActiveBattler);
}
static void RecordedOpponentHandlePaletteFade(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleSuccessBallThrowAnim(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleBallThrowAnim(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandlePause(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleMoveAnimation(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -720,22 +665,12 @@ static void RecordedOpponentHandlePrintString(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
}
static void RecordedOpponentHandlePrintSelectionString(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleChooseAction(void)
{
BtlController_EmitTwoReturnValues(BUFFER_B, RecordedBattle_GetBattlerAction(RECORDED_ACTION_TYPE, gActiveBattler), 0);
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleYesNoBox(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleChooseMove(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
@ -771,11 +706,6 @@ static void RecordedOpponentHandleChoosePokemon(void)
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleCmd23(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleHealthBarUpdate(void)
{
s16 hpVal;
@ -801,11 +731,6 @@ static void RecordedOpponentHandleHealthBarUpdate(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
}
static void RecordedOpponentHandleExpUpdate(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleStatusIconUpdate(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -832,51 +757,6 @@ static void RecordedOpponentHandleStatusAnimation(void)
}
}
static void RecordedOpponentHandleStatusXor(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleDataTransfer(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleDMA3Transfer(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandlePlayBGM(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleCmd32(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleTwoReturnValues(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleChosenMonReturnValue(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleOneReturnValue(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleOneReturnValue_Duplicate(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleClearUnkVar(void)
{
gUnusedControllerStruct.unk = 0;
@ -916,11 +796,6 @@ static void RecordedOpponentHandleHitAnimation(void)
}
}
static void RecordedOpponentHandleCantSwitch(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandlePlaySE(void)
{
s8 pan;
@ -1067,11 +942,6 @@ static void RecordedOpponentHandleHidePartyStatusSummary(void)
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleEndBounceEffect(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleSpriteInvisibility(void)
{
if (IsBattlerSpritePresent(gActiveBattler))
@ -1096,16 +966,6 @@ static void RecordedOpponentHandleBattleAnimation(void)
}
}
static void RecordedOpponentHandleLinkStandbyMsg(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleResetActionMoveSelection(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentHandleEndLinkBattle(void)
{
if (gBattleResources->bufferA[gActiveBattler][1] == B_OUTCOME_DREW)
@ -1118,12 +978,3 @@ static void RecordedOpponentHandleEndLinkBattle(void)
RecordedOpponentBufferExecCompleted();
gBattlerControllerFuncs[gActiveBattler] = SetBattleEndCallbacks;
}
static void RecordedOpponentHandleBattleDebug(void)
{
RecordedOpponentBufferExecCompleted();
}
static void RecordedOpponentCmdEnd(void)
{
}

View File

@ -29,48 +29,28 @@
#include "constants/songs.h"
static void RecordedPlayerHandleGetMonData(void);
static void RecordedPlayerHandleGetRawMonData(void);
static void RecordedPlayerHandleSetMonData(void);
static void RecordedPlayerHandleSetRawMonData(void);
static void RecordedPlayerHandleLoadMonSprite(void);
static void RecordedPlayerHandleSwitchInAnim(void);
static void RecordedPlayerHandleReturnMonToBall(void);
static void RecordedPlayerHandleDrawTrainerPic(void);
static void RecordedPlayerHandleTrainerSlide(void);
static void RecordedPlayerHandleTrainerSlideBack(void);
static void RecordedPlayerHandleFaintAnimation(void);
static void RecordedPlayerHandlePaletteFade(void);
static void RecordedPlayerHandleSuccessBallThrowAnim(void);
static void RecordedPlayerHandleBallThrowAnim(void);
static void RecordedPlayerHandlePause(void);
static void RecordedPlayerHandleMoveAnimation(void);
static void RecordedPlayerHandlePrintString(void);
static void RecordedPlayerHandlePrintSelectionString(void);
static void RecordedPlayerHandleChooseAction(void);
static void RecordedPlayerHandleYesNoBox(void);
static void RecordedPlayerHandleChooseMove(void);
static void RecordedPlayerHandleChooseItem(void);
static void RecordedPlayerHandleChoosePokemon(void);
static void RecordedPlayerHandleCmd23(void);
static void RecordedPlayerHandleHealthBarUpdate(void);
static void RecordedPlayerHandleExpUpdate(void);
static void RecordedPlayerHandleStatusIconUpdate(void);
static void RecordedPlayerHandleStatusAnimation(void);
static void RecordedPlayerHandleStatusXor(void);
static void RecordedPlayerHandleDataTransfer(void);
static void RecordedPlayerHandleDMA3Transfer(void);
static void RecordedPlayerHandlePlayBGM(void);
static void RecordedPlayerHandleCmd32(void);
static void RecordedPlayerHandleTwoReturnValues(void);
static void RecordedPlayerHandleChosenMonReturnValue(void);
static void RecordedPlayerHandleOneReturnValue(void);
static void RecordedPlayerHandleOneReturnValue_Duplicate(void);
static void RecordedPlayerHandleClearUnkVar(void);
static void RecordedPlayerHandleSetUnkVar(void);
static void RecordedPlayerHandleClearUnkFlag(void);
static void RecordedPlayerHandleToggleUnkFlag(void);
static void RecordedPlayerHandleHitAnimation(void);
static void RecordedPlayerHandleCantSwitch(void);
static void RecordedPlayerHandlePlaySE(void);
static void RecordedPlayerHandlePlayFanfareOrBGM(void);
static void RecordedPlayerHandleFaintingCry(void);
@ -78,13 +58,9 @@ static void RecordedPlayerHandleIntroSlide(void);
static void RecordedPlayerHandleIntroTrainerBallThrow(void);
static void RecordedPlayerHandleDrawPartyStatusSummary(void);
static void RecordedPlayerHandleHidePartyStatusSummary(void);
static void RecordedPlayerHandleEndBounceEffect(void);
static void RecordedPlayerHandleSpriteInvisibility(void);
static void RecordedPlayerHandleBattleAnimation(void);
static void RecordedPlayerHandleLinkStandbyMsg(void);
static void RecordedPlayerHandleResetActionMoveSelection(void);
static void RecordedPlayerHandleEndLinkBattle(void);
static void RecordedPlayerCmdEnd(void);
static void RecordedPlayerBufferRunCommand(void);
static void RecordedPlayerBufferExecCompleted(void);
@ -98,48 +74,48 @@ static void EndDrawPartyStatusSummary(void);
static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{
[CONTROLLER_GETMONDATA] = RecordedPlayerHandleGetMonData,
[CONTROLLER_GETRAWMONDATA] = RecordedPlayerHandleGetRawMonData,
[CONTROLLER_GETRAWMONDATA] = BtlController_Empty,
[CONTROLLER_SETMONDATA] = RecordedPlayerHandleSetMonData,
[CONTROLLER_SETRAWMONDATA] = RecordedPlayerHandleSetRawMonData,
[CONTROLLER_LOADMONSPRITE] = RecordedPlayerHandleLoadMonSprite,
[CONTROLLER_SWITCHINANIM] = RecordedPlayerHandleSwitchInAnim,
[CONTROLLER_RETURNMONTOBALL] = RecordedPlayerHandleReturnMonToBall,
[CONTROLLER_DRAWTRAINERPIC] = RecordedPlayerHandleDrawTrainerPic,
[CONTROLLER_TRAINERSLIDE] = RecordedPlayerHandleTrainerSlide,
[CONTROLLER_TRAINERSLIDE] = BtlController_Empty,
[CONTROLLER_TRAINERSLIDEBACK] = RecordedPlayerHandleTrainerSlideBack,
[CONTROLLER_FAINTANIMATION] = RecordedPlayerHandleFaintAnimation,
[CONTROLLER_PALETTEFADE] = RecordedPlayerHandlePaletteFade,
[CONTROLLER_SUCCESSBALLTHROWANIM] = RecordedPlayerHandleSuccessBallThrowAnim,
[CONTROLLER_BALLTHROWANIM] = RecordedPlayerHandleBallThrowAnim,
[CONTROLLER_PAUSE] = RecordedPlayerHandlePause,
[CONTROLLER_PALETTEFADE] = BtlController_Empty,
[CONTROLLER_SUCCESSBALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_BALLTHROWANIM] = BtlController_Empty,
[CONTROLLER_PAUSE] = BtlController_Empty,
[CONTROLLER_MOVEANIMATION] = RecordedPlayerHandleMoveAnimation,
[CONTROLLER_PRINTSTRING] = RecordedPlayerHandlePrintString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = RecordedPlayerHandlePrintSelectionString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = BtlController_Empty,
[CONTROLLER_CHOOSEACTION] = RecordedPlayerHandleChooseAction,
[CONTROLLER_YESNOBOX] = RecordedPlayerHandleYesNoBox,
[CONTROLLER_YESNOBOX] = BtlController_Empty,
[CONTROLLER_CHOOSEMOVE] = RecordedPlayerHandleChooseMove,
[CONTROLLER_OPENBAG] = RecordedPlayerHandleChooseItem,
[CONTROLLER_CHOOSEPOKEMON] = RecordedPlayerHandleChoosePokemon,
[CONTROLLER_23] = RecordedPlayerHandleCmd23,
[CONTROLLER_23] = BtlController_Empty,
[CONTROLLER_HEALTHBARUPDATE] = RecordedPlayerHandleHealthBarUpdate,
[CONTROLLER_EXPUPDATE] = RecordedPlayerHandleExpUpdate,
[CONTROLLER_EXPUPDATE] = BtlController_Empty,
[CONTROLLER_STATUSICONUPDATE] = RecordedPlayerHandleStatusIconUpdate,
[CONTROLLER_STATUSANIMATION] = RecordedPlayerHandleStatusAnimation,
[CONTROLLER_STATUSXOR] = RecordedPlayerHandleStatusXor,
[CONTROLLER_DATATRANSFER] = RecordedPlayerHandleDataTransfer,
[CONTROLLER_DMA3TRANSFER] = RecordedPlayerHandleDMA3Transfer,
[CONTROLLER_PLAYBGM] = RecordedPlayerHandlePlayBGM,
[CONTROLLER_32] = RecordedPlayerHandleCmd32,
[CONTROLLER_TWORETURNVALUES] = RecordedPlayerHandleTwoReturnValues,
[CONTROLLER_CHOSENMONRETURNVALUE] = RecordedPlayerHandleChosenMonReturnValue,
[CONTROLLER_ONERETURNVALUE] = RecordedPlayerHandleOneReturnValue,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = RecordedPlayerHandleOneReturnValue_Duplicate,
[CONTROLLER_STATUSXOR] = BtlController_Empty,
[CONTROLLER_DATATRANSFER] = BtlController_Empty,
[CONTROLLER_DMA3TRANSFER] = BtlController_Empty,
[CONTROLLER_PLAYBGM] = BtlController_Empty,
[CONTROLLER_32] = BtlController_Empty,
[CONTROLLER_TWORETURNVALUES] = BtlController_Empty,
[CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty,
[CONTROLLER_CLEARUNKVAR] = RecordedPlayerHandleClearUnkVar,
[CONTROLLER_SETUNKVAR] = RecordedPlayerHandleSetUnkVar,
[CONTROLLER_CLEARUNKFLAG] = RecordedPlayerHandleClearUnkFlag,
[CONTROLLER_TOGGLEUNKFLAG] = RecordedPlayerHandleToggleUnkFlag,
[CONTROLLER_HITANIMATION] = RecordedPlayerHandleHitAnimation,
[CONTROLLER_CANTSWITCH] = RecordedPlayerHandleCantSwitch,
[CONTROLLER_CANTSWITCH] = BtlController_Empty,
[CONTROLLER_PLAYSE] = RecordedPlayerHandlePlaySE,
[CONTROLLER_PLAYFANFAREORBGM] = RecordedPlayerHandlePlayFanfareOrBGM,
[CONTROLLER_FAINTINGCRY] = RecordedPlayerHandleFaintingCry,
@ -147,13 +123,14 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void)
[CONTROLLER_INTROTRAINERBALLTHROW] = RecordedPlayerHandleIntroTrainerBallThrow,
[CONTROLLER_DRAWPARTYSTATUSSUMMARY] = RecordedPlayerHandleDrawPartyStatusSummary,
[CONTROLLER_HIDEPARTYSTATUSSUMMARY] = RecordedPlayerHandleHidePartyStatusSummary,
[CONTROLLER_ENDBOUNCE] = RecordedPlayerHandleEndBounceEffect,
[CONTROLLER_ENDBOUNCE] = BtlController_Empty,
[CONTROLLER_SPRITEINVISIBILITY] = RecordedPlayerHandleSpriteInvisibility,
[CONTROLLER_BATTLEANIMATION] = RecordedPlayerHandleBattleAnimation,
[CONTROLLER_LINKSTANDBYMSG] = RecordedPlayerHandleLinkStandbyMsg,
[CONTROLLER_RESETACTIONMOVESELECTION] = RecordedPlayerHandleResetActionMoveSelection,
[CONTROLLER_LINKSTANDBYMSG] = BtlController_Empty,
[CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty,
[CONTROLLER_ENDLINKBATTLE] = RecordedPlayerHandleEndLinkBattle,
[CONTROLLER_TERMINATOR_NOP] = RecordedPlayerCmdEnd
[CONTROLLER_DEBUGMENU] = BtlController_Empty,
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop
};
static void RecordedPlayerDummy(void)
@ -478,11 +455,6 @@ static void RecordedPlayerHandleGetMonData(void)
BtlController_HandleGetMonData(gActiveBattler, gPlayerParty);
}
static void RecordedPlayerHandleGetRawMonData(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleSetMonData(void)
{
BtlController_HandleSetMonData(gActiveBattler, gPlayerParty);
@ -583,11 +555,6 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
#undef sSpeedX
static void RecordedPlayerHandleTrainerSlide(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleTrainerSlideBack(void)
{
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
@ -604,26 +571,6 @@ static void RecordedPlayerHandleFaintAnimation(void)
BtlController_HandleFaintAnimation(gActiveBattler);
}
static void RecordedPlayerHandlePaletteFade(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleSuccessBallThrowAnim(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleBallThrowAnim(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandlePause(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleMoveAnimation(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -715,11 +662,6 @@ static void RecordedPlayerHandlePrintString(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter;
}
static void RecordedPlayerHandlePrintSelectionString(void)
{
RecordedPlayerBufferExecCompleted();
}
static void ChooseActionInBattlePalace(void)
{
if (gBattleCommunication[4] >= gBattlersCount / 2)
@ -742,11 +684,6 @@ static void RecordedPlayerHandleChooseAction(void)
}
}
static void RecordedPlayerHandleYesNoBox(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleChooseMove(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
@ -782,11 +719,6 @@ static void RecordedPlayerHandleChoosePokemon(void)
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleCmd23(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleHealthBarUpdate(void)
{
s16 hpVal;
@ -813,11 +745,6 @@ static void RecordedPlayerHandleHealthBarUpdate(void)
gBattlerControllerFuncs[gActiveBattler] = CompleteOnHealthbarDone;
}
static void RecordedPlayerHandleExpUpdate(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleStatusIconUpdate(void)
{
if (!IsBattleSEPlaying(gActiveBattler))
@ -844,51 +771,6 @@ static void RecordedPlayerHandleStatusAnimation(void)
}
}
static void RecordedPlayerHandleStatusXor(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleDataTransfer(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleDMA3Transfer(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandlePlayBGM(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleCmd32(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleTwoReturnValues(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleChosenMonReturnValue(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleOneReturnValue(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleOneReturnValue_Duplicate(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleClearUnkVar(void)
{
gUnusedControllerStruct.unk = 0;
@ -928,11 +810,6 @@ static void RecordedPlayerHandleHitAnimation(void)
}
}
static void RecordedPlayerHandleCantSwitch(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandlePlaySE(void)
{
s8 pan;
@ -1080,11 +957,6 @@ static void RecordedPlayerHandleHidePartyStatusSummary(void)
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleEndBounceEffect(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleSpriteInvisibility(void)
{
if (IsBattlerSpritePresent(gActiveBattler))
@ -1109,16 +981,6 @@ static void RecordedPlayerHandleBattleAnimation(void)
}
}
static void RecordedPlayerHandleLinkStandbyMsg(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleResetActionMoveSelection(void)
{
RecordedPlayerBufferExecCompleted();
}
static void RecordedPlayerHandleEndLinkBattle(void)
{
gBattleOutcome = gBattleResources->bufferA[gActiveBattler][1];
@ -1127,7 +989,3 @@ static void RecordedPlayerHandleEndLinkBattle(void)
RecordedPlayerBufferExecCompleted();
gBattlerControllerFuncs[gActiveBattler] = SetBattleEndCallbacks;
}
static void RecordedPlayerCmdEnd(void)
{
}