pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
2,589 Commits 1 Branch 0 Tags
Commit Graph

2589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PikalaxALT
79ceca591b ITEMMENU_CLOSE is now ITEMMENU_FIELD 2015-10-25 20:43:39 -04:00
PikalaxALT
247a31c298 RIP ITEMCONTEXT constants 2015-10-25 18:47:27 -04:00
PikalaxALT
5b825653ad The jumb is too damn high! 2015-10-25 11:44:35 -04:00
yenatch
6fcba7a28a simpler mac instructions 2015-10-25 03:26:12 -04:00
yenatch
5a4da53dfd fix repository links 2015-10-25 03:23:33 -04:00
PikalaxALT
4d17f6e1f6 Address comments on PR 322 2015-10-24 19:49:19 -04:00
PikalaxALT
69ee070021 Merge branch 'master' of https://github.com/pret/pokecrystal 2015-10-24 10:40:07 -04:00
PikalaxALT
119d6b4119 About time I got to these functions 2015-10-24 10:39:52 -04:00
yenatch
7b10cb2878 use pip instead of easy_install 
easy_install was renamed to easy_install-2.7, as seen in #318

pip is maintained and less likely to be renamed at random
 2015-10-22 01:15:07 -04:00
PikalaxALT
97cc513f54 Plus 4 on person events; feeble attempt to annotate color functions 2015-10-21 10:43:42 -04:00
PikalaxALT
6c25592b8c So very jumb 2015-10-19 16:49:29 -04:00
JimB16
3b9a3cc3be merge conflicts resolved 2015-10-19 16:25:15 +02:00
PikalaxALT
0a244e043c Move battle start animation functions to its own file 2015-10-19 10:23:58 -04:00
PikalaxALT
52605b764a Add commented numbers to map/group constants 2015-10-17 21:26:38 -04:00
PikalaxALT
f53d65c536 Battle intro animation function 2015-10-17 17:18:52 -04:00
PikalaxALT
da7849d800 Restructured functions in main.asm to resemble the home functions they clone 2015-10-17 13:00:34 -04:00
PikalaxALT
4fa6c6daa4 Split up bank 2; other relabelings 2015-10-16 13:35:43 -04:00
PikalaxALT
1e2ff967aa Replaced "ldtile" and "dwtile" with the "tile" equs macro 2015-10-14 09:29:15 -04:00
IIMarckus
f399315a48 Unicode 2015-10-13 17:50:58 -06:00
yenatch
d5f94e9ee5 Merge pull request #320 from PikalaxALT/master 
More labels, including fns responsible for partymon generation
 2015-10-13 19:23:12 -04:00
PikalaxALT
d338a092c5 Revert sPlayerID 2015-10-13 17:40:18 -04:00
PikalaxALT
12f9dca7a5 Final descriptive label in tilesets/animations.asm 2015-10-13 14:29:34 -04:00
PikalaxALT
88bc86b0bb Replace Functionfb8 with FillBoxWithByte 2015-10-13 12:46:40 -04:00
PikalaxALT
8c2766e1b9 ldtile and dwtile macros added and globally implemented 2015-10-13 12:11:06 -04:00
PikalaxALT
0c39f6e273 Happiness and Mystery Gift constants 2015-10-12 12:33:24 -04:00
JimB16
3ef626d378 added comments to the PPUP-function 2015-10-11 18:39:00 +02:00
PikalaxALT
327faac497 Magikarp functions moved to event/magikarp.asm 2015-10-11 12:26:39 -04:00
PikalaxALT
d42330ed8b Annotation of PrintNum arguments in bc, and radio functions 2015-10-10 18:00:12 -04:00
JimB16
4b722eb530 changed name of some labels 2015-10-10 13:45:39 +02:00
PikalaxALT
b68913a782 More radio labels 2015-10-09 23:09:03 -04:00
JimB16
6730600d9b found CalcPkmnStats-function 2015-10-08 20:53:39 +02:00
PikalaxALT
96b0e448c4 Labeling of AI item and wild encounter functions 2015-10-07 21:27:32 -04:00