Commit Graph

165 Commits

Author SHA1 Message Date
Bryan Bishop
23117cb35a speed up asm insertion
original-commit-id: 1098757c4af82380ef0cadeaf7e37ad0186e76b6
2012-04-27 01:06:31 -05:00
Bryan Bishop
1682a95f57 Asm.insert_multiple_with_dependencies
original-commit-id: 226e964f1d2251b9fdab1fa54262ad81e6d39599
2012-04-27 00:59:05 -05:00
Bryan Bishop
847531c985 caught a self.label -> self.label.name
original-commit-id: bde9cb3b5731e82aa7b694c0005d12f053dc9e06
2012-04-26 18:45:53 -05:00
Bryan Bishop
9a2408a864 refactor all labels to be Label instances
original-commit-id: ddbfc016c1e3e1acd8ba291ccedfb16d3a3c48fb
2012-04-26 18:41:13 -05:00
Bryan Bishop
46ddc5995d refactoring some labels code
original-commit-id: ea2daf05ee5012e40d310752ca105a8ce6cf132f
2012-04-26 18:04:20 -05:00
Bryan Bishop
40d2dc632d start to write the Label class and is_label_in_asm
original-commit-id: 16b8cf491f577a9cf80107fa972ae35739ee4039
2012-04-26 17:41:37 -05:00
Bryan Bishop
35cb2c4f8b rename textpre.py -> preprocessor.py
original-commit-id: 849c0d132d9a9a9b2414d5914f41a83820be8b11
2012-04-26 16:58:20 -05:00
Bryan Bishop
53a9867201 make jumptextfaceplayer point to text
original-commit-id: 092baabdd4555d7147559c2b989133c63a45fb31
2012-04-26 16:50:52 -05:00
Bryan Bishop
38efef76a5 continue to fix off-by-one error in TextScript
original-commit-id: 8cc5597b0bdf29c4d76be26a5879a53d4f65c308
2012-04-26 15:04:09 -05:00
Bryan Bishop
3e6944344d fix off-by-one error in TextScript
original-commit-id: 806687bf690f8cd50cbf0bd3b1502fea36656a02
2012-04-26 14:59:24 -05:00
Bryan Bishop
8b46073c58 revert to dbw in MapScriptHeader.to_asm()
original-commit-id: d37f9869712ded6feed36537932c75255a3665ae
2012-04-26 14:46:46 -05:00
Bryan Bishop
16a55de2c8 revert '_' prefix to some macro_names
original-commit-id: 386a688eca4098723e6e8460257433064cdd86ee
2012-04-26 14:37:09 -05:00
Bryan Bishop
28a40fac1e revert PeopleEvent to use better-looking asm output
original-commit-id: 3c8b381489f074b2223359bd0d11ea8644a35dc7
2012-04-26 14:30:30 -05:00
Bryan Bishop
712b7a57ac add two filler bytes to MapEventHeader asm output
original-commit-id: 6c5b5d2b5771b3a4ddade9325c509bccb0c38c22
2012-04-26 14:26:16 -05:00
Bryan Bishop
98d72a999f gah forgot a file to let preprocessor import macros
original-commit-id: 70cf2554a17b604c5e65fd86ebaeb5d206839baa
2012-04-26 14:16:01 -05:00
Bryan Bishop
ec5265e2e6 add map/group constants into constants.asm
map 18.3 and 7.14 are both "Route 10" ? Need to confirm that they are
both, in fact, "Route 10". Even if they both point to the same map, we
can call them 10a and 10b so that the map constants will work.

generate_map_constants and generate_map_constant_labels have been
updated to deal with left-over issues in various labels and obscure
characters.

original-commit-id: 8f2221aa703b3ed0d98003a055c65ea794144b64
2012-04-26 14:13:06 -05:00
Bryan Bishop
74292fa922 add DataByteWordMacro for the preprocessor
original-commit-id: 8f2afd2f7c00bec87fdd33bb7745505a13d39c2e
2012-04-26 14:00:55 -05:00
Bryan Bishop
f6ec80e24e add param_types to Signpost
original-commit-id: d09cf6d950ce3ba015c3ac4f74dda68d2b8c0f87
2012-04-26 13:55:55 -05:00
Bryan Bishop
fa0b8571c6 change Signpost to extend Command and set byte_type in a few places
original-commit-id: 1bba364ba63a347a5188b21b267a66738fa11ff7
2012-04-26 13:13:24 -05:00
Bryan Bishop
084074fe8f return to using warp_def, signpost, person_event macros
original-commit-id: a720875a84c1ae89237ca2a0b075accb2c10e83c
2012-04-26 10:27:46 -05:00
Bryan Bishop
306e47f9de probably a bad idea - don't use macros inside event headers
original-commit-id: 69783a6a69046dba97ad98b41448dfd6702699fb
2012-04-26 01:07:04 -05:00
Bryan Bishop
4742425068 don't delete tempt_opt_table in gbz80disasm
original-commit-id: ece37237e3960bce6e72c6c97f1a4479dd6536aa
2012-04-26 00:32:38 -05:00
Bryan Bishop
dc5ed571f0 simple lexer
original-commit-id: ad76f259ff28b719b353581a654b4918f8ebb3b7
2012-04-26 00:31:53 -05:00
Bryan Bishop
d69fa4710e fix MapHeader size and TextScript asm output
original-commit-id: 2b159a5ebd6840da53392dc6c6bf619ceb75d0f9
2012-04-25 21:53:20 -05:00
Bryan Bishop
165304e369 fix dbw error in MapScriptHeader and add ending newline
original-commit-id: 69450ad8b33af1a40ea7ddc6d94c54cb4755c440
2012-04-25 20:23:10 -05:00
Bryan Bishop
d4f698e64d dump scripting macros into script_macros.asm
original-commit-id: cb1a372d759a027669d8012160bc2e627ea7372b
2012-04-25 20:02:40 -05:00
Bryan Bishop
cb825e39a7 update last_address in MapScriptHeader to get asm output working again
original-commit-id: f61e0288710e75ebf702d175c85e37f473ad9e48
2012-04-25 18:51:54 -05:00
Bryan Bishop
4096495b0f oops, make MapScriptHeader and others show up again
original-commit-id: c8cdbdede160ae1002a2c5a492dcda9f20b0945d
2012-04-25 18:18:14 -05:00
Bryan Bishop
9c696f260e better asm output newline logic
original-commit-id: 759c55d3f2cea4a8b09943ee7c3cb95d9cc5423e
2012-04-25 16:11:38 -05:00
Bryan Bishop
3a6621642c fix bad placement of MapScriptHeader_0x70000 in asm
original-commit-id: ff4c37eb2b05ce14db0bc1b2f75bebaccf28cfe4
2012-04-25 14:05:51 -05:00
Bryan Bishop
c1bf6e1c00 fix some parameter types
original-commit-id: 9a819183922b5498cce76ceb0228c9c7c39d4596
2012-04-22 20:49:00 -05:00
Bryan Bishop
6f486c6faa split up insertion and dumping in Asm
original-commit-id: 3869d5a30f22635637fa83775a50e117ba47ccf2
2012-04-22 20:33:42 -05:00
Bryan Bishop
bd721559ef attempts to stop a recursion limit error
original-commit-id: 1021728fb340554317be5dfd1fd1c17f33fe3289
2012-04-22 15:48:47 -05:00
Bryan Bishop
3270d8a5f9 remove duplicate incbins in asm output
original-commit-id: 2de204cdb5a24aeaae35cdb94aa61649874ddfce
2012-04-22 15:13:32 -05:00
Bryan Bishop
9cffdb17f7 awful newline rules in asm output
original-commit-id: c1cbb74ae85e29eb0554f0c9e81306ee6e15afcc
2012-04-22 15:08:58 -05:00
Bryan Bishop
7c667e09c8 prevent scripts from appearing in MapScriptHeader.to_asm output
original-commit-id: fdbf484b579c763d4a015768295a0fce8c430e76
2012-04-22 14:04:27 -05:00
Bryan Bishop
34385f546b fix MapEventHeader asm formatting
original-commit-id: c8b4c3203c8551f8ca835b35e4ad81a8f47900bd
2012-04-21 23:46:58 -05:00
Bryan Bishop
1e89af6fad remove duplicates from Asm output
original-commit-id: c33c15befbd3d957d89af11425c7be80c73a62f0
2012-04-21 23:37:02 -05:00
Bryan Bishop
dd3ec6742a hmm duplicate insertions
original-commit-id: 4f683d642176ed57fc8c27f08849cdf4065ef612
2012-04-21 18:59:58 -05:00
Bryan Bishop
4dfc10d46e TrainerFragments pointing to 0x26ef should be ignored
original-commit-id: 26e0ee9545f40522e4ff3f5a4c54437618d14f57
2012-04-21 18:24:54 -05:00
Bryan Bishop
8edfd8f6e2 insertion of asm dependencies
original-commit-id: 2588ff6255542bcaf8f20a6cafa3e9943cd0d292
2012-04-21 18:09:03 -05:00
Bryan Bishop
bfa0ed8d6e fix bug parsing INCBIN lines
original-commit-id: c42b254081033bbb54ba56cb96ead7439d8452c8
2012-04-21 16:11:00 -05:00
Bryan Bishop
f484df40ce probably right insertion routine for Asm
original-commit-id: b597af7c57033acd1acf468e48b7140c9f390ef0
2012-04-21 16:06:22 -05:00
Bryan Bishop
1db4a451cc Incbin.split method similar to split_incbin_line_into_three
original-commit-id: 02497888f6a467d5d5922cc7817c787a98aefd25
2012-04-21 12:38:12 -05:00
Bryan Bishop
61c429040f foundation for asm parsing
original-commit-id: 285b3066a443438b30691be7193e7f7135b9a950
2012-04-21 11:33:23 -05:00
Bryan Bishop
55280b7f9e improve to_asm output (newlines)
original-commit-id: 9b4ce897d4976edcfabcbce9258b27ed85759208
2012-04-21 10:24:44 -05:00
Bryan Bishop
5f379579f1 fix some bugs in get_dependencies and to_asm
original-commit-id: 3b234223c5b5376eb89124464164983cd7150739
2012-04-21 03:15:56 -05:00
Bryan Bishop
126510e975 flatten a list of dependencies into one giant list
original-commit-id: 7d6af535e9395a48e9e97b0c2a0741239c41f165
2012-04-21 02:43:19 -05:00
Bryan Bishop
c8dd923e7e improve TrainerFragment.to_asm
original-commit-id: 06bc6699dadc2e48c0de6b3041c8619303972ba3
2012-04-21 02:25:56 -05:00
Bryan Bishop
15a35a1a4a fix trainer label output
original-commit-id: 64af1959ae3b90c386569d358dfe4870990c4058
2012-04-21 02:16:12 -05:00