From 3e50480cabc0faabe93ca44f5864e0b47115eb1d Mon Sep 17 00:00:00 2001 From: johannakullmann <151456919+johannakullmann@users.noreply.github.com> Date: Sat, 27 Jan 2024 15:59:39 +0100 Subject: [PATCH] Fixed graphics bug with Steven double battle (#4078) Caused the wrong palette to be used during Steven's ball throw animation in the Mossdeep Space Center fight. --- src/battle_controller_player_partner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 5155db49ec..ed9f29c667 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -440,7 +440,7 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(u32 battler) const u32 *trainerPal; if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER) - trainerPal = gTrainerBackPicPaletteTable[TRAINER_STEVEN_PARTNER].data; + trainerPal = gTrainerBackPicPaletteTable[TRAINER_BACK_PIC_STEVEN].data; else if (gPartnerTrainerId >= TRAINER_CUSTOM_PARTNER) // Custom multi battle. trainerPal = gTrainerBackPicPaletteTable[gPartnerSpriteId].data; else if (IsAiVsAiBattle())