diff options
| author | JimB16 <f1@jimb.de> | 2015-09-10 01:28:06 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-09-10 01:28:06 +0200 |
| commit | 8ccdd4d6c05e6a6ca645011b170828851e82cc60 (patch) | |
| tree | 6f06d84f06b64cb88fec77f2cf9c6785a2dca725 /macros/event.asm | |
| parent | a7cb2a5e9baedeb077f898df4269291dee72be70 (diff) | |
| parent | 2e74d969f700f7eda40a84a75dfe8b4183d09683 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'macros/event.asm')
| -rw-r--r-- | macros/event.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macros/event.asm b/macros/event.asm index f2ab6fae5..56028bf6a 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -1039,7 +1039,7 @@ name: macro db name_command db \1 ; type db \2 ; id - db \3 ; mempry + db \3 ; memory endm enum wait_command |