366 Commits

Author SHA1 Message Date
DizzyEggg
1c60387968 Merge with master, placeholder back anims 2019-06-03 11:24:10 +02:00
DizzyEggg
0eaddd251c Merge branch 'master' into item_expansion 2019-06-03 11:06:09 +02:00
DizzyEggg
c81d06b712 Fix EV wings 2019-06-03 11:05:03 +02:00
DizzyEggg
a074f36766 USE PROTAG 2019-05-25 08:26:40 -05:00
DizzyEggg
e706280503 Rename PKMN TRAINER CALSS 4 2019-05-25 08:26:40 -05:00
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
DizzyEggg
ca51bc23bf Merge branch 'master' into item_expansion 2019-05-17 09:36:35 +02:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
26e4b52fe8 Dummy learnsets for forms 2019-05-16 10:16:00 +02:00
DizzyEggg
6367269ce9 Add dummy learnsets 2019-05-15 13:47:33 +02:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
c0470c3932 Remove skarmory mega evo 2019-05-03 17:31:23 +02:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
LOuroboros
c5f6f5e588 Renamed X Special to X Special Attack and added the item data for Old Gateau and X Special Defense. 2019-04-30 13:06:08 -03:00
LOuroboros
8e3f2d1e2d Sweet Heart and Big Malasada data. 2019-04-30 12:38:51 -03: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
50eeddfec6 Evolution stone item effects 2019-04-17 13:05:19 +02:00
DizzyEggg
896d99f919 Merge with master 2019-04-17 12:58:05 +02:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
DizzyEggg
4e5c543327 Remove new items data from battle engine 2019-04-13 14:02:04 +02:00
DizzyEggg
b3b74c2534 Longer dex entries thx MrDollSteak 2019-04-07 18:20:57 +02:00
DizzyEggg
ac5473f990 Mega Evo Base stats 2019-04-07 15:14:16 +02:00
DizzyEggg
51bb713aef Add Burmy Wormadam form gfx and data 2019-04-07 14:39:11 +02:00
DizzyEggg
b21d960c5c Add Egg Moves data 2019-04-03 23:09:07 +02:00
DizzyEggg
7dcd7362d3 Add Evolution data 2019-04-03 23:00:49 +02:00
DizzyEggg
27bafdc04d Begin pokemon expansion 2019-04-02 21:22:16 +02:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
Diegoisawesome
d64a905d65 Document trainer backsprites 2019-02-02 15:56:22 -06:00
Kurausukun
c3126df436
Prevent Skarmory from Evolving via Level 2019-01-28 00:49:26 -05:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
DizzyEggg
8833004d41 space 2018-12-24 23:29:47 +01:00
DizzyEggg
44e5e82f67 clean up party menu 2018-12-24 23:27:20 +01:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
Rangi
78bab9ca0c Fix OLD_UNOWN_BASE_STATS formatting: tabs->spaces, and comma outside the macro 2018-12-23 17:24:10 -05:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
ShinyDragonHunter
c120a446ad Moved macro to the top of base_stats.h 2018-12-21 10:37:35 +00:00
ShinyDragonHunter
c489bb88b7 Updated macro name to be less vague 2018-12-20 13:59:00 +00:00
ShinyDragonHunter
51e5be68de Use a macro for OLD_UNOWN base stats 2018-12-20 11:28:19 +00:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
nullableVoidPtr
f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
DizzyEggg
0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
DizzyEggg
a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00