diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-03 10:23:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-03 10:23:00 -0400 |
| commit | 8f5c30da23d5666d7c557821c2b3e8d670d5d169 (patch) | |
| tree | b952509f491e8e201df027e73515a785633ac283 /src | |
| parent | 0f19a99599ffa77a34535925a683113464095b8e (diff) | |
Preemptively fix evolution_scene bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/evolution_scene.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index a855efb1b..146565533 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -145,7 +145,11 @@ static void Task_BeginEvolutionScene(u8 taskID) bool8 canStopEvo; u8 partyID; +#if MODERN + mon = (struct Pokemon*)((u16)gTasks[taskID].tMonPtrHI | (gTasks[taskID].tMonPtrLO << 0x10)); +#else mon = (struct Pokemon*)(gTasks[taskID].tMonPtrHI | (gTasks[taskID].tMonPtrLO << 0x10)); +#endif speciesToEvolve = gTasks[taskID].tPostEvoSpecies; canStopEvo = gTasks[taskID].tCanStop; partyID = gTasks[taskID].tPartyID; |