pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity
2,846 Commits 1 Branch 0 Tags
Commit Graph

2846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PikalaxALT
b1dc88b728 Experience and level calculations 2015-11-03 12:36:33 -05:00
PikalaxALT
40eae001a1 Status strings 2015-11-03 09:45:25 -05:00
PikalaxALT
4a16bbe45a sprite_header and emote_header 2015-11-03 09:16:56 -05:00
yenatch
1c1fe276ca Merge pull request #324 from PikalaxALT/master 
Movement and map objects
 2015-11-03 07:56:05 -05:00
PikalaxALT
2faa4a0f70 Fix errors in global substitution 2015-11-03 07:11:32 -05:00
PikalaxALT
0f37a42ad4 Mart constants 2015-11-02 17:38:08 -05:00
PikalaxALT
d495087026 Removed \2\@ from map_header_2 2015-11-02 15:06:09 -05:00
PikalaxALT
72af3337fd No more NONE 2015-11-02 14:37:02 -05:00
PikalaxALT
e0d6e9ca7a Fix NorthMapObjectIndexBuffer etc 2015-11-02 12:54:27 -05:00
PikalaxALT
d35cfad0de object_struct 2015-11-02 11:15:32 -05:00
PikalaxALT
76e2ea534f Object masks 2015-11-01 21:17:46 -05:00
PikalaxALT
6b2d0ae841 Fix merge conflicts 2015-11-01 18:19:52 -05:00
PikalaxALT
010b450834 Prepare to merge 2015-11-01 18:13:31 -05:00
IIMarckus
25c126c69b Revert bad merge. 
"Merge pull request #317 from yenatch/pngs-kind-of"

This reverts commit 25025d1b6c00e94ac9e479747898d30267fb3282, reversing
changes made to 0d17d4a75866d053f5e0b48c66deb2508071d98b.
 2015-11-01 16:06:15 -07:00
PikalaxALT
31c407bb3d Buena local labels 2015-11-01 12:44:30 -05:00
PikalaxALT
3b4805ee98 Sweepthrough of ClearBox arg conversion to lb 2015-11-01 09:38:48 -05:00
PikalaxALT
fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT
8153737bae Enumerate text constants 2015-10-30 10:34:35 -04:00
PikalaxALT
ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
yenatch
006d14640c Merge pull request #319 from JimB16/master 
Added comments and changed labels (mainly for AI- and Battle-Functions)
 2015-10-27 14:30:22 -04:00
yenatch
25025d1b6c Merge pull request #317 from yenatch/pngs-kind-of 
Pokemon and trainer pngs
 2015-10-26 11:02:26 -04:00
yenatch
c21b6fb285 Commit the overworld sprite pngs. 2015-10-26 10:59:45 -04:00
yenatch
e638cdb74c Merge remote-tracking branch 'origin/master' into pngs-kind-of 
Conflicts:
	INSTALL.md
 2015-10-26 01:34:08 -04:00
JimB16
9a9cb38e39 merge with newest update 2015-10-26 03:26:53 +01:00
yenatch
0d17d4a758 Merge pull request #322 from PikalaxALT/master 
Split out and comment phone and animation code.
 2015-10-25 20:48:44 -04:00