dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Index battle controller cmd tables

Browse Source
This commit is contained in:
GriffinR
2020-12-29 16:51:44 -05:00
parent d74f739e05
commit 2f426e0e7d
11 changed files with 649 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_controllers.h
+13 -13
View File
@@ -85,8 +85,8 @@ enum
struct UnusedControllerStruct struct UnusedControllerStruct
{ {
u8 field_0:7; u8 unk:7;
u8 flag_x80:1; u8 flag:1;
}; };
struct HpAndStatus struct HpAndStatus
@@ -145,19 +145,19 @@ enum
CONTROLLER_STATUSXOR, CONTROLLER_STATUSXOR,
CONTROLLER_DATATRANSFER, CONTROLLER_DATATRANSFER,
CONTROLLER_DMA3TRANSFER, CONTROLLER_DMA3TRANSFER,
CONTROLLER_31, CONTROLLER_PLAYBGM,
CONTROLLER_32, CONTROLLER_32,
CONTROLLER_TWORETURNVALUES, CONTROLLER_TWORETURNVALUES,
CONTROLLER_CHOSENMONRETURNVALUE, CONTROLLER_CHOSENMONRETURNVALUE,
CONTROLLER_ONERETURNVALUE, CONTROLLER_ONERETURNVALUE,
CONTROLLER_ONERETURNVALUE_DUPLICATE, CONTROLLER_ONERETURNVALUE_DUPLICATE,
CONTROLLER_37, CONTROLLER_CLEARUNKVAR,
CONTROLLER_38, CONTROLLER_SETUNKVAR,
CONTROLLER_39, CONTROLLER_CLEARUNKFLAG,
CONTROLLER_40, CONTROLLER_TOGGLEUNKFLAG,
CONTROLLER_HITANIMATION, CONTROLLER_HITANIMATION,
CONTROLLER_42, CONTROLLER_42,
CONTROLLER_EFFECTIVENESSSOUND, CONTROLLER_PLAYSE,
CONTROLLER_PLAYFANFAREORBGM, CONTROLLER_PLAYFANFAREORBGM,
CONTROLLER_FAINTINGCRY, CONTROLLER_FAINTINGCRY,
CONTROLLER_INTROSLIDE, CONTROLLER_INTROSLIDE,
@@ -175,7 +175,7 @@ enum
CONTROLLER_CMDS_COUNT CONTROLLER_CMDS_COUNT
}; };
extern struct UnusedControllerStruct gUnknown_02022D0C; extern struct UnusedControllerStruct gUnusedControllerStruct;
// general functions // general functions
void HandleLinkBattleSetup(void); void HandleLinkBattleSetup(void);
@@ -222,10 +222,10 @@ void BtlController_EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2);
void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c); void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c);
void BtlController_EmitOneReturnValue(u8 bufferId, u16 arg1); void BtlController_EmitOneReturnValue(u8 bufferId, u16 arg1);
void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b); void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b);
void BtlController_EmitCmd37(u8 bufferId); // unused void BtlController_EmitClearUnkVar(u8 bufferId); // unused
void BtlController_EmitCmd38(u8 bufferId, u8 b); // unused void BtlController_EmitSetUnkVar(u8 bufferId, u8 b); // unused
void BtlController_EmitCmd39(u8 bufferId); // unused void BtlController_EmitClearUnkFlag(u8 bufferId); // unused
void BtlController_EmitCmd40(u8 bufferId); // unused void BtlController_EmitToggleUnkFlag(u8 bufferId); // unused
void BtlController_EmitHitAnimation(u8 bufferId); void BtlController_EmitHitAnimation(u8 bufferId);
void BtlController_EmitCmd42(u8 bufferId); void BtlController_EmitCmd42(u8 bufferId);
void BtlController_EmitPlaySE(u8 bufferId, u16 songId); void BtlController_EmitPlaySE(u8 bufferId, u16 songId);
src/battle_controller_link_opponent.c
+69 -69
View File
@@ -69,10 +69,10 @@ static void LinkOpponentHandleTwoReturnValues(void);
static void LinkOpponentHandleChosenMonReturnValue(void); static void LinkOpponentHandleChosenMonReturnValue(void);
static void LinkOpponentHandleOneReturnValue(void); static void LinkOpponentHandleOneReturnValue(void);
static void LinkOpponentHandleOneReturnValue_Duplicate(void); static void LinkOpponentHandleOneReturnValue_Duplicate(void);
static void LinkOpponentHandleCmd37(void); static void LinkOpponentHandleClearUnkVar(void);
static void LinkOpponentHandleCmd38(void); static void LinkOpponentHandleSetUnkVar(void);
static void LinkOpponentHandleCmd39(void); static void LinkOpponentHandleClearUnkFlag(void);
static void LinkOpponentHandleCmd40(void); static void LinkOpponentHandleToggleUnkFlag(void);
static void LinkOpponentHandleHitAnimation(void); static void LinkOpponentHandleHitAnimation(void);
static void LinkOpponentHandleCmd42(void); static void LinkOpponentHandleCmd42(void);
static void LinkOpponentHandlePlaySE(void); static void LinkOpponentHandlePlaySE(void);
@@ -104,63 +104,63 @@ static void sub_806782C(void);
static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
LinkOpponentHandleGetMonData, [CONTROLLER_GETMONDATA] = LinkOpponentHandleGetMonData,
LinkOpponentHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = LinkOpponentHandleGetRawMonData,
LinkOpponentHandleSetMonData, [CONTROLLER_SETMONDATA] = LinkOpponentHandleSetMonData,
LinkOpponentHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = LinkOpponentHandleSetRawMonData,
LinkOpponentHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = LinkOpponentHandleLoadMonSprite,
LinkOpponentHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = LinkOpponentHandleSwitchInAnim,
LinkOpponentHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = LinkOpponentHandleReturnMonToBall,
LinkOpponentHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = LinkOpponentHandleDrawTrainerPic,
LinkOpponentHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = LinkOpponentHandleTrainerSlide,
LinkOpponentHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = LinkOpponentHandleTrainerSlideBack,
LinkOpponentHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = LinkOpponentHandleFaintAnimation,
LinkOpponentHandlePaletteFade, [CONTROLLER_PALETTEFADE] = LinkOpponentHandlePaletteFade,
LinkOpponentHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = LinkOpponentHandleSuccessBallThrowAnim,
LinkOpponentHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = LinkOpponentHandleBallThrowAnim,
LinkOpponentHandlePause, [CONTROLLER_PAUSE] = LinkOpponentHandlePause,
LinkOpponentHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = LinkOpponentHandleMoveAnimation,
LinkOpponentHandlePrintString, [CONTROLLER_PRINTSTRING] = LinkOpponentHandlePrintString,
LinkOpponentHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = LinkOpponentHandlePrintSelectionString,
LinkOpponentHandleChooseAction, [CONTROLLER_CHOOSEACTION] = LinkOpponentHandleChooseAction,
LinkOpponentHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = LinkOpponentHandleUnknownYesNoBox,
LinkOpponentHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = LinkOpponentHandleChooseMove,
LinkOpponentHandleChooseItem, [CONTROLLER_OPENBAG] = LinkOpponentHandleChooseItem,
LinkOpponentHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = LinkOpponentHandleChoosePokemon,
LinkOpponentHandleCmd23, [CONTROLLER_23] = LinkOpponentHandleCmd23,
LinkOpponentHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = LinkOpponentHandleHealthBarUpdate,
LinkOpponentHandleExpUpdate, [CONTROLLER_EXPUPDATE] = LinkOpponentHandleExpUpdate,
LinkOpponentHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = LinkOpponentHandleStatusIconUpdate,
LinkOpponentHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = LinkOpponentHandleStatusAnimation,
LinkOpponentHandleStatusXor, [CONTROLLER_STATUSXOR] = LinkOpponentHandleStatusXor,
LinkOpponentHandleDataTransfer, [CONTROLLER_DATATRANSFER] = LinkOpponentHandleDataTransfer,
LinkOpponentHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = LinkOpponentHandleDMA3Transfer,
LinkOpponentHandlePlayBGM, [CONTROLLER_PLAYBGM] = LinkOpponentHandlePlayBGM,
LinkOpponentHandleCmd32, [CONTROLLER_32] = LinkOpponentHandleCmd32,
LinkOpponentHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = LinkOpponentHandleTwoReturnValues,
LinkOpponentHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = LinkOpponentHandleChosenMonReturnValue,
LinkOpponentHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = LinkOpponentHandleOneReturnValue,
LinkOpponentHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = LinkOpponentHandleOneReturnValue_Duplicate,
LinkOpponentHandleCmd37, [CONTROLLER_CLEARUNKVAR] = LinkOpponentHandleClearUnkVar,
LinkOpponentHandleCmd38, [CONTROLLER_SETUNKVAR] = LinkOpponentHandleSetUnkVar,
LinkOpponentHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = LinkOpponentHandleClearUnkFlag,
LinkOpponentHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = LinkOpponentHandleToggleUnkFlag,
LinkOpponentHandleHitAnimation, [CONTROLLER_HITANIMATION] = LinkOpponentHandleHitAnimation,
LinkOpponentHandleCmd42, [CONTROLLER_42] = LinkOpponentHandleCmd42,
LinkOpponentHandlePlaySE, [CONTROLLER_PLAYSE] = LinkOpponentHandlePlaySE,
LinkOpponentHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = LinkOpponentHandlePlayFanfareOrBGM,
LinkOpponentHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = LinkOpponentHandleFaintingCry,
LinkOpponentHandleIntroSlide, [CONTROLLER_INTROSLIDE] = LinkOpponentHandleIntroSlide,
LinkOpponentHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = LinkOpponentHandleIntroTrainerBallThrow,
LinkOpponentHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = LinkOpponentHandleDrawPartyStatusSummary,
LinkOpponentHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = LinkOpponentHandleHidePartyStatusSummary,
LinkOpponentHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = LinkOpponentHandleEndBounceEffect,
LinkOpponentHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = LinkOpponentHandleSpriteInvisibility,
LinkOpponentHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = LinkOpponentHandleBattleAnimation,
LinkOpponentHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = LinkOpponentHandleLinkStandbyMsg,
LinkOpponentHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = LinkOpponentHandleResetActionMoveSelection,
LinkOpponentHandleCmd55, [CONTROLLER_55] = LinkOpponentHandleCmd55,
LinkOpponentCmdEnd [CONTROLLER_TERMINATOR_NOP] = LinkOpponentCmdEnd
}; };
static void nullsub_28(void) static void nullsub_28(void)
@@ -1604,27 +1604,27 @@ static void LinkOpponentHandleOneReturnValue_Duplicate(void)
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
static void LinkOpponentHandleCmd37(void) static void LinkOpponentHandleClearUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = 0; gUnusedControllerStruct.unk = 0;
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
static void LinkOpponentHandleCmd38(void) static void LinkOpponentHandleSetUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1];
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
static void LinkOpponentHandleCmd39(void) static void LinkOpponentHandleClearUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 = 0; gUnusedControllerStruct.flag = 0;
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
static void LinkOpponentHandleCmd40(void) static void LinkOpponentHandleToggleUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 ^= 1; gUnusedControllerStruct.flag ^= 1;
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
src/battle_controller_link_partner.c
+69 -69
View File
@@ -67,10 +67,10 @@ static void LinkPartnerHandleTwoReturnValues(void);
static void LinkPartnerHandleChosenMonReturnValue(void); static void LinkPartnerHandleChosenMonReturnValue(void);
static void LinkPartnerHandleOneReturnValue(void); static void LinkPartnerHandleOneReturnValue(void);
static void LinkPartnerHandleOneReturnValue_Duplicate(void); static void LinkPartnerHandleOneReturnValue_Duplicate(void);
static void LinkPartnerHandleCmd37(void); static void LinkPartnerHandleClearUnkVar(void);
static void LinkPartnerHandleCmd38(void); static void LinkPartnerHandleSetUnkVar(void);
static void LinkPartnerHandleCmd39(void); static void LinkPartnerHandleClearUnkFlag(void);
static void LinkPartnerHandleCmd40(void); static void LinkPartnerHandleToggleUnkFlag(void);
static void LinkPartnerHandleHitAnimation(void); static void LinkPartnerHandleHitAnimation(void);
static void LinkPartnerHandleCmd42(void); static void LinkPartnerHandleCmd42(void);
static void LinkPartnerHandlePlaySE(void); static void LinkPartnerHandlePlaySE(void);
@@ -101,63 +101,63 @@ static void sub_814DE9C(void);
static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
LinkPartnerHandleGetMonData, [CONTROLLER_GETMONDATA] = LinkPartnerHandleGetMonData,
LinkPartnerHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = LinkPartnerHandleGetRawMonData,
LinkPartnerHandleSetMonData, [CONTROLLER_SETMONDATA] = LinkPartnerHandleSetMonData,
LinkPartnerHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = LinkPartnerHandleSetRawMonData,
LinkPartnerHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = LinkPartnerHandleLoadMonSprite,
LinkPartnerHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = LinkPartnerHandleSwitchInAnim,
LinkPartnerHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = LinkPartnerHandleReturnMonToBall,
LinkPartnerHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = LinkPartnerHandleDrawTrainerPic,
LinkPartnerHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = LinkPartnerHandleTrainerSlide,
LinkPartnerHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = LinkPartnerHandleTrainerSlideBack,
LinkPartnerHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = LinkPartnerHandleFaintAnimation,
LinkPartnerHandlePaletteFade, [CONTROLLER_PALETTEFADE] = LinkPartnerHandlePaletteFade,
LinkPartnerHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = LinkPartnerHandleSuccessBallThrowAnim,
LinkPartnerHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = LinkPartnerHandleBallThrowAnim,
LinkPartnerHandlePause, [CONTROLLER_PAUSE] = LinkPartnerHandlePause,
LinkPartnerHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = LinkPartnerHandleMoveAnimation,
LinkPartnerHandlePrintString, [CONTROLLER_PRINTSTRING] = LinkPartnerHandlePrintString,
LinkPartnerHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = LinkPartnerHandlePrintSelectionString,
LinkPartnerHandleChooseAction, [CONTROLLER_CHOOSEACTION] = LinkPartnerHandleChooseAction,
LinkPartnerHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = LinkPartnerHandleUnknownYesNoBox,
LinkPartnerHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = LinkPartnerHandleChooseMove,
LinkPartnerHandleChooseItem, [CONTROLLER_OPENBAG] = LinkPartnerHandleChooseItem,
LinkPartnerHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = LinkPartnerHandleChoosePokemon,
LinkPartnerHandleCmd23, [CONTROLLER_23] = LinkPartnerHandleCmd23,
LinkPartnerHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = LinkPartnerHandleHealthBarUpdate,
LinkPartnerHandleExpUpdate, [CONTROLLER_EXPUPDATE] = LinkPartnerHandleExpUpdate,
LinkPartnerHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = LinkPartnerHandleStatusIconUpdate,
LinkPartnerHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = LinkPartnerHandleStatusAnimation,
LinkPartnerHandleStatusXor, [CONTROLLER_STATUSXOR] = LinkPartnerHandleStatusXor,
LinkPartnerHandleDataTransfer, [CONTROLLER_DATATRANSFER] = LinkPartnerHandleDataTransfer,
LinkPartnerHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = LinkPartnerHandleDMA3Transfer,
LinkPartnerHandlePlayBGM, [CONTROLLER_PLAYBGM] = LinkPartnerHandlePlayBGM,
LinkPartnerHandleCmd32, [CONTROLLER_32] = LinkPartnerHandleCmd32,
LinkPartnerHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = LinkPartnerHandleTwoReturnValues,
LinkPartnerHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = LinkPartnerHandleChosenMonReturnValue,
LinkPartnerHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = LinkPartnerHandleOneReturnValue,
LinkPartnerHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = LinkPartnerHandleOneReturnValue_Duplicate,
LinkPartnerHandleCmd37, [CONTROLLER_CLEARUNKVAR] = LinkPartnerHandleClearUnkVar,
LinkPartnerHandleCmd38, [CONTROLLER_SETUNKVAR] = LinkPartnerHandleSetUnkVar,
LinkPartnerHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = LinkPartnerHandleClearUnkFlag,
LinkPartnerHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = LinkPartnerHandleToggleUnkFlag,
LinkPartnerHandleHitAnimation, [CONTROLLER_HITANIMATION] = LinkPartnerHandleHitAnimation,
LinkPartnerHandleCmd42, [CONTROLLER_42] = LinkPartnerHandleCmd42,
LinkPartnerHandlePlaySE, [CONTROLLER_PLAYSE] = LinkPartnerHandlePlaySE,
LinkPartnerHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = LinkPartnerHandlePlayFanfareOrBGM,
LinkPartnerHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = LinkPartnerHandleFaintingCry,
LinkPartnerHandleIntroSlide, [CONTROLLER_INTROSLIDE] = LinkPartnerHandleIntroSlide,
LinkPartnerHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = LinkPartnerHandleIntroTrainerBallThrow,
LinkPartnerHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = LinkPartnerHandleDrawPartyStatusSummary,
LinkPartnerHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = LinkPartnerHandleHidePartyStatusSummary,
LinkPartnerHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = LinkPartnerHandleEndBounceEffect,
LinkPartnerHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = LinkPartnerHandleSpriteInvisibility,
LinkPartnerHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = LinkPartnerHandleBattleAnimation,
LinkPartnerHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = LinkPartnerHandleLinkStandbyMsg,
LinkPartnerHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = LinkPartnerHandleResetActionMoveSelection,
LinkPartnerHandleCmd55, [CONTROLLER_55] = LinkPartnerHandleCmd55,
LinkPartnerCmdEnd [CONTROLLER_TERMINATOR_NOP] = LinkPartnerCmdEnd
}; };
static void SpriteCB_Null2(void) static void SpriteCB_Null2(void)
@@ -1428,27 +1428,27 @@ static void LinkPartnerHandleOneReturnValue_Duplicate(void)
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
} }
static void LinkPartnerHandleCmd37(void) static void LinkPartnerHandleClearUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = 0; gUnusedControllerStruct.unk = 0;
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
} }
static void LinkPartnerHandleCmd38(void) static void LinkPartnerHandleSetUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1];
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
} }
static void LinkPartnerHandleCmd39(void) static void LinkPartnerHandleClearUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 = 0; gUnusedControllerStruct.flag = 0;
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
} }
static void LinkPartnerHandleCmd40(void) static void LinkPartnerHandleToggleUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 ^= 1; gUnusedControllerStruct.flag ^= 1;
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
} }
src/battle_controller_opponent.c
+70 -70
View File
@@ -74,10 +74,10 @@ static void OpponentHandleTwoReturnValues(void);
static void OpponentHandleChosenMonReturnValue(void); static void OpponentHandleChosenMonReturnValue(void);
static void OpponentHandleOneReturnValue(void); static void OpponentHandleOneReturnValue(void);
static void OpponentHandleOneReturnValue_Duplicate(void); static void OpponentHandleOneReturnValue_Duplicate(void);
static void OpponentHandleCmd37(void); static void OpponentHandleClearUnkVar(void);
static void OpponentHandleCmd38(void); static void OpponentHandleSetUnkVar(void);
static void OpponentHandleCmd39(void); static void OpponentHandleClearUnkFlag(void);
static void OpponentHandleCmd40(void); static void OpponentHandleToggleUnkFlag(void);
static void OpponentHandleHitAnimation(void); static void OpponentHandleHitAnimation(void);
static void OpponentHandleCmd42(void); static void OpponentHandleCmd42(void);
static void OpponentHandlePlaySE(void); static void OpponentHandlePlaySE(void);
@@ -109,67 +109,67 @@ static void sub_8062A2C(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,
OpponentHandleBallThrow, [CONTROLLER_BALLTHROWANIM] = OpponentHandleBallThrow,
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] = OpponentHandleClearUnkVar,
OpponentHandleCmd38, [CONTROLLER_SETUNKVAR] = OpponentHandleSetUnkVar,
OpponentHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = OpponentHandleClearUnkFlag,
OpponentHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = OpponentHandleToggleUnkFlag,
OpponentHandleHitAnimation, [CONTROLLER_HITANIMATION] = OpponentHandleHitAnimation,
OpponentHandleCmd42, [CONTROLLER_42] = OpponentHandleCmd42,
OpponentHandlePlaySE, [CONTROLLER_PLAYSE] = OpponentHandlePlaySE,
OpponentHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = OpponentHandlePlayFanfareOrBGM,
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_55] = OpponentHandleCmd55,
OpponentCmdEnd [CONTROLLER_TERMINATOR_NOP] = OpponentCmdEnd
}; };
// unknown unused data // unknown unused data
static const u8 sUnknown_0831C7AC[] = {0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20}; static const u8 sUnused[] = {0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20};
static void nullsub_26(void) static void nullsub_26(void)
{ {
@@ -1769,27 +1769,27 @@ static void OpponentHandleOneReturnValue_Duplicate(void)
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
static void OpponentHandleCmd37(void) static void OpponentHandleClearUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = 0; gUnusedControllerStruct.unk = 0;
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
static void OpponentHandleCmd38(void) static void OpponentHandleSetUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1];
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
static void OpponentHandleCmd39(void) static void OpponentHandleClearUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 = 0; gUnusedControllerStruct.flag = 0;
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
static void OpponentHandleCmd40(void) static void OpponentHandleToggleUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 ^= 1; gUnusedControllerStruct.flag ^= 1;
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
src/battle_controller_player.c
+70 -70
View File
@@ -75,10 +75,10 @@ static void PlayerHandleTwoReturnValues(void);
static void PlayerHandleChosenMonReturnValue(void); static void PlayerHandleChosenMonReturnValue(void);
static void PlayerHandleOneReturnValue(void); static void PlayerHandleOneReturnValue(void);
static void PlayerHandleOneReturnValue_Duplicate(void); static void PlayerHandleOneReturnValue_Duplicate(void);
static void PlayerHandleCmd37(void); static void PlayerHandleClearUnkVar(void);
static void PlayerHandleCmd38(void); static void PlayerHandleSetUnkVar(void);
static void PlayerHandleCmd39(void); static void PlayerHandleClearUnkFlag(void);
static void PlayerHandleCmd40(void); static void PlayerHandleToggleUnkFlag(void);
static void PlayerHandleHitAnimation(void); static void PlayerHandleHitAnimation(void);
static void PlayerHandleCmd42(void); static void PlayerHandleCmd42(void);
static void PlayerHandlePlaySE(void); static void PlayerHandlePlaySE(void);
@@ -125,69 +125,69 @@ static void sub_805CE38(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] = PlayerHandleClearUnkVar,
PlayerHandleCmd38, [CONTROLLER_SETUNKVAR] = PlayerHandleSetUnkVar,
PlayerHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = PlayerHandleClearUnkFlag,
PlayerHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = PlayerHandleToggleUnkFlag,
PlayerHandleHitAnimation, [CONTROLLER_HITANIMATION] = PlayerHandleHitAnimation,
PlayerHandleCmd42, [CONTROLLER_42] = PlayerHandleCmd42,
PlayerHandlePlaySE, [CONTROLLER_PLAYSE] = PlayerHandlePlaySE,
PlayerHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = PlayerHandlePlayFanfareOrBGM,
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_55] = 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};
// unknown unused data // unknown unused data
static const u8 sUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58}; static const u8 sUnused[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58};
void nullsub_21(void) void nullsub_21(void)
{ {
@@ -2822,27 +2822,27 @@ static void PlayerHandleOneReturnValue_Duplicate(void)
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
static void PlayerHandleCmd37(void) static void PlayerHandleClearUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = 0; gUnusedControllerStruct.unk = 0;
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
static void PlayerHandleCmd38(void) static void PlayerHandleSetUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1];
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
static void PlayerHandleCmd39(void) static void PlayerHandleClearUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 = 0; gUnusedControllerStruct.flag = 0;
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
static void PlayerHandleCmd40(void) static void PlayerHandleToggleUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 ^= 1; gUnusedControllerStruct.flag ^= 1;
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();
} }
src/battle_controller_player_partner.c
+70 -70
View File
@@ -65,10 +65,10 @@ static void PlayerPartnerHandleTwoReturnValues(void);
static void PlayerPartnerHandleChosenMonReturnValue(void); static void PlayerPartnerHandleChosenMonReturnValue(void);
static void PlayerPartnerHandleOneReturnValue(void); static void PlayerPartnerHandleOneReturnValue(void);
static void PlayerPartnerHandleOneReturnValue_Duplicate(void); static void PlayerPartnerHandleOneReturnValue_Duplicate(void);
static void PlayerPartnerHandleCmd37(void); static void PlayerPartnerHandleClearUnkVar(void);
static void PlayerPartnerHandleCmd38(void); static void PlayerPartnerHandleSetUnkVar(void);
static void PlayerPartnerHandleCmd39(void); static void PlayerPartnerHandleClearUnkFlag(void);
static void PlayerPartnerHandleCmd40(void); static void PlayerPartnerHandleToggleUnkFlag(void);
static void PlayerPartnerHandleHitAnimation(void); static void PlayerPartnerHandleHitAnimation(void);
static void PlayerPartnerHandleCmd42(void); static void PlayerPartnerHandleCmd42(void);
static void PlayerPartnerHandlePlaySE(void); static void PlayerPartnerHandlePlaySE(void);
@@ -105,67 +105,67 @@ static void sub_81BE498(void);
static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
PlayerPartnerHandleGetMonData, [CONTROLLER_GETMONDATA] = PlayerPartnerHandleGetMonData,
PlayerPartnerHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = PlayerPartnerHandleGetRawMonData,
PlayerPartnerHandleSetMonData, [CONTROLLER_SETMONDATA] = PlayerPartnerHandleSetMonData,
PlayerPartnerHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = PlayerPartnerHandleSetRawMonData,
PlayerPartnerHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = PlayerPartnerHandleLoadMonSprite,
PlayerPartnerHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = PlayerPartnerHandleSwitchInAnim,
PlayerPartnerHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = PlayerPartnerHandleReturnMonToBall,
PlayerPartnerHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = PlayerPartnerHandleDrawTrainerPic,
PlayerPartnerHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = PlayerPartnerHandleTrainerSlide,
PlayerPartnerHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = PlayerPartnerHandleTrainerSlideBack,
PlayerPartnerHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = PlayerPartnerHandleFaintAnimation,
PlayerPartnerHandlePaletteFade, [CONTROLLER_PALETTEFADE] = PlayerPartnerHandlePaletteFade,
PlayerPartnerHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = PlayerPartnerHandleSuccessBallThrowAnim,
PlayerPartnerHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = PlayerPartnerHandleBallThrowAnim,
PlayerPartnerHandlePause, [CONTROLLER_PAUSE] = PlayerPartnerHandlePause,
PlayerPartnerHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = PlayerPartnerHandleMoveAnimation,
PlayerPartnerHandlePrintString, [CONTROLLER_PRINTSTRING] = PlayerPartnerHandlePrintString,
PlayerPartnerHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = PlayerPartnerHandlePrintSelectionString,
PlayerPartnerHandleChooseAction, [CONTROLLER_CHOOSEACTION] = PlayerPartnerHandleChooseAction,
PlayerPartnerHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = PlayerPartnerHandleUnknownYesNoBox,
PlayerPartnerHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = PlayerPartnerHandleChooseMove,
PlayerPartnerHandleChooseItem, [CONTROLLER_OPENBAG] = PlayerPartnerHandleChooseItem,
PlayerPartnerHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = PlayerPartnerHandleChoosePokemon,
PlayerPartnerHandleCmd23, [CONTROLLER_23] = PlayerPartnerHandleCmd23,
PlayerPartnerHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = PlayerPartnerHandleHealthBarUpdate,
PlayerPartnerHandleExpUpdate, [CONTROLLER_EXPUPDATE] = PlayerPartnerHandleExpUpdate,
PlayerPartnerHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = PlayerPartnerHandleStatusIconUpdate,
PlayerPartnerHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = PlayerPartnerHandleStatusAnimation,
PlayerPartnerHandleStatusXor, [CONTROLLER_STATUSXOR] = PlayerPartnerHandleStatusXor,
PlayerPartnerHandleDataTransfer, [CONTROLLER_DATATRANSFER] = PlayerPartnerHandleDataTransfer,
PlayerPartnerHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = PlayerPartnerHandleDMA3Transfer,
PlayerPartnerHandlePlayBGM, [CONTROLLER_PLAYBGM] = PlayerPartnerHandlePlayBGM,
PlayerPartnerHandleCmd32, [CONTROLLER_32] = PlayerPartnerHandleCmd32,
PlayerPartnerHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = PlayerPartnerHandleTwoReturnValues,
PlayerPartnerHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = PlayerPartnerHandleChosenMonReturnValue,
PlayerPartnerHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = PlayerPartnerHandleOneReturnValue,
PlayerPartnerHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = PlayerPartnerHandleOneReturnValue_Duplicate,
PlayerPartnerHandleCmd37, [CONTROLLER_CLEARUNKVAR] = PlayerPartnerHandleClearUnkVar,
PlayerPartnerHandleCmd38, [CONTROLLER_SETUNKVAR] = PlayerPartnerHandleSetUnkVar,
PlayerPartnerHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = PlayerPartnerHandleClearUnkFlag,
PlayerPartnerHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = PlayerPartnerHandleToggleUnkFlag,
PlayerPartnerHandleHitAnimation, [CONTROLLER_HITANIMATION] = PlayerPartnerHandleHitAnimation,
PlayerPartnerHandleCmd42, [CONTROLLER_42] = PlayerPartnerHandleCmd42,
PlayerPartnerHandlePlaySE, [CONTROLLER_PLAYSE] = PlayerPartnerHandlePlaySE,
PlayerPartnerHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = PlayerPartnerHandlePlayFanfareOrBGM,
PlayerPartnerHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = PlayerPartnerHandleFaintingCry,
PlayerPartnerHandleIntroSlide, [CONTROLLER_INTROSLIDE] = PlayerPartnerHandleIntroSlide,
PlayerPartnerHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = PlayerPartnerHandleIntroTrainerBallThrow,
PlayerPartnerHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = PlayerPartnerHandleDrawPartyStatusSummary,
PlayerPartnerHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = PlayerPartnerHandleHidePartyStatusSummary,
PlayerPartnerHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = PlayerPartnerHandleEndBounceEffect,
PlayerPartnerHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = PlayerPartnerHandleSpriteInvisibility,
PlayerPartnerHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = PlayerPartnerHandleBattleAnimation,
PlayerPartnerHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = PlayerPartnerHandleLinkStandbyMsg,
PlayerPartnerHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = PlayerPartnerHandleResetActionMoveSelection,
PlayerPartnerHandleCmd55, [CONTROLLER_55] = PlayerPartnerHandleCmd55,
PlayerPartnerCmdEnd [CONTROLLER_TERMINATOR_NOP] = PlayerPartnerCmdEnd
}; };
// unknown unused data // unknown unused data
static const u8 sUnknown_08617254[] = static const u8 sUnused[] =
{ {
0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e, 0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e,
0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35, 0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35,
@@ -1679,27 +1679,27 @@ static void PlayerPartnerHandleOneReturnValue_Duplicate(void)
PlayerPartnerBufferExecCompleted(); PlayerPartnerBufferExecCompleted();
} }
static void PlayerPartnerHandleCmd37(void) static void PlayerPartnerHandleClearUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = 0; gUnusedControllerStruct.unk = 0;
PlayerPartnerBufferExecCompleted(); PlayerPartnerBufferExecCompleted();
} }
static void PlayerPartnerHandleCmd38(void) static void PlayerPartnerHandleSetUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1];
PlayerPartnerBufferExecCompleted(); PlayerPartnerBufferExecCompleted();
} }
static void PlayerPartnerHandleCmd39(void) static void PlayerPartnerHandleClearUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 = 0; gUnusedControllerStruct.flag = 0;
PlayerPartnerBufferExecCompleted(); PlayerPartnerBufferExecCompleted();
} }
static void PlayerPartnerHandleCmd40(void) static void PlayerPartnerHandleToggleUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 ^= 1; gUnusedControllerStruct.flag ^= 1;
PlayerPartnerBufferExecCompleted(); PlayerPartnerBufferExecCompleted();
} }
src/battle_controller_recorded_opponent.c
+69 -69
View File
@@ -69,10 +69,10 @@ static void RecordedOpponentHandleTwoReturnValues(void);
static void RecordedOpponentHandleChosenMonReturnValue(void); static void RecordedOpponentHandleChosenMonReturnValue(void);
static void RecordedOpponentHandleOneReturnValue(void); static void RecordedOpponentHandleOneReturnValue(void);
static void RecordedOpponentHandleOneReturnValue_Duplicate(void); static void RecordedOpponentHandleOneReturnValue_Duplicate(void);
static void RecordedOpponentHandleCmd37(void); static void RecordedOpponentHandleClearUnkVar(void);
static void RecordedOpponentHandleCmd38(void); static void RecordedOpponentHandleSetUnkVar(void);
static void RecordedOpponentHandleCmd39(void); static void RecordedOpponentHandleClearUnkFlag(void);
static void RecordedOpponentHandleCmd40(void); static void RecordedOpponentHandleToggleUnkFlag(void);
static void RecordedOpponentHandleHitAnimation(void); static void RecordedOpponentHandleHitAnimation(void);
static void RecordedOpponentHandleCmd42(void); static void RecordedOpponentHandleCmd42(void);
static void RecordedOpponentHandlePlaySE(void); static void RecordedOpponentHandlePlaySE(void);
@@ -104,63 +104,63 @@ static void sub_818975C(void);
static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
RecordedOpponentHandleGetMonData, [CONTROLLER_GETMONDATA] = RecordedOpponentHandleGetMonData,
RecordedOpponentHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = RecordedOpponentHandleGetRawMonData,
RecordedOpponentHandleSetMonData, [CONTROLLER_SETMONDATA] = RecordedOpponentHandleSetMonData,
RecordedOpponentHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = RecordedOpponentHandleSetRawMonData,
RecordedOpponentHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = RecordedOpponentHandleLoadMonSprite,
RecordedOpponentHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = RecordedOpponentHandleSwitchInAnim,
RecordedOpponentHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = RecordedOpponentHandleReturnMonToBall,
RecordedOpponentHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = RecordedOpponentHandleDrawTrainerPic,
RecordedOpponentHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = RecordedOpponentHandleTrainerSlide,
RecordedOpponentHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = RecordedOpponentHandleTrainerSlideBack,
RecordedOpponentHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = RecordedOpponentHandleFaintAnimation,
RecordedOpponentHandlePaletteFade, [CONTROLLER_PALETTEFADE] = RecordedOpponentHandlePaletteFade,
RecordedOpponentHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = RecordedOpponentHandleSuccessBallThrowAnim,
RecordedOpponentHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = RecordedOpponentHandleBallThrowAnim,
RecordedOpponentHandlePause, [CONTROLLER_PAUSE] = RecordedOpponentHandlePause,
RecordedOpponentHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = RecordedOpponentHandleMoveAnimation,
RecordedOpponentHandlePrintString, [CONTROLLER_PRINTSTRING] = RecordedOpponentHandlePrintString,
RecordedOpponentHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = RecordedOpponentHandlePrintSelectionString,
RecordedOpponentHandleChooseAction, [CONTROLLER_CHOOSEACTION] = RecordedOpponentHandleChooseAction,
RecordedOpponentHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = RecordedOpponentHandleUnknownYesNoBox,
RecordedOpponentHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = RecordedOpponentHandleChooseMove,
RecordedOpponentHandleChooseItem, [CONTROLLER_OPENBAG] = RecordedOpponentHandleChooseItem,
RecordedOpponentHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = RecordedOpponentHandleChoosePokemon,
RecordedOpponentHandleCmd23, [CONTROLLER_23] = RecordedOpponentHandleCmd23,
RecordedOpponentHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = RecordedOpponentHandleHealthBarUpdate,
RecordedOpponentHandleExpUpdate, [CONTROLLER_EXPUPDATE] = RecordedOpponentHandleExpUpdate,
RecordedOpponentHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = RecordedOpponentHandleStatusIconUpdate,
RecordedOpponentHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = RecordedOpponentHandleStatusAnimation,
RecordedOpponentHandleStatusXor, [CONTROLLER_STATUSXOR] = RecordedOpponentHandleStatusXor,
RecordedOpponentHandleDataTransfer, [CONTROLLER_DATATRANSFER] = RecordedOpponentHandleDataTransfer,
RecordedOpponentHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = RecordedOpponentHandleDMA3Transfer,
RecordedOpponentHandlePlayBGM, [CONTROLLER_PLAYBGM] = RecordedOpponentHandlePlayBGM,
RecordedOpponentHandleCmd32, [CONTROLLER_32] = RecordedOpponentHandleCmd32,
RecordedOpponentHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = RecordedOpponentHandleTwoReturnValues,
RecordedOpponentHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = RecordedOpponentHandleChosenMonReturnValue,
RecordedOpponentHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = RecordedOpponentHandleOneReturnValue,
RecordedOpponentHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = RecordedOpponentHandleOneReturnValue_Duplicate,
RecordedOpponentHandleCmd37, [CONTROLLER_CLEARUNKVAR] = RecordedOpponentHandleClearUnkVar,
RecordedOpponentHandleCmd38, [CONTROLLER_SETUNKVAR] = RecordedOpponentHandleSetUnkVar,
RecordedOpponentHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = RecordedOpponentHandleClearUnkFlag,
RecordedOpponentHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = RecordedOpponentHandleToggleUnkFlag,
RecordedOpponentHandleHitAnimation, [CONTROLLER_HITANIMATION] = RecordedOpponentHandleHitAnimation,
RecordedOpponentHandleCmd42, [CONTROLLER_42] = RecordedOpponentHandleCmd42,
RecordedOpponentHandlePlaySE, [CONTROLLER_PLAYSE] = RecordedOpponentHandlePlaySE,
RecordedOpponentHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = RecordedOpponentHandlePlayFanfareOrBGM,
RecordedOpponentHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = RecordedOpponentHandleFaintingCry,
RecordedOpponentHandleIntroSlide, [CONTROLLER_INTROSLIDE] = RecordedOpponentHandleIntroSlide,
RecordedOpponentHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = RecordedOpponentHandleIntroTrainerBallThrow,
RecordedOpponentHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = RecordedOpponentHandleDrawPartyStatusSummary,
RecordedOpponentHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = RecordedOpponentHandleHidePartyStatusSummary,
RecordedOpponentHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = RecordedOpponentHandleEndBounceEffect,
RecordedOpponentHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = RecordedOpponentHandleSpriteInvisibility,
RecordedOpponentHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = RecordedOpponentHandleBattleAnimation,
RecordedOpponentHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = RecordedOpponentHandleLinkStandbyMsg,
RecordedOpponentHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = RecordedOpponentHandleResetActionMoveSelection,
RecordedOpponentHandleCmd55, [CONTROLLER_55] = RecordedOpponentHandleCmd55,
RecordedOpponentCmdEnd [CONTROLLER_TERMINATOR_NOP] = RecordedOpponentCmdEnd
}; };
static void nullsub_70(void) static void nullsub_70(void)
@@ -1544,27 +1544,27 @@ static void RecordedOpponentHandleOneReturnValue_Duplicate(void)
RecordedOpponentBufferExecCompleted(); RecordedOpponentBufferExecCompleted();
} }
static void RecordedOpponentHandleCmd37(void) static void RecordedOpponentHandleClearUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = 0; gUnusedControllerStruct.unk = 0;
RecordedOpponentBufferExecCompleted(); RecordedOpponentBufferExecCompleted();
} }
static void RecordedOpponentHandleCmd38(void) static void RecordedOpponentHandleSetUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1];
RecordedOpponentBufferExecCompleted(); RecordedOpponentBufferExecCompleted();
} }
static void RecordedOpponentHandleCmd39(void) static void RecordedOpponentHandleClearUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 = 0; gUnusedControllerStruct.flag = 0;
RecordedOpponentBufferExecCompleted(); RecordedOpponentBufferExecCompleted();
} }
static void RecordedOpponentHandleCmd40(void) static void RecordedOpponentHandleToggleUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 ^= 1; gUnusedControllerStruct.flag ^= 1;
RecordedOpponentBufferExecCompleted(); RecordedOpponentBufferExecCompleted();
} }
src/battle_controller_recorded_player.c
+69 -69
View File
@@ -65,10 +65,10 @@ static void RecordedPlayerHandleTwoReturnValues(void);
static void RecordedPlayerHandleChosenMonReturnValue(void); static void RecordedPlayerHandleChosenMonReturnValue(void);
static void RecordedPlayerHandleOneReturnValue(void); static void RecordedPlayerHandleOneReturnValue(void);
static void RecordedPlayerHandleOneReturnValue_Duplicate(void); static void RecordedPlayerHandleOneReturnValue_Duplicate(void);
static void RecordedPlayerHandleCmd37(void); static void RecordedPlayerHandleClearUnkVar(void);
static void RecordedPlayerHandleCmd38(void); static void RecordedPlayerHandleSetUnkVar(void);
static void RecordedPlayerHandleCmd39(void); static void RecordedPlayerHandleClearUnkFlag(void);
static void RecordedPlayerHandleCmd40(void); static void RecordedPlayerHandleToggleUnkFlag(void);
static void RecordedPlayerHandleHitAnimation(void); static void RecordedPlayerHandleHitAnimation(void);
static void RecordedPlayerHandleCmd42(void); static void RecordedPlayerHandleCmd42(void);
static void RecordedPlayerHandlePlaySE(void); static void RecordedPlayerHandlePlaySE(void);
@@ -99,63 +99,63 @@ static void sub_818CDF4(void);
static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
RecordedPlayerHandleGetMonData, [CONTROLLER_GETMONDATA] = RecordedPlayerHandleGetMonData,
RecordedPlayerHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = RecordedPlayerHandleGetRawMonData,
RecordedPlayerHandleSetMonData, [CONTROLLER_SETMONDATA] = RecordedPlayerHandleSetMonData,
RecordedPlayerHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = RecordedPlayerHandleSetRawMonData,
RecordedPlayerHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = RecordedPlayerHandleLoadMonSprite,
RecordedPlayerHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = RecordedPlayerHandleSwitchInAnim,
RecordedPlayerHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = RecordedPlayerHandleReturnMonToBall,
RecordedPlayerHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = RecordedPlayerHandleDrawTrainerPic,
RecordedPlayerHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = RecordedPlayerHandleTrainerSlide,
RecordedPlayerHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = RecordedPlayerHandleTrainerSlideBack,
RecordedPlayerHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = RecordedPlayerHandleFaintAnimation,
RecordedPlayerHandlePaletteFade, [CONTROLLER_PALETTEFADE] = RecordedPlayerHandlePaletteFade,
RecordedPlayerHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = RecordedPlayerHandleSuccessBallThrowAnim,
RecordedPlayerHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = RecordedPlayerHandleBallThrowAnim,
RecordedPlayerHandlePause, [CONTROLLER_PAUSE] = RecordedPlayerHandlePause,
RecordedPlayerHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = RecordedPlayerHandleMoveAnimation,
RecordedPlayerHandlePrintString, [CONTROLLER_PRINTSTRING] = RecordedPlayerHandlePrintString,
RecordedPlayerHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = RecordedPlayerHandlePrintSelectionString,
RecordedPlayerHandleChooseAction, [CONTROLLER_CHOOSEACTION] = RecordedPlayerHandleChooseAction,
RecordedPlayerHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = RecordedPlayerHandleUnknownYesNoBox,
RecordedPlayerHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = RecordedPlayerHandleChooseMove,
RecordedPlayerHandleChooseItem, [CONTROLLER_OPENBAG] = RecordedPlayerHandleChooseItem,
RecordedPlayerHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = RecordedPlayerHandleChoosePokemon,
RecordedPlayerHandleCmd23, [CONTROLLER_23] = RecordedPlayerHandleCmd23,
RecordedPlayerHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = RecordedPlayerHandleHealthBarUpdate,
RecordedPlayerHandleExpUpdate, [CONTROLLER_EXPUPDATE] = RecordedPlayerHandleExpUpdate,
RecordedPlayerHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = RecordedPlayerHandleStatusIconUpdate,
RecordedPlayerHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = RecordedPlayerHandleStatusAnimation,
RecordedPlayerHandleStatusXor, [CONTROLLER_STATUSXOR] = RecordedPlayerHandleStatusXor,
RecordedPlayerHandleDataTransfer, [CONTROLLER_DATATRANSFER] = RecordedPlayerHandleDataTransfer,
RecordedPlayerHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = RecordedPlayerHandleDMA3Transfer,
RecordedPlayerHandlePlayBGM, [CONTROLLER_PLAYBGM] = RecordedPlayerHandlePlayBGM,
RecordedPlayerHandleCmd32, [CONTROLLER_32] = RecordedPlayerHandleCmd32,
RecordedPlayerHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = RecordedPlayerHandleTwoReturnValues,
RecordedPlayerHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = RecordedPlayerHandleChosenMonReturnValue,
RecordedPlayerHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = RecordedPlayerHandleOneReturnValue,
RecordedPlayerHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = RecordedPlayerHandleOneReturnValue_Duplicate,
RecordedPlayerHandleCmd37, [CONTROLLER_CLEARUNKVAR] = RecordedPlayerHandleClearUnkVar,
RecordedPlayerHandleCmd38, [CONTROLLER_SETUNKVAR] = RecordedPlayerHandleSetUnkVar,
RecordedPlayerHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = RecordedPlayerHandleClearUnkFlag,
RecordedPlayerHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = RecordedPlayerHandleToggleUnkFlag,
RecordedPlayerHandleHitAnimation, [CONTROLLER_HITANIMATION] = RecordedPlayerHandleHitAnimation,
RecordedPlayerHandleCmd42, [CONTROLLER_42] = RecordedPlayerHandleCmd42,
RecordedPlayerHandlePlaySE, [CONTROLLER_PLAYSE] = RecordedPlayerHandlePlaySE,
RecordedPlayerHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = RecordedPlayerHandlePlayFanfareOrBGM,
RecordedPlayerHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = RecordedPlayerHandleFaintingCry,
RecordedPlayerHandleIntroSlide, [CONTROLLER_INTROSLIDE] = RecordedPlayerHandleIntroSlide,
RecordedPlayerHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = RecordedPlayerHandleIntroTrainerBallThrow,
RecordedPlayerHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = RecordedPlayerHandleDrawPartyStatusSummary,
RecordedPlayerHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = RecordedPlayerHandleHidePartyStatusSummary,
RecordedPlayerHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = RecordedPlayerHandleEndBounceEffect,
RecordedPlayerHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = RecordedPlayerHandleSpriteInvisibility,
RecordedPlayerHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = RecordedPlayerHandleBattleAnimation,
RecordedPlayerHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = RecordedPlayerHandleLinkStandbyMsg,
RecordedPlayerHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = RecordedPlayerHandleResetActionMoveSelection,
RecordedPlayerHandleCmd55, [CONTROLLER_55] = RecordedPlayerHandleCmd55,
RecordedPlayerCmdEnd [CONTROLLER_TERMINATOR_NOP] = RecordedPlayerCmdEnd
}; };
static void nullsub_120(void) static void nullsub_120(void)
@@ -1561,27 +1561,27 @@ static void RecordedPlayerHandleOneReturnValue_Duplicate(void)
RecordedPlayerBufferExecCompleted(); RecordedPlayerBufferExecCompleted();
} }
static void RecordedPlayerHandleCmd37(void) static void RecordedPlayerHandleClearUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = 0; gUnusedControllerStruct.unk = 0;
RecordedPlayerBufferExecCompleted(); RecordedPlayerBufferExecCompleted();
} }
static void RecordedPlayerHandleCmd38(void) static void RecordedPlayerHandleSetUnkVar(void)
{ {
gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1];
RecordedPlayerBufferExecCompleted(); RecordedPlayerBufferExecCompleted();
} }
static void RecordedPlayerHandleCmd39(void) static void RecordedPlayerHandleClearUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 = 0; gUnusedControllerStruct.flag = 0;
RecordedPlayerBufferExecCompleted(); RecordedPlayerBufferExecCompleted();
} }
static void RecordedPlayerHandleCmd40(void) static void RecordedPlayerHandleToggleUnkFlag(void)
{ {
gUnknown_02022D0C.flag_x80 ^= 1; gUnusedControllerStruct.flag ^= 1;
RecordedPlayerBufferExecCompleted(); RecordedPlayerBufferExecCompleted();
} }
src/battle_controller_safari.c
+65 -65
View File
@@ -62,10 +62,10 @@ static void SafariHandleTwoReturnValues(void);
static void SafariHandleChosenMonReturnValue(void); static void SafariHandleChosenMonReturnValue(void);
static void SafariHandleOneReturnValue(void); static void SafariHandleOneReturnValue(void);
static void SafariHandleOneReturnValue_Duplicate(void); static void SafariHandleOneReturnValue_Duplicate(void);
static void SafariHandleCmd37(void); static void SafariHandleClearUnkVar(void);
static void SafariHandleCmd38(void); static void SafariHandleSetUnkVar(void);
static void SafariHandleCmd39(void); static void SafariHandleClearUnkFlag(void);
static void SafariHandleCmd40(void); static void SafariHandleToggleUnkFlag(void);
static void SafariHandleHitAnimation(void); static void SafariHandleHitAnimation(void);
static void SafariHandleCmd42(void); static void SafariHandleCmd42(void);
static void SafariHandlePlaySE(void); static void SafariHandlePlaySE(void);
@@ -89,63 +89,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] = SafariHandleClearUnkVar,
SafariHandleCmd38, [CONTROLLER_SETUNKVAR] = SafariHandleSetUnkVar,
SafariHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = SafariHandleClearUnkFlag,
SafariHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = SafariHandleToggleUnkFlag,
SafariHandleHitAnimation, [CONTROLLER_HITANIMATION] = SafariHandleHitAnimation,
SafariHandleCmd42, [CONTROLLER_42] = SafariHandleCmd42,
SafariHandlePlaySE, [CONTROLLER_PLAYSE] = SafariHandlePlaySE,
SafariHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = 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_55] = SafariHandleCmd55,
SafariCmdEnd [CONTROLLER_TERMINATOR_NOP] = SafariCmdEnd
}; };
static void SpriteCB_Null4(void) static void SpriteCB_Null4(void)
@@ -553,22 +553,22 @@ static void SafariHandleOneReturnValue_Duplicate(void)
SafariBufferExecCompleted(); SafariBufferExecCompleted();
} }
static void SafariHandleCmd37(void) static void SafariHandleClearUnkVar(void)
{ {
SafariBufferExecCompleted(); SafariBufferExecCompleted();
} }
static void SafariHandleCmd38(void) static void SafariHandleSetUnkVar(void)
{ {
SafariBufferExecCompleted(); SafariBufferExecCompleted();
} }
static void SafariHandleCmd39(void) static void SafariHandleClearUnkFlag(void)
{ {
SafariBufferExecCompleted(); SafariBufferExecCompleted();
} }
static void SafariHandleCmd40(void) static void SafariHandleToggleUnkFlag(void)
{ {
SafariBufferExecCompleted(); SafariBufferExecCompleted();
} }
src/battle_controller_wally.c
+65 -65
View File
@@ -70,10 +70,10 @@ static void WallyHandleTwoReturnValues(void);
static void WallyHandleChosenMonReturnValue(void); static void WallyHandleChosenMonReturnValue(void);
static void WallyHandleOneReturnValue(void); static void WallyHandleOneReturnValue(void);
static void WallyHandleOneReturnValue_Duplicate(void); static void WallyHandleOneReturnValue_Duplicate(void);
static void WallyHandleCmd37(void); static void WallyHandleClearUnkVar(void);
static void WallyHandleCmd38(void); static void WallyHandleSetUnkVar(void);
static void WallyHandleCmd39(void); static void WallyHandleClearUnkFlag(void);
static void WallyHandleCmd40(void); static void WallyHandleToggleUnkFlag(void);
static void WallyHandleHitAnimation(void); static void WallyHandleHitAnimation(void);
static void WallyHandleCmd42(void); static void WallyHandleCmd42(void);
static void WallyHandlePlaySE(void); static void WallyHandlePlaySE(void);
@@ -102,63 +102,63 @@ static void sub_816AC04(u8 taskId);
static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
{ {
WallyHandleGetMonData, [CONTROLLER_GETMONDATA] = WallyHandleGetMonData,
WallyHandleGetRawMonData, [CONTROLLER_GETRAWMONDATA] = WallyHandleGetRawMonData,
WallyHandleSetMonData, [CONTROLLER_SETMONDATA] = WallyHandleSetMonData,
WallyHandleSetRawMonData, [CONTROLLER_SETRAWMONDATA] = WallyHandleSetRawMonData,
WallyHandleLoadMonSprite, [CONTROLLER_LOADMONSPRITE] = WallyHandleLoadMonSprite,
WallyHandleSwitchInAnim, [CONTROLLER_SWITCHINANIM] = WallyHandleSwitchInAnim,
WallyHandleReturnMonToBall, [CONTROLLER_RETURNMONTOBALL] = WallyHandleReturnMonToBall,
WallyHandleDrawTrainerPic, [CONTROLLER_DRAWTRAINERPIC] = WallyHandleDrawTrainerPic,
WallyHandleTrainerSlide, [CONTROLLER_TRAINERSLIDE] = WallyHandleTrainerSlide,
WallyHandleTrainerSlideBack, [CONTROLLER_TRAINERSLIDEBACK] = WallyHandleTrainerSlideBack,
WallyHandleFaintAnimation, [CONTROLLER_FAINTANIMATION] = WallyHandleFaintAnimation,
WallyHandlePaletteFade, [CONTROLLER_PALETTEFADE] = WallyHandlePaletteFade,
WallyHandleSuccessBallThrowAnim, [CONTROLLER_SUCCESSBALLTHROWANIM] = WallyHandleSuccessBallThrowAnim,
WallyHandleBallThrowAnim, [CONTROLLER_BALLTHROWANIM] = WallyHandleBallThrowAnim,
WallyHandlePause, [CONTROLLER_PAUSE] = WallyHandlePause,
WallyHandleMoveAnimation, [CONTROLLER_MOVEANIMATION] = WallyHandleMoveAnimation,
WallyHandlePrintString, [CONTROLLER_PRINTSTRING] = WallyHandlePrintString,
WallyHandlePrintSelectionString, [CONTROLLER_PRINTSTRINGPLAYERONLY] = WallyHandlePrintSelectionString,
WallyHandleChooseAction, [CONTROLLER_CHOOSEACTION] = WallyHandleChooseAction,
WallyHandleUnknownYesNoBox, [CONTROLLER_UNKNOWNYESNOBOX] = WallyHandleUnknownYesNoBox,
WallyHandleChooseMove, [CONTROLLER_CHOOSEMOVE] = WallyHandleChooseMove,
WallyHandleChooseItem, [CONTROLLER_OPENBAG] = WallyHandleChooseItem,
WallyHandleChoosePokemon, [CONTROLLER_CHOOSEPOKEMON] = WallyHandleChoosePokemon,
WallyHandleCmd23, [CONTROLLER_23] = WallyHandleCmd23,
WallyHandleHealthBarUpdate, [CONTROLLER_HEALTHBARUPDATE] = WallyHandleHealthBarUpdate,
WallyHandleExpUpdate, [CONTROLLER_EXPUPDATE] = WallyHandleExpUpdate,
WallyHandleStatusIconUpdate, [CONTROLLER_STATUSICONUPDATE] = WallyHandleStatusIconUpdate,
WallyHandleStatusAnimation, [CONTROLLER_STATUSANIMATION] = WallyHandleStatusAnimation,
WallyHandleStatusXor, [CONTROLLER_STATUSXOR] = WallyHandleStatusXor,
WallyHandleDataTransfer, [CONTROLLER_DATATRANSFER] = WallyHandleDataTransfer,
WallyHandleDMA3Transfer, [CONTROLLER_DMA3TRANSFER] = WallyHandleDMA3Transfer,
WallyHandlePlayBGM, [CONTROLLER_PLAYBGM] = WallyHandlePlayBGM,
WallyHandleCmd32, [CONTROLLER_32] = WallyHandleCmd32,
WallyHandleTwoReturnValues, [CONTROLLER_TWORETURNVALUES] = WallyHandleTwoReturnValues,
WallyHandleChosenMonReturnValue, [CONTROLLER_CHOSENMONRETURNVALUE] = WallyHandleChosenMonReturnValue,
WallyHandleOneReturnValue, [CONTROLLER_ONERETURNVALUE] = WallyHandleOneReturnValue,
WallyHandleOneReturnValue_Duplicate, [CONTROLLER_ONERETURNVALUE_DUPLICATE] = WallyHandleOneReturnValue_Duplicate,
WallyHandleCmd37, [CONTROLLER_CLEARUNKVAR] = WallyHandleClearUnkVar,
WallyHandleCmd38, [CONTROLLER_SETUNKVAR] = WallyHandleSetUnkVar,
WallyHandleCmd39, [CONTROLLER_CLEARUNKFLAG] = WallyHandleClearUnkFlag,
WallyHandleCmd40, [CONTROLLER_TOGGLEUNKFLAG] = WallyHandleToggleUnkFlag,
WallyHandleHitAnimation, [CONTROLLER_HITANIMATION] = WallyHandleHitAnimation,
WallyHandleCmd42, [CONTROLLER_42] = WallyHandleCmd42,
WallyHandlePlaySE, [CONTROLLER_PLAYSE] = WallyHandlePlaySE,
WallyHandlePlayFanfareOrBGM, [CONTROLLER_PLAYFANFAREORBGM] = WallyHandlePlayFanfareOrBGM,
WallyHandleFaintingCry, [CONTROLLER_FAINTINGCRY] = WallyHandleFaintingCry,
WallyHandleIntroSlide, [CONTROLLER_INTROSLIDE] = WallyHandleIntroSlide,
WallyHandleIntroTrainerBallThrow, [CONTROLLER_INTROTRAINERBALLTHROW] = WallyHandleIntroTrainerBallThrow,
WallyHandleDrawPartyStatusSummary, [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = WallyHandleDrawPartyStatusSummary,
WallyHandleHidePartyStatusSummary, [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = WallyHandleHidePartyStatusSummary,
WallyHandleEndBounceEffect, [CONTROLLER_ENDBOUNCE] = WallyHandleEndBounceEffect,
WallyHandleSpriteInvisibility, [CONTROLLER_SPRITEINVISIBILITY] = WallyHandleSpriteInvisibility,
WallyHandleBattleAnimation, [CONTROLLER_BATTLEANIMATION] = WallyHandleBattleAnimation,
WallyHandleLinkStandbyMsg, [CONTROLLER_LINKSTANDBYMSG] = WallyHandleLinkStandbyMsg,
WallyHandleResetActionMoveSelection, [CONTROLLER_RESETACTIONMOVESELECTION] = WallyHandleResetActionMoveSelection,
WallyHandleCmd55, [CONTROLLER_55] = WallyHandleCmd55,
WallyCmdEnd [CONTROLLER_TERMINATOR_NOP] = WallyCmdEnd
}; };
static void SpriteCB_Null7(void) static void SpriteCB_Null7(void)
@@ -1346,22 +1346,22 @@ static void WallyHandleOneReturnValue_Duplicate(void)
WallyBufferExecCompleted(); WallyBufferExecCompleted();
} }
static void WallyHandleCmd37(void) static void WallyHandleClearUnkVar(void)
{ {
WallyBufferExecCompleted(); WallyBufferExecCompleted();
} }
static void WallyHandleCmd38(void) static void WallyHandleSetUnkVar(void)
{ {
WallyBufferExecCompleted(); WallyBufferExecCompleted();
} }
static void WallyHandleCmd39(void) static void WallyHandleClearUnkFlag(void)
{ {
WallyBufferExecCompleted(); WallyBufferExecCompleted();
} }
static void WallyHandleCmd40(void) static void WallyHandleToggleUnkFlag(void)
{ {
WallyBufferExecCompleted(); WallyBufferExecCompleted();
} }
src/battle_controllers.c
+20 -20
View File
@@ -17,7 +17,7 @@
static EWRAM_DATA u8 sLinkSendTaskId = 0; static EWRAM_DATA u8 sLinkSendTaskId = 0;
static EWRAM_DATA u8 sLinkReceiveTaskId = 0; static EWRAM_DATA u8 sLinkReceiveTaskId = 0;
static EWRAM_DATA u8 sUnknown_02022D0A = 0; static EWRAM_DATA u8 sUnknown_02022D0A = 0;
EWRAM_DATA struct UnusedControllerStruct gUnknown_02022D0C = {}; EWRAM_DATA struct UnusedControllerStruct gUnusedControllerStruct = {}; // Debug? Unused code that writes to it, never read
static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {}; static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {};
// this file's funcionts // this file's funcionts
@@ -1282,7 +1282,7 @@ void BtlController_EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataPara
{ {
s32 i; s32 i;
sBattleBuffersTransferData[0] = CONTROLLER_31; sBattleBuffersTransferData[0] = CONTROLLER_PLAYBGM;
sBattleBuffersTransferData[1] = songId; sBattleBuffersTransferData[1] = songId;
sBattleBuffersTransferData[2] = (songId & 0xFF00) >> 8; sBattleBuffersTransferData[2] = (songId & 0xFF00) >> 8;
for (i = 0; i < songId; i++) // ???? for (i = 0; i < songId; i++) // ????
@@ -1340,37 +1340,37 @@ void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b)
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4);
} }
void BtlController_EmitCmd37(u8 bufferId) void BtlController_EmitClearUnkVar(u8 bufferId)
{ {
sBattleBuffersTransferData[0] = CONTROLLER_37; sBattleBuffersTransferData[0] = CONTROLLER_CLEARUNKVAR;
sBattleBuffersTransferData[1] = CONTROLLER_37; sBattleBuffersTransferData[1] = CONTROLLER_CLEARUNKVAR;
sBattleBuffersTransferData[2] = CONTROLLER_37; sBattleBuffersTransferData[2] = CONTROLLER_CLEARUNKVAR;
sBattleBuffersTransferData[3] = CONTROLLER_37; sBattleBuffersTransferData[3] = CONTROLLER_CLEARUNKVAR;
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4);
} }
void BtlController_EmitCmd38(u8 bufferId, u8 b) void BtlController_EmitSetUnkVar(u8 bufferId, u8 b)
{ {
sBattleBuffersTransferData[0] = CONTROLLER_38; sBattleBuffersTransferData[0] = CONTROLLER_SETUNKVAR;
sBattleBuffersTransferData[1] = b; sBattleBuffersTransferData[1] = b;
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2);
} }
void BtlController_EmitCmd39(u8 bufferId) void BtlController_EmitClearUnkFlag(u8 bufferId)
{ {
sBattleBuffersTransferData[0] = CONTROLLER_39; sBattleBuffersTransferData[0] = CONTROLLER_CLEARUNKFLAG;
sBattleBuffersTransferData[1] = CONTROLLER_39; sBattleBuffersTransferData[1] = CONTROLLER_CLEARUNKFLAG;
sBattleBuffersTransferData[2] = CONTROLLER_39; sBattleBuffersTransferData[2] = CONTROLLER_CLEARUNKFLAG;
sBattleBuffersTransferData[3] = CONTROLLER_39; sBattleBuffersTransferData[3] = CONTROLLER_CLEARUNKFLAG;
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4);
} }
void BtlController_EmitCmd40(u8 bufferId) void BtlController_EmitToggleUnkFlag(u8 bufferId)
{ {
sBattleBuffersTransferData[0] = CONTROLLER_40; sBattleBuffersTransferData[0] = CONTROLLER_TOGGLEUNKFLAG;
sBattleBuffersTransferData[1] = CONTROLLER_40; sBattleBuffersTransferData[1] = CONTROLLER_TOGGLEUNKFLAG;
sBattleBuffersTransferData[2] = CONTROLLER_40; sBattleBuffersTransferData[2] = CONTROLLER_TOGGLEUNKFLAG;
sBattleBuffersTransferData[3] = CONTROLLER_40; sBattleBuffersTransferData[3] = CONTROLLER_TOGGLEUNKFLAG;
PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4);
} }
@@ -1394,7 +1394,7 @@ void BtlController_EmitCmd42(u8 bufferId)
void BtlController_EmitPlaySE(u8 bufferId, u16 songId) void BtlController_EmitPlaySE(u8 bufferId, u16 songId)
{ {
sBattleBuffersTransferData[0] = CONTROLLER_EFFECTIVENESSSOUND; sBattleBuffersTransferData[0] = CONTROLLER_PLAYSE;
sBattleBuffersTransferData[1] = songId; sBattleBuffersTransferData[1] = songId;
sBattleBuffersTransferData[2] = (songId & 0xFF00) >> 8; sBattleBuffersTransferData[2] = (songId & 0xFF00) >> 8;
sBattleBuffersTransferData[3] = 0; sBattleBuffersTransferData[3] = 0;