Eduardo Quezada D'Ottone
|
27166a7147
|
Fixed UndoFormChange bug at the end of battles
|
2020-11-16 20:56:11 -03:00 |
|
ultima-soul
|
63bd0ec836
|
Remove Cacophony and fix some Gen 8 ability descriptions to fit.
|
2020-11-16 15:42:09 -08:00 |
|
LOuroboros
|
9c6a5f1ab6
|
Implemented Guts' missing effect
|
2020-11-16 20:22:59 -03:00 |
|
ultima-soul
|
e32659d4bb
|
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
|
2020-11-16 13:50:26 -08:00 |
|
LOuroboros
|
ae4525d170
|
Fixed the pal. of Arceus' Fighting and Flying forms
|
2020-11-16 18:39:49 -03:00 |
|
GriffinR
|
de153a67cf
|
Merge pull request #1253 from LOuroboros/patch-1
sanityIsBagEgg -> sanityIsBadEgg
|
2020-11-16 14:57:16 -05:00 |
|
TheXaman
|
6422164d31
|
Added moves, trainer edits and fixed abilities, now only possible ones including hidden when using PE
Give all TMs, watch credits, change trainer name/gender/id
implemented moves
|
2020-11-16 19:45:53 +01:00 |
|
LOuroboros
|
cad5b57b42
|
sanityIsBagEgg -> sanityIsBadEgg
Fixed a typo.
Lunos#4026
|
2020-11-16 15:36:38 -03:00 |
|
ExpoSeed
|
e5f043ff72
|
Fix grammar
|
2020-11-15 16:28:09 -06:00 |
|
ExpoSeed
|
3f157b5293
|
Document bugged IV inheritance difference
|
2020-11-15 16:24:19 -06:00 |
|
ExpoSeed
|
c8e3104adc
|
ifdef items in base_stats.h
|
2020-11-15 11:46:38 -06:00 |
|
Eduardo Quezada D'Ottone
|
fb8a6b408f
|
Merge pull request #1224 from AsparagusEduardo/BE-PECompat
Fixed compatibility with Pokémon Expansion
|
2020-11-15 14:16:26 -03:00 |
|
ExpoSeed
|
994f4893d9
|
Merge pull request #1223 from LOuroboros/patch-1
Defined Isle of Armor moves
|
2020-11-15 11:07:37 -06:00 |
|
Eduardo Quezada D'Ottone
|
4da357aef4
|
Fixed compatibility with Pokémon Expansion
|
2020-11-15 13:35:02 -03:00 |
|
LOuroboros
|
890144f153
|
Defined Isle of Armor moves
Straight up copied from the battle_engine branch.
|
2020-11-15 13:05:49 -03:00 |
|
TheXaman
|
04bf06a7c0
|
Removed unnecessary check for BE
|
2020-11-15 16:30:59 +01:00 |
|
ghoulslash
|
686ff59b11
|
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves
LGPE & Isle of Armor move data.
|
2020-11-15 08:29:10 -07:00 |
|
ghoulslash
|
c91fba0310
|
Merge pull request #536 from AsparagusEduardo/PE-Ultima-Forms
Added missing forms from UltimaSoul's FormID system.
|
2020-11-15 08:28:05 -07:00 |
|
Eduardo Quezada D'Ottone
|
afeb0c5ae4
|
Fixed Greninja form species names.
|
2020-11-14 09:10:16 -03:00 |
|
Eduardo Quezada D'Ottone
|
f0154028ff
|
Review changes 2
|
2020-11-14 09:01:43 -03:00 |
|
TheXaman
|
094a0b8774
|
More BattleEngine and PokemonExpansion compatibility
|
2020-11-14 12:39:40 +01:00 |
|
Eduardo Quezada D'Ottone
|
29c33b908b
|
Apply suggestions from code review
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2020-11-13 21:34:37 -03:00 |
|
Evan
|
66152538ec
|
add back accidentally deleted item theft battle type checks
|
2020-11-13 13:42:49 -07:00 |
|
Eduardo Quezada D'Ottone
|
54630ff5a9
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
# src/data/pokemon/evolution.h
|
2020-11-13 16:40:31 -03:00 |
|
Eduardo Quezada D'Ottone
|
3981720343
|
Review changes 4
|
2020-11-13 16:36:31 -03:00 |
|
Eduardo Quezada D'Ottone
|
d3a5921122
|
Review changes 3
|
2020-11-13 16:34:53 -03:00 |
|
Eduardo Quezada D'Ottone
|
b2f078410f
|
Review changes 2
|
2020-11-13 16:13:13 -03:00 |
|
Eduardo Quezada D'Ottone
|
26db02e95a
|
Review changes 1
|
2020-11-13 15:36:36 -03:00 |
|
Evan
|
a05d8f7d43
|
fix conflicts
|
2020-11-13 11:21:15 -07:00 |
|
Evan
|
435f928aa4
|
opponent trainer theft config option. Clean up code a bit
|
2020-11-13 11:00:44 -07:00 |
|
Eduardo Quezada D'Ottone
|
e87f0f1ddb
|
Review changes
|
2020-11-13 14:51:50 -03:00 |
|
ultima-soul
|
236d7145ae
|
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances
Added config option for Steel type resistances.
|
2020-11-12 23:25:21 -08:00 |
|
ultima-soul
|
28147cd3ba
|
Merge pull request #1219 from LOuroboros/pokeexp_move_megaevo_tweaks
Small tweaks related to EVO_MOVE_MEGA_EVOLUTION
|
2020-11-12 23:11:44 -08:00 |
|
Evan
|
64bcac4589
|
move pickpocket to back of moveend sequence
|
2020-11-12 23:30:00 -07:00 |
|
ultima-soul
|
c3423b4212
|
Merge pull request #1206 from ExpoSeed/type-changing-moves
Refactor move effects for type changing moves
|
2020-11-12 19:10:48 -08:00 |
|
luckytyphlosion
|
5029c90979
|
Missing inc files in asm/*.s and data/*.s will raise an actual error message.
|
2020-11-12 11:04:38 -05:00 |
|
Evan
|
e585be6f2e
|
format fix
|
2020-11-11 18:37:11 -07:00 |
|
Evan
|
520f00f4ae
|
add pickpocket
|
2020-11-11 18:08:46 -07:00 |
|
Eduardo Quezada D'Ottone
|
4b9d0d8e24
|
Added config option for Steel type resistances.
|
2020-11-11 17:48:02 -03:00 |
|
LOuroboros
|
47c0a38401
|
Added Rayquaza's Mega Evolution to the list of evolutions
|
2020-11-11 15:19:56 -03:00 |
|
LOuroboros
|
6f122ac8f8
|
Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility
|
2020-11-11 15:18:39 -03:00 |
|
ExpoSeed
|
0912577ea1
|
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
Implemented Wish Mega Evolution
|
2020-11-11 11:05:06 -06:00 |
|
Eduardo Quezada D'Ottone
|
dbd02d1857
|
Fixed defines.
|
2020-11-10 20:05:01 -03:00 |
|
Eduardo Quezada D'Ottone
|
caf6253ba3
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
# src/pokemon_icon.c
|
2020-11-10 19:37:02 -03:00 |
|
Eduardo Quezada D'Ottone
|
d97932c009
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
# src/pokemon.c
|
2020-11-10 19:29:50 -03:00 |
|
Eduardo Quezada D'Ottone
|
98d3427e62
|
Prevent Ability Popup overwrites #1218 from ghoulslash
|
2020-11-10 17:34:33 -03:00 |
|
Eduardo Quezada D'Ottone
|
e021a4aa87
|
Critical Capture Config Option And Catching Charm #556 from ghoulslash
Critical Capture Config Option And Catching Charm
|
2020-11-10 17:31:08 -03:00 |
|
Eduardo Quezada D'Ottone
|
e6f8d57f08
|
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
# Conflicts:
# include/constants/battle_string_ids.h
|
2020-11-10 17:28:17 -03:00 |
|
ghoulslash
|
7a9476323c
|
Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences
Support for Gender Differences
|
2020-11-10 12:31:03 -07:00 |
|
ExpoSeed
|
3e3c655f43
|
Merge pull request #563 from AsparagusEduardo/Fix-LitleoPyroarGender
Fixing Litleo's and Pyroar's gender ratio.
|
2020-11-10 11:42:25 -06:00 |
|