diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-19 14:05:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 14:05:18 -0500 |
| commit | 43efafa12c2243354ccee4ddd76cd41aed3ecf18 (patch) | |
| tree | 73a2391f2c0460573b778794e0b4119886bd9e80 /include | |
| parent | 89dc26755ad2818c10b37a34ed46f5c79dc571c8 (diff) | |
| parent | 009732cb4c099c7311410c41a5945a50449c41de (diff) | |
Merge pull request #157 from PikalaxALT/dism_more_data
Evolution Graphics and others
Diffstat (limited to 'include')
| -rw-r--r-- | include/dynamic_placeholder_text_util.h | 6 | ||||
| -rw-r--r-- | include/evolution_graphics.h | 2 | ||||
| -rw-r--r-- | include/evolution_scene.h | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/dynamic_placeholder_text_util.h b/include/dynamic_placeholder_text_util.h index 31cfe8d30..bae92eb01 100644 --- a/include/dynamic_placeholder_text_util.h +++ b/include/dynamic_placeholder_text_util.h @@ -1,5 +1,5 @@ -#ifndef GUARD_UNK_TEXT_UTIL_H -#define GUARD_UNK_TEXT_UTIL_H +#ifndef GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H +#define GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H #include "global.h" @@ -9,4 +9,4 @@ u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src); const u8 *DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 idx); u8 GetColorFromTextColorTable(u16 graphicId); -#endif //GUARD_UNK_TEXT_UTIL_H +#endif //GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H 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] diff --git a/include/evolution_scene.h b/include/evolution_scene.h index 6ceed99c1..75b64dadc 100644 --- a/include/evolution_scene.h +++ b/include/evolution_scene.h @@ -8,5 +8,6 @@ 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); #endif // GUARD_EVOLUTION_SCENE_H |