diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-26 15:02:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 15:02:38 -0400 |
| commit | 1016b239186097361ea20f2f91adf3932026f40c (patch) | |
| tree | 840a0f28046d3c66fcaf1c2bb8ab3228386a3a8a /src/new_game.c | |
| parent | bb236b490d99fef02ed172e7ca86f6c70ef09527 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into rename-tablecmds
Diffstat (limited to 'src/new_game.c')
| -rw-r--r-- | src/new_game.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/new_game.c b/src/new_game.c index ee67da9be..1021ea96c 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -81,7 +81,7 @@ u32 GetTrainerId(u8 *trainerId) void CopyTrainerId(u8 *dst, u8 *src) { s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < TRAINER_ID_LENGTH; i++) dst[i] = src[i]; } @@ -198,7 +198,7 @@ void NewGameInitData(void) ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags); ResetMiniGamesResults(); copy_strings_to_sav1(); - SetLilycoveLady(); + InitLilycoveLady(); ResetAllApprenticeData(); ClearRankingHallRecords(); InitMatchCallCounters(); |