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

2019-02-21 22:24:25 -05:00
parent 9e8a841bfa b105d20d1e
commit 399d646e3f
498 changed files with 11313 additions and 14336 deletions
--- a/src/rom_8011DC0.c
+++ b/src/rom_8011DC0.c
@@ -1687,7 +1687,7 @@ void sub_801440C(u8 taskId)
    case 9 ... 11:
    case 13:
    case 15:
-        sub_800E3A8();
+        RecordMixTrainerNames();
        break;
    }

@@ -1800,12 +1800,12 @@ void sub_8014790(u8 taskId)
            sendBuff[1] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[1] - 1], MON_DATA_SPECIES, NULL);
            gMain.savedCallback = NULL;
            data[0] = 4;
-            sub_800E3A8();
+            RecordMixTrainerNames();
            ResetBlockReceivedFlags();
            break;
        case 16:
        case 23 ... 27:
-            sub_800E3A8();
+            RecordMixTrainerNames();
            DestroyTask(taskId);
        default:
            EnableBothScriptContexts();