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_factory.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_factory.c')
| -rw-r--r-- | src/battle_factory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_factory.c b/src/battle_factory.c index a693acfb6..801b33ba7 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -526,7 +526,7 @@ static void sub_81A67EC(void) } var_40 = sub_81A6F70(factoryBattleMode, factoryLvlMode); - currSpecies = 0; + currSpecies = SPECIES_NONE; i = 0; while (i != PARTY_SIZE) { @@ -546,7 +546,7 @@ static void sub_81A67EC(void) break; if (species[j] == gFacilityTrainerMons[monSetId].species) { - if (currSpecies == 0) + if (currSpecies == SPECIES_NONE) currSpecies = gFacilityTrainerMons[monSetId].species; else break; @@ -561,7 +561,7 @@ static void sub_81A67EC(void) if (heldItems[j] != 0 && heldItems[j] == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]) { if (gFacilityTrainerMons[monSetId].species == currSpecies) - currSpecies = 0; + currSpecies = SPECIES_NONE; break; } } @@ -579,7 +579,7 @@ static void sub_81A67EC(void) static void sub_81A6A08(void) { u8 i; - u8 typesCount[18]; + u8 typesCount[NUMBER_OF_MON_TYPES]; u8 usedType[2]; gFacilityTrainerMons = gBattleFrontierMons; |