diff options
author | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
commit | 73cce797533c5985406b7b5696834b0976039c4f (patch) | |
tree | bcf7766a7a7ae0ad42bbfacd9566c219fe1d0fd3 /src/rom_8011DC0.c | |
parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) |
Merge remote-tracking branch 'upstream/master' into frontier-data
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 bf16a20fc..b7ca087fd 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1784,7 +1784,7 @@ void sub_801440C(u8 taskId) ScriptContext2_Disable(); } -extern u8 gUnknown_0203CEF8[]; +extern u8 gSelectedOrderFromParty[]; void sub_8014790(u8 taskId) { @@ -1802,8 +1802,8 @@ void sub_8014790(u8 taskId) gLinkPlayers[0].linkType = 0x2211; gLinkPlayers[0].id = 0; gLinkPlayers[1].id = 2; - sendBuff[0] = GetMonData(&gPlayerParty[gUnknown_0203CEF8[0] - 1], MON_DATA_SPECIES); - sendBuff[1] = GetMonData(&gPlayerParty[gUnknown_0203CEF8[1] - 1], MON_DATA_SPECIES, NULL); + sendBuff[0] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[0] - 1], MON_DATA_SPECIES); + sendBuff[1] = GetMonData(&gPlayerParty[gSelectedOrderFromParty[1] - 1], MON_DATA_SPECIES, NULL); gMain.savedCallback = NULL; data[0] = 4; sub_800E3A8(); |