diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
| commit | d004ce065c9cc6425df6f567dff39eb831f84875 (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /src/battle_factory_screen.c | |
| parent | ec780bb2098be75e591b212e85947f88c91d4e37 (diff) | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into trade
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]); |