diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 19:43:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 20:30:56 -0600 |
| commit | 09e431077af3c6fe672ad8a775b58d955596b81d (patch) | |
| tree | 88d2eceb1071df85b4f73b1742885127755579c6 /include/evolution_scene.h | |
| parent | 2d3044aaa645bbad85e8e60dfe23f7f0224383ca (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge remote-tracking branch 'pret/master' into dump_maps
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); |