diff options
| author | Ryan Tandy <ryan@nardis.ca> | 2019-09-20 13:30:58 -0700 |
|---|---|---|
| committer | Ryan Tandy <ryan@nardis.ca> | 2019-09-20 13:30:58 -0700 |
| commit | 111722c5e46588d34805b68e6eb59cfb05e099f2 (patch) | |
| tree | 1934fdf2386397fc2546e2439a0f86113eb9fa2f /constants | |
| parent | cf4ab739af833709a6796e1434bee4dd07c1ea70 (diff) | |
Sync daycare from pokecrystal
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 6 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index c4730b50..41d52d25 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_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_DAY_CARE_MAN_HAS_EGG, wDayCareMan, DAYCAREMAN_HAS_EGG_F + engine_flag_def ENGINE_DAY_CARE_MAN_HAS_MON, wDayCareMan, DAYCAREMAN_HAS_MON_F - engine_flag_def ENGINE_DAY_CARE_LADY_HAS_MON, wDaycareLady, 0 ; monster 2 in daycare + engine_flag_def ENGINE_DAY_CARE_LADY_HAS_MON, wDayCareLady, DAYCARELADY_HAS_MON_F 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/wram_constants.asm b/constants/wram_constants.asm index 4c3917c8..656d2ef5 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -127,6 +127,17 @@ NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES REGISTERED_POCKET EQU %11000000 REGISTERED_NUMBER EQU %00111111 +; wDayCareMan:: ; dc40 +DAYCAREMAN_HAS_MON_F EQU 0 +DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 +DAYCAREMAN_HAS_EGG_F EQU 6 + +; wDayCareLady:: ; dc77 +DAYCARELADY_HAS_MON_F EQU 0 + +; used with both wDayCareMan and wDayCareLady +DAYCARE_INTRO_SEEN_F EQU 7 + ; PlayerState: ; d95d PLAYER_NORMAL EQU 0 PLAYER_BIKE EQU 1 |