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/pokemon_constants.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/pokemon_constants.asm')
| -rw-r--r-- | constants/pokemon_constants.asm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 40b450b85..29739ed46 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,3 +1,5 @@ +NUM_POKEMON EQU 251 + BULBASAUR EQU 1 IVYSAUR EQU 2 VENUSAUR EQU 3 |