import unittest.mock as mock2016-08-28T00:14:32+00:00Bryan Bishopkanzure@gmail.com2016-08-28T00:14:32+00:0085ee624293900c78e9b02f1fcb4aa00c5b2140a5
Merge branch 'master' into py3-continued2016-08-28T00:12:23+00:00Bryan Bishopkanzure@gmail.com2016-08-28T00:12:23+00:0030ec94681f8dda48cd66ecdbf1d7a0a82666f145
Conflicts:
pokemontools/crystal.py
Conflicts:
pokemontools/crystal.py
fix many failing tests2016-08-27T17:26:57+00:00Bryan Bishopkanzure@gmail.com2016-08-27T17:26:57+00:0092e1ef72d91b58cb8284806a44e1f2b56c205098
Fix most Python 3 compat issues with futurize --stage12016-08-24T22:43:15+00:00Eevee (Lexy Munroe)eevee.git@veekun.com2016-08-24T22:43:15+00:00a64657988a50522885618998e7f14168c299a19b
fix a typo in the switch prompt test2013-11-12T03:57:08+00:00Bryan Bishopkanzure@gmail.com2013-11-12T03:57:08+00:002ff3478bfda330fbc379f5278a6d37d7065dd9df
rename the switch prompt detector2013-11-12T03:56:34+00:00Bryan Bishopkanzure@gmail.com2013-11-12T03:56:34+00:00d9bb01f2c0aef6d270bc4e2da93af94ea210e8db
fix the is_switch_prompt test2013-11-12T03:52:33+00:00Bryan Bishopkanzure@gmail.com2013-11-12T03:52:33+00:00993eaa34517c271f3e076744f96aa479008fdf16
a test for detecting the yes/no prompt2013-11-12T03:48:29+00:00Bryan Bishopkanzure@gmail.com2013-11-12T03:48:29+00:00ba6eb203b4afef6179d30a13f6f4037349d79272
use set_battle_mon_hp in a test2013-11-12T03:33:14+00:00Bryan Bishopkanzure@gmail.com2013-11-12T03:33:14+00:00e61643e6814d49c4244c49fa561745dc3fc3e80a