Skip to content

Commit a468117

Browse files
committed
Reorder safari battle enums to match former order
Renaming safari battle enums caused the enums to be mismatched in the battle.h and battle_controller_player.c files. This should realign them.
1 parent 11b2b05 commit a468117

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/constants/battle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,8 @@ typedef enum ControllerCommand {
617617
CONTROLLER_COMMAND_POKEMON_INPUT, // 15
618618
CONTROLLER_COMMAND_RUN_INPUT,
619619
CONTROLLER_COMMAND_SAFARI_THROW_BALL,
620-
CONTROLLER_COMMAND_SAFARI_THROW_BAIT,
621620
CONTROLLER_COMMAND_SAFARI_THROW_MUD,
621+
CONTROLLER_COMMAND_SAFARI_THROW_BAIT,
622622
CONTROLLER_COMMAND_SAFARI_RUN, // 20
623623
CONTROLLER_COMMAND_CATCHING_CONSTEST_THROW_BALL,
624624
CONTROLLER_COMMAND_RUN_SCRIPT,

src/battle/battle_controller_player.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ static const ControllerFunction sPlayerBattleCommands[CONTROLLER_COMMAND_MAX] =
112112
[CONTROLLER_COMMAND_POKEMON_INPUT] = BattleControllerPlayer_PokemonInput,
113113
[CONTROLLER_COMMAND_RUN_INPUT] = BattleControllerPlayer_RunInput,
114114
[CONTROLLER_COMMAND_SAFARI_THROW_BALL] = BattleControllerPlayer_SafariThrowBall,
115-
[CONTROLLER_COMMAND_SAFARI_THROW_BAIT] = BattleControllerPlayer_SafariThrowBait,
116115
[CONTROLLER_COMMAND_SAFARI_THROW_MUD] = BattleControllerPlayer_SafariThrowMud,
116+
[CONTROLLER_COMMAND_SAFARI_THROW_BAIT] = BattleControllerPlayer_SafariThrowBait,
117117
[CONTROLLER_COMMAND_SAFARI_RUN] = BattleControllerPlayer_SafariRun,
118118
[CONTROLLER_COMMAND_CATCHING_CONSTEST_THROW_BALL] = BattleControllerPlayer_CatchingContestThrowBall,
119119
[CONTROLLER_COMMAND_RUN_SCRIPT] = BattleControllerPlayer_RunScript,

0 commit comments

Comments
 (0)