Commit Graph

828 Commits

Author SHA1 Message Date
yenatch
b0fa67a511 wram: fix section address allocation
who wrote this?
2013-12-11 20:28:25 -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
U-Fish-PC\Daniel
c57e0f0706 Add pokered music tools 2013-10-13 10:50:09 -04:00
U-Fish-PC\Daniel
1b56d95aa0 Add pokered music commands 2013-10-13 10:49:07 -04:00
Bryan Bishop
1089cf99d0 Merge pull request #42 from yenatch/script-commands
rename some event script commands
2013-09-30 21:43:28 -07:00
yenatch
bcb3295dbd use 'wait' for events instead of move effects 2013-10-01 00:36:39 -04:00
yenatch
a0397cad28 event script command 0xaa doesnt exist 2013-09-30 22:40:21 -04:00
yenatch
7268b91c23 fix up the last few event scirpt commands 2013-09-30 22:40:14 -04:00
yenatch
f4b04ff8e9 if_greater_than and if_less_than commands were swapped 2013-09-26 18:22:27 -04:00
Bryan Bishop
f3fb1f24ea Merge pull request #41 from kanzure/fix-crystal-config
Fix crystal.py configuration
2013-09-26 15:19:20 -07:00
Bryan Bishop
f7b6808797 fix configuration typo 2013-09-26 17:18:46 -05:00
Bryan Bishop
97fdec37ec fix crystal.py configuration
Ugh, it's still a global?
2013-09-26 17:17:18 -05:00
Bryan Bishop
c02c65fe74 Merge branch 'yenatch/map-editor' into master
Conflicts:
	pokemontools/crystal.py

Fixes #40.
2013-09-26 10:46:04 -05:00
yenatch
3496b81eb3 crystal.py: no more relative paths 2013-09-26 03:13:15 -04:00
yenatch
001b6bc850 map_editor: create any pngs that don't exist yet 2013-09-26 02:52:45 -04:00
yenatch
92eeee28dd map_editor: skip any nonexistent tiles in map rendering 2013-09-26 02:49:37 -04:00
yenatch
96574a08ee map_editor: more flexible macro handling
makes less assumptions about the structure of a header
2013-09-26 02:27:01 -04:00
Bryan Bishop
cff5ce9bc8 Revert "tabs to spaces (pep8)"
This reverts commit 9bea14db79.

Conflicts:
	pokemontools/map_editor.py
2013-09-26 01:24:13 -05:00
Bryan Bishop
907217fb90 Merge pull request #38 from kanzure/importable-map-editor
Importable map editor
2013-09-25 23:17:28 -07:00
Bryan Bishop
9d1a68cce5 refactor a global constant to be set in __init__ 2013-09-26 01:09:50 -05:00
Bryan Bishop
3f28232f0d put the tk loop into __main__ 2013-09-26 01:06:19 -05:00
Bryan Bishop
e4b2d2e4d2 minor formatting fix 2013-09-26 01:05:23 -05:00
Bryan Bishop
9bea14db79 tabs to spaces (pep8) 2013-09-26 01:04:51 -05:00
yenatch
5f0bd7a2fe use config instead of configuration
this was kind of overzealous
2013-09-26 01:57:29 -04:00
yenatch
46f1a2e1c3 rename bit1/bit2 script commands to event/flag 2013-09-24 03:28:55 -04:00
yenatch
918adb82ba script commands wildon and wildoff got mixed up
this was a mistake in the original pksv spec and tauwasser's notes
2013-09-24 03:24:29 -04:00
Bryan Bishop
82fb73edc3 version bump to: v1.4.1
The previous version was uploaded with .swp files and a large libvba.so
that was in my working directory. I regret everything.
2013-09-21 21:45:51 -05:00
Bryan Bishop
480593e472 also exclude .*.swp files 2013-09-21 21:39:51 -05:00
Bryan Bishop
0da95fe05f version bump to: v1.4.0 2013-09-21 21:37:07 -05:00
Bryan Bishop
4b69463fb2 Merge pull request #35 from kanzure/include-everything
Include all pokemontools/ files in installs
2013-09-21 19:33:23 -07:00
Bryan Bishop
8caeec66b9 include all pokemontools/ files in installs 2013-09-21 21:32:29 -05:00
Bryan Bishop
5f959fa7c8 Merge pull request #31 from yenatch/map-editor
Another map editor.
2013-09-21 13:31:31 -07:00
Bryan Bishop
2374a9ce90 Merge pull request #33 from kanzure/dont-always-use-globals
Use try/except on globals.asm for preprocessing
2013-09-16 10:41:10 -07:00
Bryan Bishop
b67e68c6a1 use try/except on globals.asm for preprocessing 2013-09-16 12:40:37 -05:00
Bryan Bishop
4b36a0c41a Merge pull request #32 from kanzure/fix-an-import
Fix how pointers are imported
2013-09-16 10:37:39 -07:00
Bryan Bishop
427fbf4d04 fix how pointers are imported 2013-09-16 12:36:53 -05:00
yenatch
33c8e4147c map_editor: red: read tileset gfx filenames from source 2013-09-15 15:46:26 -04:00
yenatch
bd3b608188 barely-working map editor
works with both pokecrystal and pokered

version is crystal by default
2013-09-14 17:10:59 -04:00
Bryan Bishop
6809c951ac Merge pull request #30 from kanzure/cleanup-again
More cleanup of crystal.py
2013-09-12 21:45:01 -07:00
Bryan Bishop
0a9ccaebbb Merge pull request #29 from kanzure/fix-json-gitignore
Allow (some) json files in the repo
2013-09-12 21:40:30 -07:00
Bryan Bishop
9830c9dc0a Merge pull request #28 from kanzure/config-cleanup
Rename config.py -> configuration.py
2013-09-12 21:39:24 -07:00
Bryan Bishop
b9955a5e40 deglobalize map_internal_ids
Also, don't set global rom in the load_rom related methods. This will
nip everything for a while, but roms should be passed around as
references instead of globals.
2013-09-12 23:33:14 -05:00
Bryan Bishop
03a94980d8 pass around all_movements (not a global) 2013-09-12 23:27:44 -05:00
Bryan Bishop
6d075ba08c run_main -> main 2013-09-12 23:00:15 -05:00