diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-09 08:51:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-09 08:51:16 -0400 |
| commit | e011ca7ac919efe05d5c965c84e14abd19dfaacd (patch) | |
| tree | 9c9f3920cf3070d9d16d4c9b9374c2e8ffa56c9f /include/evolution_graphics.h | |
| parent | 113659ca87d944f2949d0cdb9e863101d040edc1 (diff) | |
| parent | 99dc97f6aa48646c90def102ce2632be8c45eab9 (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'include/evolution_graphics.h')
| -rw-r--r-- | include/evolution_graphics.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/evolution_graphics.h b/include/evolution_graphics.h index c217f22af..a960f637b 100644 --- a/include/evolution_graphics.h +++ b/include/evolution_graphics.h @@ -6,8 +6,10 @@ void LoadEvoSparkleSpriteAndPal(void); u8 LaunchTask_PreEvoSparklesSet1(u16 arg0); u8 LaunchTask_PreEvoSparklesSet2(void); u8 LaunchTask_PostEvoSparklesSet1(void); -u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 arg0); -u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 arg0); +u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species); +u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species); u8 sub_8149E7C(u8 preEvoSpriteID, u8 postEvoSpriteID); +#define EvoGraphicsTaskEvoStop data[8] + #endif // GUARD_EVOLUTION_GRAPHICS_H |