dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Index controller function tables

Browse Source
This commit is contained in:
GriffinR
2022-12-07 14:09:33 -05:00
parent 537b1ce6d3
commit 32ddd0f5cc
6 changed files with 293 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_controllers.h
+5 -5
View File
@@ -120,16 +120,16 @@ struct HpAndStatus
struct MovePpInfo struct MovePpInfo
{ {
u16 moves[4]; u16 moves[MAX_MON_MOVES];
u8 pp[4]; u8 pp[MAX_MON_MOVES];
u8 ppBonuses; u8 ppBonuses;
}; };
struct ChooseMoveStruct struct ChooseMoveStruct
{ {
u16 moves[4]; u16 moves[MAX_MON_MOVES];
u8 currentPp[4]; u8 currentPp[MAX_MON_MOVES];
u8 maxPp[4]; u8 maxPp[MAX_MON_MOVES];
u16 species; u16 species;
u8 monType1; u8 monType1;
u8 monType2; u8 monType2;
src/battle_controller_oak_old_man.c
+57 -57
View File
@@ -98,63 +98,63 @@ static void Task_StartSendOutAnim(u8 taskId);
static void (*const sOakOldManBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sOakOldManBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
OakOldManHandleGetMonData, [CONTROLLER_GETMONDATA] = OakOldManHandleGetMonData,
OakOldManHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = OakOldManHandleGetRawMonData,
OakOldManHandleSetMonData, [CONTROLLER_SETMONDATA] = OakOldManHandleSetMonData,
OakOldManHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = OakOldManHandleSetRawMonData,
OakOldManHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = OakOldManHandleLoadMonSprite,
OakOldManHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = OakOldManHandleSwitchInAnim,
OakOldManHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = OakOldManHandleReturnMonToBall,
OakOldManHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = OakOldManHandleDrawTrainerPic,
OakOldManHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = OakOldManHandleTrainerSlide,
OakOldManHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = OakOldManHandleTrainerSlideBack,
OakOldManHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = OakOldManHandleFaintAnimation,
OakOldManHandlePaletteFade, [CONTROLLER_PALETTEFADE] = OakOldManHandlePaletteFade,
OakOldManHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = OakOldManHandleSuccessBallThrowAnim,
OakOldManHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = OakOldManHandleBallThrowAnim,
OakOldManHandlePause, [CONTROLLER_PAUSE] = OakOldManHandlePause,
OakOldManHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = OakOldManHandleMoveAnimation,
OakOldManHandlePrintString, [CONTROLLER_PRINTSTRING] = OakOldManHandlePrintString,
OakOldManHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = OakOldManHandlePrintSelectionString,
OakOldManHandleChooseAction, [CONTROLLER_CHOOSEACTION] = OakOldManHandleChooseAction,
OakOldManHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = OakOldManHandleUnknownYesNoBox,
OakOldManHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = OakOldManHandleChooseMove,
OakOldManHandleChooseItem, [CONTROLLER_OPENBAG] = OakOldManHandleChooseItem,
OakOldManHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = OakOldManHandleChoosePokemon,
OakOldManHandleCmd23, [CONTROLLER_23] = OakOldManHandleCmd23,
OakOldManHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = OakOldManHandleHealthBarUpdate,
OakOldManHandleExpUpdate, [CONTROLLER_EXPUPDATE] = OakOldManHandleExpUpdate,
OakOldManHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = OakOldManHandleStatusIconUpdate,
OakOldManHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = OakOldManHandleStatusAnimation,
OakOldManHandleStatusXor, [CONTROLLER_STATUSXOR] = OakOldManHandleStatusXor,
OakOldManHandleDataTransfer, [CONTROLLER_DATATRANSFER] = OakOldManHandleDataTransfer,
OakOldManHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = OakOldManHandleDMA3Transfer,
OakOldManHandlePlayBGM, [CONTROLLER_PLAYBGM] = OakOldManHandlePlayBGM,
OakOldManHandleCmd32, [CONTROLLER_32] = OakOldManHandleCmd32,
OakOldManHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = OakOldManHandleTwoReturnValues,
OakOldManHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = OakOldManHandleChosenMonReturnValue,
OakOldManHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = OakOldManHandleOneReturnValue,
OakOldManHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = OakOldManHandleOneReturnValue_Duplicate,
OakOldManHandleCmd37, [CONTROLLER_CLEARUNKVAR] = OakOldManHandleCmd37,
OakOldManHandleCmd38, [CONTROLLER_SETUNKVAR] = OakOldManHandleCmd38,
OakOldManHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = OakOldManHandleCmd39,
OakOldManHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = OakOldManHandleCmd40,
OakOldManHandleHitAnimation, [CONTROLLER_HITANIMATION] = OakOldManHandleHitAnimation,
OakOldManHandleCmd42, [CONTROLLER_CANTSWITCH] = OakOldManHandleCmd42,
OakOldManHandlePlaySE, [CONTROLLER_PLAYSE] = OakOldManHandlePlaySE,
OakOldManHandlePlayFanfare, [CONTROLLER_PLAYFANFARE] = OakOldManHandlePlayFanfare,
OakOldManHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = OakOldManHandleFaintingCry,
OakOldManHandleIntroSlide, [CONTROLLER_INTROSLIDE] = OakOldManHandleIntroSlide,
OakOldManHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = OakOldManHandleIntroTrainerBallThrow,
OakOldManHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = OakOldManHandleDrawPartyStatusSummary,
OakOldManHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = OakOldManHandleHidePartyStatusSummary,
OakOldManHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = OakOldManHandleEndBounceEffect,
OakOldManHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = OakOldManHandleSpriteInvisibility,
OakOldManHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = OakOldManHandleBattleAnimation,
OakOldManHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = OakOldManHandleLinkStandbyMsg,
OakOldManHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = OakOldManHandleResetActionMoveSelection,
OakOldManHandleCmd55, [CONTROLLER_ENDLINKBATTLE] = OakOldManHandleCmd55,
OakOldManCmdEnd, [CONTROLLER_TERMINATOR_NOP] = OakOldManCmdEnd,
}; };
static void OakOldManDummy(void) static void OakOldManDummy(void)
src/battle_controller_opponent.c
+57 -57
View File
@@ -92,63 +92,63 @@ static void EndDrawPartyStatusSummary(void);
static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
OpponentHandleGetMonData, [CONTROLLER_GETMONDATA] = OpponentHandleGetMonData,
OpponentHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = OpponentHandleGetRawMonData,
OpponentHandleSetMonData, [CONTROLLER_SETMONDATA] = OpponentHandleSetMonData,
OpponentHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = OpponentHandleSetRawMonData,
OpponentHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = OpponentHandleLoadMonSprite,
OpponentHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = OpponentHandleSwitchInAnim,
OpponentHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = OpponentHandleReturnMonToBall,
OpponentHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = OpponentHandleDrawTrainerPic,
OpponentHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = OpponentHandleTrainerSlide,
OpponentHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = OpponentHandleTrainerSlideBack,
OpponentHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = OpponentHandleFaintAnimation,
OpponentHandlePaletteFade, [CONTROLLER_PALETTEFADE] = OpponentHandlePaletteFade,
OpponentHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = OpponentHandleSuccessBallThrowAnim,
OpponentHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = OpponentHandleBallThrowAnim,
OpponentHandlePause, [CONTROLLER_PAUSE] = OpponentHandlePause,
OpponentHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = OpponentHandleMoveAnimation,
OpponentHandlePrintString, [CONTROLLER_PRINTSTRING] = OpponentHandlePrintString,
OpponentHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = OpponentHandlePrintSelectionString,
OpponentHandleChooseAction, [CONTROLLER_CHOOSEACTION] = OpponentHandleChooseAction,
OpponentHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = OpponentHandleUnknownYesNoBox,
OpponentHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = OpponentHandleChooseMove,
OpponentHandleChooseItem, [CONTROLLER_OPENBAG] = OpponentHandleChooseItem,
OpponentHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = OpponentHandleChoosePokemon,
OpponentHandleCmd23, [CONTROLLER_23] = OpponentHandleCmd23,
OpponentHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = OpponentHandleHealthBarUpdate,
OpponentHandleExpUpdate, [CONTROLLER_EXPUPDATE] = OpponentHandleExpUpdate,
OpponentHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = OpponentHandleStatusIconUpdate,
OpponentHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = OpponentHandleStatusAnimation,
OpponentHandleStatusXor, [CONTROLLER_STATUSXOR] = OpponentHandleStatusXor,
OpponentHandleDataTransfer, [CONTROLLER_DATATRANSFER] = OpponentHandleDataTransfer,
OpponentHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = OpponentHandleDMA3Transfer,
OpponentHandlePlayBGM, [CONTROLLER_PLAYBGM] = OpponentHandlePlayBGM,
OpponentHandleCmd32, [CONTROLLER_32] = OpponentHandleCmd32,
OpponentHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = OpponentHandleTwoReturnValues,
OpponentHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = OpponentHandleChosenMonReturnValue,
OpponentHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = OpponentHandleOneReturnValue,
OpponentHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = OpponentHandleOneReturnValue_Duplicate,
OpponentHandleCmd37, [CONTROLLER_CLEARUNKVAR] = OpponentHandleCmd37,
OpponentHandleCmd38, [CONTROLLER_SETUNKVAR] = OpponentHandleCmd38,
OpponentHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = OpponentHandleCmd39,
OpponentHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = OpponentHandleCmd40,
OpponentHandleHitAnimation, [CONTROLLER_HITANIMATION] = OpponentHandleHitAnimation,
OpponentHandleCmd42, [CONTROLLER_CANTSWITCH] = OpponentHandleCmd42,
OpponentHandlePlaySE, [CONTROLLER_PLAYSE] = OpponentHandlePlaySE,
OpponentHandlePlayFanfare, [CONTROLLER_PLAYFANFARE] = OpponentHandlePlayFanfare,
OpponentHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = OpponentHandleFaintingCry,
OpponentHandleIntroSlide, [CONTROLLER_INTROSLIDE] = OpponentHandleIntroSlide,
OpponentHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = OpponentHandleIntroTrainerBallThrow,
OpponentHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = OpponentHandleDrawPartyStatusSummary,
OpponentHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = OpponentHandleHidePartyStatusSummary,
OpponentHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = OpponentHandleEndBounceEffect,
OpponentHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = OpponentHandleSpriteInvisibility,
OpponentHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = OpponentHandleBattleAnimation,
OpponentHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = OpponentHandleLinkStandbyMsg,
OpponentHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = OpponentHandleResetActionMoveSelection,
OpponentHandleCmd55, [CONTROLLER_ENDLINKBATTLE] = OpponentHandleCmd55,
OpponentCmdEnd [CONTROLLER_TERMINATOR_NOP] = OpponentCmdEnd
}; };
// unknown unused data // unknown unused data
src/battle_controller_player.c
+57 -57
View File
@@ -109,63 +109,63 @@ static void EndDrawPartyStatusSummary(void);
static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
PlayerHandleGetMonData, [CONTROLLER_GETMONDATA] = PlayerHandleGetMonData,
PlayerHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = PlayerHandleGetRawMonData,
PlayerHandleSetMonData, [CONTROLLER_SETMONDATA] = PlayerHandleSetMonData,
PlayerHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = PlayerHandleSetRawMonData,
PlayerHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = PlayerHandleLoadMonSprite,
PlayerHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = PlayerHandleSwitchInAnim,
PlayerHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = PlayerHandleReturnMonToBall,
PlayerHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = PlayerHandleDrawTrainerPic,
PlayerHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = PlayerHandleTrainerSlide,
PlayerHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = PlayerHandleTrainerSlideBack,
PlayerHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = PlayerHandleFaintAnimation,
PlayerHandlePaletteFade, [CONTROLLER_PALETTEFADE] = PlayerHandlePaletteFade,
PlayerHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = PlayerHandleSuccessBallThrowAnim,
PlayerHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = PlayerHandleBallThrowAnim,
PlayerHandlePause, [CONTROLLER_PAUSE] = PlayerHandlePause,
PlayerHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = PlayerHandleMoveAnimation,
PlayerHandlePrintString, [CONTROLLER_PRINTSTRING] = PlayerHandlePrintString,
PlayerHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = PlayerHandlePrintSelectionString,
PlayerHandleChooseAction, [CONTROLLER_CHOOSEACTION] = PlayerHandleChooseAction,
PlayerHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = PlayerHandleUnknownYesNoBox,
PlayerHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = PlayerHandleChooseMove,
PlayerHandleChooseItem, [CONTROLLER_OPENBAG] = PlayerHandleChooseItem,
PlayerHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = PlayerHandleChoosePokemon,
PlayerHandleCmd23, [CONTROLLER_23] = PlayerHandleCmd23,
PlayerHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = PlayerHandleHealthBarUpdate,
PlayerHandleExpUpdate, [CONTROLLER_EXPUPDATE] = PlayerHandleExpUpdate,
PlayerHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = PlayerHandleStatusIconUpdate,
PlayerHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = PlayerHandleStatusAnimation,
PlayerHandleStatusXor, [CONTROLLER_STATUSXOR] = PlayerHandleStatusXor,
PlayerHandleDataTransfer, [CONTROLLER_DATATRANSFER] = PlayerHandleDataTransfer,
PlayerHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = PlayerHandleDMA3Transfer,
PlayerHandlePlayBGM, [CONTROLLER_PLAYBGM] = PlayerHandlePlayBGM,
PlayerHandleCmd32, [CONTROLLER_32] = PlayerHandleCmd32,
PlayerHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = PlayerHandleTwoReturnValues,
PlayerHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = PlayerHandleChosenMonReturnValue,
PlayerHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = PlayerHandleOneReturnValue,
PlayerHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = PlayerHandleOneReturnValue_Duplicate,
PlayerHandleCmd37, [CONTROLLER_CLEARUNKVAR] = PlayerHandleCmd37,
PlayerHandleCmd38, [CONTROLLER_SETUNKVAR] = PlayerHandleCmd38,
PlayerHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = PlayerHandleCmd39,
PlayerHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = PlayerHandleCmd40,
PlayerHandleHitAnimation, [CONTROLLER_HITANIMATION] = PlayerHandleHitAnimation,
PlayerHandleCmd42, [CONTROLLER_CANTSWITCH] = PlayerHandleCmd42,
PlayerHandlePlaySE, [CONTROLLER_PLAYSE] = PlayerHandlePlaySE,
PlayerHandlePlayFanfare, [CONTROLLER_PLAYFANFARE] = PlayerHandlePlayFanfare,
PlayerHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = PlayerHandleFaintingCry,
PlayerHandleIntroSlide, [CONTROLLER_INTROSLIDE] = PlayerHandleIntroSlide,
PlayerHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = PlayerHandleIntroTrainerBallThrow,
PlayerHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = PlayerHandleDrawPartyStatusSummary,
PlayerHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = PlayerHandleHidePartyStatusSummary,
PlayerHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = PlayerHandleEndBounceEffect,
PlayerHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = PlayerHandleSpriteInvisibility,
PlayerHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = PlayerHandleBattleAnimation,
PlayerHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = PlayerHandleLinkStandbyMsg,
PlayerHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = PlayerHandleResetActionMoveSelection,
PlayerHandleCmd55, [CONTROLLER_ENDLINKBATTLE] = PlayerHandleCmd55,
PlayerCmdEnd, [CONTROLLER_TERMINATOR_NOP] = PlayerCmdEnd,
}; };
static const u8 sTargetIdentities[] = { B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT }; static const u8 sTargetIdentities[] = { B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT };
src/battle_controller_pokedude.c
+60 -60
View File
@@ -34,7 +34,7 @@ struct PokedudeBattlePartyInfo
u8 side; u8 side;
u8 level; u8 level;
u16 species; u16 species;
u16 moves[4]; u16 moves[MAX_MON_MOVES];
u8 nature; u8 nature;
u8 gender; u8 gender;
}; };
@@ -121,65 +121,65 @@ static void Task_StartSendOutAnim(u8 taskId);
static const u8 *GetPokedudeText(void); static const u8 *GetPokedudeText(void);
static void (*const sPokedudeBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sPokedudeBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
PokedudeHandleGetMonData, [CONTROLLER_GETMONDATA] = PokedudeHandleGetMonData,
PokedudeHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = PokedudeHandleGetRawMonData,
PokedudeHandleSetMonData, [CONTROLLER_SETMONDATA] = PokedudeHandleSetMonData,
PokedudeHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = PokedudeHandleSetRawMonData,
PokedudeHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = PokedudeHandleLoadMonSprite,
PokedudeHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = PokedudeHandleSwitchInAnim,
PokedudeHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = PokedudeHandleReturnMonToBall,
PokedudeHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = PokedudeHandleDrawTrainerPic,
PokedudeHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = PokedudeHandleTrainerSlide,
PokedudeHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = PokedudeHandleTrainerSlideBack,
PokedudeHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = PokedudeHandleFaintAnimation,
PokedudeHandlePaletteFade, [CONTROLLER_PALETTEFADE] = PokedudeHandlePaletteFade,
PokedudeHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = PokedudeHandleSuccessBallThrowAnim,
PokedudeHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = PokedudeHandleBallThrowAnim,
PokedudeHandlePause, [CONTROLLER_PAUSE] = PokedudeHandlePause,
PokedudeHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = PokedudeHandleMoveAnimation,
PokedudeHandlePrintString, [CONTROLLER_PRINTSTRING] = PokedudeHandlePrintString,
PokedudeHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = PokedudeHandlePrintSelectionString,
PokedudeHandleChooseAction, [CONTROLLER_CHOOSEACTION] = PokedudeHandleChooseAction,
PokedudeHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = PokedudeHandleUnknownYesNoBox,
PokedudeHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = PokedudeHandleChooseMove,
PokedudeHandleChooseItem, [CONTROLLER_OPENBAG] = PokedudeHandleChooseItem,
PokedudeHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = PokedudeHandleChoosePokemon,
PokedudeHandleCmd23, [CONTROLLER_23] = PokedudeHandleCmd23,
PokedudeHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = PokedudeHandleHealthBarUpdate,
PokedudeHandleExpUpdate, [CONTROLLER_EXPUPDATE] = PokedudeHandleExpUpdate,
PokedudeHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = PokedudeHandleStatusIconUpdate,
PokedudeHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = PokedudeHandleStatusAnimation,
PokedudeHandleStatusXor, [CONTROLLER_STATUSXOR] = PokedudeHandleStatusXor,
PokedudeHandleDataTransfer, [CONTROLLER_DATATRANSFER] = PokedudeHandleDataTransfer,
PokedudeHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = PokedudeHandleDMA3Transfer,
PokedudeHandlePlayBGM, [CONTROLLER_PLAYBGM] = PokedudeHandlePlayBGM,
PokedudeHandleCmd32, [CONTROLLER_32] = PokedudeHandleCmd32,
PokedudeHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = PokedudeHandleTwoReturnValues,
PokedudeHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = PokedudeHandleChosenMonReturnValue,
PokedudeHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = PokedudeHandleOneReturnValue,
PokedudeHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = PokedudeHandleOneReturnValue_Duplicate,
PokedudeHandleCmd37, [CONTROLLER_CLEARUNKVAR] = PokedudeHandleCmd37,
PokedudeHandleCmd38, [CONTROLLER_SETUNKVAR] = PokedudeHandleCmd38,
PokedudeHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = PokedudeHandleCmd39,
PokedudeHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = PokedudeHandleCmd40,
PokedudeHandleHitAnimation, [CONTROLLER_HITANIMATION] = PokedudeHandleHitAnimation,
PokedudeHandleCmd42, [CONTROLLER_CANTSWITCH] = PokedudeHandleCmd42,
PokedudeHandlePlaySE, [CONTROLLER_PLAYSE] = PokedudeHandlePlaySE,
PokedudeHandlePlayFanfare, [CONTROLLER_PLAYFANFARE] = PokedudeHandlePlayFanfare,
PokedudeHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = PokedudeHandleFaintingCry,
PokedudeHandleIntroSlide, [CONTROLLER_INTROSLIDE] = PokedudeHandleIntroSlide,
PokedudeHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = PokedudeHandleIntroTrainerBallThrow,
PokedudeHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = PokedudeHandleDrawPartyStatusSummary,
PokedudeHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = PokedudeHandleHidePartyStatusSummary,
PokedudeHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = PokedudeHandleEndBounceEffect,
PokedudeHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = PokedudeHandleSpriteInvisibility,
PokedudeHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = PokedudeHandleBattleAnimation,
PokedudeHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = PokedudeHandleLinkStandbyMsg,
PokedudeHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = PokedudeHandleResetActionMoveSelection,
PokedudeHandleCmd55, [CONTROLLER_ENDLINKBATTLE] = PokedudeHandleCmd55,
PokedudeCmdEnd, [CONTROLLER_TERMINATOR_NOP] = PokedudeCmdEnd,
}; };
// unknown unused data // unknown unused data
static const u8 sUnused[] = { 0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58 }; static const u8 sUnused[] = { 0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58 };
src/battle_controller_safari.c
+57 -57
View File
@@ -79,63 +79,63 @@ static void CompleteWhenChosePokeblock(void);
static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
SafariHandleGetMonData, [CONTROLLER_GETMONDATA] = SafariHandleGetMonData,
SafariHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = SafariHandleGetRawMonData,
SafariHandleSetMonData, [CONTROLLER_SETMONDATA] = SafariHandleSetMonData,
SafariHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = SafariHandleSetRawMonData,
SafariHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = SafariHandleLoadMonSprite,
SafariHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = SafariHandleSwitchInAnim,
SafariHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = SafariHandleReturnMonToBall,
SafariHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = SafariHandleDrawTrainerPic,
SafariHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = SafariHandleTrainerSlide,
SafariHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = SafariHandleTrainerSlideBack,
SafariHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = SafariHandleFaintAnimation,
SafariHandlePaletteFade, [CONTROLLER_PALETTEFADE] = SafariHandlePaletteFade,
SafariHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = SafariHandleSuccessBallThrowAnim,
SafariHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = SafariHandleBallThrowAnim,
SafariHandlePause, [CONTROLLER_PAUSE] = SafariHandlePause,
SafariHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = SafariHandleMoveAnimation,
SafariHandlePrintString, [CONTROLLER_PRINTSTRING] = SafariHandlePrintString,
SafariHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = SafariHandlePrintSelectionString,
SafariHandleChooseAction, [CONTROLLER_CHOOSEACTION] = SafariHandleChooseAction,
SafariHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = SafariHandleUnknownYesNoBox,
SafariHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = SafariHandleChooseMove,
SafariHandleChooseItem, [CONTROLLER_OPENBAG] = SafariHandleChooseItem,
SafariHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = SafariHandleChoosePokemon,
SafariHandleCmd23, [CONTROLLER_23] = SafariHandleCmd23,
SafariHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = SafariHandleHealthBarUpdate,
SafariHandleExpUpdate, [CONTROLLER_EXPUPDATE] = SafariHandleExpUpdate,
SafariHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = SafariHandleStatusIconUpdate,
SafariHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = SafariHandleStatusAnimation,
SafariHandleStatusXor, [CONTROLLER_STATUSXOR] = SafariHandleStatusXor,
SafariHandleDataTransfer, [CONTROLLER_DATATRANSFER] = SafariHandleDataTransfer,
SafariHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = SafariHandleDMA3Transfer,
SafariHandlePlayBGM, [CONTROLLER_PLAYBGM] = SafariHandlePlayBGM,
SafariHandleCmd32, [CONTROLLER_32] = SafariHandleCmd32,
SafariHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = SafariHandleTwoReturnValues,
SafariHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = SafariHandleChosenMonReturnValue,
SafariHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = SafariHandleOneReturnValue,
SafariHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = SafariHandleOneReturnValue_Duplicate,
SafariHandleCmd37, [CONTROLLER_CLEARUNKVAR] = SafariHandleCmd37,
SafariHandleCmd38, [CONTROLLER_SETUNKVAR] = SafariHandleCmd38,
SafariHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = SafariHandleCmd39,
SafariHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = SafariHandleCmd40,
SafariHandleHitAnimation, [CONTROLLER_HITANIMATION] = SafariHandleHitAnimation,
SafariHandleCmd42, [CONTROLLER_CANTSWITCH] = SafariHandleCmd42,
SafariHandlePlaySE, [CONTROLLER_PLAYSE] = SafariHandlePlaySE,
SafariHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFARE] = SafariHandlePlayFanfareOrBGM,
SafariHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = SafariHandleFaintingCry,
SafariHandleIntroSlide, [CONTROLLER_INTROSLIDE] = SafariHandleIntroSlide,
SafariHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = SafariHandleIntroTrainerBallThrow,
SafariHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = SafariHandleDrawPartyStatusSummary,
SafariHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = SafariHandleHidePartyStatusSummary,
SafariHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = SafariHandleEndBounceEffect,
SafariHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = SafariHandleSpriteInvisibility,
SafariHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = SafariHandleBattleAnimation,
SafariHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = SafariHandleLinkStandbyMsg,
SafariHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = SafariHandleResetActionMoveSelection,
SafariHandleCmd55, [CONTROLLER_ENDLINKBATTLE] = SafariHandleCmd55,
SafariCmdEnd, [CONTROLLER_TERMINATOR_NOP] = SafariCmdEnd,
}; };
// not used // not used