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/evolution_constants.asm | |
parent | f558d784a87d7b56b2cacfc2f543f63237ad8183 (diff) | |
parent | c43c338a5f7d90494b7e6e67c6533288bd28117d (diff) |
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
wram.asm
Diffstat (limited to 'constants/evolution_constants.asm')
-rwxr-xr-x | constants/evolution_constants.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm index 96b063cc..2e3f3613 100755 --- a/constants/evolution_constants.asm +++ b/constants/evolution_constants.asm @@ -1,4 +1,4 @@ -; Evolution types
-EV_LEVEL EQU 1
-EV_ITEM EQU 2
-EV_TRADE EQU 3
\ No newline at end of file +; Evolution types +EV_LEVEL EQU 1 +EV_ITEM EQU 2 +EV_TRADE EQU 3 |