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.
pret · Dec 30, 2024 · a468117 · a468117
1 parent 11b2b05
commit a468117
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/constants/battle.h b/include/constants/battle.h
@@ -617,8 +617,8 @@ typedef enum ControllerCommand {
     CONTROLLER_COMMAND_POKEMON_INPUT, // 15
     CONTROLLER_COMMAND_RUN_INPUT,
     CONTROLLER_COMMAND_SAFARI_THROW_BALL,
-    CONTROLLER_COMMAND_SAFARI_THROW_BAIT,
     CONTROLLER_COMMAND_SAFARI_THROW_MUD,
+    CONTROLLER_COMMAND_SAFARI_THROW_BAIT,
     CONTROLLER_COMMAND_SAFARI_RUN, // 20
     CONTROLLER_COMMAND_CATCHING_CONSTEST_THROW_BALL,
     CONTROLLER_COMMAND_RUN_SCRIPT,

diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
@@ -112,8 +112,8 @@ static const ControllerFunction sPlayerBattleCommands[CONTROLLER_COMMAND_MAX] =
     [CONTROLLER_COMMAND_POKEMON_INPUT] = BattleControllerPlayer_PokemonInput,
     [CONTROLLER_COMMAND_RUN_INPUT] = BattleControllerPlayer_RunInput,
     [CONTROLLER_COMMAND_SAFARI_THROW_BALL] = BattleControllerPlayer_SafariThrowBall,
-    [CONTROLLER_COMMAND_SAFARI_THROW_BAIT] = BattleControllerPlayer_SafariThrowBait,
     [CONTROLLER_COMMAND_SAFARI_THROW_MUD] = BattleControllerPlayer_SafariThrowMud,
+    [CONTROLLER_COMMAND_SAFARI_THROW_BAIT] = BattleControllerPlayer_SafariThrowBait,
     [CONTROLLER_COMMAND_SAFARI_RUN] = BattleControllerPlayer_SafariRun,
     [CONTROLLER_COMMAND_CATCHING_CONSTEST_THROW_BALL] = BattleControllerPlayer_CatchingContestThrowBall,
     [CONTROLLER_COMMAND_RUN_SCRIPT] = BattleControllerPlayer_RunScript,