1381 Commits

Author SHA1 Message Date
Bryan Bishop
00b36922d2 remove a special case for MoneyByteParam
The preprocessor should ideally have no special cases for macros at all
in the first place. But it does. This one doesn't seem to be necessary.
2013-08-28 16:14:23 -05:00
Bryan Bishop
ddc4a92905 Merge pull request #161 from kanzure/remove-extras
This merges branch 'remove-extras' into master. The extras/ path is now
replaced by a git submodule that is independently version controlled and
separate from the pokecrystal project.

The git submodule is a reference to v1.1.0 of this repository:
    https://github.com/kanzure/pokemon-reverse-engineering-tools

It's also available as a generic python module now:
    https://pypi.python.org/pypi/pokemontools

https://github.com/kanzure/pokecrystal/pull/161
2013-08-27 11:18:30 -05:00
Bryan Bishop
94f5f61265 bump extras submodule to v1.1.0
The extras submodule is provided by pokemon-reverse-engineering-tools
v1.1.0 at commit 016f0206b5029fc83a6200be29b0f980c76dfd90.
2013-08-27 11:17:14 -05:00
Bryan Bishop
3453879756 Merge branch 'master' into remove-extras 2013-08-27 10:51:30 -05:00
Bryan Bishop
c61b3d42ad Merge remote-tracking branch 'yenatch/merge-kanzure-again' into master 2013-08-26 11:50:30 -05:00
Bryan Bishop
5098ed740d Merge remote-tracking branch 'github/master' into master 2013-08-26 11:49:04 -05:00
yenatch
76fe7c5aa1 Merge remote-tracking branch 'kanzure/master' into merge-kanzure-again
Conflicts:
	wram.asm
2013-08-21 14:04:06 -04:00
yenatch
27e1d3fabf Merge branch 'master' into merge-kanzure 2013-08-21 14:02:13 -04:00
yenatch
7b5ffb5475 more field move asm/scripts 2013-08-21 14:01:51 -04:00
yenatch
5db04abdab TileType is actually TileCollision 2013-08-21 14:01:50 -04:00
yenatch
9ac0fc631b formatting in TileTypeTable and tile checks 2013-08-21 14:01:50 -04:00
yenatch
636a960909 split out text engine 2013-08-21 14:01:49 -04:00
yenatch
c1d0253162 graphics loading functions (2bpp and 1bpp) 2013-08-21 14:01:48 -04:00
yenatch
35de889dd7 split out decompression 2013-08-21 14:01:46 -04:00
yenatch
802c3149c0 Merge commit 'd2d5c09'
Conflicts:
	main.asm
	wram.asm

Git couldn't figure out what this commit did, so it was redone to merge.
2013-08-21 13:54:35 -04:00
yenatch
99d2ee2bdc split out program init 2013-08-20 03:26:37 -04:00
yenatch
4b0889b396 remove unnecessary incbin lengths 2013-08-20 03:20:49 -04:00
yenatch
6b2faef6f1 remove garbage data in tileset 31 metatile defs 2013-08-20 03:18:35 -04:00
yenatch
5fe7c6bb67 johto/kanto maps 2013-08-20 02:55:14 -04:00
yenatch
29085399a2 copyright graphics 2013-08-20 02:09:35 -04:00
yenatch
91474f1b86 MBC3SRAMEnable is actually MBC3SRamEnable 2013-08-20 01:38:05 -04:00
yenatch
5b7d887f9d comment program init functions 2013-08-20 01:35:15 -04:00
yenatch
3460b82d22 update hram addresses in engine/vblank.asm 2013-08-19 20:49:41 -04:00
yenatch
df21dbccb7 $ffcf $ffd0 -> hSCX hSCY 2013-08-19 18:46:56 -04:00
yenatch
b66bac8a44 hram: hSCX, hSCY 2013-08-19 18:44:57 -04:00