diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-31 12:47:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-31 12:47:23 -0500 |
| commit | 12c1d874b94cf51523b072477a59b0cc398fc8d3 (patch) | |
| tree | a3940230cf443d809780f8f7b19748f782b17fdd /constants/event_flags.asm | |
| parent | 724215ea7519c28b602f72440e1ec73e2e6cf388 (diff) | |
| parent | c0a01c998240bacae77addbb08a5d2133cf58a21 (diff) | |
Merge branch 'master' into refactor-preprocessor
Conflicts:
preprocessor.py
Also bump the extras submodule to a version of pokemontools with a
suitable version of the preprocessor. The changes from 'master' for
preprocessor.py have been inserted into pokemontools prior to the
submodule bump.
Diffstat (limited to 'constants/event_flags.asm')
| -rw-r--r-- | constants/event_flags.asm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm new file mode 100644 index 000000000..a533761fb --- /dev/null +++ b/constants/event_flags.asm @@ -0,0 +1,6 @@ +EVENT_FOUGHT_SUDOWOODO EQU $02a +EVENT_FOUGHT_HO_OH EQU $317 +EVENT_FOUGHT_LUGIA EQU $318 +EVENT_FOUGHT_SUICUNE EQU $335 +EVENT_FOUGHT_SNORLAX EQU $750 + |