diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
commit | 6bd6cfcac7ae76806c8c9d940163dc3ece6a9acf (patch) | |
tree | f71ad889881572488c2a2be299c50fc09393e1a2 /src/battle_controller_safari.c | |
parent | 0e8d6645f84057a9eaf9e60ac9312bc259f15be1 (diff) | |
parent | 4554b546ef1699d4b3bde9ef27e7477e620d38d9 (diff) |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/battle_controller_safari.c')
-rw-r--r-- | src/battle_controller_safari.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index db4670523..64e6a0bc3 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -19,6 +19,7 @@ #include "reshow_battle_screen.h" #include "pokeball.h" #include "data2.h" +#include "pokeblock.h" extern u32 gBattleExecBuffer; extern u8 gActiveBank; @@ -291,13 +292,13 @@ static void CompleteOnSpecialAnimDone(void) SafariBufferExecCompleted(); } -static void OpenPokeblockCase(void) +static void SafariOpenPokeblockCase(void) { if (!gPaletteFade.active) { gBattleBankFunc[gActiveBank] = CompleteWhenChosePokeblock; FreeAllWindowBuffers(); - sub_81358F4(); + OpenPokeblockCaseInBattle(); } } @@ -497,7 +498,7 @@ static void SafariHandleChooseItem(void) s32 i; BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); - gBattleBankFunc[gActiveBank] = OpenPokeblockCase; + gBattleBankFunc[gActiveBank] = SafariOpenPokeblockCase; gBankInMenu = gActiveBank; } |