summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-22 13:18:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-22 13:18:23 -0500
commite135091f09cbd92e7cd5ec851f874501ee5090a2 (patch)
treef4efa38ed9fa0a297863fa5c0bf17d4ee5ffaa28 /data
parent7cef012335f0bb335833a3ea36fd02dfa31cfbea (diff)
Day-Care bit flags
Diffstat (limited to 'data')
-rw-r--r--data/engine_flags.asm11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/engine_flags.asm b/data/engine_flags.asm
index 119697466..f75b050c6 100644
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -14,13 +14,10 @@ EngineFlags: ; 80462
engine_flag wPokegearFlags, POKEGEAR_EXPN_CARD_F
engine_flag wPokegearFlags, POKEGEAR_OBTAINED_F
- ; wDayCareMan, 7 ; day-care 1 on
- engine_flag wDayCareMan, 6 ; egg is ready
- ; wDayCareMan, 5 ; monster 1 and 2 are compatible
- engine_flag wDayCareMan, 0 ; monster 1 in day-care
-
- ; wDayCareLady, 7 = day-care 2 on
- engine_flag wDayCareLady, 0 ; monster 2 in day-care
+ ; day-care
+ engine_flag wDayCareMan, DAYCAREMAN_HAS_EGG_F
+ engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F
+ engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F
engine_flag wMomSavingMoney, 0 ; mom saving money ; $8
engine_flag wMomSavingMoney, 7 ; dst