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/record_mixing.c | |
| parent | 0a7b97ee0605e48a34c7af193a26d770c6d23d29 (diff) | |
| parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) | |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'src/record_mixing.c')
| -rw-r--r-- | src/record_mixing.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/record_mixing.c b/src/record_mixing.c index 7bbb4286d..aafd7284b 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1095,7 +1095,7 @@ void GetPlayerHallRecords(struct PlayerHallRecords *dst) CopyTrainerId(dst->twoPlayers[j].id1, gSaveBlock2Ptr->playerTrainerId); CopyTrainerId(dst->twoPlayers[j].id2, gSaveBlock2Ptr->frontier.field_EF1[j]); StringCopy(dst->twoPlayers[j].name1, gSaveBlock2Ptr->playerName); - StringCopy(dst->twoPlayers[j].name2, gSaveBlock2Ptr->frontier.field_EE1[j]); + StringCopy(dst->twoPlayers[j].name2, gSaveBlock2Ptr->frontier.opponentName[j]); } for (i = 0; i < 2; i++) |