595 Commits

Author SHA1 Message Date
DizzyEggg
ad6093f5bc Merge with master, fix conflicts 2019-05-17 10:15:30 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
garak
60baf19d45 rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses 2019-05-16 17:10:13 -05:00
garak
daecd5ec40 name some trainer card related functions 2019-05-16 17:10:13 -05:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
5bc63ab550 Merge branch 'master' into battle_engine_v2 2019-05-07 10:23:14 +02:00
DizzyEggg
a22495d7cb Gen4 mon animations 2019-05-05 10:09:52 +02:00
DizzyEggg
02594be062 Merge branch 'master' into pokemon_expansion 2019-05-04 09:20:45 +02:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
DizzyEggg
2d670fa803 Rotom forms and meowstic female 2019-04-23 13:00:40 +02:00
DizzyEggg
0666da6145 Merge branch 'master' into pokemon_expansion 2019-04-22 14:12:18 +02:00
DizzyEggg
f1e420ff69 Move tutor and tms compatibility for all mons 2019-04-22 14:10:40 +02:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
Papa Cancer
7d20d8082f Gen 7 animations
Includes 2-frame images for Tapus and Marshadow
Custom animations made for Yveltal, Shiinotic, and Toxapex/Poipole
2019-04-12 20:07:54 +01:00
Papa Cancer
dfeb2ebcea Gen 6 mon animations
Includes 2-frame Chespin sprite
2019-04-09 19:46:45 +01:00
DizzyEggg
60eb4b7389 mothim animation 2019-04-07 15:31:21 +02:00
DizzyEggg
51bb713aef Add Burmy Wormadam form gfx and data 2019-04-07 14:39:11 +02:00
DizzyEggg
c090f6cda9 Add Unown forms 2019-04-07 12:40:18 +02:00
DizzyEggg
8213222337 Merge with master 2019-04-06 23:20:16 +02:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
DizzyEggg
70569e7ebc Use shiny species tag 2019-04-05 07:53:23 -05:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
DizzyEggg
a6e345e095 Coordinates for gen5 sprites 2019-04-04 17:31:25 +02:00
DizzyEggg
438521bf21 Get rid of redundant cast 2019-04-03 17:04:07 -05:00
DizzyEggg
5219b7b30a Code for new evo methods 2019-04-03 22:19:18 +02:00
DizzyEggg
de4722708b Add Gen4 mon sprites 2019-04-03 17:39:08 +02:00
DizzyEggg
2745cdc7d2 Remove unneeded sMonAnimationDelayTable entries 2019-04-02 16:27:58 -05:00
DizzyEggg
27bafdc04d Begin pokemon expansion 2019-04-02 21:22:16 +02:00
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
Phlosioneer
ee69426838 Eliminate more externs 2019-03-02 02:44:02 -05:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Ariel Antonitis
74a3c06270 Documented/polished pokemon_summary_screen.c
Mostly variables mislabeled as global and some formerly unknown stuff.
2019-02-23 21:12:35 -05:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01:00
Marcus Huderle
3a88ab831d Document more battle pyramid 2019-02-07 11:51:03 -06:00
huderlem
b0ee100975
Merge pull request #543 from pret/mapdata
Convert map data to JSON
2019-02-04 21:36:18 -06:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
Diegoisawesome
ff48e5ada0
Merge pull request #541 from Diegoisawesome/master
Misc documentation
2019-02-02 16:00:56 -06:00
Diegoisawesome
d64a905d65 Document trainer backsprites 2019-02-02 15:56:22 -06:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00