Commit Graph

1144 Commits

Author SHA1 Message Date
yenatch
943e7b704f get_ram_label: Setup wram labels if they haven't been already. 2014-03-23 02:14:46 -04:00
yenatch
de39f7c6ff PointerLabelParam: Return valid (or at least informative) arguments.
PointerLabelParam.to_asm() returns a label by default.

If no label exists, instead return a bank and address.
This will not compile (maybe it ought to), but it
simplifies debugging.
2014-03-23 02:12:26 -04:00
yenatch
da0ccc6e1d Refactor read_bss_sections into a class.
- Pass a constants dict into eval instead of using globals
- Read same-line labels and tokens
2014-03-07 00:23:05 -05:00
yenatch
f300444ca1 wram: Interpret rgbasm macros and fix token logic.
This doesn't read same-line tokens after labels yet.
2014-03-05 03:13:09 -05:00
Bryan Bishop
c9f9d7f280 Merge pull request #68 from yenatch/master
crystal: use a 16-bit PokemonParam for event scripting command `cry`
2014-02-06 20:22:02 -06:00
yenatch
657a27badb crystal: use a 16-bit PokemonParam for event scripting command cry
fixes 2a44f6e4
2014-02-06 21:18:40 -05:00
Bryan Bishop
6e6028ae3e Merge pull request #66 from yenatch/noise
Dump and format all types of sound data correctly.
2014-02-06 19:03:21 -06:00
Bryan Bishop
31ec935141 Merge pull request #67 from yenatch/merge-old-commits
Merge some older commits that never made it into pull requests
2014-02-06 19:02:31 -06:00
yenatch
b18976e8ed Merge branch 'kanzure/master' into merge-old-commits
Conflicts:
	pokemontools/map_editor.py
2014-02-06 19:58:21 -05:00
yenatch
8b72eedc2c audio: Import sound names outside of functions 2014-02-06 19:53:21 -05:00
yenatch
b89a36e9a2 audio: Docstrings for functions that didn't have any. 2014-02-06 19:49:44 -05:00
yenatch
00d2cbc4eb labels: exported labels are labels too 2014-02-06 19:00:50 -05:00
yenatch
7571be9e6f crystal: unknownmusic0xdf -> togglesfx 2014-02-06 18:59:38 -05:00
yenatch
c723f32d11 audio: Don't use underscores in base labels 2014-02-06 18:40:11 -05:00
yenatch
45833dcbaf audio: Add a comment to generate_crystal_sfx_pointers output 2014-02-06 18:39:03 -05:00
yenatch
108086fcf3 audio: parse channel branches independently instead of running past the end 2014-02-06 18:13:03 -05:00
yenatch
527b9ac7ff audio: Dump an unknown sound effect 2014-02-06 17:13:34 -05:00
yenatch
7b381c5461 audio: rework sfx dumps and fix incbin insertion 2014-02-06 16:56:22 -05:00
yenatch
d893d11212 audio: Use generate_label_asm instead of manually creating label asm 2014-02-06 05:31:17 -05:00
yenatch
c694af14c2 audio: Include unreferenced cries in dump_crystal_cries output 2014-02-06 05:27:01 -05:00
yenatch
7bc0473f5e audio: Refactor output handling.
Drastically improves execution time.
2014-02-06 04:53:58 -05:00
yenatch
15eca02957 audio: Distinguish between sound and noise commands
sound takes a word for frequency, and noise takes a byte
2014-02-06 01:42:18 -05:00
yenatch
6a2a47074e audio: Crystal sfx are in a separate clump 2014-02-05 22:57:39 -05:00
yenatch
fced980337 sfx_names: UnknownCb to UnknownCB 2014-02-05 22:41:37 -05:00
yenatch
9976bf57be audio: Clean up output and fix sfx handling 2014-02-05 22:33:39 -05:00
yenatch
5272a1693f sfx_names: 1St, 2Nd to 1st, 2nd 2014-02-05 22:31:54 -05:00
Bryan Bishop
61b83803be Merge pull request #65 from yenatch/rgbasm-equs
preprocessor: rgbasm "EQUS" takes string literals
2014-01-22 07:12:22 -08:00
yenatch
89ca24a934 preprocessor: rgbasm "EQUS" takes string literals 2014-01-19 19:37:35 -05:00
Bryan Bishop
074e47aeea Merge pull request #63 from yenatch/map-editor-saving
map_editor: allow saving new maps + save file dialog
2013-12-29 01:18:49 -08:00
yenatch
c234cdd903 gfx: touch exported lz files so they don't get remade 2013-12-29 04:13:56 -05:00
yenatch
51d6f1edca map_editor: allow saving new maps + save file dialog
saves to newmap.asm by default
2013-12-29 03:59:35 -05:00
Bryan Bishop
6ec167512e Merge pull request #62 from yenatch/battle-animations
* event command macro storetext actually took one param

* PointerLabel{Before,After}Bank now take a label instead of the redundant BANK(label), label

* use the from_asm() method for all macros

* no more macro logic in the preprocessor

* read and write RGB macros for palettes instead of binary chunks

* battle animation macros
2013-12-28 17:04:15 -08:00
yenatch
70cd4f7c00 audio: use labels.line_has_label and clean up crystal imports 2013-12-28 19:57:37 -05:00
yenatch
82389c9998 audio: note duration from 0-15 to 1-16 to match pokered 2013-12-28 19:53:32 -05:00
yenatch
981e0c634f audio: fix Noise and size handling for nybble params 2013-12-28 18:32:35 -05:00
yenatch
486483ef19 don't use children functions in sort_asms 2013-12-27 21:46:29 -05:00
yenatch
020ae38d34 wram: return an empty dict for missing constants files 2013-12-25 06:54:52 -05:00
yenatch
d983b8a02a battle_animations: docstring for battle_anim_label 2013-12-25 06:52:55 -05:00
yenatch
906472a8f1 battle_animations: docstring for BattleAnim, consistent sorting 2013-12-25 06:44:31 -05:00
yenatch
bddb346ca0 battle_animations: dont use globals for macros in class BattleAnim 2013-12-25 06:31:58 -05:00
yenatch
dd471c6d5d rename battle animation command class Wait to BattleAnimWait 2013-12-25 06:19:06 -05:00
yenatch
f0538721a3 battle_animations: dont combine print and text conversion 2013-12-25 06:11:03 -05:00
yenatch
12f0578a6c audio: more readable asm list sorting 2013-12-25 06:10:44 -05:00
yenatch
9dc5b70cac map_gfx: read rgb macros for palettes 2013-12-23 03:40:04 -05:00
yenatch
d996bcf18e map_editor: read rgb macros instead of binary data for palettes
also fix tileset graphics handling
2013-12-23 03:32:50 -05:00
yenatch
b5c3ef9b4f gfx: 1bpp-to-png option 2013-12-21 00:38:11 -05:00
yenatch
efe0b717ef Merge remote-tracking branch 'kanzure/master' into battle-animations
Conflicts:
	pokemontools/wram.py
2013-12-21 00:37:35 -05:00
yenatch
973a78167b gfx: use RGB asm macros for .pal files
simpler to edit by hand than bin dumps
2013-12-19 19:35:21 -05:00
yenatch
049891c4ed battle animations 2013-12-19 04:24:48 -05:00
Bryan Bishop
f0aaf3cd56 Merge pull request #61 from kanzure/path-finding
Some basic path finding stuff
2013-12-18 18:22:42 -08:00