diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-14 22:01:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-14 22:01:31 -0400 |
| commit | 200bdcb5c2c34f18ca8ccb667642080441feb97f (patch) | |
| tree | ed504cfb57480f0a9c6d8af9aded8e5300f16a3d /src/battle_interface.c | |
| parent | 8219bb53d59c426de31c43ec3a045b61d7108798 (diff) | |
| parent | 817f20d2275d29a2d1976fa2e1281a15b0c45630 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index 0fd9462cc..c5d07e8e9 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -9,6 +9,7 @@ #include "songs.h" #include "battle.h" #include "palette.h" +#include "pokedex.h" #include "battle_interface.h" struct UnknownStruct5 @@ -84,7 +85,6 @@ extern const u16 gBattleInterfaceStatusIcons_DynPal[]; #define MACRO1(n) ((n) - (n) / 8 * 8) + 64 * ((n) / 8) extern int sub_8040D3C(); -extern u8 sub_8090D90(); extern void load_gfxc_health_bar(); static void sub_8043D5C(struct Sprite *); @@ -2506,7 +2506,7 @@ static void sub_8045458(u8 a, u8 b) if (battle_side_get_owner(r4) != 0) { u16 species = GetMonData(&gEnemyParty[gUnknown_02024A6A[r4]], MON_DATA_SPECIES); - if (sub_8090D90(SpeciesToNationalPokedexNum(species), 1) != 0) + if (GetNationalPokedexFlag(SpeciesToNationalPokedexNum(species), 1) != 0) { r4 = gSprites[a].data5; if (b != 0) |