Commit Graph

1085 Commits

Author SHA1 Message Date
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
Bryan Bishop
cff5ce9bc8 Revert "tabs to spaces (pep8)"
This reverts commit 9bea14db79.

Conflicts:
	pokemontools/map_editor.py
2013-09-26 01:24:13 -05:00
Bryan Bishop
907217fb90 Merge pull request #38 from kanzure/importable-map-editor
Importable map editor
2013-09-25 23:17:28 -07:00
Bryan Bishop
9d1a68cce5 refactor a global constant to be set in __init__ 2013-09-26 01:09:50 -05:00
Bryan Bishop
3f28232f0d put the tk loop into __main__ 2013-09-26 01:06:19 -05:00
Bryan Bishop
e4b2d2e4d2 minor formatting fix 2013-09-26 01:05:23 -05:00
Bryan Bishop
9bea14db79 tabs to spaces (pep8) 2013-09-26 01:04:51 -05:00
Bryan Bishop
27ea6f6527 grind to a higher level 2013-09-26 01:03:58 -05:00
yenatch
5f0bd7a2fe use config instead of configuration
this was kind of overzealous
2013-09-26 01:57:29 -04:00
yenatch
46f1a2e1c3 rename bit1/bit2 script commands to event/flag 2013-09-24 03:28:55 -04:00
yenatch
918adb82ba script commands wildon and wildoff got mixed up
this was a mistake in the original pksv spec and tauwasser's notes
2013-09-24 03:24:29 -04:00
Bryan Bishop
38ecfa8705 use explicit skips in vba autoplayer 2013-09-22 17:27:35 -05:00
Bryan Bishop
2268dd43b5 additional words for the keyboard testing 2013-09-22 17:27:21 -05:00
Bryan Bishop
3c4207d777 basic level-up stats screen detection 2013-09-22 17:26:56 -05:00
Bryan Bishop
0b7ed30a33 go heal if level reached the target 2013-09-22 12:42:02 -05:00
Bryan Bishop
e048f192d9 test keyboard typing functions
This tests 18 different names being typed on the keyboard. These are
supposed to be typed using the shortest possible sequence of button
presses to get to the right letter selection.
2013-09-22 12:15:33 -05:00
Bryan Bishop
6e4c7d5a0f pause a few frames before typing on a keyboard
For names that weren't starting with a capletter, the "select" button to
switch to downcase was happening too soon. So add in a small delay to
get the keyboard writing to work.
2013-09-22 12:14:49 -05:00
Bryan Bishop
e3f6d91d06 basic keyboard writing test 2013-09-22 11:39:34 -05:00
Bryan Bishop
54579ad699 make skippable decorator not always save state
There are some runs where the "skippable" decorator should not save the
state of the game before and after, like if the function is given
different parameters and the after state should not be the canonical
after state.
2013-09-22 11:38:35 -05:00
Bryan Bishop
d0b0b9c5f2 only heal if HP is low or move1 PP is low 2013-09-22 11:12:38 -05:00
Bryan Bishop
6a1fc60771 better IsInBattle detection for level grinding 2013-09-22 10:55:44 -05:00
Bryan Bishop
a4c418bc7a fix some func calls in the auto level grinder 2013-09-22 10:50:21 -05:00
Bryan Bishop
c1fbb59696 a test for moving in circles
Well, it's more like a square.
2013-09-22 10:21:09 -05:00
Bryan Bishop
13a1da5e84 remove vba.shutdown() from another test 2013-09-22 10:14:17 -05:00
Bryan Bishop
1d92396ca9 reduce some duplicated code inside some tests
Those movement checks are now collapsed into a single function that each
test can individually call.
2013-09-22 10:10:46 -05:00
Bryan Bishop
3151acd42c remove unnecessary emulator shutdown 2013-09-22 02:58:25 -05:00
Bryan Bishop
840e447557 change the walk test after Elm's Lab
The walk test is useful to see if the player is able to move, but it
shouldn't walk down and out of the building because the test is
comparing against the MapNumber for Elm's Lab and not New Bark Town.
2013-09-22 02:55:08 -05:00
Bryan Bishop
742bdf8c2f test that the Elm's Lab sequence works 2013-09-22 02:48:41 -05:00
Bryan Bishop
50997c8b38 get rid of a text_wait when talking to Elm 2013-09-22 02:48:26 -05:00
Bryan Bishop
a04f6ceb4b fix cyndaquil selection in Elm's Lab 2013-09-22 02:46:40 -05:00
Bryan Bishop
7d3994ae75 test that the current map is correct 2013-09-22 02:33:02 -05:00
Bryan Bishop
57dc8c4fd0 add more defaults to setup_wram for testing
This is sorta absurd, it should just load these values by parsing
wram.asm on its own.
2013-09-22 02:27:57 -05:00