Commit Graph

795 Commits

Author SHA1 Message Date
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
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
Bryan Bishop
0ce2555a19 Merge pull request #27 from yenatch/master
spit GLOBAL defs for labels into globals.asm instead of inline
2013-09-11 17:38:53 -07:00
yenatch
7bf5fcab90 spit GLOBAL defs for labels into globals.asm instead of inline 2013-09-11 16:30:38 -04:00
Bryan Bishop
4e0f27d789 Merge pull request #25 from kanzure/fix-gbz80disasm-for-pokered
Be okay with blank labels in gbz80disasm
2013-09-11 12:26:14 -07:00
Bryan Bishop
622534ca73 Merge pull request #26 from kanzure/fix-pokered-paths
fix pokered paths in redtools

Argh, these need to go away.
2013-09-11 12:25:47 -07:00
Bryan Bishop
f220d59d4a be okay with blank labels in gbz80disasm
For whatever reason, this makes gbz80disasm work with pokered.
2013-09-11 14:23:11 -05:00
Bryan Bishop
ef77506d94 also import os 2013-09-11 10:57:05 -05:00
Bryan Bishop
435180a2cd fix rom path in another redtool 2013-09-11 10:56:31 -05:00
Bryan Bishop
e74f9833a1 update pokered_dir.py to use cwd for path
This will be fixed when redtools is merged into the rest of the junk,
but for now the path will just be the cwd.

This is necessary for pokered gbz80disasm.
2013-09-11 10:53:49 -05:00
Bryan Bishop
50341bae50 Merge pull request #21 from kanzure/vba-automation
Start moving away from jvm/jython.
2013-09-10 21:18:30 -07:00
Bryan Bishop
42c7b03483 Merge branch 'master' into vba-automation 2013-09-10 23:16:55 -05:00
Bryan Bishop
cb65c31968 Merge pull request #22 from kanzure/ignore-build
add build/ to .gitignore
2013-09-09 00:26:18 -07:00
Bryan Bishop
052fde28ca remove the old vba filenames from MANIFEST.in 2013-09-09 02:18:01 -05:00
Bryan Bishop
98defaf9f2 remove the Recording junk
That should go into vba_wrapper if it turns out to be important.
2013-09-09 02:10:01 -05:00