diff --git a/src/battle_controllers.c b/src/battle_controllers.c index cb794abacf..15e90691f2 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -2536,6 +2536,8 @@ void BtlController_HandleDrawTrainerPic(u32 battler, u32 trainerPicId, bool32 is xPos, yPos, subpriority); + if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT) + gBattlerSpriteIds[battler] = gBattleStruct->trainerSlideSpriteIds[battler]; gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].oam.paletteNum = battler; } @@ -2560,6 +2562,8 @@ void BtlController_HandleTrainerSlide(u32 battler, u32 trainerPicId) 80, (8 - gTrainerBacksprites[trainerPicId].coordinates.size) * 4 + 80, 30); + if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT) + gBattlerSpriteIds[battler] = gBattleStruct->trainerSlideSpriteIds[battler]; gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].x2 = -96; gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].sSpeedX = 2; diff --git a/src/battle_main.c b/src/battle_main.c index b6132a9a04..61e61aeb34 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -42,7 +42,6 @@ #include "pokemon.h" #include "random.h" #include "recorded_battle.h" -#include "reshow_battle_screen.h" #include "roamer.h" #include "safari_zone.h" #include "scanline_effect.h" @@ -3720,10 +3719,6 @@ static void DoBattleIntro(void) PrepareStringBattle(STRINGID_INTROSENDOUT, battler); } - else - { - CreateBattlerSprite(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)); - } gBattleStruct->introState++; break; case BATTLE_INTRO_STATE_WAIT_FOR_PLAYER_SEND_OUT_TEXT: