Commit Graph

12 Commits

Author SHA1 Message Date
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
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
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
yenatch
5f0bd7a2fe use config instead of configuration
this was kind of overzealous
2013-09-26 01:57:29 -04:00
yenatch
33c8e4147c map_editor: red: read tileset gfx filenames from source 2013-09-15 15:46:26 -04:00
yenatch
bd3b608188 barely-working map editor
works with both pokecrystal and pokered

version is crystal by default
2013-09-14 17:10:59 -04:00