Commit Graph

139 Commits

Author SHA1 Message Date
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
Bryan Bishop
a04f88fbc0 better get_dependencies and MapEventHeader.to_asm
original-commit-id: 09908ecbdf84a178cc3101ae53eb4750b3a5d0f0
2012-04-20 22:19:01 -05:00
Bryan Bishop
dc0085d375 starting dependencies work
original-commit-id: c80279b98fdedd72f4da2a1b565a687015c1bf64
2012-04-20 18:26:52 -05:00
Bryan Bishop
9b832c0012 improvements to global to_asm
original-commit-id: a8da5fbda9be62bc1786954f9e62f3957c1764ed
2012-04-20 17:57:59 -05:00
Bryan Bishop
324e68af7c switch from "r" to "rb" when reading the ROM for Microsoft Windows users
original-commit-id: 628a1475785bf3f4dabf96787b84170736c109d5
2012-04-20 10:34:07 -05:00
Bryan Bishop
3bdade3a7f create maps directory if necessary
original-commit-id: 7114385997599104c259c378c656273b2486a54b
2012-04-19 22:17:22 -05:00
Bryan Bishop
aaf40541b1 make unit tests work again
original-commit-id: b7cca3a54857506f49975e7df5dc47b47f174d51
2012-04-18 23:20:28 -05:00
Bryan Bishop
eecc30a3c9 add encoding to old_parse_scripts.py
original-commit-id: b7295080d5713e589da7fbd1b1465870c83e889e
2012-04-18 20:55:16 -05:00
Bryan Bishop
f148191573 move Script.parse_old into its own file
original-commit-id: 1877c7573e9085787d4459e972c8298883af7a97
2012-04-18 16:54:11 -05:00
Bryan Bishop
90de015636 spacing
original-commit-id: 6a8e2d0ed4394b1302434a4ec1334c231a8f3b38
2012-04-18 16:17:31 -05:00
C Nelson
227a77ac3b Move some data back to avoid a circular import.
original-commit-id: 475ec418dda19164125a3994e3999d7d328e013a
2012-04-17 23:33:23 -05:00
C Nelson
30598bd310 Fix an import.
original-commit-id: c7838eec93586379f3b938e5553060a0fd3febc0
2012-04-17 23:32:56 -05:00
C Nelson
127dd914a2 Move a bunch of constant data into separate files.
original-commit-id: 17ab9dc558db716e02d86c48a0682489c499337e
2012-04-17 21:37:46 -05:00
C Nelson
5ef14c29e5 Fixing whitespace for real this time.
original-commit-id: f19bd8638ee329da200f9ce138c36136b6fef0ff
2012-04-17 20:22:28 -05:00
C Nelson
224bb7f87a Revert "Fix whitespace."
Discovered an overwritten incoming change.

This reverts commit 9ddcf90fccbab1f7be75c8675d875472ef016945.

original-commit-id: ae3857d64fbd3e9eb21e51420389829af0833175
2012-04-17 20:16:42 -05:00
C Nelson
9dcc07922d Fix whitespace.
Add newlines around functions and classes, remove trailing whitespaces.

original-commit-id: 9ddcf90fccbab1f7be75c8675d875472ef016945
2012-04-17 20:03:27 -05:00
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