Bryan Bishop
9ce504f528
Merge pull request #174 from yenatch/boxmons
...
boxmons and related structs
2013-08-30 11:35:49 -07:00
Bryan Bishop
9da5768b34
fix baserom.gbc check in Makefile
2013-08-29 11:56:20 -05:00
Bryan Bishop
61dd634698
Merge pull request #169 from kanzure/fail-fast-without-baserom
...
Fail fast when the baserom.gbc file doesn't exist.
2013-08-29 09:51:32 -07:00
Bryan Bishop
4f685791c1
Merge pull request #171 from kanzure/remove-imports-from-preprocessor
...
Two more unused imports from preprocessor
2013-08-28 18:33:33 -07:00
Bryan Bishop
3fb03e9981
two more unused imports from preprocessor
2013-08-28 20:31:17 -05:00
Bryan Bishop
52c3daca54
Merge pull request #170 from kanzure/fix-up-preprocessor
...
Remove some globals from preprocessor.
2013-08-28 17:54:02 -07:00
Bryan Bishop
e4d3ea7256
don't use globals in the preprocessor
...
Macros are now passed around as lists and dicts.
2013-08-28 17:53:26 -05:00
Bryan Bishop
16bfc01124
use generic skippable macros in preprocessor
...
This removes TextEndingCommand from the preprocessor. Instead, there is
a generic concept of a skippable type of macro like "db".
This adds SkippableMacro to the preprocessor.
2013-08-28 17:18:29 -05:00
Bryan Bishop
b602cc9bd6
don't directly reference two macro classes
...
Ideally the macro classes will be removed from the preprocessor core
soon, there's no reason they should be infecting these functions.
2013-08-28 16:48:29 -05:00
Bryan Bishop
d46d1901c2
Merge branch 'remove-another-moneybyteparam-special-case' into master
2013-08-28 16:34:06 -05:00
Bryan Bishop
6d612c8828
remove MoneyByteParam from preprocessor
...
It didn't belong in there. All of the references were removed.
2013-08-28 16:33:27 -05:00
Bryan Bishop
a4782d9b5a
Merge branch 'master' into remove-another-moneybyteparam-special-case
2013-08-28 16:32:15 -05:00
Bryan Bishop
0236b59360
remove another MoneyByteParam special case
...
This updates the preprocessor to just look for a from_asm method on the
class for the parameter it's processing. If there's a from_asm method,
then it uses it to spit out the right asm.
2013-08-28 16:30:47 -05:00
Bryan Bishop
53d208ce4c
fail fast when the baserom.gbc file doesn't exist
...
One day this will not be required. But until then, waiting one or more
seconds for the build to fail just to learn that you forgot baserom.gbc
is really silly.
This makes failure almost instantaneous compared to before, which would
take between one and ten seconds depending on system performance.
fixes #167
2013-08-28 16:22:50 -05:00
Bryan Bishop
16f6619ac8
Merge pull request #168 from kanzure/remove-preprocessor-special-case
...
Remove a special case for MoneyByteParam.
2013-08-28 14:15:58 -07:00
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
849e5a7d0f
game freak presents splash
2013-08-23 01:26:35 -04:00
yenatch
ac7b7ede0b
more bank 0 labels instead of static addresses
2013-08-23 01:11:53 -04:00
yenatch
8105dc6c7c
BoxMons in main.asm
2013-08-22 18:34:01 -04:00
yenatch
35a16b4860
Party/BoxMon nickname enders
2013-08-22 15:40:00 -04:00
yenatch
231adfe99c
boxmon labels in sram
2013-08-22 14:01:46 -04:00
yenatch
179decd644
GiveOddEgg and related asm
...
That's it for bank 7e
2013-08-21 17:25:24 -04:00
yenatch
7f96387411
dump odd eggs
2013-08-21 16:02:36 -04:00
yenatch
cc1f57ec93
condense IncGradGBPalTable
...
this way is more readable too
2013-08-21 14:49:35 -04: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
yenatch
449bda272a
$ffd1 $ffd2 -> hWX hWY
2013-08-19 18:44:12 -04:00
yenatch
084083add0
hram: hWX, hWY
2013-08-19 18:42:01 -04:00
