diff options
author | JimB16 <f1@jimb.de> | 2015-10-19 16:25:15 +0200 |
---|---|---|
committer | JimB16 <f1@jimb.de> | 2015-10-19 16:25:15 +0200 |
commit | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (patch) | |
tree | b402ddfd95a21402d2ab76368d44b9f04f937725 /engine/engine_flags.asm | |
parent | 3ef626d37864f4dae26f115c26e448351f19da7c (diff) | |
parent | f399315a489c7eff28ec1941c41d12264fb38039 (diff) |
merge conflicts resolved
Diffstat (limited to 'engine/engine_flags.asm')
-rw-r--r-- | engine/engine_flags.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index ff7948708..278c7c996 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -97,7 +97,7 @@ dwb VisitedSpawns + 3, %00000100 ; silver cave dwb VisitedSpawns + 3, %00010000 ; unused - dwb wdc9d, %00000001 ; lucky number show + dwb wLuckyNumberShowFlag, %00000001 ; lucky number show dwb StatusFlags2, %00001000 dwb DailyFlags, %00000001 ; kurt making balls ; $50 |