Commit Graph

2222 Commits

Author SHA1 Message Date
Bryan Bishop
783a22cc21 Merge branch 'remove-extras-fix-make-gfx' into remove-extras 2013-08-03 21:42:03 -05:00
Bryan Bishop
36b7935bed Merge branch 'master' into remove-extras-fix-make-gfx 2013-08-03 21:40:45 -05:00
Bryan Bishop
daa0760e26 fix gfx/pics/%/front.lz make target
The parameter order was wrong, causing make to always try to make
front.lz files every run.
2013-08-03 21:29:49 -05:00
Bryan Bishop
268a2d28fd probably fix the pngs target for make
Update the submodule to a version where gfx.py is able to handle the
current paths.

Make some other fixes to Makefile to call gfx.py correctly.
2013-08-03 20:13:37 -05:00
Bryan Bishop
a94257c7f8 update Makefile for the new gfx.py path
Why isn't the build breaking?
2013-08-03 18:40:02 -05:00
Bryan Bishop
4619cf13de reset extras submodule to branch master
The eggify branch was a success, so the submodule's upstream changes
have been merged in.
2013-08-03 16:54:28 -05:00
Bryan Bishop
1265d503a3 Merge branch 'remove-extras-eggify' into remove-extras
Make pokecrystal work against the reverse engineering tools turned into
a python egg with sane structure and stuff.
2013-08-03 16:27:52 -05:00
yenatch
c01c2ad3c4 dump marts and related asm 2013-08-03 17:26:58 -04:00
Bryan Bishop
2a421c54b6 fix preprocessor imports for the latest submodule
I am surprised this worked. Maybe it's not actually working, and I just
have cached files everywhere.
2013-08-03 16:25:14 -05:00
Bryan Bishop
2b7b3b6dc2 update extras submodule on the "organizing" branch
The eggified version of all of the python stuff will probably not work
immediately.
2013-08-03 16:22:08 -05:00
Bryan Bishop
a5f1029d1c update extras submodule to latest master branch 2013-08-03 16:17:25 -05:00
yenatch
a2242e1b9d Merge branch 'sprites' 2013-08-03 16:34:51 -04:00
yenatch
0ee006a145 more item effects 2013-08-03 16:25:38 -04:00
yenatch
46fea97994 more step handling 2013-08-03 16:25:38 -04:00
yenatch
09dfa9f09e incbin unown font 2013-08-03 16:25:37 -04:00
yenatch
b07ab26c35 more predef constants 2013-08-03 16:25:37 -04:00
yenatch
0e50b4c798 more bank 1 incbins 2013-08-03 16:25:37 -04:00
yenatch
e2a0c68f4c comment more battle ui 2013-08-03 16:25:37 -04:00
yenatch
257302dff9 player hud stuff 2013-08-03 16:25:36 -04:00
Bryan Bishop
44c459ab81 INSTALL: fix extra newlines 2013-08-03 13:58:31 -05:00
Bryan Bishop
6bf0fab5df INSTALL: move general stuff out of windows section 2013-08-03 13:57:10 -05:00
Bryan Bishop
21a5ee0dd4 fix spacing in a markdown file 2013-08-03 13:56:16 -05:00
Bryan Bishop
4b5a5b6f0e update INSTALL.md with submodule instructions 2013-08-03 13:55:45 -05:00
Bryan Bishop
81c5b26945 Merge branch 'master' into remove-extras 2013-08-03 13:49:27 -05:00
Bryan Bishop
e880c29319 remove stray newline from README 2013-08-03 13:46:27 -05:00
Bryan Bishop
2e9caa75d7 Move extras/ into a git submodule. 2013-08-03 13:44:03 -05:00
Bryan Bishop
1c3ebf956d write comment in .gitignore 2013-08-03 12:17:28 -05:00
yenatch
ce31567c4d frames 2013-08-01 15:30:48 -04:00
yenatch
ff1536ddf9 refactor symfile parser and add labels.json generator 2013-08-01 14:54:33 -04:00
yenatch
d39dc68a88 field move asm 2013-08-01 05:34:10 -04:00
yenatch
59cb57b954 more cleanup 2013-07-31 19:17:35 -04:00
yenatch
b275df6974 correct misnamed sfx constants 2013-07-31 18:04:01 -04:00
yenatch
814ab52b21 cleanup and bank 9 menus 2013-07-31 18:03:18 -04:00
yenatch
d4e6ccca3b jp char ァ 2013-07-31 18:02:08 -04:00
yenatch
c9b70ba105 update predef/specials pointers 2013-07-30 01:05:20 -04:00
yenatch
4cb7c4e407 update known labels in main 2013-07-30 00:32:18 -04:00
yenatch
caaab30e66 reorder a couple wram labels
latest label is used in wram label replace
2013-07-29 23:59:05 -04:00
yenatch
50f1d7b788 no more incbins in bank 0 2013-07-29 23:58:02 -04:00
yenatch
7db40e0395 no more incbins in bank f 2013-07-29 17:53:59 -04:00
yenatch
ed200a5a16 fill out bank f more 2013-07-29 13:58:20 -04:00
yenatch
39d84d4491 bank f 2013-07-28 18:20:08 -04:00
yenatch
03413c9f43 common text 2 and some fixes to compile 2013-07-28 17:16:51 -04:00
yenatch
3070aeb915 make way for bank 6f 2013-07-28 03:39:05 -04:00
yenatch
5001d9b023 bank 6f is common text 2013-07-28 03:32:25 -04:00
yenatch
a0d54cce51 couple bank e functions 2013-07-28 03:12:03 -04:00
yenatch
5b07ea19d0 move descriptions 2013-07-27 16:31:29 -04:00
yenatch
0d0066a0da picking at bank 0 incbins 2013-07-27 15:19:35 -04:00
yenatch
5ecf9f1081 were gonna get bank 0 done!! 2013-07-27 05:43:15 -04:00
yenatch
6343e2ddaf Reset 2013-07-26 23:49:33 -04:00
yenatch
be0af35e3f over a million hours in gedit 2013-07-26 22:19:26 -04:00