From ff72723464be032b3f576dfce3c80cfdfe538772 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:51:13 -0400 Subject: [PATCH] Fix Cmd_trainerslidein/out (#5326) * fix Cmd_trainerslidein battler Id * GetBattlerForBattleScript in trainerslideout --------- Co-authored-by: ghoulslash --- src/battle_script_commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 9d8c0d4491..3f483c9ea7 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7439,7 +7439,7 @@ static void Cmd_trainerslidein(void) { CMD_ARGS(u8 battler); - u32 battler = GetBattlerAtPosition(cmd->battler); + u32 battler = GetBattlerForBattleScript(cmd->battler); BtlController_EmitTrainerSlide(battler, BUFFER_A); MarkBattlerForControllerExec(battler); @@ -15647,7 +15647,7 @@ static void Cmd_trainerslideout(void) { CMD_ARGS(u8 position); - u32 battler = GetBattlerAtPosition(cmd->position); + u32 battler = GetBattlerForBattleScript(cmd->position); BtlController_EmitTrainerSlideBack(battler, BUFFER_A); MarkBattlerForControllerExec(battler);