diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-27 18:52:21 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-27 18:52:21 +0200 |
commit | e8903fb4dd3e1f9ef260beb93a939a7e6e9a045b (patch) | |
tree | e8a656d1c48de6d66ba2a5476a59419a2e8bfd61 /include | |
parent | f4e134569f0abf5f6b0bd23043a28e135b0c188c (diff) |
start workin on evo scene
Diffstat (limited to 'include')
-rw-r--r-- | include/battle.h | 1 | ||||
-rw-r--r-- | include/pokemon.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 3328c691f..0bdeb4f1e 100644 --- a/include/battle.h +++ b/include/battle.h @@ -229,6 +229,7 @@ #define BATTLE_TERRAIN_ROCK 6 #define BATTLE_TERRAIN_CAVE 7 #define BATTLE_TERRAIN_INSIDE 8 +#define BATTLE_TERRAIN_PLAIN 9 // array entries for battle communication #define MULTIUSE_STATE 0x0 diff --git a/include/pokemon.h b/include/pokemon.h index 4159a2f96..c1c61d241 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -620,7 +620,7 @@ void SetWildMonHeldItem(void); u16 GetMonEVCount(struct Pokemon *); const struct CompressedSpritePalette *sub_806E794(struct Pokemon *mon); -const struct CompressedSpritePalette *sub_806E7CC(u16 species, u32 otId , u32 personality); +const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u16 species, u32 otId , u32 personality); bool32 IsHMMove2(u16 move); bool8 IsPokeSpriteNotFlipped(u16 species); bool8 IsMonShiny(struct Pokemon *mon); |