Commit Graph

773 Commits

Author SHA1 Message Date
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
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
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
Bryan Bishop
f0dece5d53 add build/ to .gitignore 2013-09-09 02:08:17 -05:00
Bryan Bishop
1caffffa38 vba_autoplayer.py -> autoplayer.py 2013-09-09 02:06:30 -05:00
Bryan Bishop
54057bc762 strip out jython garbage from vba.py 2013-09-09 02:04:47 -05:00
Bryan Bishop
709850fff5 fix keyboard.data path in keyboard.py 2013-09-09 02:02:45 -05:00
Bryan Bishop
cdf1b82fad keyboard needs os 2013-09-09 01:59:58 -05:00
Bryan Bishop
e88a4767e9 some config defaults taken from vba stuff 2013-09-09 00:27:26 -05:00
Bryan Bishop
fa966f7a3f remove some TODOs 2013-09-09 00:21:54 -05:00
Bryan Bishop
55af0392e1 remove vba_config and just use pokemontools.config 2013-09-09 00:20:37 -05:00
Bryan Bishop
fab1b4ce20 encoding -> coding in python headers 2013-09-09 00:18:27 -05:00
Bryan Bishop
8b307f116a remove jython shebangs 2013-09-09 00:17:40 -05:00
Bryan Bishop
5d41f8a91d move vba_keyboard.py -> keyboard.py 2013-09-09 00:12:34 -05:00
Bryan Bishop
815266f03f fix path in vba_keyboard.py 2013-09-09 00:11:54 -05:00
Bryan Bishop
e593f680c2 encoding -> coding in header 2013-09-08 23:05:19 -05:00
Bryan Bishop
c6ee12ed1d split keyboard graph data from the python file
The keyboard.data file has the information necessary to reconstruct the
graph of the keyboard that appears in pokecrystal.
2013-09-08 23:03:44 -05:00
Bryan Bishop
0eb5468d22 fix some imports in pokemontools/vba/vba.py
This file is meant to be run while under jython, so it's not completely
fair to run it through python2.7 when testing. But whatever.
2013-09-08 22:55:25 -05:00
Bryan Bishop
37b9c79b4c fix some imports in test_vba.py 2013-09-08 22:54:39 -05:00
Bryan Bishop
bde8f7670a vba_tests.py -> test_vba.py
This matches the other filenames in the tests/ directory.
2013-09-08 22:53:18 -05:00
Bryan Bishop
72cdd7ba64 move vba/ -> pokemontools/vba/ 2013-09-08 22:52:50 -05:00
Bryan Bishop
5ce5342833 require vba_wrapper from pypi 2013-09-08 22:49:39 -05:00
Bryan Bishop
baf8c7f046 Merge branch 'master' into vba-automation 2013-09-08 22:48:29 -05:00
Bryan Bishop
87ab004d70 Merge pull request #19 from kanzure/vba-automation
More VBA automation.
2013-09-08 17:11:17 -07:00
Bryan Bishop
138637d8f3 move vba tools into vba/ 2013-09-08 11:06:13 -05:00