diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /include/evolution_graphics.h | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'include/evolution_graphics.h')
| -rw-r--r-- | include/evolution_graphics.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/evolution_graphics.h b/include/evolution_graphics.h index 21f133872..e4fbf0fc0 100644 --- a/include/evolution_graphics.h +++ b/include/evolution_graphics.h @@ -10,7 +10,7 @@ u8 LaunchTask_PreEvoSparklesSet2(void); u8 LaunchTask_PostEvoSparklesSet1(void); u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species); u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species); -u8 sub_817C3A0(u8 preEvoSpriteID, u8 postEvoSpriteID); +u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId); #define EvoGraphicsTaskEvoStop data[8] |