7691 Commits

Author SHA1 Message Date
DizzyEggg
e00890a555 Fix Air Baloon msg 2019-05-20 12:20:49 +02:00
DizzyEggg
e1ea4b62e9 Natural Gift 2019-05-20 12:03:00 +02:00
DizzyEggg
09c0a195ac Merge branch 'master' into battle_engine_v2 2019-05-20 09:05:12 +02:00
Flametix
dbdb827e54 Fix typos (#713)
* fix typos
2019-05-18 21:56:19 -05:00
LOuroboros
2592d38303 Added the data, sprites and sprites data of the Wings. 2019-05-17 07:52:41 -03:00
DizzyEggg
473f84f31b Formatting 2019-05-17 10:42:14 +02:00
DizzyEggg
a9b4d0208b Move new species to battle_config.h 2019-05-17 10:38:48 +02: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
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
0518025b92 formatting 2019-05-16 09:43:19 +02:00
Slawter666
2fdc489bc0 Further documentation of party_menu.c 2019-05-15 16:55:39 -05:00
DizzyEggg
20841a9f87 Use PLAYER_NAME_LENGTH constant 2019-05-15 16:53:59 -05:00
DizzyEggg
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
DizzyEggg
6f5e9a1944 Merge branch 'master' into item_expansion 2019-05-14 14:02:07 +02:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
00dcc05516 Add new dex flags 2019-05-14 11:54:58 +02:00
DizzyEggg
5682f98605 Merge branch 'master' into pokemon_expansion 2019-05-14 09:12:45 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
DizzyEggg
d027bb0d7a Life Flame toxic orbs 2019-05-10 11:03:33 +02:00
DizzyEggg
875b413a09 Various battle target items 2019-05-09 20:31:58 +02:00
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
DizzyEggg
5bc63ab550 Merge branch 'master' into battle_engine_v2 2019-05-07 10:23:14 +02:00
DizzyEggg
02594be062 Merge branch 'master' into pokemon_expansion 2019-05-04 09:20:45 +02:00
DizzyEggg
5b23f3787e Tweak up batle item's secondary ids 2019-05-04 09:15:10 +02:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
DizzyEggg
900c15c20c Mega evo animation 2019-05-03 17:27:49 +02:00
PikalaxALT
f13e1c78b2 through sub_81CA0EC 2019-05-02 17:53:00 -04:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
PikalaxALT
a14162eb9f through sub_81C9F28 2019-05-02 16:43:32 -04:00
PikalaxALT
518865d8d9 sub_81C9A10 2019-05-02 16:19:25 -04:00
LOuroboros
eaafcd539d Fixed the Power Items' hold effects. 2019-05-02 15:47:43 -03:00
LOuroboros
fbdcbfd33d Fixed Silvally's Memory items' hold effects. 2019-05-02 15:39:47 -03:00
PikalaxALT
9b40cdaeb9 through sub_81C99FC 2019-05-02 14:27:59 -04:00
LOuroboros
36d8371950 Added the sprites and the data for the missing items. 2019-05-02 15:11:06 -03:00
DizzyEggg
a7f2fa67ef
Merge pull request #142 from thechurchofcage/beta
Magnetic Flux + Gear Up
2019-05-01 11:11:46 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
LOuroboros
90e94f50d9 Defined a hold effect for every battle-related item, and added all the missing items' data. 2019-04-30 22:07:43 -03:00
LOuroboros
cda17700c3 Defined a lot of hold effects and added more items data. 2019-04-30 19:41:10 -03:00
DizzyEggg
e9a104a0c1 Merge with master 2019-04-30 17:05:09 +02:00
DizzyEggg
fdb328fbd3 Gfx for megas 2019-04-29 14:27:36 +02:00
DizzyEggg
2d670fa803 Rotom forms and meowstic female 2019-04-23 13:00:40 +02:00
Fontbane
6cf06d5f95 Doc some event scripts
Doc decoration shops

Revert "Doc decoration shops"

This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.

Document through comments

Un-revert decor documentation
2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e Doc most OnTransitions 2019-04-22 17:23:59 -05:00
DizzyEggg
0666da6145 Merge branch 'master' into pokemon_expansion 2019-04-22 14:12:18 +02:00