Merge with master

2018-07-16 20:23:05 +02:00
parent ee3d505b58 07ef762770
commit ea5ffa3375
1044 changed files with 7296 additions and 7064 deletions
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -478,7 +478,7 @@ static void SafariHandleChooseItem(void)
 {
    s32 i;

-    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
    gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
    gBattlerInMenuId = gActiveBattler;
 }