diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-06-05 20:15:21 -0400 |
| commit | 5ecda4d2741cc8f43a0b172aefc8299e44687832 (patch) | |
| tree | 7fbac7a8f1be0bcd6a877ea47ec73fd5dfbbc211 /constants/evolution_constants.asm | |
| parent | Fix EOL to LF to make push requests more doable. (diff) | |
| parent | Fix a lot of bugs (diff) | |
| download | pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.tar.gz pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.tar.xz pokeyellow-5ecda4d2741cc8f43a0b172aefc8299e44687832.zip | |
Merge git://github.com/dannye/pokeyellow into dannye-master
Conflicts:
constants/connection_constants.asm
constants/evolution_constants.asm
constants/list_constants.asm
constants/oam_constants.asm
constants/sprite_constants.asm
constants/type_constants.asm
engine/bank3d/random.asm
engine/bank3f/main.asm
home.asm
home/overworld.asm
home/serial.asm
macros.asm
main.asm
wram.asm
Diffstat (limited to 'constants/evolution_constants.asm')
| -rwxr-xr-x | constants/evolution_constants.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm index 879b2c2a..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 +EV_TRADE EQU 3 |