4f3bb35e56
Merge pull request #126 from yenatch/master
...
map scripts + ai + disabled line ending correction
original-commit-id: 2a44711fa7b96868048f39418a6095ea7013608d
2013-05-06 22:15:41 -07:00
f8dd005ee7
Fix PointerLabelToScriptPointer class
...
used the current address instead of the parsed address
original-commit-id: 9fc8d527f727dedfb8dd718cfea9e29d7b26775d
2013-04-30 20:29:15 -04:00
7953d20fd5
Merge yenatch/master.
...
original-commit-id: 0e47273378b1f7f010e4d3e6dbab2a14dcc781ce
2013-04-27 17:29:29 -05:00
9114f86aa3
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
...
original-commit-id: 494f4c13fe2a45d0569bde2fc06e1bdf3fbfc857
2013-04-20 02:55:50 -04:00
ee31193dfc
dump move effects
...
original-commit-id: dc81d0cfcfa92ecfab99984ee674d0fe3e6c19cf
2013-03-29 18:54:42 -04:00
fbd4277bc8
fix docstring formatting everywhere
...
original-commit-id: 4332a25bd5f6f80975f762d126e92064c756f7d4
2013-03-21 15:15:42 -05:00
c749f4bb5b
Fix unused function parse_map_header_by_id
...
'Dunno' exception always fired even if parameters were correct
original-commit-id: c19dcb996c26111d5ccda8cb783ccbb15348992b
2013-03-18 00:30:37 -04:00
852043eab2
Script commands 0xb2 and 0xcc don't exist
...
original-commit-id: a7c260f4f4b843cfed1d8f39d3fca396cacc95c2
2013-03-01 16:22:35 -05:00
a1dce154d4
update automatic main.asm insertion
...
This updates the automatic parsing of main.asm to catch cases of INCBINs
pulling in files that end in .asm, .lz, .1bpp, and .2bpp. This is
necessary because otherwise the parser tries to figure out the start and
end addresses expressed on the INCBIN line, details not present on these
types of lines in the asm.
Asm and Asm.insert_all are now back in working condition.
original-commit-id: 0e2ab04353bf5fa3114aa87e77e5366af6aa942c
2013-02-27 21:38:53 -06:00
d847dcd8f4
make to_asm more configurable
...
original-commit-id: affcd587d69b18d84bcb473b28723613b755c846
2013-02-27 20:02:51 -06:00
c7a67544b7
fix parameters for verbosegiveitem2 definition
...
original-commit-id: 2a04c1c20a22f13ff3f0b0a8ce2d8e96b8798ef8
2013-02-27 17:22:07 -06:00
44ecf8ed24
oops, include map_names
...
original-commit-id: 821d7948981924a4b8145edf072a69ab799ddd14
2013-02-27 03:01:49 -06:00
a799f922fc
separate map_names into map_names.py
...
original-commit-id: 160acfa2967e898f97ba2b92e8602146bdf5b714
2013-02-26 21:30:24 -06:00
a5f54394f5
various formatting fixes for crystal.py
...
original-commit-id: fd6bb7de55183152bc116902be7b341ab71269ff
2013-01-27 17:33:25 -06:00
1b2e7de885
replace wildcard import with explicit import
...
original-commit-id: 5b2848b419148a30e97cb1cdb6f57a06b1076d8b
2013-01-27 17:20:41 -06:00
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
e5a2fa2174
remove a duplication of load_rom and load_asm
...
original-commit-id: f22bbdd722bad8e2700b5801b45d935b631de6c8
2013-01-27 17:00:51 -06:00
6922cd3f61
better import syntax in crystal.py
...
original-commit-id: 4dfb8d3b095c72336614ff6add54cc063321ed50
2013-01-27 16:54:58 -06:00
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
cc0757f7c7
split out tests into a separate file
...
original-commit-id: 35682de426c14eb18da736464ebf718927ef393e
2013-01-27 07:22:31 -06:00
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
b17ba65a47
clean up python script imports
...
original-commit-id: 0a54ce9e75201d718b971789a6502f8205d2e986
2013-01-15 16:20:10 -06:00
b733482ed3
remove the Size class (unused)
...
original-commit-id: 80781e56f045dca95e03ccf8d8851f44b0bae0df
2013-01-15 16:15:25 -06:00
6a3fa68f8b
split out IntervalMap into a separate file
...
original-commit-id: 536df0787f77db30144d47bda2c2105ee9ad1321
2013-01-15 16:12:26 -06:00
6829d3aafe
add missing script command (3jumptext)
...
original-commit-id: 28b565a01c40bf61990ad84c78cf602e2419256e
2013-01-14 21:44:47 -05:00
451a0d7700
banish script parser output to debug
...
original-commit-id: acd6d354c8701f0ac296611fda2d184fdd8c15fc
2013-01-14 03:15:47 -05:00
99331db1d0
clean up whitespace
...
original-commit-id: da8b1e06e5c2866cf73f469f08835c658713ff41
2012-12-28 12:37:58 -06:00
e31127e33b
specialphonecall takes a 16‐bit ID.
...
original-commit-id: 19ce6e7a748094f8f74b123c6b803808ed530d90
2012-12-17 21:00:41 -07:00
e15fcc4fd8
md5 -> hashlib
...
original-commit-id: 671e2b1289950586723078b3b29d14c9631ac140
2012-11-30 10:17:23 -06:00
a21b183757
move allowed_lengths for music macros out
...
This moves the allowed_lengths setting out of the preprocessor. Special
cases should not be hardcoded in the preprocessor.
original-commit-id: a1a9fa5560e01d97c7c33bbf8bb19fe4e76d3c28
2012-11-30 09:54:02 -06:00
ff24a0d621
implement music macros; INCLUDE injection in pre
...
original-commit-id: 3626ddebd1dd7363c98b403ba1fe3c2d7dc598ee
2012-11-30 05:58:00 -05:00
786d4fb35d
remove deprecated functions from crystal.py
...
original-commit-id: 69c012511242cda45d1e60014833823226583093
2012-10-11 19:05:49 -05:00
25ece07f34
clean up comments in extras/crystal.py
...
This fixes the inconsistent comment formatting throughout the file.
There should be a space between the comment token and the comment
message, otherwise this file is less fun to read.
original-commit-id: e6c95e22c9a61b5a8817c7a5ae0fb235c01d722c
2012-10-01 13:11:52 -05:00
689a501e97
call load_asm in scan_for_predefined_labels
...
original-commit-id: d23972b7a3bf387ffa883fa0c8f2827b0b826e84
2012-09-10 22:30:58 -05:00
107fc14663
use decimal output for givepoke in extras/crystal.py
...
original-commit-id: 6f8c3e5c3ea2edb80fddd2d17cf689fc1da39120
2012-07-05 10:25:33 -05:00
b27e547509
more de-dependency-looping
...
original-commit-id: 1342ab67db4301563d317722d04fab9473411fda
2012-06-20 01:42:33 -05:00
8fe39c647b
move code around to avoid dependency loops
...
original-commit-id: ca07f1d64c0235b49160fc501553a70af8331d81
2012-06-20 01:13:15 -05:00
88d1cd8197
make unittest2 error show up in stderr
...
original-commit-id: 914470651080df7cf0bf36e3fa45ed299dd694ec
2012-06-02 11:42:09 -05:00
31d92266f9
fix up AsmSection and line_has_comment_address
...
original-commit-id: d174c8b7c6ba0fd9da2b8145e3f8ec5909917e29
2012-05-29 14:50:35 -05:00
895f32e891
move AsmList into romstr.py too
...
original-commit-id: 0edf9eb8b8d5bdf74b8af18401a92c2ce7a2c2a3
2012-05-29 13:19:02 -05:00
19e3c8ae4e
move RomStr into a shared file
...
original-commit-id: ee7d39bf046ca4b8c40eb293d50657cda151dc58
2012-05-29 13:08:43 -05:00
f2c2dbc90c
use map constants for wildmons sections
...
original-commit-id: 0aecb683a0aa7a2c38f0f9bc5c1fff4085bf245e
2012-05-28 10:30:45 -05:00
ac230bdee9
update to_asm on MapHeader to use the BANK macro
...
original-commit-id: a9b0eb4d87410f453c2135092ef2f810845b746a
2012-05-28 09:51:49 -05:00
3528fd881b
insert all map connections
...
original-commit-id: 5e37b9a97fc2b2054d35ce36575dd0fd204bb2bf
2012-05-28 00:16:38 -05:00
d0ea2e74c0
don't use any particular formula for strip-destination west/east
...
original-commit-id: 2fe10a6682299f03415c9d1ecceb11007a032691
2012-05-27 23:50:18 -05:00
cb9a67ad84
fix typo in strip destination pointer (north) calculations
...
original-commit-id: 7d9552b5fa9be937f39dbe03c7f5f369c3886a7a
2012-05-27 20:02:34 -05:00
051efc9de8
do all the connection to_asm output
...
original-commit-id: d48ce599970d3d7077477ed000dfb38e146d3448
2012-05-27 19:45:44 -05:00
a4fa1665ca
asm output for strip pointer formulas
...
original-commit-id: da74952bf72048e075073f5389630f964b42c7ce
2012-05-27 18:24:09 -05:00
3fa144bb24
better formulas for strip_destination and window
...
original-commit-id: 5b59d0776b5b07e6128f48d4e9743c8a3c0477ac
2012-05-27 15:54:44 -05:00
62963ee671
improve formulas for calculating strip_pointer
...
original-commit-id: a32c6d0aa40b4d240b97828796da08b9becbd479
2012-05-27 13:46:58 -05:00
Bryan Bishop