Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-10-02 05:50:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

finished updating battle_controller_link_partner

Browse Source
This commit is contained in:
cawtds
2024-05-10 17:55:19 +02:00
parent 3e7f8a6c0f
commit 46c82ee187
3 changed files with 163 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/battle_controllers.h
View File

@@ -313,6 +313,7 @@ void SetBattleEndCallbacks(u32 battler);
void MoveSelectionCreateCursorAt(u8 cursorPos, u8 arg1);
void MoveSelectionDestroyCursorAt(u8 cursorPos);
void HandleInputChooseMove(u32 battler);
u32 LinkPlayerGetTrainerPicId(u32 multiplayerId);
// opponent controller
void SetControllerToOpponent(u32 battler);

1527
src/battle_controller_link_partner.c
View File

File diff suppressed because it is too large Load Diff

114
src/battle_controller_safari.c
View File

@@ -33,63 +33,63 @@ static void CompleteWhenChosePokeblock(u32 battler);
static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(u32 battler) =
{
[CONTROLLER_GETMONDATA] = BtlController_Empty,
[CONTROLLER_GETRAWMONDATA] = BtlController_Empty,
[CONTROLLER_SETMONDATA] = BtlController_Empty,
[CONTROLLER_SETRAWMONDATA] = BtlController_Empty,
[CONTROLLER_LOADMONSPRITE] = BtlController_Empty,
[CONTROLLER_SWITCHINANIM] = BtlController_Empty,
[CONTROLLER_RETURNMONTOBALL] = BtlController_Empty,
[CONTROLLER_DRAWTRAINERPIC] = SafariHandleDrawTrainerPic,
[CONTROLLER_TRAINERSLIDE] = BtlController_Empty,
[CONTROLLER_TRAINERSLIDEBACK] = BtlController_Empty,
[CONTROLLER_FAINTANIMATION] = BtlController_Empty,
[CONTROLLER_PALETTEFADE] = BtlController_Empty,
[CONTROLLER_SUCCESSBALLTHROWANIM] = SafariHandleSuccessBallThrowAnim,
[CONTROLLER_BALLTHROWANIM] = SafariHandleBallThrowAnim,
[CONTROLLER_PAUSE] = BtlController_Empty,
[CONTROLLER_MOVEANIMATION] = BtlController_Empty,
[CONTROLLER_PRINTSTRING] = BtlController_HandlePrintString,
[CONTROLLER_PRINTSTRINGPLAYERONLY] = SafariHandlePrintSelectionString,
[CONTROLLER_CHOOSEACTION] = SafariHandleChooseAction,
[CONTROLLER_UNKNOWNYESNOBOX] = BtlController_Empty,
[CONTROLLER_CHOOSEMOVE] = BtlController_Empty,
[CONTROLLER_OPENBAG] = SafariHandleChooseItem,
[CONTROLLER_CHOOSEPOKEMON] = BtlController_Empty,
[CONTROLLER_23] = BtlController_Empty,
[CONTROLLER_HEALTHBARUPDATE] = BtlController_Empty,
[CONTROLLER_EXPUPDATE] = BtlController_Empty,
[CONTROLLER_STATUSICONUPDATE] = SafariHandleStatusIconUpdate,
[CONTROLLER_STATUSANIMATION] = BtlController_Empty,
[CONTROLLER_STATUSXOR] = BtlController_Empty,
[CONTROLLER_DATATRANSFER] = BtlController_Empty,
[CONTROLLER_DMA3TRANSFER] = BtlController_Empty,
[CONTROLLER_PLAYBGM] = BtlController_Empty,
[CONTROLLER_32] = BtlController_Empty,
[CONTROLLER_TWORETURNVALUES] = BtlController_Empty,
[CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE] = BtlController_Empty,
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty,
[CONTROLLER_CLEARUNKVAR] = BtlController_Empty,
[CONTROLLER_SETUNKVAR] = BtlController_Empty,
[CONTROLLER_CLEARUNKFLAG] = BtlController_Empty,
[CONTROLLER_TOGGLEUNKFLAG] = BtlController_Empty,
[CONTROLLER_HITANIMATION] = BtlController_Empty,
[CONTROLLER_CANTSWITCH] = BtlController_Empty,
[CONTROLLER_PLAYSE] = BtlController_HandlePlaySE,
[CONTROLLER_PLAYFANFAREORBGM] = BtlController_HandlePlayFanfareOrBGM,
[CONTROLLER_FAINTINGCRY] = SafariHandleFaintingCry,
[CONTROLLER_INTROSLIDE] = BtlController_HandleIntroSlide,
[CONTROLLER_INTROTRAINERBALLTHROW] = SafariHandleIntroTrainerBallThrow,
[CONTROLLER_DRAWPARTYSTATUSSUMMARY] = BtlController_Empty,
[CONTROLLER_HIDEPARTYSTATUSSUMMARY] = BtlController_Empty,
[CONTROLLER_ENDBOUNCE] = BtlController_Empty,
[CONTROLLER_SPRITEINVISIBILITY] = BtlController_Empty,
[CONTROLLER_BATTLEANIMATION] = SafariHandleBattleAnimation,
[CONTROLLER_LINKSTANDBYMSG] = BtlController_Empty,
[CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty,
[CONTROLLER_ENDLINKBATTLE] = SafariHandleEndLinkBattle,
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop,
[CONTROLLER_GETMONDATA] = BtlController_Empty, // done
[CONTROLLER_GETRAWMONDATA] = BtlController_Empty, // done
[CONTROLLER_SETMONDATA] = BtlController_Empty, // done
[CONTROLLER_SETRAWMONDATA] = BtlController_Empty, // done
[CONTROLLER_LOADMONSPRITE] = BtlController_Empty, // done
[CONTROLLER_SWITCHINANIM] = BtlController_Empty, // done
[CONTROLLER_RETURNMONTOBALL] = BtlController_Empty, // done
[CONTROLLER_DRAWTRAINERPIC] = SafariHandleDrawTrainerPic, // done
[CONTROLLER_TRAINERSLIDE] = BtlController_Empty, // done
[CONTROLLER_TRAINERSLIDEBACK] = BtlController_Empty, // done
[CONTROLLER_FAINTANIMATION] = BtlController_Empty, // done
[CONTROLLER_PALETTEFADE] = BtlController_Empty, // done
[CONTROLLER_SUCCESSBALLTHROWANIM] = SafariHandleSuccessBallThrowAnim, // done
[CONTROLLER_BALLTHROWANIM] = SafariHandleBallThrowAnim, // done
[CONTROLLER_PAUSE] = BtlController_Empty, // done
[CONTROLLER_MOVEANIMATION] = BtlController_Empty, // done
[CONTROLLER_PRINTSTRING] = BtlController_HandlePrintString, // done
[CONTROLLER_PRINTSTRINGPLAYERONLY] = SafariHandlePrintSelectionString, // done
[CONTROLLER_CHOOSEACTION] = SafariHandleChooseAction, // done
[CONTROLLER_UNKNOWNYESNOBOX] = BtlController_Empty, // done
[CONTROLLER_CHOOSEMOVE] = BtlController_Empty, // done
[CONTROLLER_OPENBAG] = SafariHandleChooseItem, // done
[CONTROLLER_CHOOSEPOKEMON] = BtlController_Empty, // done
[CONTROLLER_23] = BtlController_Empty, // done
[CONTROLLER_HEALTHBARUPDATE] = BtlController_Empty, // done
[CONTROLLER_EXPUPDATE] = BtlController_Empty, // done
[CONTROLLER_STATUSICONUPDATE] = SafariHandleStatusIconUpdate, // done
[CONTROLLER_STATUSANIMATION] = BtlController_Empty, // done
[CONTROLLER_STATUSXOR] = BtlController_Empty, // done
[CONTROLLER_DATATRANSFER] = BtlController_Empty, // done
[CONTROLLER_DMA3TRANSFER] = BtlController_Empty, // done
[CONTROLLER_PLAYBGM] = BtlController_Empty, // done
[CONTROLLER_32] = BtlController_Empty, // done
[CONTROLLER_TWORETURNVALUES] = BtlController_Empty, // done
[CONTROLLER_CHOSENMONRETURNVALUE] = BtlController_Empty, // done
[CONTROLLER_ONERETURNVALUE] = BtlController_Empty, // done
[CONTROLLER_ONERETURNVALUE_DUPLICATE] = BtlController_Empty, // done
[CONTROLLER_CLEARUNKVAR] = BtlController_Empty, // done
[CONTROLLER_SETUNKVAR] = BtlController_Empty, // done
[CONTROLLER_CLEARUNKFLAG] = BtlController_Empty, // done
[CONTROLLER_TOGGLEUNKFLAG] = BtlController_Empty, // done
[CONTROLLER_HITANIMATION] = BtlController_Empty, // done
[CONTROLLER_CANTSWITCH] = BtlController_Empty, // done
[CONTROLLER_PLAYSE] = BtlController_HandlePlaySE, // done
[CONTROLLER_PLAYFANFAREORBGM] = BtlController_HandlePlayFanfareOrBGM, // done
[CONTROLLER_FAINTINGCRY] = SafariHandleFaintingCry, // done
[CONTROLLER_INTROSLIDE] = BtlController_HandleIntroSlide, // done
[CONTROLLER_INTROTRAINERBALLTHROW] = SafariHandleIntroTrainerBallThrow, // done
[CONTROLLER_DRAWPARTYSTATUSSUMMARY] = BtlController_Empty, // done
[CONTROLLER_HIDEPARTYSTATUSSUMMARY] = BtlController_Empty, // done
[CONTROLLER_ENDBOUNCE] = BtlController_Empty, // done
[CONTROLLER_SPRITEINVISIBILITY] = BtlController_Empty, // done
[CONTROLLER_BATTLEANIMATION] = SafariHandleBattleAnimation, // done
[CONTROLLER_LINKSTANDBYMSG] = BtlController_Empty, // done
[CONTROLLER_RESETACTIONMOVESELECTION] = BtlController_Empty, // done
[CONTROLLER_ENDLINKBATTLE] = SafariHandleEndLinkBattle, // done
[CONTROLLER_TERMINATOR_NOP] = BtlController_TerminatorNop, // done
};
void SetControllerToSafari(u32 battler)