diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
| commit | 407d22af8e685076bc92f837266786dfe78e7123 (patch) | |
| tree | 11a039ad7737c105d4b81ae653ba899d342b6e57 /include/evolution_scene.h | |
| parent | e6bc189a033bb2019233dc99f2c1114053c7650d (diff) | |
| parent | 1234d0252cbe2b0001784b10b75f0d339824632d (diff) | |
fix PR merge conflicts
Diffstat (limited to 'include/evolution_scene.h')
| -rw-r--r-- | include/evolution_scene.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/evolution_scene.h b/include/evolution_scene.h index 75b64dadc..3f504a1f1 100644 --- a/include/evolution_scene.h +++ b/include/evolution_scene.h @@ -3,11 +3,11 @@ #include "global.h" -void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyID); -void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyID); -void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID); - extern void (*gCB2_AfterEvolution)(void); -void sub_80D0474(void); + +void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyId); +void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyId); +void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteId, u8 partyId); +void IsMovingBackgroundTaskRunning(void); #endif // GUARD_EVOLUTION_SCENE_H |