diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
| commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
| tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /include/pokemon.h | |
| parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
| parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 507497683..60ccb27f4 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -431,9 +431,9 @@ extern const u8 *const gItemEffectTable[]; extern const struct Evolution gEvolutionTable[][EVOS_PER_MON]; extern const u32 gExperienceTables[][MAX_LEVEL + 1]; extern const u16 *const gLevelUpLearnsets[]; -extern const u8 gUnknown_08329D22[]; -extern const u8 gUnknown_08329D26[]; -extern const u8 gUnknown_08329D2A[]; +extern const u8 gPPUpGetMask[]; +extern const u8 gPPUpSetMask[]; +extern const u8 gPPUpAddMask[]; extern const u8 gStatStageRatios[][2]; extern const u16 gUnknown_08329D54[]; extern const struct SpriteTemplate gUnknown_08329D98[]; @@ -583,7 +583,7 @@ const u8 *GetTrainerPartnerName(void); void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3); void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3); void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneFrame); -void sub_806EE98(void); +void StopPokemonAnimationDelayTask(void); void BattleAnimateBackSprite(struct Sprite* sprite, u16 species); u8 sub_806EF08(u8 arg0); u8 sub_806EF84(u8 arg0, u8 arg1); |