Commit Graph

3144 Commits

Author SHA1 Message Date
Bryan Bishop
2cb6e41831 clean up the preprocessor imports 2012-04-26 17:41:10 -05:00
Bryan Bishop
849c0d132d rename textpre.py -> preprocessor.py 2012-04-26 16:58:20 -05:00
Bryan Bishop
092baabdd4 make jumptextfaceplayer point to text 2012-04-26 16:50:52 -05:00
Bryan Bishop
5dc153880b improve PointerLabelAfterBank handling in preprocessor 2012-04-26 15:28:28 -05:00
Bryan Bishop
0e439e5e08 remove script_macros.asm (deprecated) 2012-04-26 15:13:22 -05:00
Bryan Bishop
8cc5597b0b continue to fix off-by-one error in TextScript 2012-04-26 15:04:09 -05:00
Bryan Bishop
806687bf69 fix off-by-one error in TextScript 2012-04-26 14:59:24 -05:00
Bryan Bishop
d37f986971 revert to dbw in MapScriptHeader.to_asm() 2012-04-26 14:46:46 -05:00
Bryan Bishop
e14ee0838d clean up an error message in preprocessor 2012-04-26 14:41:28 -05:00
Bryan Bishop
5bc8b861f6 remove newlines from guessed macro names in preprocessor 2012-04-26 14:37:42 -05:00
Bryan Bishop
386a688eca revert '_' prefix to some macro_names 2012-04-26 14:37:09 -05:00
Bryan Bishop
3c8b381489 revert PeopleEvent to use better-looking asm output 2012-04-26 14:30:30 -05:00
Bryan Bishop
6c5b5d2b57 add two filler bytes to MapEventHeader asm output 2012-04-26 14:26:16 -05:00
Bryan Bishop
70cf2554a1 gah forgot a file to let preprocessor import macros 2012-04-26 14:16:01 -05:00
Bryan Bishop
e2d31b6029 preprocessor support for macros 2012-04-26 14:14:46 -05:00
Bryan Bishop
8f2221aa70 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.
2012-04-26 14:13:06 -05:00
Bryan Bishop
8f2afd2f7c add DataByteWordMacro for the preprocessor 2012-04-26 14:00:55 -05:00
Bryan Bishop
d09cf6d950 add param_types to Signpost 2012-04-26 13:55:55 -05:00
Bryan Bishop
1bba364ba6 change Signpost to extend Command and set byte_type in a few places 2012-04-26 13:13:24 -05:00
Bryan Bishop
2446153f98 break up the for loop in textpre.py into separate functions 2012-04-26 11:19:34 -05:00
Bryan Bishop
6e083c9b3a only strip comments when a semicolon appears on the line 2012-04-26 11:02:17 -05:00
Bryan Bishop
d358b39024 skip lines wth no quotes in textpre.py 2012-04-26 10:56:21 -05:00
Bryan Bishop
216a7ac1ec better comment handling in textpre.py 2012-04-26 10:51:37 -05:00
Bryan Bishop
a720875a84 return to using warp_def, signpost, person_event macros 2012-04-26 10:27:46 -05:00
Bryan Bishop
69783a6a69 probably a bad idea - don't use macros inside event headers 2012-04-26 01:07:04 -05:00
Bryan Bishop
ece37237e3 don't delete tempt_opt_table in gbz80disasm 2012-04-26 00:32:38 -05:00
Bryan Bishop
ad76f259ff simple lexer 2012-04-26 00:31:53 -05:00
Bryan Bishop
2b159a5ebd fix MapHeader size and TextScript asm output 2012-04-25 21:53:20 -05:00
Bryan Bishop
69450ad8b3 fix dbw error in MapScriptHeader and add ending newline 2012-04-25 20:23:10 -05:00
Bryan Bishop
cb1a372d75 dump scripting macros into script_macros.asm 2012-04-25 20:02:40 -05:00
Bryan Bishop
f61e028871 update last_address in MapScriptHeader to get asm output working again 2012-04-25 18:51:54 -05:00
Bryan Bishop
9a3733e8d1 run main.asm through the line spacing logic once 2012-04-25 18:33:36 -05:00
Bryan Bishop
c8cdbdede1 oops, make MapScriptHeader and others show up again 2012-04-25 18:18:14 -05:00
Bryan Bishop
759c55d3f2 better asm output newline logic 2012-04-25 16:11:38 -05:00
Bryan Bishop
ff4c37eb2b fix bad placement of MapScriptHeader_0x70000 in asm 2012-04-25 14:05:51 -05:00
Bryan Bishop
9a81918392 fix some parameter types 2012-04-22 20:49:00 -05:00
Bryan Bishop
3869d5a30f split up insertion and dumping in Asm 2012-04-22 20:33:42 -05:00
Bryan Bishop
1021728fb3 attempts to stop a recursion limit error 2012-04-22 15:48:47 -05:00
Bryan Bishop
2de204cdb5 remove duplicate incbins in asm output 2012-04-22 15:13:32 -05:00
Bryan Bishop
c1cbb74ae8 awful newline rules in asm output 2012-04-22 15:08:58 -05:00
Bryan Bishop
fdbf484b57 prevent scripts from appearing in MapScriptHeader.to_asm output 2012-04-22 14:04:27 -05:00
Bryan Bishop
c8b4c3203c fix MapEventHeader asm formatting 2012-04-21 23:46:58 -05:00
Bryan Bishop
c33c15befb remove duplicates from Asm output 2012-04-21 23:37:02 -05:00
Bryan Bishop
4f683d6421 hmm duplicate insertions 2012-04-21 18:59:58 -05:00
Bryan Bishop
26e0ee9545 TrainerFragments pointing to 0x26ef should be ignored 2012-04-21 18:24:54 -05:00
Bryan Bishop
2588ff6255 insertion of asm dependencies 2012-04-21 18:09:03 -05:00
Bryan Bishop
c42b254081 fix bug parsing INCBIN lines 2012-04-21 16:11:00 -05:00
Bryan Bishop
b597af7c57 probably right insertion routine for Asm 2012-04-21 16:06:22 -05:00
Bryan Bishop
02497888f6 Incbin.split method similar to split_incbin_line_into_three 2012-04-21 12:38:12 -05:00
Bryan Bishop
285b3066a4 foundation for asm parsing 2012-04-21 11:33:23 -05:00