Commit Graph

315 Commits

Author SHA1 Message Date
Bryan Bishop
e15fcc4fd8 md5 -> hashlib
original-commit-id: 671e2b1289950586723078b3b29d14c9631ac140
2012-11-30 10:17:23 -06:00
Bryan Bishop
a21b183757 move allowed_lengths for music macros out
This moves the allowed_lengths setting out of the preprocessor. Special
cases should not be hardcoded in the preprocessor.

original-commit-id: a1a9fa5560e01d97c7c33bbf8bb19fe4e76d3c28
2012-11-30 09:54:02 -06:00
padz
ff24a0d621 implement music macros; INCLUDE injection in pre
original-commit-id: 3626ddebd1dd7363c98b403ba1fe3c2d7dc598ee
2012-11-30 05:58:00 -05:00
Bryan Bishop
786d4fb35d remove deprecated functions from crystal.py
original-commit-id: 69c012511242cda45d1e60014833823226583093
2012-10-11 19:05:49 -05:00
Bryan Bishop
25ece07f34 clean up comments in extras/crystal.py
This fixes the inconsistent comment formatting throughout the file.

There should be a space between the comment token and the comment
message, otherwise this file is less fun to read.

original-commit-id: e6c95e22c9a61b5a8817c7a5ae0fb235c01d722c
2012-10-01 13:11:52 -05:00
Bryan Bishop
689a501e97 call load_asm in scan_for_predefined_labels
original-commit-id: d23972b7a3bf387ffa883fa0c8f2827b0b826e84
2012-09-10 22:30:58 -05:00
Bryan Bishop
107fc14663 use decimal output for givepoke in extras/crystal.py
original-commit-id: 6f8c3e5c3ea2edb80fddd2d17cf689fc1da39120
2012-07-05 10:25:33 -05:00
Bryan Bishop
b27e547509 more de-dependency-looping
original-commit-id: 1342ab67db4301563d317722d04fab9473411fda
2012-06-20 01:42:33 -05:00
Bryan Bishop
8fe39c647b move code around to avoid dependency loops
original-commit-id: ca07f1d64c0235b49160fc501553a70af8331d81
2012-06-20 01:13:15 -05:00
Bryan Bishop
88d1cd8197 make unittest2 error show up in stderr
original-commit-id: 914470651080df7cf0bf36e3fa45ed299dd694ec
2012-06-02 11:42:09 -05:00
Bryan Bishop
31d92266f9 fix up AsmSection and line_has_comment_address
original-commit-id: d174c8b7c6ba0fd9da2b8145e3f8ec5909917e29
2012-05-29 14:50:35 -05:00
Bryan Bishop
895f32e891 move AsmList into romstr.py too
original-commit-id: 0edf9eb8b8d5bdf74b8af18401a92c2ce7a2c2a3
2012-05-29 13:19:02 -05:00
Bryan Bishop
19e3c8ae4e move RomStr into a shared file
original-commit-id: ee7d39bf046ca4b8c40eb293d50657cda151dc58
2012-05-29 13:08:43 -05:00
Bryan Bishop
f2c2dbc90c use map constants for wildmons sections
original-commit-id: 0aecb683a0aa7a2c38f0f9bc5c1fff4085bf245e
2012-05-28 10:30:45 -05:00
Bryan Bishop
ac230bdee9 update to_asm on MapHeader to use the BANK macro
original-commit-id: a9b0eb4d87410f453c2135092ef2f810845b746a
2012-05-28 09:51:49 -05:00
Bryan Bishop
3528fd881b insert all map connections
original-commit-id: 5e37b9a97fc2b2054d35ce36575dd0fd204bb2bf
2012-05-28 00:16:38 -05:00
Bryan Bishop
d0ea2e74c0 don't use any particular formula for strip-destination west/east
original-commit-id: 2fe10a6682299f03415c9d1ecceb11007a032691
2012-05-27 23:50:18 -05:00
Bryan Bishop
cb9a67ad84 fix typo in strip destination pointer (north) calculations
original-commit-id: 7d9552b5fa9be937f39dbe03c7f5f369c3886a7a
2012-05-27 20:02:34 -05:00
Bryan Bishop
051efc9de8 do all the connection to_asm output
original-commit-id: d48ce599970d3d7077477ed000dfb38e146d3448
2012-05-27 19:45:44 -05:00
Bryan Bishop
a4fa1665ca asm output for strip pointer formulas
original-commit-id: da74952bf72048e075073f5389630f964b42c7ce
2012-05-27 18:24:09 -05:00
Bryan Bishop
3fa144bb24 better formulas for strip_destination and window
original-commit-id: 5b59d0776b5b07e6128f48d4e9743c8a3c0477ac
2012-05-27 15:54:44 -05:00
Bryan Bishop
62963ee671 improve formulas for calculating strip_pointer
original-commit-id: a32c6d0aa40b4d240b97828796da08b9becbd479
2012-05-27 13:46:58 -05:00
Bryan Bishop
cb865cc243 better equations for calculating strip_pointer in connections
original-commit-id: 56e0795d0dd40cd9525291b13dbf4f2df2691bda
2012-05-27 12:51:53 -05:00
Bryan Bishop
5dab9a01f6 some broken code
original-commit-id: fbaadd97ac995da8d0f3dcbe68e75eed7ba2569d
2012-05-26 23:13:48 -05:00
Bryan Bishop
fe1d9a7d1e east connections?
original-commit-id: 3a614ddcea0656a3297af78f305de64de38c41a1
2012-05-26 22:19:53 -05:00
Bryan Bishop
661e66d89c fix MainText/PokedexText interaction
original-commit-id: 30695eec25a544662752052d936cce231488002d
2012-05-26 16:10:11 -05:00
Bryan Bishop
ec6a3b89a3 start to parse the connection data
original-commit-id: d88ea77cfafed57babb432eeb5ba64e7317c9db5
2012-05-26 14:46:34 -05:00
Bryan Bishop
27223d5b57 minor whitespace fix
original-commit-id: 6074a55e3d40fb6e94ecb07092317bf54f5e7ad7
2012-05-24 22:01:50 -05:00
Bryan Bishop
bd196063d3 fix more height/weight confusion and whitespacing
original-commit-id: 64f52b32ef3e271aff7e482d37bb76b3f35d7ed2
2012-05-23 19:40:12 -05:00
Sanky
05088b3d23 Dumped Pokédex data and entries.
original-commit-id: 765b555b47419526b7e442abb08b41d9f0f52478
2012-05-24 02:33:42 +02:00
Bryan Bishop
178ab6f333 fix PokedexText?
original-commit-id: 4ec6dfc5fea3429e920c80fb7384a23a7fa0996f
2012-05-23 18:15:48 -05:00
Bryan Bishop
60c1e32216 fix PokedexText
original-commit-id: 38eae01fcd134b4ef55ae8cac62626ff52015687
2012-05-23 17:56:34 -05:00
Bryan Bishop
8021dbee59 quick fix for PokedexText
original-commit-id: 1663472cf61e999168c2ba2a4b5f55de56c95c91
2012-05-23 17:39:30 -05:00
Bryan Bishop
8d7df87373 use PokedexText to parse text-script-like text without the first bash command
original-commit-id: 0c778f2930d91dbfde77b75c0147240c713a5085
2012-05-23 17:38:15 -05:00
IIMarckus
54003acc82 Use Pokémon IDs for the “cry” macro.
original-commit-id: bd1760f3f978f8cd0e5fbd65a7aedad612b4381f
2012-05-22 19:57:09 -06:00
Bryan Bishop
b9e91a809b dump-insert the stringtotext targets
original-commit-id: 4b2d26965ef9f48860d83e3b19fddc7fda0db799
2012-05-22 11:57:00 -05:00
Bryan Bishop
5055302451 use EncodedText for stringtotext params
original-commit-id: 256795769263d5fc392e1ca4b56736832a4a9d64
2012-05-22 11:50:25 -05:00
Bryan Bishop
dfe7d7ce34 check if trainer_names has been set yet before using that key
original-commit-id: cb5eae3e9de8c1a79ce6b69a70fb4a5dd0b73d9b
2012-05-22 11:44:42 -05:00
Bryan Bishop
40b3d689e7 add '@' to EncodedText output
original-commit-id: c16d796c27ad011f409f2110cf3e50b94198812a
2012-05-22 11:38:57 -05:00
Bryan Bishop
0a68c5cadb at least try to keep HoOh in tact in label names
original-commit-id: e517b30a14e39f60b0f98c2c7184771245aa2465
2012-05-21 01:38:11 -05:00
Bryan Bishop
49c1480082 fix line continuation syntax error
original-commit-id: 7641b53a6a1e945aeade2958295bb0f5fd84fad5
2012-05-21 01:35:45 -05:00
Bryan Bishop
6d5c10b8ad add trainer id to trainer fragment headers for grunts
original-commit-id: 9ea35422f8e54811a6ad51c06bb4300c146bc832
2012-05-21 01:34:21 -05:00
Bryan Bishop
6afd0dd3f2 improvements to map_name_cleaner
original-commit-id: 377a212322a47c7117163010d7a1648131400afe
2012-05-21 01:31:26 -05:00
Bryan Bishop
5dca99fe60 add the labels to the scripts, not to the params pointing to scripts
original-commit-id: ba72006077d276c85ed4c1e20d9a1f8610b566ed
2012-05-20 14:32:19 -05:00
Bryan Bishop
96b34ee905 better signpost labeling
original-commit-id: a34d4621eed4212f81540510829b960e87a638be
2012-05-20 14:23:13 -05:00
Bryan Bishop
7134fba663 use better label for MapEventHeader
original-commit-id: 61d3b8a6b460e9f8cea9a6cc91fef43aedcff59e
2012-05-20 09:56:27 -05:00
Bryan Bishop
f7fddb64fe reuse pre-existing/pre-inserted MapBlockData objects when possible
original-commit-id: a27a7f2892e5b24f4446d46c892b7d38ff3f6970
2012-05-20 09:37:43 -05:00
Bryan Bishop
b77dac770a make map header labels use better rules
original-commit-id: 2c73f020a66e36bda80ff61ea24285527e67625c
2012-05-20 09:32:59 -05:00
Bryan Bishop
f4da55e93f don't add TrainerGroupTable to future dumps
original-commit-id: 1286f37a855aa5e7fca62698847c8d1f6b98a1b7
2012-05-20 04:32:39 -05:00
Bryan Bishop
7634addf82 give better labels to TrainerFragment subobjects like texts and scripts
original-commit-id: 38b986200243668deb8f80494589b577794ac410
2012-05-20 04:29:19 -05:00