Prepare learn_move for merge

2018-08-12 12:54:07 -07:00
parent a000eb4f36
commit 2dd5fc23d4
39 changed files with 875 additions and 1902 deletions
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -659,7 +659,7 @@ static void CB2_EggHatch_1(void)
        }
        break;
    case 10:
-        switch (ProcessMenuInputNoWrap_())
+        switch (Menu_ProcessInputNoWrap_())
        {
        case 0:
            GetMonNick(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar3);