diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-04 23:17:30 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-04 23:17:30 -0500 |
| commit | b0b1f88b9466f0414e4a6c782b5348f46768c8c4 (patch) | |
| tree | 3ed8d12b5328b4f655d96351b3959f262fb2d72a /constants/type_constants.asm | |
| parent | EOL Windows->UNIX (diff) | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| download | pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.gz pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.xz pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
wram.asm
Diffstat (limited to 'constants/type_constants.asm')
| -rwxr-xr-x | constants/type_constants.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/constants/type_constants.asm b/constants/type_constants.asm index 7ded18c3..b36dc179 100755 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -1,16 +1,16 @@ -; Elemental 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
-FIRE EQU $14
-WATER EQU $15
-GRASS EQU $16
-ELECTRIC EQU $17
-PSYCHIC EQU $18
-ICE EQU $19
-DRAGON EQU $1A
\ No newline at end of file +; Elemental 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 +FIRE EQU $14 +WATER EQU $15 +GRASS EQU $16 +ELECTRIC EQU $17 +PSYCHIC EQU $18 +ICE EQU $19 +DRAGON EQU $1A |