Commit Graph

1050 Commits

Author SHA1 Message Date
Bryan Bishop
8fe3f149d0 comment add_map_offsets_into_map_names 2013-11-22 21:10:58 -06:00
Bryan Bishop
8767c40b04 move the map offsets out of main()
This is a function that is necessary outside of the context of a main
method.
2013-11-22 21:04:10 -06:00
Bryan Bishop
9d2a0c3b60 Merge branch 'master' into path-finding 2013-11-22 20:44:30 -06:00
Bryan Bishop
46782bf6dc Merge pull request #56 from kanzure/map-editor-stuff
Remove globals from the map editor
2013-11-18 22:26:54 -08:00
Bryan Bishop
e673a9f7b2 Merge pull request #57 from yenatch/master
gfx rewrites and 1bpp support
2013-11-18 18:13:47 -08:00
yenatch
3dac619f2d gfx: fix misuse of export_2bpp_to_png 2013-11-18 21:05:59 -05:00
yenatch
dfc88b9ac0 Merge branch 'master' of github.com:kanzure/pokemon-reverse-engineering-tools 2013-11-18 21:03:31 -05:00
yenatch
9d01c85d3b gfx: make sure rectangular images are also divisible into 8x8 tiles 2013-11-18 20:19:18 -05:00
yenatch
7fa921eb65 gfx: direct png-to-1bpp 2013-11-18 17:57:07 -05:00
yenatch
125a58fb9a gfx: rewrite lz commands and comments 2013-11-18 17:41:55 -05:00
yenatch
a91b349823 gfx: 1bpp-to-png
also dont assume any dimension matches in png conversion
2013-11-18 05:15:43 -05:00
yenatch
2ffe762d17 gfx: rewrite lots 2013-11-18 04:35:48 -05:00
Bryan Bishop
185a29698e clean up more imports in map_editor.py 2013-11-17 19:51:04 -06:00
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
96088a6266 Merge branch 'master' into path-finding 2013-11-17 17:35:55 -06:00
yenatch
3acbf50237 refactor png-to-2bpp conversion 2013-11-17 16:27:20 -05:00
yenatch
45d2614aff gfx: 1bpp<->2bpp conversion
this is the simplest way to support 1bpp without rewriting a lot
2013-11-17 16:27:03 -05: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
7e9e9cf1e5 Merge branch 'master' into path-finding 2013-11-17 14:58:36 -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
fbbab0be69 groundwork for path planning implementation 2013-11-17 01:53:00 -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