Bryan Bishop
|
54e2b189b8
|
Merge branch 'master' into vba-automation
Conflicts:
pokemontools/vba/vba.py
|
2013-11-09 15:25:34 -06:00 |
|
Bryan Bishop
|
ff55a23ece
|
Merge pull request #47 from kanzure/testing-fixups
Testing fixups
|
2013-11-09 13:23:04 -08:00 |
|
Bryan Bishop
|
8f0b06f22e
|
fix an import in tests.py
|
2013-11-09 15:21:59 -06:00 |
|
Bryan Bishop
|
efd71a5cd3
|
fix some configuration in vba/vba.py
|
2013-11-09 15:21:43 -06:00 |
|
Bryan Bishop
|
b363e6cca0
|
fix a syntax error in battle.py
|
2013-11-09 15:18:55 -06:00 |
|
Bryan Bishop
|
8c7e2bcae7
|
Merge branch 'master' into vba-automation
|
2013-11-09 15:16:48 -06:00 |
|
Bryan Bishop
|
cc40339298
|
import Battle for testing
|
2013-11-09 15:16:34 -06:00 |
|
Bryan Bishop
|
1d2239e091
|
Merge pull request #46 from kanzure/fix-old-parsers-test-imports
Fix a few imports for testing an old func
|
2013-11-09 13:11:13 -08:00 |
|
Bryan Bishop
|
cddfe3804d
|
fix a few imports for testing an old func
|
2013-11-09 15:10:06 -06:00 |
|
Bryan Bishop
|
fd61c8f460
|
fix move() for lists of commands
|
2013-11-09 15:09:21 -06:00 |
|
Bryan Bishop
|
11664e2ac6
|
a basic battle test
|
2013-11-09 15:08:04 -06:00 |
|
Bryan Bishop
|
6a1699d32e
|
even more comments in the battle routines
|
2013-11-09 14:50:55 -06:00 |
|
Bryan Bishop
|
1ac0e437d1
|
add a bunch of docstrings in the battler
|
2013-11-09 14:44:36 -06:00 |
|
Bryan Bishop
|
2b7e903f84
|
implement more parts of the battler
|
2013-11-03 01:53:04 -05:00 |
|
Bryan Bishop
|
a4179b5337
|
attempting a few more trainer battles
|
2013-11-03 01:41:07 -05:00 |
|
Bryan Bishop
|
a9a9568d14
|
a broken attempt at starting random battles
|
2013-11-02 23:12:14 -05:00 |
|
Bryan Bishop
|
0d4f9340b0
|
a naive implementation of start_trainer_battle
This is a really dumb way to start a battle, but the other methods
aren't working yet.
|
2013-11-02 20:56:40 -05:00 |
|
Bryan Bishop
|
211da4dcb3
|
attempt to start a trainer battle
|
2013-11-02 14:41:48 -05:00 |
|
Bryan Bishop
|
185856adb4
|
fix a call to vba.shutdown in bootstrap()
|
2013-11-02 14:01:01 -05:00 |
|
Bryan Bishop
|
1f185185ca
|
autoplayer.bootstrap to call skip_intro
There are situations other than just testing where making a bootstrapped
game state is a useful ability.
|
2013-11-02 14:00:04 -05:00 |
|
Bryan Bishop
|
016d0b8864
|
fix some hook calls in Battle.run
|
2013-11-02 13:54:35 -05:00 |
|
Bryan Bishop
|
9eb78d9c5a
|
simplify the number of battle-related classes
|
2013-11-02 00:14:37 -05:00 |
|
Bryan Bishop
|
0283856044
|
a basic battle handling framework
|
2013-11-02 00:05:57 -05:00 |
|
Bryan Bishop
|
dafb5518df
|
Merge pull request #44 from dannye/master
Red Music Tools
|
2013-11-01 07:48:48 -07:00 |
|
U-Fish-PC\Daniel
|
71204998ed
|
Update red music tools
|
2013-11-01 10:25:40 -04:00 |
|
U-Fish-PC\Daniel
|
ed174d2432
|
Update redmusicdisasm and redsfxdisasm
|
2013-10-22 02:24:37 -04:00 |
|
U-Fish-PC\Daniel
|
c57e0f0706
|
Add pokered music tools
|
2013-10-13 10:50:09 -04:00 |
|
U-Fish-PC\Daniel
|
1b56d95aa0
|
Add pokered music commands
|
2013-10-13 10:49:07 -04:00 |
|
Bryan Bishop
|
5fdd27030e
|
move() can now take a list of movements to make
|
2013-10-12 16:41:50 -05:00 |
|
Bryan Bishop
|
e13cdeab11
|
another minor docstring
|
2013-10-12 16:33:52 -05:00 |
|
Bryan Bishop
|
49c51e03d0
|
even more docstrings
|
2013-10-12 16:31:05 -05:00 |
|
Bryan Bishop
|
819d16726e
|
improve some VBA-related docstrings
|
2013-10-12 16:29:03 -05:00 |
|
Bryan Bishop
|
2328b2bd3a
|
call super __init__() in SpeedRunner
|
2013-10-12 16:25:39 -05:00 |
|
Bryan Bishop
|
80fe5be906
|
use get_enemy_hp instead of a custom check
|
2013-10-12 16:22:53 -05:00 |
|
Bryan Bishop
|
de5a585e5e
|
oops, made a mistake in get_enemy_hp
|
2013-10-12 16:18:52 -05:00 |
|
Bryan Bishop
|
c2d13dab14
|
write get_enemy_hp to calculate current hp
|
2013-10-12 16:17:57 -05:00 |
|
Bryan Bishop
|
87c9bef30d
|
Merge branch 'master' into vba-automation
|
2013-10-12 16:09:12 -05:00 |
|
Bryan Bishop
|
1089cf99d0
|
Merge pull request #42 from yenatch/script-commands
rename some event script commands
|
2013-09-30 21:43:28 -07:00 |
|
yenatch
|
bcb3295dbd
|
use 'wait' for events instead of move effects
|
2013-10-01 00:36:39 -04:00 |
|
yenatch
|
a0397cad28
|
event script command 0xaa doesnt exist
|
2013-09-30 22:40:21 -04:00 |
|
yenatch
|
7268b91c23
|
fix up the last few event scirpt commands
|
2013-09-30 22:40:14 -04:00 |
|
yenatch
|
f4b04ff8e9
|
if_greater_than and if_less_than commands were swapped
|
2013-09-26 18:22:27 -04:00 |
|
Bryan Bishop
|
f3fb1f24ea
|
Merge pull request #41 from kanzure/fix-crystal-config
Fix crystal.py configuration
|
2013-09-26 15:19:20 -07:00 |
|
Bryan Bishop
|
f7b6808797
|
fix configuration typo
|
2013-09-26 17:18:46 -05:00 |
|
Bryan Bishop
|
97fdec37ec
|
fix crystal.py configuration
Ugh, it's still a global?
|
2013-09-26 17:17:18 -05:00 |
|
Bryan Bishop
|
c02c65fe74
|
Merge branch 'yenatch/map-editor' into master
Conflicts:
pokemontools/crystal.py
Fixes #40.
|
2013-09-26 10:46:04 -05:00 |
|
yenatch
|
3496b81eb3
|
crystal.py: no more relative paths
|
2013-09-26 03:13:15 -04:00 |
|
yenatch
|
001b6bc850
|
map_editor: create any pngs that don't exist yet
|
2013-09-26 02:52:45 -04:00 |
|
yenatch
|
92eeee28dd
|
map_editor: skip any nonexistent tiles in map rendering
|
2013-09-26 02:49:37 -04:00 |
|
yenatch
|
96574a08ee
|
map_editor: more flexible macro handling
makes less assumptions about the structure of a header
|
2013-09-26 02:27:01 -04:00 |
|