diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:37:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:39:54 -0400 |
| commit | 17fd3bccf7a6dd49362f2d280ba2f6670cb5ac0f (patch) | |
| tree | df66ddc51a60e6de70e3cdfbb6924a52a4c6ab6f /include/evolution_scene.h | |
| parent | bb10a4dd57fdbdd9b2c0e3962adef705d8ab8f39 (diff) | |
| parent | 63210c07897e86953bf093397eee5a33e95b8c91 (diff) | |
Merge branch 'master' into secret_base
Diffstat (limited to 'include/evolution_scene.h')
| -rw-r--r-- | include/evolution_scene.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/evolution_scene.h b/include/evolution_scene.h index 48bd6ebe1..5f8c534b9 100644 --- a/include/evolution_scene.h +++ b/include/evolution_scene.h @@ -1,8 +1,8 @@ #ifndef GUARD_EVOLUTION_SCENE_H #define GUARD_EVOLUTION_SCENE_H -void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); +void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID); extern void (*gCB2_AfterEvolution)(void); |