Commit Graph

1263 Commits

Author SHA1 Message Date
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
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
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
Bryan Bishop
c7a649c47d Merge pull request #160 from iimarckus/master
Add Time Capsule item conversions.
2013-07-25 15:58:35 -07:00
IIMarckus
3a6e587121 Add Time Capsule item conversions.
From http://forums.glitchcity.info/index.php/topic,6719.msg190623/topicseen.html#msg190623
2013-07-25 06:33:28 -06:00
Bryan Bishop
bb8990dc3c Merge pull request #157 from yenatch/overworld
overworld loop and movement
2013-07-12 19:16:49 -07:00
Bryan Bishop
226729d175 Merge pull request #158 from yenatch/gbz80disasm-more-data
gbz80disasm bugfixes
2013-07-11 09:01:02 -07:00
yenatch
90c18c5cf3 rst $28 -> JumpTable 2013-07-10 19:17:04 -04:00
yenatch
37c009ca1c player/script events 2013-07-10 19:17:04 -04:00
yenatch
0988d69d9d more scripting cleanup 2013-07-10 19:17:04 -04:00
yenatch
a3870db643 Clean up and remove incbins from script commands 2013-07-10 19:17:04 -04:00
yenatch
82ebad99de MapObjects and ScriptRunning 2013-07-10 19:17:04 -04:00
yenatch
aa62a4b88d version constant 2013-07-10 19:17:04 -04:00
yenatch
e7a7fcc924 crystal: add more movements 2013-07-10 19:17:03 -04:00
yenatch
24daef7afb SelectMenu 2013-07-10 19:17:03 -04:00
yenatch
dca6fd37cd start using relevant constants in wram.asm 2013-07-10 19:17:03 -04:00
yenatch
425b727784 make: check wram/constants 2013-07-10 19:17:02 -04:00
yenatch
fbf9ae7877 clean up StartMenu 2013-07-10 19:17:02 -04:00
yenatch
d3872d1aa9 chars: â–· 2013-07-10 19:17:02 -04:00
yenatch
6597eb7e50 Overworld input handling 2013-07-10 19:17:02 -04:00
yenatch
6765083c1c wram.py: allow space definitions using constants 2013-07-10 19:12:48 -04:00
yenatch
341e11cccb labels: hex is case-insensitive 2013-07-10 19:12:48 -04:00
yenatch
ba5cd8bbb8 use wram from outside extras 2013-07-10 19:12:48 -04:00
Bryan Bishop
9b71315d7b Merge pull request #156 from yenatch/cygwin-install
More cygwin installation instructions.
2013-07-10 15:35:46 -07:00
yenatch
3d3208425e apt-cyg is not a cygwin default; rgbds was outdated; simplify rgbds install 2013-07-10 18:31:28 -04:00
yenatch
daf3930984 crystal: wram label finding 2013-06-28 21:49:50 -04:00
yenatch
17b5e86311 crystal: 2pt script commands are for wram 2013-06-28 21:35:44 -04:00
yenatch
622d6b86f7 crystal: PointerLabelToScriptPointer bank is not reversed 2013-06-28 21:17:35 -04:00
yenatch
fee0f0d6a4 gbz80disasm: don't read data where there is none 2013-06-28 16:06:39 -04:00
yenatch
3a1f843e78 gbz80disasm: only track rom addresses for data 2013-06-28 00:10:38 -04:00
yenatch
fe4b13e304 gbz80disasm: use existing labels as addresses 2013-06-27 22:28:53 -04:00
Bryan Bishop
34c8cb8077 Merge pull request #154 from yenatch/movement
Movement.
2013-06-26 21:45:44 -07:00
yenatch
b9dfd607bb DoPlayerMovement and recomment ow surfing checks 2013-06-27 00:34:49 -04:00
Bryan Bishop
ff11134023 Merge branch 'github/master' into master.
Conflicts:
	extras/gbz80disasm.py

Comments.
2013-06-25 23:54:39 -05:00
Bryan Bishop
bd6a985317 Merge branch 'gfx-fixes-again' into master.
Various whitespace and formatting changes.
2013-06-25 23:48:44 -05:00
Bryan Bishop
7da503ac33 use rm -f in Makefile 2013-06-25 23:48:28 -05:00
Bryan Bishop
aee96a5cf7 Merge branch 'cogitokat/master' into master.
fixes #152
2013-06-25 23:47:59 -05:00
Bryan Bishop
78ee534e25 add jython stuff into .gitignore 2013-06-25 23:25:49 -05:00
Bryan Bishop
28268df40e remove extra whitespace in extras/vba.py 2013-06-25 23:23:46 -05:00