Commit Graph

1032 Commits

Author SHA1 Message Date
Bryan Bishop
8dcde9ae28 use pillow instead of PIL in requirements.txt 2013-11-17 19:44:49 -06:00
Bryan Bishop
444d1ecfc7 also import TclError into map_editor.py 2013-11-17 19:41:37 -06:00
Bryan Bishop
49072b9917 replace print with python logging 2013-11-17 19:41:21 -06:00
Bryan Bishop
712f4ce53b use explicit import of Tkinter components 2013-11-17 19:15:33 -06:00
Bryan Bishop
98d335438a fix up map_editor.py extra newlines 2013-11-17 19:11:54 -06:00
Bryan Bishop
f414cf38f6 only set global constants for eval
Although I am not sure that using eval is a good idea in the first
place... it should go away.
2013-11-17 19:05:09 -06:00
Bryan Bishop
6920881598 factor out global configs in map_editor.py 2013-11-17 18:56:31 -06:00
Bryan Bishop
0dac29a91d change RomStr usage in gfx.py to use RomStr.load 2013-11-17 18:36:01 -06:00
Bryan Bishop
8ebf9b05b5 make ConfigException accessible
Apparently the "exceptions" name is already used for another module.
2013-11-17 18:34:57 -06:00
Bryan Bishop
76d47a68b3 get PIL from pypi to run map editor 2013-11-17 18:30:50 -06:00
Bryan Bishop
2d59e4d3e0 move import statements to top of map_editor.py 2013-11-17 17:39:02 -06:00
Bryan Bishop
9e3105e5c0 tabs to spaces in map_editor.py
This is to maintain consistency in python source code formatting in the
project.
2013-11-17 17:36:59 -06:00
Bryan Bishop
3027746bd6 Merge pull request #55 from kanzure/fix-map-editor-import
Fix configuration import line in map_editor.py
2013-11-17 13:02:56 -08:00
Bryan Bishop
2ca1c4b59c fix configuration import line in map_editor.py 2013-11-17 15:01:26 -06:00
Bryan Bishop
f80e3a864a be sure to import romstr into gfx.py 2013-11-17 13:24:02 -06:00
Bryan Bishop
59fd9978d9 Merge pull request #54 from kanzure/fix-gfx-config
Make gfx.py not depend on crystal.py
2013-11-17 11:22:27 -08:00
Bryan Bishop
b65d8a7833 Merge pull request #53 from kanzure/fix-audio-syntax-error
Fix audio syntax error
2013-11-17 11:21:47 -08:00
Bryan Bishop
9f55db8803 make gfx.py not depend on crystal.py 2013-11-17 11:20:09 -06:00
Bryan Bishop
726d6f2134 fix configuration import in audio.py 2013-11-17 11:09:36 -06:00
Bryan Bishop
af6b87ae49 fix syntax error in audio.py 2013-11-17 11:09:24 -06:00
Bryan Bishop
4a95f90360 Merge pull request #52 from kanzure/battle-handling
Battles
2013-11-14 18:19:52 -08:00
Bryan Bishop
1b9212a7e4 never learn a new move 2013-11-14 20:16:35 -06:00
Bryan Bishop
b2785948d1 fast check for the "move to make room for" text 2013-11-14 20:04:22 -06:00
Bryan Bishop
3bf53fa87f detect the evolved screen text 2013-11-14 20:00:59 -06:00
Bryan Bishop
05faa7784a quick check for the evolved screen
This is the message that appears after the pokemon evolved.
2013-11-14 19:57:49 -06:00
Bryan Bishop
783a4916f3 Merge pull request #51 from yenatch/master
sound dumps and from_asm() method in preprocessor macros
2013-11-14 11:22:31 -08:00
Bryan Bishop
038a9d8ec0 a quick method to detect the "is evolving" message 2013-11-14 01:44:40 -06:00
Bryan Bishop
1bbfb2869f a faster way to detect the stats screen in battles
The other way was way too slow since it had to parse 1000 characters
every frame.
2013-11-14 01:08:08 -06:00
Bryan Bishop
dc0a7ac670 make get_text slightly more configurable
Add params to the get_text() function to dump text tiles from screen.
2013-11-14 00:43:52 -06:00
Bryan Bishop
106f45ac7a a really slow way to check for stats screen 2013-11-14 00:43:35 -06:00
Bryan Bishop
d8ab944d43 simplify the date/clock check in text_wait 2013-11-13 23:07:44 -06:00
Bryan Bishop
811630a5dd a better in-battle check for text_wait 2013-11-13 23:07:26 -06:00
Bryan Bishop
367485303a improve text_wait for in-battle situations 2013-11-13 22:44:04 -06:00
Bryan Bishop
dddc61e026 a really simple, broken battle strategy 2013-11-13 22:43:35 -06:00
Bryan Bishop
79bc508889 better "is input required" detector 2013-11-13 21:45:05 -06:00
Bryan Bishop
28393a5342 fix a variable typo in wild prompt detector 2013-11-13 21:44:21 -06:00
Bryan Bishop
257ddde525 press the "a" button (fix typo) 2013-11-13 21:02:34 -06:00
Bryan Bishop
e8371152c9 self.vba -> self.emulator.vba 2013-11-13 19:52:40 -06:00
Bryan Bishop
84c106e118 battle move selection 2013-11-13 19:43:47 -06:00
Bryan Bishop
8be80027e8 Merge branch 'master' into battle-handling 2013-11-13 19:02:23 -06:00
yenatch
f5ad14d634 audio: pass in a channel id to sound commands 2013-11-13 12:46:18 -05:00
yenatch
7c4f12dec9 audio: noise command 2013-11-13 12:45:28 -05:00
Bryan Bishop
4a002c193b Merge pull request #50 from kanzure/include-wram
Parse WRAM addresses into a dictionary
2013-11-12 22:35:39 -08:00
Bryan Bishop
e4067faa60 use the correct wram_labels variable in wram.py 2013-11-13 00:28:59 -06:00
Bryan Bishop
51b1f6e642 flip the wram labels dictionary 2013-11-13 00:24:15 -06:00
Bryan Bishop
2b23c09e57 include some constants for wram.asm
UNfortunately these aren't being parsed from files at the moment.
2013-11-13 00:09:05 -06:00
Bryan Bishop
9c56fcd97d make a simple join function in data/ 2013-11-12 23:42:24 -06:00
Bryan Bishop
4ca83d72bf store pokecrystal wram.asm in the repository 2013-11-12 21:36:31 -06:00
Bryan Bishop
7271993919 Merge pull request #49 from kanzure/givepoke-todo
TODO in givepoke
2013-11-12 09:04:01 -08:00
Bryan Bishop
5355c3ce04 add todo comment to givepoke 2013-11-12 11:03:18 -06:00