From 9bdc8f6f3a7bec4fa80c3072e8cd567ccbd56bab Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Tue, 7 Jan 2025 22:33:30 +0100 Subject: [PATCH] formatting --- src/battle_controller_oak_old_man.c | 114 ++++++++++++++-------------- src/battle_controller_pokedude.c | 114 ++++++++++++++-------------- 2 files changed, 114 insertions(+), 114 deletions(-) diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index 00679e290..69e438b4c 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -51,64 +51,64 @@ static void HandleInputChooseAction(u32 battler); static void (*const sOakOldManBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) = { - [CONTROLLER_GETMONDATA] = BtlController_HandleGetMonData, // done - [CONTROLLER_GETRAWMONDATA] = BtlController_Empty, // done - [CONTROLLER_SETMONDATA] = BtlController_HandleSetMonData, // done - [CONTROLLER_SETRAWMONDATA] = BtlController_Empty, // done - [CONTROLLER_LOADMONSPRITE] = BtlController_Empty, // done - [CONTROLLER_SWITCHINANIM] = BtlController_Empty, // done - [CONTROLLER_RETURNMONTOBALL] = BtlController_HandleReturnMonToBall, // done - [CONTROLLER_DRAWTRAINERPIC] = OakOldManHandleDrawTrainerPic, // done - [CONTROLLER_TRAINERSLIDE] = OakOldManHandleTrainerSlide, // done - [CONTROLLER_TRAINERSLIDEBACK] = BtlController_Empty, // done - [CONTROLLER_FAINTANIMATION] = BtlController_HandleFaintAnimation, // done - [CONTROLLER_PALETTEFADE] = BtlController_Empty, // done - [CONTROLLER_SUCCESSBALLTHROWANIM] = OakOldManHandleSuccessBallThrowAnim, // done - [CONTROLLER_BALLTHROWANIM] = OakOldManHandleBallThrowAnim, // done - [CONTROLLER_PAUSE] = BtlController_Empty, // done - [CONTROLLER_MOVEANIMATION] = BtlController_HandleMoveAnimation, // done - [CONTROLLER_PRINTSTRING] = OakOldManHandlePrintString, // done - [CONTROLLER_PRINTSTRINGPLAYERONLY] = OakOldManHandlePrintSelectionString, // done - [CONTROLLER_CHOOSEACTION] = OakOldManHandleChooseAction, // done - [CONTROLLER_YESNOBOX] = BtlController_Empty, // done - [CONTROLLER_CHOOSEMOVE] = OakOldManHandleChooseMove, // done - [CONTROLLER_OPENBAG] = OakOldManHandleChooseItem, // done - [CONTROLLER_CHOOSEPOKEMON] = OakOldManHandleChoosePokemon, // done - [CONTROLLER_23] = BtlController_Empty, // done - [CONTROLLER_HEALTHBARUPDATE] = OakOldManHandleHealthBarUpdate, // done - [CONTROLLER_EXPUPDATE] = PlayerHandleExpUpdate, // done - [CONTROLLER_STATUSICONUPDATE] = BtlController_HandleStatusIconUpdate, // done - [CONTROLLER_STATUSANIMATION] = BtlController_HandleStatusAnimation, // done - [CONTROLLER_STATUSXOR] = BtlController_Empty, // done - [CONTROLLER_DATATRANSFER] = BtlController_Empty, // done - [CONTROLLER_DMA3TRANSFER] = BtlController_Empty, // done - [CONTROLLER_PLAYBGM] = BtlController_Empty, // done - [CONTROLLER_32] = BtlController_Empty, // done - [CONTROLLER_TWORETURNVALUES] = BtlController_Empty, // done - [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, // done - [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, // done - [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, // done - [CONTROLLER_CLEARUNKVAR] = BtlController_Empty, // done - [CONTROLLER_SETUNKVAR] = BtlController_Empty, // done - [CONTROLLER_CLEARUNKFLAG] = BtlController_Empty, // done - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_Empty, // done - [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, // done - [CONTROLLER_CANTSWITCH] = BtlController_Empty, // done - [CONTROLLER_PLAYSE] = OakOldManHandlePlaySE, // done - [CONTROLLER_PLAYFANFAREORBGM] = BtlController_HandlePlayFanfareOrBGM, // done - [CONTROLLER_FAINTINGCRY] = OakOldManHandleFaintingCry, // done - [CONTROLLER_INTROSLIDE] = BtlController_HandleIntroSlide, // done - [CONTROLLER_INTROTRAINERBALLTHROW] = OakOldManHandleIntroTrainerBallThrow, // done - [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = OakOldManHandleDrawPartyStatusSummary, // done - [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = BtlController_Empty, // done - [CONTROLLER_ENDBOUNCE] = OakOldManHandleEndBounceEffect, // done - [CONTROLLER_SPRITEINVISIBILITY] = BtlController_Empty, // done - [CONTROLLER_BATTLEANIMATION] = OakOldManHandleBattleAnimation, // done - [CONTROLLER_LINKSTANDBYMSG] = OakOldManHandleLinkStandbyMsg, // done - [CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty, // done - [CONTROLLER_ENDLINKBATTLE] = OakOldManHandleEndLinkBattle, // done + [CONTROLLER_GETMONDATA] = BtlController_HandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = BtlController_Empty, + [CONTROLLER_SETMONDATA] = BtlController_HandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = BtlController_Empty, + [CONTROLLER_LOADMONSPRITE] = BtlController_Empty, + [CONTROLLER_SWITCHINANIM] = BtlController_Empty, + [CONTROLLER_RETURNMONTOBALL] = BtlController_HandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = OakOldManHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = OakOldManHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = BtlController_Empty, + [CONTROLLER_FAINTANIMATION] = BtlController_HandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = BtlController_Empty, + [CONTROLLER_SUCCESSBALLTHROWANIM] = OakOldManHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = OakOldManHandleBallThrowAnim, + [CONTROLLER_PAUSE] = BtlController_Empty, + [CONTROLLER_MOVEANIMATION] = BtlController_HandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = OakOldManHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = OakOldManHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = OakOldManHandleChooseAction, + [CONTROLLER_YESNOBOX] = BtlController_Empty, + [CONTROLLER_CHOOSEMOVE] = OakOldManHandleChooseMove, + [CONTROLLER_OPENBAG] = OakOldManHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = OakOldManHandleChoosePokemon, + [CONTROLLER_23] = BtlController_Empty, + [CONTROLLER_HEALTHBARUPDATE] = OakOldManHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = PlayerHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = BtlController_HandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = BtlController_HandleStatusAnimation, + [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] = BtlController_Empty, + [CONTROLLER_SETUNKVAR] = BtlController_Empty, + [CONTROLLER_CLEARUNKFLAG] = BtlController_Empty, + [CONTROLLER_TOGGLEUNKFLAG] = BtlController_Empty, + [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, + [CONTROLLER_CANTSWITCH] = BtlController_Empty, + [CONTROLLER_PLAYSE] = OakOldManHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = BtlController_HandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = OakOldManHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = BtlController_HandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = OakOldManHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = OakOldManHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = BtlController_Empty, + [CONTROLLER_ENDBOUNCE] = OakOldManHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = BtlController_Empty, + [CONTROLLER_BATTLEANIMATION] = OakOldManHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = OakOldManHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty, + [CONTROLLER_ENDLINKBATTLE] = OakOldManHandleEndLinkBattle, [CONTROLLER_DEBUGMENU] = BtlController_Empty, - [CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop, // done + [CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop, }; void SetControllerToOakOrOldMan(u32 battler) diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 0cdfee846..fe2c94137 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -76,64 +76,64 @@ static const u8 *GetPokedudeText(void); static void (*const sPokedudeBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) = { - [CONTROLLER_GETMONDATA] = BtlController_HandleGetMonData, // done - [CONTROLLER_GETRAWMONDATA] = BtlController_Empty, // done - [CONTROLLER_SETMONDATA] = BtlController_HandleSetMonData, // done - [CONTROLLER_SETRAWMONDATA] = BtlController_Empty, // done - [CONTROLLER_LOADMONSPRITE] = PokedudeHandleLoadMonSprite, // done - [CONTROLLER_SWITCHINANIM] = PokedudeHandleSwitchInAnim, // done - [CONTROLLER_RETURNMONTOBALL] = BtlController_HandleReturnMonToBall, // done - [CONTROLLER_DRAWTRAINERPIC] = PokedudeHandleDrawTrainerPic, // done - [CONTROLLER_TRAINERSLIDE] = PokedudeHandleTrainerSlide, // done - [CONTROLLER_TRAINERSLIDEBACK] = BtlController_Empty, // done - [CONTROLLER_FAINTANIMATION] = BtlController_HandleFaintAnimation, // done - [CONTROLLER_PALETTEFADE] = BtlController_Empty, // done - [CONTROLLER_SUCCESSBALLTHROWANIM] = PokedudeHandleSuccessBallThrowAnim, // done - [CONTROLLER_BALLTHROWANIM] = PokedudeHandleBallThrowAnim, // done - [CONTROLLER_PAUSE] = BtlController_Empty, // done - [CONTROLLER_MOVEANIMATION] = BtlController_HandleMoveAnimation, // done - [CONTROLLER_PRINTSTRING] = BtlController_HandlePrintString, // done - [CONTROLLER_PRINTSTRINGPLAYERONLY] = PokedudeHandlePrintSelectionString, // done - [CONTROLLER_CHOOSEACTION] = PokedudeHandleChooseAction, // done - [CONTROLLER_YESNOBOX] = BtlController_Empty, // done - [CONTROLLER_CHOOSEMOVE] = PokedudeHandleChooseMove, // done - [CONTROLLER_OPENBAG] = PokedudeHandleChooseItem, // done - [CONTROLLER_CHOOSEPOKEMON] = PokedudeHandleChoosePokemon, // done - [CONTROLLER_23] = BtlController_Empty, // done - [CONTROLLER_HEALTHBARUPDATE] = PokedudeHandleHealthBarUpdate, // done - [CONTROLLER_EXPUPDATE] = PlayerHandleExpUpdate, // done - [CONTROLLER_STATUSICONUPDATE] = BtlController_HandleStatusIconUpdate, // done - [CONTROLLER_STATUSANIMATION] = BtlController_HandleStatusAnimation, // done - [CONTROLLER_STATUSXOR] = PokedudeHandleStatusXor, // done - [CONTROLLER_DATATRANSFER] = BtlController_Empty, // done - [CONTROLLER_DMA3TRANSFER] = BtlController_Empty, // done - [CONTROLLER_PLAYBGM] = BtlController_Empty, // done - [CONTROLLER_32] = BtlController_Empty, // done - [CONTROLLER_TWORETURNVALUES] = BtlController_Empty, // done - [CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, // done - [CONTROLLER_ONERETURNVALUE] = BtlController_Empty, // done - [CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, // done - [CONTROLLER_CLEARUNKVAR] = BtlController_Empty, // done - [CONTROLLER_SETUNKVAR] = BtlController_Empty, // done - [CONTROLLER_CLEARUNKFLAG] = BtlController_Empty, // done - [CONTROLLER_TOGGLEUNKFLAG] = BtlController_Empty, // done - [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, // done - [CONTROLLER_CANTSWITCH] = BtlController_Empty, // done - [CONTROLLER_PLAYSE] = PokedudeHandlePlaySE, // done - [CONTROLLER_PLAYFANFAREORBGM] = BtlController_HandlePlayFanfareOrBGM, // done - [CONTROLLER_FAINTINGCRY] = BtlController_HandleFaintingCry, // done - [CONTROLLER_INTROSLIDE] = BtlController_HandleIntroSlide, // done - [CONTROLLER_INTROTRAINERBALLTHROW] = PokedudeHandleIntroTrainerBallThrow, // done - [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = PokedudeHandleDrawPartyStatusSummary, // done - [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = BtlController_Empty, // done - [CONTROLLER_ENDBOUNCE] = PokedudeHandleEndBounceEffect, // done - [CONTROLLER_SPRITEINVISIBILITY] = BtlController_Empty, // done - [CONTROLLER_BATTLEANIMATION] = PokedudeHandleBattleAnimation, // done - [CONTROLLER_LINKSTANDBYMSG] = PokedudeHandleLinkStandbyMsg, // done - [CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty, // done - [CONTROLLER_ENDLINKBATTLE] = PokedudeHandleEndLinkBattle, // done + [CONTROLLER_GETMONDATA] = BtlController_HandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = BtlController_Empty, + [CONTROLLER_SETMONDATA] = BtlController_HandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = BtlController_Empty, + [CONTROLLER_LOADMONSPRITE] = PokedudeHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = PokedudeHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = BtlController_HandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = PokedudeHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = PokedudeHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = BtlController_Empty, + [CONTROLLER_FAINTANIMATION] = BtlController_HandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = BtlController_Empty, + [CONTROLLER_SUCCESSBALLTHROWANIM] = PokedudeHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = PokedudeHandleBallThrowAnim, + [CONTROLLER_PAUSE] = BtlController_Empty, + [CONTROLLER_MOVEANIMATION] = BtlController_HandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = BtlController_HandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = PokedudeHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = PokedudeHandleChooseAction, + [CONTROLLER_YESNOBOX] = BtlController_Empty, + [CONTROLLER_CHOOSEMOVE] = PokedudeHandleChooseMove, + [CONTROLLER_OPENBAG] = PokedudeHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = PokedudeHandleChoosePokemon, + [CONTROLLER_23] = BtlController_Empty, + [CONTROLLER_HEALTHBARUPDATE] = PokedudeHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = PlayerHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = BtlController_HandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = BtlController_HandleStatusAnimation, + [CONTROLLER_STATUSXOR] = PokedudeHandleStatusXor, + [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] = BtlController_Empty, + [CONTROLLER_SETUNKVAR] = BtlController_Empty, + [CONTROLLER_CLEARUNKFLAG] = BtlController_Empty, + [CONTROLLER_TOGGLEUNKFLAG] = BtlController_Empty, + [CONTROLLER_HITANIMATION] = BtlController_HandleHitAnimation, + [CONTROLLER_CANTSWITCH] = BtlController_Empty, + [CONTROLLER_PLAYSE] = PokedudeHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = BtlController_HandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = BtlController_HandleFaintingCry, + [CONTROLLER_INTROSLIDE] = BtlController_HandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = PokedudeHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = PokedudeHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = BtlController_Empty, + [CONTROLLER_ENDBOUNCE] = PokedudeHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = BtlController_Empty, + [CONTROLLER_BATTLEANIMATION] = PokedudeHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = PokedudeHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty, + [CONTROLLER_ENDLINKBATTLE] = PokedudeHandleEndLinkBattle, [CONTROLLER_DEBUGMENU] = BtlController_Empty, - [CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop, // done + [CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop, }; #define pdHealthboxPal1 simulatedInputState[0]