diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-08-16 11:09:18 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-08-16 11:10:22 -0600 |
| commit | c7bc0b142714341f5ff85975d079fc4b1249d847 (patch) | |
| tree | 7b996ac1abb1de48269c822ccc5d64e5750dde94 /constants | |
| parent | d3ace72a8df29ac67ee92b997418a9e298a42eac (diff) | |
Import map objects for a single map (Day Care).
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 6 | ||||
| -rw-r--r-- | constants/event_flags.asm | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index acd7f26d..e1ac69bf 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -6,10 +6,10 @@ engine_flag_def ENGINE_EXPN_CARD, wPokegearFlags, 3 ; expn card engine_flag_def ENGINE_POKEGEAR, wPokegearFlags, 7 ; on/off - engine_flag_def ENGINE_DAYCARE_MAN_HAS_EGG, wDayCareMan, 6 ; egg is ready - engine_flag_def ENGINE_DAYCARE_MAN_HAS_MON, wDayCareMan, 0 ; monster 1 in daycare + engine_flag_def ENGINE_DAY_CARE_MAN_HAS_EGG, wDayCareMan, 6 ; egg is ready + engine_flag_def ENGINE_DAY_CARE_MAN_HAS_MON, wDayCareMan, 0 ; monster 1 in daycare - engine_flag_def ENGINE_DAYCARE_LADY_HAS_MON, wDaycareLady, 0 ; monster 2 in daycare + engine_flag_def ENGINE_DAY_CARE_LADY_HAS_MON, wDaycareLady, 0 ; monster 2 in daycare engine_flag_def ENGINE_MOM_SAVING_MONEY, wMomSavingMoney, 0 ; mom saving money ; $8 engine_flag_def ENGINE_DST, wMomSavingMoney, 7 ; dst diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 636d0226..926b7e70 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1833,10 +1833,10 @@ const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 const EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM const EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM - const EVENT_DAYCARE_MAN_IN_DAYCARE - const EVENT_DAYCARE_MAN_ON_ROUTE_34 - const EVENT_DAYCARE_MON_1 - const EVENT_DAYCARE_MON_2 + const EVENT_DAY_CARE_MAN_IN_DAY_CARE + const EVENT_DAY_CARE_MAN_ON_ROUTE_34 + const EVENT_DAY_CARE_MON_1 + const EVENT_DAY_CARE_MON_2 const EVENT_ILEX_FOREST_FARFETCHD const EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER const EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS |