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
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
yenatch
5f0bd7a2fe
use config instead of configuration
...
this was kind of overzealous
2013-09-26 01:57:29 -04:00
Bryan Bishop
82fb73edc3
version bump to: v1.4.1
...
The previous version was uploaded with .swp files and a large libvba.so
that was in my working directory. I regret everything.
2013-09-21 21:45:51 -05:00
Bryan Bishop
480593e472
also exclude .*.swp files
2013-09-21 21:39:51 -05:00
Bryan Bishop
0da95fe05f
version bump to: v1.4.0
2013-09-21 21:37:07 -05:00
Bryan Bishop
4b69463fb2
Merge pull request #35 from kanzure/include-everything
...
Include all pokemontools/ files in installs
2013-09-21 19:33:23 -07:00
Bryan Bishop
8caeec66b9
include all pokemontools/ files in installs
2013-09-21 21:32:29 -05:00
Bryan Bishop
5f959fa7c8
Merge pull request #31 from yenatch/map-editor
...
Another map editor.
2013-09-21 13:31:31 -07:00
Bryan Bishop
2374a9ce90
Merge pull request #33 from kanzure/dont-always-use-globals
...
Use try/except on globals.asm for preprocessing
2013-09-16 10:41:10 -07:00
Bryan Bishop
b67e68c6a1
use try/except on globals.asm for preprocessing
2013-09-16 12:40:37 -05:00
Bryan Bishop
4b36a0c41a
Merge pull request #32 from kanzure/fix-an-import
...
Fix how pointers are imported
2013-09-16 10:37:39 -07:00
Bryan Bishop
427fbf4d04
fix how pointers are imported
2013-09-16 12:36:53 -05: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
Bryan Bishop
6809c951ac
Merge pull request #30 from kanzure/cleanup-again
...
More cleanup of crystal.py
2013-09-12 21:45:01 -07:00
Bryan Bishop
0a9ccaebbb
Merge pull request #29 from kanzure/fix-json-gitignore
...
Allow (some) json files in the repo
2013-09-12 21:40:30 -07:00
Bryan Bishop
9830c9dc0a
Merge pull request #28 from kanzure/config-cleanup
...
Rename config.py -> configuration.py
2013-09-12 21:39:24 -07:00
Bryan Bishop
b9955a5e40
deglobalize map_internal_ids
...
Also, don't set global rom in the load_rom related methods. This will
nip everything for a while, but roms should be passed around as
references instead of globals.
2013-09-12 23:33:14 -05:00
Bryan Bishop
03a94980d8
pass around all_movements (not a global)
2013-09-12 23:27:44 -05:00
Bryan Bishop
6d075ba08c
run_main -> main
2013-09-12 23:00:15 -05:00
Bryan Bishop
30afb173f5
pretty_print_trainer_id_constants to trainers.py
2013-09-12 22:57:45 -05:00
Bryan Bishop
10360d114f
one preprocessor macro needs trainer_group_maximum
2013-09-12 22:51:24 -05:00
Bryan Bishop
97da7b7922
knock out some trainer group globals
2013-09-12 22:50:04 -05:00
Bryan Bishop
325a1d63de
convert all_map_headers from a global
2013-09-12 22:36:47 -05:00
Bryan Bishop
b3bbd5f9cb
don't use the old header parsing method
2013-09-12 22:29:56 -05:00
Bryan Bishop
0c1e9095d8
remove globals from some map group parsers
2013-09-12 22:27:33 -05:00
Bryan Bishop
c6f0f7f5c9
move old parsers from 'crystal' into crystalparts/
2013-09-12 01:37:30 -05:00
Bryan Bishop
463cd6197f
move find_labels_without_addresses into labels.py
2013-09-12 01:15:45 -05:00
Bryan Bishop
05c396ddd9
remove an unused import from integration tests
2013-09-12 01:15:01 -05:00
Bryan Bishop
fff6a7154c
don't override the object type/variable
2013-09-12 01:09:34 -05:00
Bryan Bishop
510bb1c3d9
try to fix old_text_script.py with an import
...
There are a few more missing imports to get this to work. On the other
hand, it may not be valuable enough to bother fixing.
2013-09-12 01:07:18 -05:00
Bryan Bishop
06dc9462fe
split OldTextScript out of crystal.py
...
This creates a new file called old_text_script.py with that huge class.
Does this mean that I wrote this a second time when I wrote TextScript ?
2013-09-12 01:05:10 -05:00
Bryan Bishop
1389ed7b02
remove a global from how_many_until
2013-09-12 01:00:05 -05:00
Bryan Bishop
5a4955e9c7
move is_valid_address into addresses.py
2013-09-12 00:56:45 -05:00
Bryan Bishop
01779ed10d
move load_asm2 next to load_asm
2013-09-12 00:51:48 -05:00
Bryan Bishop
d1343b58b4
remove global from load_asm2
...
Why is there even a second method in the first place?
2013-09-12 00:50:17 -05:00
Bryan Bishop
c80af2798e
allow (some) json files in the repo
...
This ignores only "labels.json", which so far has been the only
problematic json file. This is a file generated by gbz80disasm.
Other json files might be necessary in the future, and it's okay to let
them in.
2013-09-12 00:46:21 -05:00
Bryan Bishop
2059ea6f95
move "import crystal" in labels.py until needed
...
Otherwise there's a circular import. This circular import is going away
once crystal.py is fixed up.
2013-09-12 00:44:14 -05:00
Bryan Bishop
7cb38df60b
move AsmLine into crystalparts/asmline.py
2013-09-12 00:44:03 -05:00
Bryan Bishop
a4849db265
rename config.py -> configuration.py
...
This should help cut down on the confusion between the "config" module
and the "config" variable that everyone likes to use. The config
variable should refer to an instance of Config, whereas before it was
being shared as both the name of the module and the name of an instance.
"configuration" is always the module. "config" should always be a Config
instance.
TODO: avoid passing around a Config instance everywhere.
2013-09-12 00:34:43 -05:00
