diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 21:21:10 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 21:22:10 -0500 |
commit | eca329f9c500d89f451a4ab88f65da79c112bf71 (patch) | |
tree | 7fd4fa77064398ad1a19354df534f31f8355f839 /src/rom_8011DC0.c | |
parent | 0a7b97ee0605e48a34c7af193a26d770c6d23d29 (diff) | |
parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'src/rom_8011DC0.c')
-rw-r--r-- | src/rom_8011DC0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 19f032fd0..0f3ebe633 100644 --- 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(); |