Bryan Bishop 30ec94681f Merge branch 'master' into py3-continued ...

Conflicts:
	pokemontools/crystal.py

2016-08-27 19:12:23 -05:00

..

integration

fix many failing tests

2016-08-27 12:26:57 -05:00

bootstrapping.py

switch tests to use new battle starter

2013-11-11 00:04:32 -06:00

setup_vba.py

simplify the vba-related tests

2013-11-09 15:45:03 -06:00

test_dump_sections.py

fix import lines in tests/

2013-08-03 16:12:54 -05:00

test_vba_battle.py

fix a typo in the switch prompt test

2013-11-11 21:57:08 -06:00

test_vba.py

Fix most Python 3 compat issues with futurize --stage1

2016-08-24 15:43:15 -07:00

tests.py

fix many failing tests

2016-08-27 12:26:57 -05:00