diff options
author | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
commit | 1ecfe6bd23bb9b4e1886342c082bd5c3a108abbb (patch) | |
tree | 8190d5b11ebec4505c5494baf74b339ae9c82078 /engine/engine_flags.asm | |
parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'engine/engine_flags.asm')
-rw-r--r-- | engine/engine_flags.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index 11414438e..34f26c87c 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -9,13 +9,13 @@ dwb $d957, %00001000 ; expn card dwb $d957, %10000000 ; on/off - ; DaycareMan, %10000000 ; daycare 1 on - dwb DaycareMan, %01000000 ; monster 1 and 2 are compatible - ; DaycareMan, %00100000 ; egg is ready - dwb DaycareMan, %00000001 ; monster 1 in daycare + ; wDaycareMan, %10000000 ; daycare 1 on + dwb wDaycareMan, %01000000 ; monster 1 and 2 are compatible + ; wDaycareMan, %00100000 ; egg is ready + dwb wDaycareMan, %00000001 ; monster 1 in daycare - ; DaycareLady, %10000000 = daycare 2 on - dwb DaycareLady, %00000001 ; monster 2 in daycare + ; wDaycareLady, %10000000 = daycare 2 on + dwb wDaycareLady, %00000001 ; monster 2 in daycare dwb $d854, %00000001 ; mom saving money ; $8 dwb $d854, %10000000 ; dst |