summaryrefslogtreecommitdiff
path: root/engine/engine_flags.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-06-12 18:32:42 -0700
committeryenatch <yenatch@gmail.com>2014-06-12 18:32:42 -0700
commit023cfdbb051ea5184ebc7fa329db3ca43f1ca23e (patch)
tree0f91ce5ba8d243080fbe58a7f0e1a97949ba6c1a /engine/engine_flags.asm
parent23f9b5d21e93f1b3c8de5e4ecf72da89265ccea8 (diff)
Consolidate monster structs in wram and sram.
The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
Diffstat (limited to 'engine/engine_flags.asm')
-rw-r--r--engine/engine_flags.asm12
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