diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-27 23:41:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-27 23:41:35 -0400 |
| commit | 1da42d0c0ba0499203e60523f9cfd4cb3abc75eb (patch) | |
| tree | 2e7be4a2d4351e4136fa3d76b27117ebae08bd83 /src/field/daycare.c | |
| parent | 1c2a815d7b31bc9f43c26e4ea0bf346487b958ac (diff) | |
| parent | d783f420001b67c19f8d81bbc94d266af98e89ad (diff) | |
Merge branch 'master' into secret_base_data_fix
Diffstat (limited to 'src/field/daycare.c')
| -rw-r--r-- | src/field/daycare.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/field/daycare.c b/src/field/daycare.c index 9c5808a0e..d182e121b 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -13,7 +13,6 @@ #include "moves.h" #include "trade.h" #include "strings2.h" -#include "data/pokemon/egg_moves.h" #include "party_menu.h" #include "field_effect.h" #include "main.h" @@ -33,6 +32,8 @@ static void sub_80417F4(struct DayCareMail *); static void sub_80420FC(struct Pokemon *, u16, struct DayCareData *); static u8 daycare_relationship_score(struct DayCareData *); +#include "../data/pokemon/egg_moves.h" + const u8 *const gUnknown_08209AC4[] = { DaycareText_GetAlongVeryWell, DaycareText_GetAlong, |