diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
| commit | 973721491c38aa3014f5b28982227a618d2f6b59 (patch) | |
| tree | e01415064e6da53a471d75b2eb0113846650322b /engine/engine_flags.asm | |
| parent | a3c6931fa8edd09fcea678fd8d2e9988951380de (diff) | |
| parent | 0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (diff) | |
Merge remote-tracking branch 'kanzure/master' into gfx-script
Diffstat (limited to 'engine/engine_flags.asm')
| -rw-r--r-- | engine/engine_flags.asm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index 414604661..87fbd987d 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -100,26 +100,26 @@ dwb wdc9d, %00000001 ; lucky number show dwb StatusFlags2, %00001000 - dwb wdc1e, %00000001 ; kurt making balls ; $50 - dwb wdc1e, %00000010 - dwb wdc1e, %00000100 ; special wilddata? - dwb wdc1e, %00001000 ; time capsule (24h wait) - dwb wdc1e, %00010000 ; all fruit trees - dwb wdc1e, %00100000 ; shuckle given - dwb wdc1e, %01000000 ; goldenrod underground merchant closed - dwb wdc1e, %10000000 ; fought in trainer hall today - - dwb wdc1f, %00000001 ; mt moon square clefairy ; $58 - dwb wdc1f, %00000010 ; union cave lapras - dwb wdc1f, %00000100 ; goldenrod underground haircut used - dwb wdc1f, %00001000 ; goldenrod mall happiness event floor05 person07 - dwb wdc1f, %00010000 ; tea in blues house - dwb wdc1f, %00100000 ; indigo plateau rival fight - dwb wdc1f, %01000000 - dwb wdc1f, %10000000 - - dwb wdc20, %00000001 ; $60 - dwb wdc20, %00000010 ; goldenrod dept store sale is on + dwb DailyFlags, %00000001 ; kurt making balls ; $50 + dwb DailyFlags, %00000010 + dwb DailyFlags, %00000100 ; special wilddata? + dwb DailyFlags, %00001000 ; time capsule (24h wait) + dwb DailyFlags, %00010000 ; all fruit trees + dwb DailyFlags, %00100000 ; shuckle given + dwb DailyFlags, %01000000 ; goldenrod underground merchant closed + dwb DailyFlags, %10000000 ; fought in trainer hall today + + dwb WeeklyFlags, %00000001 ; mt moon square clefairy ; $58 + dwb WeeklyFlags, %00000010 ; union cave lapras + dwb WeeklyFlags, %00000100 ; goldenrod underground haircut used + dwb WeeklyFlags, %00001000 ; goldenrod mall happiness event floor05 person07 + dwb WeeklyFlags, %00010000 ; tea in blues house + dwb WeeklyFlags, %00100000 ; indigo plateau rival fight + dwb WeeklyFlags, %01000000 + dwb WeeklyFlags, %10000000 + + dwb SwarmFlags, %00000001 ; $60 + dwb SwarmFlags, %00000010 ; goldenrod dept store sale is on dwb GameTimerPause, %10000000 ; $62 @@ -194,5 +194,5 @@ dwb wd45b, %00000100 ; female player has been transformed into male - dwb wdc20, %00000100 ; dunsparce swarm ; $a0 - dwb wdc20, %00001000 ; yanma swarm + dwb SwarmFlags, %00000100 ; dunsparce swarm ; $a0 + dwb SwarmFlags, %00001000 ; yanma swarm |