Commit Graph

500 Commits

Author SHA1 Message Date
Bryan Bishop
0ad2dfdf48 use $byte not 0xbyte
original-commit-id: 41a5e27bdd68607746ba5376048a2dd79ad35296
2012-04-17 19:24:18 -05:00
Bryan Bishop
a1584535e7 to_asm adds a label and end text
Need to write more tools for injecting asm into main.asm from the
python interpreter.

original-commit-id: f3f2adb219594daf1c68058a247836ab4ffa81c6
2012-04-16 09:55:28 -05:00
Bryan Bishop
33b5f439ac better asm output for MapScriptHeader
original-commit-id: e97ba71d11629e7b97e37b73fedc7f6212c4aa84
2012-04-15 22:12:10 -05:00
Bryan Bishop
d866246581 fix SecondMapHeader asm output
original-commit-id: e3cf6313e783beb9eb8ddb165796df3b9bcc447e
2012-04-15 21:47:12 -05:00
Bryan Bishop
2f4cfb0adf restrict what shows up in script_parse_table
original-commit-id: f70c5cf74bb02fd3cbc3713c4ea0e256ad26187f
2012-04-15 18:26:06 -05:00
Bryan Bishop
27c5e4c56f keep track of these headers in globals
original-commit-id: bd2a23379ee4b7a69d43609f033cdb581080c385
2012-04-15 18:24:56 -05:00
Bryan Bishop
26e1e46945 fix MapScriptHeader parsing
original-commit-id: 6dda1a8fac3aad499a9e8ee6d67b73d68d3500bb
2012-04-15 17:21:07 -05:00
Bryan Bishop
6ed474f6ae MapEventHeader address fix
original-commit-id: b0b807e3ea4b210f92d65567bf252e2aa5f2297e
2012-04-15 16:37:31 -05:00
Bryan Bishop
aff3f45cfd SecondMapHeader looks ok
original-commit-id: 2f3e59178fc2c8d526c05041048fd27ef122015c
2012-04-15 14:49:24 -05:00
Bryan Bishop
3619373c4d MapHeader parsing looks correct
original-commit-id: 7cfe92c50673926167c42e3ef73d5cd7fe6c67d5
2012-04-15 14:39:13 -05:00
Bryan Bishop
70f42f1b10 add the old parsers back in for testing
original-commit-id: 2b08f91d983063014255cb109509a51c6ad08b3d
2012-04-15 14:33:41 -05:00
Bryan Bishop
cea041f2dd debugging statements
original-commit-id: cbd8f0925aa7a04969fc1263b23fc246b34879d9
2012-04-15 12:26:46 -05:00
Bryan Bishop
4cd5daab72 more fixes (sort of)
original-commit-id: 00ab26a8c43fc04bb18bb40cc752aa0836d00f9a
2012-04-15 01:27:20 -05:00
Bryan Bishop
a16d5fce34 corrections to almost make things run
original-commit-id: 441cb01c397ca37584ddbddf6e67079e1dcf199f
2012-04-15 01:18:25 -05:00
Bryan Bishop
4ea9099169 MapHeader parsing and to_asm
original-commit-id: cbd896b8b97f986250baeaa66a9b620f16b4bb62
2012-04-15 01:11:00 -05:00
Bryan Bishop
c0187efdb7 better code for MapScriptHeader
original-commit-id: 49add12c45ec20369d59890b5ebdfba2412772a5
2012-04-15 00:50:48 -05:00
Bryan Bishop
6ab6059684 code for MapBlockData
original-commit-id: 746317f90e797ce2189c13badea6df5dd03d2542
2012-04-15 00:06:47 -05:00
Bryan Bishop
13472328e1 to_asm on SecondMapHeader
original-commit-id: 6b029c36fdf93a9d70b7d581415ff4ac98531d26
2012-04-14 21:46:04 -05:00
Bryan Bishop
20cf5c1955 start on SecondMapHeader
original-commit-id: 1ee335063f95aadb3cd919d80d4744455552cc1c
2012-04-14 20:03:19 -05:00
Bryan Bishop
225290d8bf class for MapEventHeader
original-commit-id: 0cb84a7e3a012ca1fd80c506c55e63d8728bc635
2012-04-14 18:23:55 -05:00
Bryan Bishop
dd5144358a XYTrigger class
original-commit-id: f90f05050d3834a8d9fd6555c926e7d8c40ec12e
2012-04-14 17:58:15 -05:00
Bryan Bishop
a9d32953a0 making things work
original-commit-id: 52b70619bcb77f7e038691e6b9231fe65eedca34
2012-04-14 15:48:26 -05:00
Bryan Bishop
39d843d9c4 PeopleEvent class code
original-commit-id: 93533ce0681ba7c97256506b5b4d668167c41703
2012-04-14 15:16:09 -05:00
Bryan Bishop
02e22e1795 skeleton for PeopleEvent class
original-commit-id: 0c2c2cd3a3931bd08f55e40f2553dc6dceead555
2012-04-14 13:45:05 -05:00
Bryan Bishop
e9f2d7df61 saner warp parsing
original-commit-id: 01a5c61d4d7b95bda02604bd4ac3827001d4eb82
2012-04-14 13:01:20 -05:00
Bryan Bishop
f9bf4be2e9 better signpost parsing
original-commit-id: e099019701cad461988501ac65d35b053d29b800
2012-04-14 12:23:53 -05:00
Bryan Bishop
3b2b59d99c start moving signpost into a class
original-commit-id: f70650a15836170921a549539b90942dff3a193d
2012-04-14 10:54:48 -05:00
Bryan Bishop
a6ad25bd39 0xcc probably ends the script
original-commit-id: 91df3747bf0b92a47ac38feba32fca1dd351834c
2012-04-09 00:38:55 -05:00
Bryan Bishop
a0ecd40277 fix size computation in GivePoke
original-commit-id: 63c161397dda62e09d91f107b97c8880b45e8aee
2012-04-08 23:47:28 -05:00
Bryan Bishop
894a2895f8 japanese text dumper and some more script changes
original-commit-id: a06abcf9f4fa2a734b67268c9233c0bd30243078
2012-04-08 23:05:19 -05:00
Bryan Bishop
3eb33917a4 all of these scripting changes are probably wrong
original-commit-id: 36212177742d6d653c50c6333ac768cb09bb9ca8
2012-04-08 21:15:50 -05:00
Bryan Bishop
312f78c65a don't forget the custom GivePoke commad class
original-commit-id: b276eeb832659dd851c55b15dd5504d3957d96c5
2012-04-08 16:38:34 -05:00
Bryan Bishop
a598b23ede oops forgot to create a command class for writevarcode
original-commit-id: 4c3c85d2308558608c8c0f3d1e987ae908fb6948
2012-04-08 16:25:52 -05:00
Bryan Bishop
50f273c6de fix pokemart command parsing for the script at 0x9cac7
original-commit-id: 51ef61e327fba778c41c1042ddd0883c7be12402
2012-04-08 16:20:34 -05:00
Bryan Bishop
2939eb997b winlosstext does not always point to a value
original-commit-id: 247469f740e97c161cbd5f36a72e69d3c496a659
2012-04-08 16:09:00 -05:00
Bryan Bishop
67a38c5296 a working version of compare_script_parsing_methods
original-commit-id: 403652525acaf94f5078aeda945630cebe5ff515
2012-04-08 15:52:36 -05:00
Bryan Bishop
8c27050a9f begin compare_script_parsing_methods
original-commit-id: 8e6466feb711769c277c60a50cd542c2820f0b8e
2012-04-08 15:41:52 -05:00
Bryan Bishop
0c9d19daa2 text and script parsing improvements
original-commit-id: e85e71b6a6f6815456c8ddab608077699a4ea43e
2012-04-08 14:46:37 -05:00
Bryan Bishop
a650a86726 get_label_for improvements (use script_parse_table if possible)
original-commit-id: d331a28c7a437d1f7d6fe12ded986edab0b0e566
2012-04-08 13:40:55 -05:00
Bryan Bishop
395d0db9a1 make parse_text_at use script_parse_table and make 2writetext parse target texts
original-commit-id: bd33188588f43b1f3ac71f62af7155af936c8fc1
2012-04-08 13:35:35 -05:00
Bryan Bishop
c2daf4e7c8 fix bit setting/checking/clearing commands (their parameters were wrong)
original-commit-id: dd0dfc821c95ec85235c2ec6349f6fe08ef0dc83
2012-04-08 13:14:31 -05:00
Bryan Bishop
b525b4289f pass force=True/False and debug=True/False to command parsing
original-commit-id: d7ff5e5cebfb8349ef6b2263c227eb603e27f012
2012-04-08 12:19:03 -05:00
Bryan Bishop
87e3bc1b3e fixes for parse_script_with_command_classes
original-commit-id: e80f480da9dab91046b876ad02a47e6a2903b374
2012-04-08 11:48:23 -05:00
Bryan Bishop
81a0d46c49 move rom_interval into RomStr.interval
original-commit-id: 768c4c360ffdf84a2f6993703221579261f6938f
2012-04-06 14:22:35 -05:00
C Nelson
84fc578838 Making generate_diff_insert python2.7 compatible.
original-commit-id: bd06a22fb874dcc2a51255670656afec6f5e21ea
2012-04-06 13:12:30 -05:00
C Nelson
015d676f5a Adding compatibility for newer versions of json.
original-commit-id: 1d17d3e8104606da398becc8430d02aba5eea06b
2012-04-06 12:38:22 -05:00
C Nelson
cf9d55b811 Adding a real check for unittest2 features.
original-commit-id: 8dc750b1e4c3882edb42f88c72a148275c9355b8
2012-04-06 12:11:40 -05:00
C Nelson
721751dd57 Adding an exception handler around the unittest import.
original-commit-id: 4de0c12b438cf99e90070e723508ce636278e063
2012-04-06 11:54:48 -05:00
Bryan Bishop
76aab69763 fix command parsing some more
original-commit-id: 7b3b1f11b2887a58c7fd1a91345f16e2924d4879
2012-04-03 15:28:25 -05:00
Bryan Bishop
0c83eb9a98 not sure why the scripts aren't working yet
original-commit-id: 21081a08e1976a13b77057820724c2318f3f116f
2012-04-03 00:59:16 -05:00