diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-31 19:36:25 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-31 19:36:25 +0100 |
| commit | 6cb1c4fd6e7c52e528f36e3511ac4b4db4dbb2ee (patch) | |
| tree | c5d4f93c251472daa4cded616da3141448a37e6b /src/reshow_battle_screen.c | |
| parent | 665734d689fbd6da708e482b1cb9fdf3ee2345bc (diff) | |
| parent | 4cb8528d94216f69c4a37d470c1d5f3487a87239 (diff) | |
fix merge conflicts, evo scene
Diffstat (limited to 'src/reshow_battle_screen.c')
| -rw-r--r-- | src/reshow_battle_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 343ddb9c0..002f4f069 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -220,9 +220,9 @@ static bool8 LoadBankSpriteGfx(u8 bank) BattleLoadSubstituteSpriteGfx(bank, FALSE); } else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0) - LoadBackTrainerBankSpriteGfx(gSaveBlock2Ptr->playerGender, bank); + DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, bank); else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0) - LoadBackTrainerBankSpriteGfx(BACK_PIC_WALLY, bank); + DecompressTrainerBackPic(BACK_PIC_WALLY, bank); else if (!gBattleSpritesDataPtr->bankData[bank].behindSubstitute) BattleLoadPlayerMonSpriteGfx(&gPlayerParty[gBattlePartyID[bank]], bank); else |