Merge branch 'master' into main-menu-state-machine

2019-02-26 22:34:42 -05:00
parent 6cb4c677cd 231355f84d
commit 72bb0daccb
457 changed files with 17619 additions and 23557 deletions
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -6654,7 +6654,7 @@ static void sub_80CE8E4(void)
    if (sIsMonBeingMoved)
        sub_80CE790();
    else
-        sBoxCursorPosition = gUnknown_0203CF20;
+        sBoxCursorPosition = gLastViewedMonIndex;
 }

 s16 CompactPartySlots(void)