Commit Graph

124 Commits

Author SHA1 Message Date
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
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