Commit Graph

3983 Commits

Author SHA1 Message Date
Bryan Bishop a3dc607989 Merge pull request #4 from yenatch/document_some_asm
label expansion
2012-04-18 21:59:05 -07:00
padz 0784a952af accidentally repeated some labels 2012-04-19 00:54:46 -04:00
padz 534469658c forgot to expand moves 2012-04-19 00:24:49 -04:00
Bryan Bishop b7cca3a548 make unit tests work again 2012-04-18 23:20:28 -05:00
padz af0707166c expanding wram labels / modifying name convention 2012-04-19 00:18:36 -04:00
Bryan Bishop b7295080d5 add encoding to old_parse_scripts.py 2012-04-18 20:55:16 -05:00
Bryan Bishop 1877c7573e move Script.parse_old into its own file 2012-04-18 16:54:11 -05:00
Bryan Bishop 6a8e2d0ed4 spacing 2012-04-18 16:17:31 -05:00
Bryan Bishop 3f536b62a7 Merge pull request #3 from cnelsonsic/master
Move some pksv stuff back into crystal.py
2012-04-17 22:44:22 -07:00
C Nelson 475ec418dd Move some data back to avoid a circular import. 2012-04-17 23:33:23 -05:00
C Nelson c7838eec93 Fix an import. 2012-04-17 23:32:56 -05:00
Bryan Bishop 427c822910 Merge branch 'move-data-to-files' from cnelsonsic 2012-04-17 22:59:29 -05:00
C Nelson 17ab9dc558 Move a bunch of constant data into separate files. 2012-04-17 21:37:46 -05:00
Bryan Bishop 2d260da8ec Merge pull request #1 from cnelsonsic/master
Fix all the whitespaces.
2012-04-17 18:59:01 -07:00
C Nelson dac0a54deb Merge remote-tracking branch 'upstream/master' 2012-04-17 20:38:35 -05:00
C Nelson f19bd8638e Fixing whitespace for real this time. 2012-04-17 20:22:28 -05:00
C Nelson ae3857d64f Revert "Fix whitespace."
Discovered an overwritten incoming change.

This reverts commit 9ddcf90fcc.
2012-04-17 20:16:42 -05:00
Bryan Bishop 61ff35c181 .hgignore -> .gitignore 2012-04-17 20:05:16 -05:00
C Nelson 9ddcf90fcc Fix whitespace.
Add newlines around functions and classes, remove trailing whitespaces.
2012-04-17 20:03:27 -05:00
Bryan Bishop 41a5e27bdd use $byte not 0xbyte 2012-04-17 19:24:18 -05:00
yenatch 92f7a85103 clarifying move structure comment 2012-04-17 20:04:43 -04:00
Bryan Bishop 4d55533b73 insert the first map header (manually) 2012-04-16 13:43:27 -05:00
Bryan Bishop f3f2adb219 to_asm adds a label and end text
Need to write more tools for injecting asm into main.asm from the
python interpreter.
2012-04-16 09:55:28 -05:00
Bryan Bishop e97ba71d11 better asm output for MapScriptHeader 2012-04-15 22:12:10 -05:00
Bryan Bishop e3cf6313e7 fix SecondMapHeader asm output 2012-04-15 21:47:12 -05:00
Bryan Bishop f70c5cf74b restrict what shows up in script_parse_table 2012-04-15 18:26:06 -05:00
Bryan Bishop bd2a23379e keep track of these headers in globals 2012-04-15 18:24:56 -05:00
Bryan Bishop 6dda1a8fac fix MapScriptHeader parsing 2012-04-15 17:21:07 -05:00
Bryan Bishop b0b807e3ea MapEventHeader address fix 2012-04-15 16:37:31 -05:00
Bryan Bishop 2f3e59178f SecondMapHeader looks ok 2012-04-15 14:49:24 -05:00
Bryan Bishop 7cfe92c506 MapHeader parsing looks correct 2012-04-15 14:39:13 -05:00
Bryan Bishop 2b08f91d98 add the old parsers back in for testing 2012-04-15 14:33:41 -05:00
Bryan Bishop cbd8f0925a debugging statements 2012-04-15 12:26:46 -05:00
Bryan Bishop 00ab26a8c4 more fixes (sort of) 2012-04-15 01:27:20 -05:00
Bryan Bishop 441cb01c39 corrections to almost make things run 2012-04-15 01:18:25 -05:00
Bryan Bishop cbd896b8b9 MapHeader parsing and to_asm 2012-04-15 01:11:00 -05:00
Bryan Bishop 49add12c45 better code for MapScriptHeader 2012-04-15 00:50:48 -05:00
Bryan Bishop 746317f90e code for MapBlockData 2012-04-15 00:06:47 -05:00
Bryan Bishop 6b029c36fd to_asm on SecondMapHeader 2012-04-14 21:46:04 -05:00
Bryan Bishop 1ee335063f start on SecondMapHeader 2012-04-14 20:03:19 -05:00
Bryan Bishop 0cb84a7e3a class for MapEventHeader 2012-04-14 18:23:55 -05:00
Bryan Bishop f90f05050d XYTrigger class 2012-04-14 17:58:15 -05:00
Bryan Bishop 52b70619bc making things work 2012-04-14 15:48:26 -05:00
Bryan Bishop 93533ce068 PeopleEvent class code 2012-04-14 15:16:09 -05:00
Bryan Bishop 0c2c2cd3a3 skeleton for PeopleEvent class 2012-04-14 13:45:05 -05:00
Bryan Bishop 01a5c61d4d saner warp parsing 2012-04-14 13:01:20 -05:00
Bryan Bishop e099019701 better signpost parsing 2012-04-14 12:23:53 -05:00
Bryan Bishop f70650a158 start moving signpost into a class 2012-04-14 10:54:48 -05:00
Bryan Bishop 91df3747bf 0xcc probably ends the script 2012-04-09 00:38:55 -05:00
Bryan Bishop 63c161397d fix size computation in GivePoke 2012-04-08 23:47:28 -05:00