diff options
| author | melthelesbian <44884535+melthelesbian@users.noreply.github.com> | 2018-12-25 12:50:15 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-12-25 11:50:15 -0600 |
| commit | 2dd706ca5410d98ad214ceff7026d6db276f4d5a (patch) | |
| tree | 20d184fb4f7e48d965c6c88b39dfd7fc11d3dd86 /src/battle_factory_screen.c | |
| parent | dcbc8db6a32e70651163a132950d486d93a58254 (diff) | |
use max mon moves constant where able (#480)
* use max mon moves constant where able
* fix errors in script commands file
* fix more errors
Diffstat (limited to 'src/battle_factory_screen.c')
| -rw-r--r-- | src/battle_factory_screen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 2571e7a92..7831ef750 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle.h" #include "battle_factory_screen.h" #include "battle_factory.h" #include "sprite.h" @@ -1691,7 +1692,7 @@ static void CreateFrontierFactorySelectableMons(u8 firstMonId) gFacilityTrainerMons[monSetId].evSpread, otId); happiness = 0; - for (j = 0; j < 4; j++) + for (j = 0; j < MAX_MON_MOVES; j++) SetMonMoveAvoidReturn(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monSetId].moves[j], j); SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_FRIENDSHIP, &happiness); SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); @@ -1721,7 +1722,7 @@ static void CreateTentFactorySelectableMons(u8 firstMonId) gFacilityTrainerMons[monSetId].evSpread, otId); happiness = 0; - for (j = 0; j < 4; j++) + for (j = 0; j < MAX_MON_MOVES; j++) SetMonMoveAvoidReturn(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monSetId].moves[j], j); SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_FRIENDSHIP, &happiness); SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]); |