pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,381 Commits 1 Branch 0 Tags 52 MiB
00b36922d2
Commit Graph

1381 Commits

This Branch
This Branch
All Branches
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
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
yenatch
8af06f3cc2 rename and clean up _Start, Init 2013-08-19 18:40:59 -04:00
yenatch
75d5cc3bb6 options menu 2013-08-17 05:57:14 -04:00
yenatch
deb5d1ed46 <&iimarckus> kill those labels please 2013-08-17 01:12:03 -04:00
yenatch
a29c13837d labels for IncGradGBPalTable 2013-08-17 00:53:19 -04:00
yenatch
4105ac8102 battle tower trainers and mons 2013-08-16 22:36:13 -04:00
yenatch
570d2ab1cf dt: three-byte value 
used for pokemon exp
 2013-08-16 22:35:31 -04:00
yenatch
4398dde8cb even more phone text (bank 5d) 2013-08-16 15:25:06 -04:00
yenatch
d83f8228ce dump some mobile link text 2013-08-16 15:15:06 -04:00
yenatch
f458f96427 even more phone text (bank 29) 2013-08-16 14:43:35 -04:00
yenatch
b3dcb0e875 pokegear radio channel names 2013-08-16 14:38:59 -04:00
Bryan Bishop
e44d0a2228 Merge pull request #165 from yenatch/make-mapfile-and-symfile 
generate a mapfile and symfile on compile
 2013-08-16 10:53:29 -07:00
Bryan Bishop
c9ea43345e Merge pull request #164 from yenatch/fix-install 
rework install instructions
 2013-08-16 10:50:15 -07:00
yenatch
dbe8f750fe generate a mapfile and symfile on compile 
the symfile is convenient and the mapfile is a better source for labels.json
 2013-08-16 13:43:04 -04:00
yenatch
5cc74ff025 rework install instructions 
apt-cyg no longer works and rgbds has been updated
 2013-08-16 13:40:59 -04:00
yenatch
ff453a514b LoadMenuDataHeader and intro player name menu 2013-08-16 04:58:14 -04:00
yenatch
caa7865ce7 extra phone text (bank 19) 2013-08-15 21:54:16 -04:00
yenatch
627914195d battle tower trainer text (bank 7b) 2013-08-15 06:09:12 -04:00
yenatch
000c6d1349 CheckContestMon and a couple labels in bank 0 2013-08-15 06:07:14 -04:00
yenatch
8ecd66f5d5 replace more addresses with labels 2013-08-14 05:42:28 -04:00
yenatch
2fb8d10c23 more bank 2 incbins 2013-08-14 05:38:12 -04:00
yenatch
7a8eb4e434 sort out player/battle backpic asm 2013-08-12 16:33:17 -04:00
Bryan Bishop
e545f0c1ea Merge commit '92152c9' into master 
Fix some script commands for the preprocessor and script parsers.
 2013-08-12 15:33:06 -05:00
Bryan Bishop
1cb19a03a3 Merge commit '8d75f96' into master 
Mostly sprite stuff.
 2013-08-12 15:16:23 -05:00