diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 00:09:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 00:09:14 -0400 |
| commit | 75262c1920a0611f89e95837efb4f5e327760a8b (patch) | |
| tree | 9982e4fcd275f8a1ea3c851c3dbf297d9e1c1307 /include/evolution_scene.h | |
| parent | 6e5dcf19f76b1839537848cf0fd91c7ddb27898c (diff) | |
| parent | c71f6baa8cb713a567520279ff18dca0c4ed0915 (diff) | |
Merge branch 'master' into bard_music
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); |