diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
| commit | ecee02816d475f012dd4eec8a59b9ad3ba9ab531 (patch) | |
| tree | 5eb0cdad91aeba20866a731033d76add878c3ec4 /src/battle_tent.c | |
| parent | 7dcb614cca6d61c5e51960826dddc004858ed9f1 (diff) | |
| parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) | |
Merge with master
Diffstat (limited to 'src/battle_tent.c')
| -rw-r--r-- | src/battle_tent.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/battle_tent.c b/src/battle_tent.c index c7e70912c..c358deaa5 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -13,10 +13,7 @@ #include "string_util.h" #include "constants/items.h" #include "constants/region_map_sections.h" - -extern const struct BattleFrontierTrainer gSlateportBattleTentTrainers[]; -extern const struct FacilityMon gSlateportBattleTentMons[]; -extern const u16 gBattleFrontierHeldItems[]; +#include "constants/species.h" // This file's functions. static void sub_81B99D4(void); @@ -296,7 +293,7 @@ static void sub_81B9EC0(void) heldItems[i] = 0; } gFacilityTrainerMons = gSlateportBattleTentMons; - currSpecies = 0; + currSpecies = SPECIES_NONE; i = 0; while (i != PARTY_SIZE) { @@ -309,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; @@ -324,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; } } |