summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-12split OldTextScript out of crystal.pyBryan Bishop
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-12remove a global from how_many_untilBryan Bishop
2013-09-12move is_valid_address into addresses.pyBryan Bishop
2013-09-12move load_asm2 next to load_asmBryan Bishop
2013-09-12remove global from load_asm2Bryan Bishop
Why is there even a second method in the first place?
2013-09-12allow (some) json files in the repoBryan Bishop
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-12move "import crystal" in labels.py until neededBryan Bishop
Otherwise there's a circular import. This circular import is going away once crystal.py is fixed up.
2013-09-12move AsmLine into crystalparts/asmline.pyBryan Bishop
2013-09-12rename config.py -> configuration.pyBryan Bishop
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-11Merge pull request #27 from yenatch/masterBryan Bishop
spit GLOBAL defs for labels into globals.asm instead of inline
2013-09-11spit GLOBAL defs for labels into globals.asm instead of inlineyenatch
2013-09-11Merge pull request #25 from kanzure/fix-gbz80disasm-for-pokeredBryan Bishop
Be okay with blank labels in gbz80disasm
2013-09-11Merge pull request #26 from kanzure/fix-pokered-pathsBryan Bishop
fix pokered paths in redtools Argh, these need to go away.
2013-09-11be okay with blank labels in gbz80disasmBryan Bishop
For whatever reason, this makes gbz80disasm work with pokered.
2013-09-11also import osBryan Bishop
2013-09-11fix rom path in another redtoolBryan Bishop
2013-09-11update pokered_dir.py to use cwd for pathBryan Bishop
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-10Merge pull request #21 from kanzure/vba-automationBryan Bishop
Start moving away from jvm/jython.
2013-09-10Merge branch 'master' into vba-automationBryan Bishop
2013-09-09Merge pull request #22 from kanzure/ignore-buildBryan Bishop
add build/ to .gitignore
2013-09-09remove the old vba filenames from MANIFEST.inBryan Bishop
2013-09-09remove the Recording junkBryan Bishop
That should go into vba_wrapper if it turns out to be important.
2013-09-09add build/ to .gitignoreBryan Bishop
2013-09-09vba_autoplayer.py -> autoplayer.pyBryan Bishop
2013-09-09strip out jython garbage from vba.pyBryan Bishop
2013-09-09fix keyboard.data path in keyboard.pyBryan Bishop
2013-09-09keyboard needs osBryan Bishop
2013-09-09some config defaults taken from vba stuffBryan Bishop
2013-09-09remove some TODOsBryan Bishop
2013-09-09remove vba_config and just use pokemontools.configBryan Bishop
2013-09-09encoding -> coding in python headersBryan Bishop
2013-09-09remove jython shebangsBryan Bishop
2013-09-09move vba_keyboard.py -> keyboard.pyBryan Bishop
2013-09-09fix path in vba_keyboard.pyBryan Bishop
2013-09-08encoding -> coding in headerBryan Bishop
2013-09-08split keyboard graph data from the python fileBryan Bishop
The keyboard.data file has the information necessary to reconstruct the graph of the keyboard that appears in pokecrystal.
2013-09-08fix some imports in pokemontools/vba/vba.pyBryan Bishop
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-08fix some imports in test_vba.pyBryan Bishop
2013-09-08vba_tests.py -> test_vba.pyBryan Bishop
This matches the other filenames in the tests/ directory.
2013-09-08move vba/ -> pokemontools/vba/Bryan Bishop
2013-09-08require vba_wrapper from pypiBryan Bishop
2013-09-08Merge branch 'master' into vba-automationBryan Bishop
2013-09-08Merge pull request #19 from kanzure/vba-automationBryan Bishop
More VBA automation.
2013-09-08move vba tools into vba/Bryan Bishop
2013-09-08crude tests for the vba automation softwareBryan Bishop
2013-09-08Merge branch 'master' into vba-automationBryan Bishop
2013-09-07Merge pull request #20 from kanzure/fix-labelsBryan Bishop
Fix an import in labels.py
2013-09-07fix logging import in labels.pyBryan Bishop
2013-09-07redo the vba autoplayerBryan Bishop
This rewrites the basic methods to use the new primitives for vba automation. There are still a number of bugs in here. Also, the level grinding recursion is broken because there's no method used to detect whether or not a wild battle is starting. Waiting for a battle to really end is currently broken. There's a problem when interacting with radios because of the sound effect check in text_wait. There should be unit tests, but there aren't any.
2013-09-07remove some experimental methodsBryan Bishop
These methods weren't needed. Turns out the problem was frameskip, these were just other attempts to try to do movement and text waiting.