Merge branch 'master' into link
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
#include "pokemon.h"
|
||||
#include "string_util.h"
|
||||
#include "battle.h"
|
||||
#include "unknown_task.h"
|
||||
#include "scanline_effect.h"
|
||||
#include "decompress.h"
|
||||
#include "m4a.h"
|
||||
#include "menu.h"
|
||||
@@ -1364,7 +1364,7 @@ static void VBlankCB_EvolutionScene(void)
|
||||
LoadOam();
|
||||
ProcessSpriteCopyRequests();
|
||||
TransferPlttBuffer();
|
||||
sub_80BA0A8();
|
||||
ScanlineEffect_InitHBlankDmaTransfer();
|
||||
}
|
||||
|
||||
static void VBlankCB_TradeEvolutionScene(void)
|
||||
@@ -1381,7 +1381,7 @@ static void VBlankCB_TradeEvolutionScene(void)
|
||||
LoadOam();
|
||||
ProcessSpriteCopyRequests();
|
||||
TransferPlttBuffer();
|
||||
sub_80BA0A8();
|
||||
ScanlineEffect_InitHBlankDmaTransfer();
|
||||
}
|
||||
|
||||
static void sub_813FDEC(u8 taskId)
|
||||
|
||||
Reference in New Issue
Block a user