Commit Graph

1269 Commits

Author SHA1 Message Date
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
Bryan Bishop
a07c92d3b3 Merge branch 'master' into path-finding 2013-12-18 20:20:09 -06:00
Bryan Bishop
d8f4e687eb Merge pull request #60 from yenatch/dependencies
wram: fix section address allocation
2013-12-11 17:42:00 -08:00
yenatch
b0fa67a511 wram: fix section address allocation
who wrote this?
2013-12-11 20:28:25 -05:00
Bryan Bishop
58de3846c7 Merge pull request #59 from yenatch/dependencies
Use a mapfile instead of labels.json; object dependency handling
2013-12-09 17:48:11 -08:00
yenatch
697e2fa2ad audio: sort output by content 2013-12-08 17:19:38 -05:00
yenatch
f35bb2c5cc scan_includes: join names properly and actually use conf.path 2013-12-08 01:26:09 -05:00
yenatch
f5ddc33705 preprocessor: dont write to globals.asm for each process 2013-12-07 05:05:54 -05:00
yenatch
05b622e7c0 labels: grab labels from a mapfile instead of an old json dump
labels.json had to be deleted manually to be updated, and rgbasm is better at scanning labels anyway
2013-12-06 19:44:02 -05:00
yenatch
460171a2c5 wram: cleaner line parsing
fixes 0fd121a8
2013-12-06 19:43:41 -05:00
yenatch
1be104b8e8 sym: rgbds does ram banks now 2013-12-06 19:39:34 -05:00
yenatch
806fd657c2 use file includes in rgbasm objects to generate dependencies 2013-12-05 21:21:08 -05:00
yenatch
0fd121a81e wram: try to determine addresses for section defs without any 2013-12-05 21:21:05 -05:00
yenatch
a401ebc620 crystal: make PointerLabelParam output just a label
to match the new from_asm handling
2013-12-04 01:20:47 -05:00
yenatch
fef1cdd4f2 preprocessor: str.split() already removes preceding/trailing whitespace 2013-12-02 23:48:24 -05:00
yenatch
3a586ef165 preprocessor: simplify macro_translator 2013-12-02 15:15:19 -05:00
yenatch
a648e0a8cd preprocessor: remove some redundant code in macro_translator 2013-12-02 15:08:19 -05:00
yenatch
07f7b1b892 preprocessor: get rid of PointerLabel cruft
now pretty much everything uses from_asm
2013-12-02 14:56:06 -05:00
yenatch
765e846a9e crystal: fix storetext and rework PointerLabel{Before,After}Bank
- storetext only takes one param
- the logic for PointerLabel*Bank was actually in preprocessor.py. theyve also been changed to take a single label
2013-12-02 14:45:52 -05:00
yenatch
79630cd43b wram: more consistent rgbasm value conversion 2013-12-02 14:44:16 -05:00
yenatch
2a44f6e448 crystal: some new param classes and reword bittable1 -> event flag 2013-12-01 16:26:15 -05:00
yenatch
10d8edbc3b map_editor: to_png got renamed 2013-11-30 19:11:20 -05:00
Bryan Bishop
a077e470b2 basic plan for drawing paths
This doesn't work yet.
2013-11-29 23:56:35 -06:00
Bryan Bishop
80f32f5b37 some code to prep for path planning 2013-11-29 18:49:56 -06:00
Bryan Bishop
4294fdc140 Merge pull request #58 from kanzure/map-editor-stuff
Minor map editor changes
2013-11-27 12:45:05 -08:00
Bryan Bishop
6b5f469df8 read sprite images from rom 2013-11-24 19:28:56 -06:00