ultima-soul
|
e15a86caae
|
Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8.
|
2020-11-17 10:32:24 -08:00 |
|
kageru
|
6f91f7e0e3
|
Use more constants in Battle Tower code
|
2020-11-17 17:40:26 +01:00 |
|
Eduardo Quezada D'Ottone
|
14bc55007b
|
Merge pull request #1226 from ExpoSeed/PE-ifdef-items
ifdef items in base_stats.h and uncomment vanilla hold items
|
2020-11-17 11:29:42 -03:00 |
|
Aaron B-D
|
151aca8365
|
Changed how scripted wild encounters work to include double battles
Removed the old commands for scripted wild double encounters
|
2020-11-17 03:13:00 -05:00 |
|
ultima-soul
|
06e3097d44
|
Merge pull request #1234 from LOuroboros/guts
Implemented Guts' missing effect
|
2020-11-16 20:24:35 -08:00 |
|
ghoulslash
|
985b0874c9
|
Merge pull request #1236 from AsparagusEduardo/BE-FixMinior
Fixed UndoFormChange bug at the end of battles
|
2020-11-16 21:18:10 -07:00 |
|
ultima-soul
|
bb2be3cf98
|
Merge pull request #1237 from LOuroboros/icon_sprite_fixes
Fixed a few Pokémon icon sprites
|
2020-11-16 18:21:03 -08:00 |
|
ultima-soul
|
be10a005d6
|
Merge pull request #1232 from LOuroboros/arceus_form_pals
Fixed the pal. of Arceus' Fighting and Flying forms
|
2020-11-16 18:19:24 -08:00 |
|
LOuroboros
|
1f33a030ac
|
Fixed the pal. of Nu-Arceus' Fighting and Flying forms
|
2020-11-16 22:05:43 -03:00 |
|
ExpoSeed
|
4db1f02154
|
Remove ifdefs for vanilla items
|
2020-11-16 18:58:11 -06:00 |
|
LOuroboros
|
ab512b3d24
|
Fixed a few Pokémon icon sprites
|
2020-11-16 21:06:56 -03:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|