Sanky
4089cf486d
Merge https://github.com/kanzure/pokecrystal
...
Conflicts:
constants.asm
extras/crystal.py
main.asm
original-commit-id: 7df002c3e20f1b728b1d29a877c3731d4867f502
2013-02-02 23:20:50 +01:00
Bryan Bishop
1e893fae74
README: fix testing instructions
...
original-commit-id: 73c374a366dc41c56ca6572fdc0784c84011b8f5
2013-01-27 19:22:12 -06:00
Bryan Bishop
7b3699bb8f
dump_sections - tool to dump a skeleton asm file
...
original-commit-id: eb6cb9812da6a75dc86f64be27d9ef419963790c
2013-01-27 19:10:42 -06:00
Bryan Bishop
a9347aa296
basic type_constants data
...
original-commit-id: 9a29def2503b00a971c7384e2071877aacf64eea
2013-01-27 17:46:48 -06:00
Bryan Bishop
a5f54394f5
various formatting fixes for crystal.py
...
original-commit-id: fd6bb7de55183152bc116902be7b341ab71269ff
2013-01-27 17:33:25 -06:00
Bryan Bishop
1b2e7de885
replace wildcard import with explicit import
...
original-commit-id: 5b2848b419148a30e97cb1cdb6f57a06b1076d8b
2013-01-27 17:20:41 -06:00
Bryan Bishop
15ad3b8d1e
add character encoding header in pksv.py
...
original-commit-id: edee13391dd8f3c8f5a5d0164a60edb4ad99b483
2013-01-27 17:17:45 -06:00
Bryan Bishop
06174e7c2a
py26 fix for RomStr.load_labels (json)
...
original-commit-id: 9e9c37f5771c989630fa670aaafdc2ab1fdf1edf
2013-01-27 17:14:59 -06:00
Bryan Bishop
457c03a49f
make gbz80disasm work with python2.6 again
...
There was an incompatible change to the json module api between py26 and
py27, causing gbz80disasm to not work with py26. The fix is to simply
alias the new loads method to the old read function.
A possibly better plan might be to not support py26 at all.
original-commit-id: db5208b41f8a505f68ddbccb34dca206df9ca77e
2013-01-27 17:13:18 -06:00
Bryan Bishop
2b6ca1f9a8
pedantic formatting changes for pointers.py
...
original-commit-id: 00a2e4e1192513885f9a6e2e77bb78d2bcb1f53c
2013-01-27 17:08:14 -06:00
Bryan Bishop
40f232cea0
add character encoding headers to other files
...
original-commit-id: 3b7089411bda77af8e0b0080a20c934e579ff1f8
2013-01-27 17:07:32 -06:00
Bryan Bishop
22430c531e
fix headers and imports in labels.py
...
original-commit-id: 12c06174d8af879377d5d6be35f474032316eb9b
2013-01-27 17:05:52 -06:00
Bryan Bishop
9ef0b0bfc6
set character encoding header in interval_map.py
...
original-commit-id: 47a828c1dcdb3fa1b9655bb4e3f618afe4fe14cc
2013-01-27 17:05:17 -06:00
Bryan Bishop
f924fff38f
fix imports in graph.py
...
Although graph.py never used DisAsm, it was still trying to import the
deprecated class. Removed.
original-commit-id: 74a4d6588458a05d2e833f12ea2c80df10b0865d
2013-01-27 17:03:51 -06:00
Bryan Bishop
107f5d6901
fix header comments in graph.py
...
original-commit-id: 26ed5760a2116110c8940b9958cdd87c2ca8ea00
2013-01-27 17:03:00 -06:00
Bryan Bishop
e5a2fa2174
remove a duplication of load_rom and load_asm
...
original-commit-id: f22bbdd722bad8e2700b5801b45d935b631de6c8
2013-01-27 17:00:51 -06:00
Bryan Bishop
01691e2659
clean up lousy headers in comparator.py
...
original-commit-id: 0ee57e94db13be9654c8bd1bbcb2b7bb2aa4e929
2013-01-27 16:56:31 -06:00
Bryan Bishop
263561455b
better import syntax in comparator.py
...
original-commit-id: 59d0c6bc0311ea236c355974403176cab39d1894
2013-01-27 16:55:52 -06:00
Bryan Bishop
6922cd3f61
better import syntax in crystal.py
...
original-commit-id: 4dfb8d3b095c72336614ff6add54cc063321ed50
2013-01-27 16:54:58 -06:00
Bryan Bishop
baa2523bfb
remove extra whitespace in gbz80disasm
...
original-commit-id: ac47399e66c333dd733a352e2c93689908eaba3b
2013-01-27 16:52:20 -06:00
Bryan Bishop
fe8e2a0a4b
remove a broken, unfinished disassembler (DisAsm)
...
This removes DisAsm from romstr.py, which was the only reason that
gbz80disasm wasn't able to import RomStr from romstr.py.
DisAsm was an experimental gbz80 disassembler that was meant to replace
gbz80disasm eventually. The goals were to write cleaner code and write
more unit tests. But it never worked and the code quality looks close to
being the same as gbz80disasm anyway.
original-commit-id: 00f1b71cd48f7992d70309a82ccd0a2d0f5ac8db
2013-01-27 16:49:35 -06:00
Bryan Bishop
ea6e8ed566
allow unicode addresses in RomStr.to_asm
...
original-commit-id: a1579ab5193d4f0bf0d751b335a06dddf9ba3dfa
2013-01-27 16:46:52 -06:00
Bryan Bishop
c671840136
add character encoding header in gbz80disasm.py
...
original-commit-id: 500d47f4cca9a4f9c7a6909c9fd6f340abf1d022
2013-01-27 16:43:03 -06:00
Bryan Bishop
c11e9643d7
include character encoding header in romstr.py
...
original-commit-id: 4e1e9ed229554e9c27c4a2fa6dfaa42b4eb518c0
2013-01-27 16:42:23 -06:00
Bryan Bishop
a1d75be754
better formatting for romstr imports
...
original-commit-id: 8f4b5dae2a36bfb98f04e941252462b69b8cf953
2013-01-27 16:41:35 -06:00
Bryan Bishop
b14f54f861
RomStr doesn't need deepcopy
...
original-commit-id: 5eb81b07f32fe00ad8be23f80a32eb44db42831e
2013-01-27 16:40:09 -06:00
Bryan Bishop
33be75263a
commentify report_untested
...
original-commit-id: 86150b0f8a1cfac1b30521a9bae78d32bbdb29d2
2013-01-27 16:37:48 -06:00
Bryan Bishop
a0cc3cac6e
fix label imports in tests
...
original-commit-id: bc167bedb73052c37c37f5158ae30cfdff88e581
2013-01-27 16:34:21 -06:00
Bryan Bishop
a94c18fca3
fix AsmList import in tests
...
original-commit-id: 44db66e13e55d01adac349a48e26384318f24c56
2013-01-27 16:32:52 -06:00
Bryan Bishop
13f0b0df11
fix pksv imports in tests
...
original-commit-id: 564a1b5874dfb7bae6454ad0b78d11cd1454aaab
2013-01-27 16:30:27 -06:00
Bryan Bishop
1024ac17f8
fix calculate_pointer in tests
...
original-commit-id: 50ae458b08d6097510a2f95dc596cad6e2c31eeb
2013-01-27 16:29:30 -06:00
Bryan Bishop
307894a7dd
split out more item_constants stuff
...
Some of the item_constants functions are now placed in
item_constants.py, and the unit tests now import from that file rather
than from crystal.py for those functions.
original-commit-id: f8b1695b548403e5db7e65d22e10cde81be66861
2013-01-27 16:27:41 -06:00
Bryan Bishop
cc0757f7c7
split out tests into a separate file
...
original-commit-id: 35682de426c14eb18da736464ebf718927ef393e
2013-01-27 07:22:31 -06:00
Bryan Bishop
850de7f573
fix label generator
...
Recently the bank lines were changed to use lowercase characters,
breaking the generator for "labels.json".
original-commit-id: a826951adbbe74f170219402791ceb4074c3c4de
2013-01-23 18:32:23 -06:00
yenatch
7cfc2746c6
update gfx.py to reflect new structure
...
original-commit-id: cd0f71730583f7db1e81549d0269fa38ea315ac9
2013-01-22 05:01:21 -05:00
Bryan Bishop
b17ba65a47
clean up python script imports
...
original-commit-id: 0a54ce9e75201d718b971789a6502f8205d2e986
2013-01-15 16:20:10 -06:00
Bryan Bishop
b733482ed3
remove the Size class (unused)
...
original-commit-id: 80781e56f045dca95e03ccf8d8851f44b0bae0df
2013-01-15 16:15:25 -06:00
Bryan Bishop
6a3fa68f8b
split out IntervalMap into a separate file
...
original-commit-id: 536df0787f77db30144d47bda2c2105ee9ad1321
2013-01-15 16:12:26 -06:00
Bryan Bishop
f11fc0fa09
Merge pull request #86 from yenatch/master
...
3jumptext is an ender.
original-commit-id: 7a33b66ab4758fc00bb573eb0d1e3881a824a29a
2013-01-14 20:44:07 -08:00
yenatch
e810b8df37
forgot to make 3jumptext an ender
...
original-commit-id: 669c461ad8c60c0ca709fc5b52f02c6a0fc60561
2013-01-14 23:19:31 -05:00
Bryan Bishop
211ce8f725
Merge pull request #85 from yenatch/master
...
More script commands.
original-commit-id: e09aff77152b50cd9fde923fc913a6f5b815c3e8
2013-01-14 19:25:54 -08:00
yenatch
6829d3aafe
add missing script command (3jumptext)
...
original-commit-id: 28b565a01c40bf61990ad84c78cf602e2419256e
2013-01-14 21:44:47 -05:00
Sanky
43546fd07a
Fix crystal.scan_for_predefined_labels to work with current main.asm
...
original-commit-id: 3010a1fbb3cdb7c86803a9f4528557ef8dcac216
2013-01-14 17:28:18 +01:00
Bryan Bishop
1c963494a8
Merge pull request #84 from yenatch/master
...
make script parsing less terrible
original-commit-id: df680fde38030c8ad572b5667b89f50696049a20
2013-01-14 01:48:24 -08:00
yenatch
451a0d7700
banish script parser output to debug
...
original-commit-id: acd6d354c8701f0ac296611fda2d184fdd8c15fc
2013-01-14 03:15:47 -05:00
IIMarckus
2a01a4873f
Fix typo.
...
original-commit-id: 818a82a20ebb3e35454e33389b0174a2a4623070
2013-01-13 16:12:25 -07:00
yenatch
f0e7a120a5
make careless use of gfx.py less fatal
...
original-commit-id: 9fbe7ea42390e7a0d6a1288f076d7951ce66b5eb
2013-01-13 00:40:13 -05:00
yenatch
7774a995fb
implement rgb macro for palettes
...
original-commit-id: 238f40602479c43954916a967523d0a873cdd92b
2013-01-13 00:38:48 -05:00
yenatch
e07544636d
add symfile generation
...
original-commit-id: e59a7c8d6f2c469fcb4cade67556f60f49ccb429
2013-01-10 03:00:46 -05:00
yenatch
636e7e1ec7
include all compressed and decompressed graphics
...
* frontpics & animation tiles
* backpics
* trainer pics
* attack animation gfx
* intro gfx
* intro tilemaps
* title gfx
* tilesets
* player backpic
* dude backpic
* pokegear/town map
fixes #33 , #34 and #35
original-commit-id: 2cdf7a3688c43766663028cf6e644f13fae4bdf3
2013-01-04 04:08:13 -06:00
