diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-18 14:27:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 14:27:01 -0600 |
| commit | 2c7948bae8cbe58882c1d4ad0669f33d56dac76b (patch) | |
| tree | 71bae050175d7ea03df5be89d9bc62075c1d2fd6 /src/battle_tent.c | |
| parent | c74468fd11b551e1babf18a4d320e114fe495bd8 (diff) | |
| parent | d6b31346c3441d4d99f1fbf7d4c4de8573450872 (diff) | |
Merge pull request #452 from Meowsy/pokemon-adding-easer
Add macros to simplify defining front animations and still pics.
Diffstat (limited to 'src/battle_tent.c')
| -rw-r--r-- | src/battle_tent.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/battle_tent.c b/src/battle_tent.c index d66c093e9..c358deaa5 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -13,6 +13,7 @@ #include "string_util.h" #include "constants/items.h" #include "constants/region_map_sections.h" +#include "constants/species.h" // This file's functions. static void sub_81B99D4(void); @@ -292,7 +293,7 @@ static void sub_81B9EC0(void) heldItems[i] = 0; } gFacilityTrainerMons = gSlateportBattleTentMons; - currSpecies = 0; + currSpecies = SPECIES_NONE; i = 0; while (i != PARTY_SIZE) { @@ -305,7 +306,7 @@ static void sub_81B9EC0(void) break; if (species[j] == gFacilityTrainerMons[monSetId].species) { - if (currSpecies == 0) + if (currSpecies == SPECIES_NONE) currSpecies = gFacilityTrainerMons[monSetId].species; else break; @@ -320,7 +321,7 @@ static void sub_81B9EC0(void) if (heldItems[j] != 0 && heldItems[j] == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]) { if (gFacilityTrainerMons[monSetId].species == currSpecies) - currSpecies = 0; + currSpecies = SPECIES_NONE; break; } } |