diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-01-27 06:51:01 -0800 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-01-27 06:51:01 -0800 |
| commit | 94c9f59f459e7a96c9e1febfac45e20e5bfce759 (patch) | |
| tree | 8e4477cfd7b8ef0e2f4ee2511b252d6e19f40ec2 /constants.asm | |
| parent | 056c2403667a6670815528e220b4e1e4ea974e32 (diff) | |
| parent | 08a0462c1e588c2efb99097cf1e9b314f600b009 (diff) | |
Merge pull request #224 from yenatch/moves
Clean up the battle core and specify type categories
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/constants.asm b/constants.asm index 7ffaba56a..2c07ebb5a 100644 --- a/constants.asm +++ b/constants.asm @@ -12,6 +12,7 @@ INCLUDE "hram.asm" INCLUDE "constants/wram_constants.asm" INCLUDE "constants/pokemon_constants.asm" +INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/battle_constants.asm" INCLUDE "constants/map_constants.asm" @@ -31,25 +32,6 @@ INCLUDE "constants/gfx_constants.asm" NONE EQU 0 -; types -NORMAL EQU $00 -FIGHTING EQU $01 -FLYING EQU $02 -POISON EQU $03 -GROUND EQU $04 -ROCK EQU $05 -BUG EQU $07 -GHOST EQU $08 -STEEL EQU $09 -CURSE_T EQU $13 -FIRE EQU $14 -WATER EQU $15 -GRASS EQU $16 -ELECTRIC EQU $17 -PSYCHIC EQU $18 -ICE EQU $19 -DRAGON EQU $1A -DARK EQU $1B ; egg group constants MONSTER EQU $01 |