LOuroboros
ce8f794100
Updated abilities.h
...
Straight up copied from the BE to avoid silly merge conflicts.
2020-12-05 14:57:13 -03:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags
...
Add mon flags
2020-12-03 15:07:17 -05:00
ExpoSeed
7b4806c85e
Merge pull request #1249 from LOuroboros/patch-1
...
A few evolution updates
2020-11-28 20:26:45 -06:00
LOuroboros
1083130125
Another one
...
Made Crabrawler evolve in the Ice Room of the Shoal Cave too.
2020-11-25 10:42:57 -03:00
ExpoSeed
f2259d7ce1
Remove IS_ULTRA_BEAST
2020-11-24 22:44:00 -06:00
ExpoSeed
3adf316574
Add mon flags
2020-11-24 22:42:42 -06:00
LOuroboros
c4c802162e
A few more evo related changes.
...
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
2020-11-25 01:15:19 -03:00
LOuroboros
d817950fb6
Readded the EVO_MAP based Eevee->Leafeon and Eevee->Glaceon evos
2020-11-24 23:49:18 -03:00
LOuroboros
89f6036e77
Bumped EVOS_PER_MON from 8 to 10
2020-11-24 23:47:07 -03:00
LOuroboros
210cfabe4c
Another one
...
In SwSh, Magneton can evolve with a Thunder Stone just like Charjabug
2020-11-23 11:02:23 -03:00
LOuroboros
e6f44328a1
Commented out parameters
2020-11-23 10:49:32 -03:00
LOuroboros
bb75b1ad17
A few evolution updates
...
- Changed the Eevee->Leafeon evo method from EVO_MAP to EVO_ITEM, which is more accurate in comparison as of Gen. 8 since we still don't have the actual evo method implemented.
- Changed the Eevee->Glaceon evo method for the same reason.
- Added Vikavolt's Thunder Stone based evolution as a second option.
2020-11-23 10:45:00 -03: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
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
LOuroboros
ae4525d170
Fixed the pal. of Arceus' Fighting and Flying forms
2020-11-16 18:39:49 -03:00
ExpoSeed
c8e3104adc
ifdef items in base_stats.h
2020-11-15 11:46:38 -06:00
ExpoSeed
994f4893d9
Merge pull request #1223 from LOuroboros/patch-1
...
Defined Isle of Armor moves
2020-11-15 11:07:37 -06: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
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
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
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
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
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
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
ExpoSeed
6829c5880d
Merge pull request #1214 from AsparagusEduardo/PE-GlobalDefine
...
Moved POKEMON_EXPANSION define to global.h to fix reading from other branches
2020-11-09 12:01:43 -06:00
Eduardo Quezada D'Ottone
03c7843e45
Capitalization
2020-11-09 14:52:58 -03:00
Eduardo Quezada D'Ottone
690307dbf9
Updated comment.
2020-11-09 14:49:23 -03:00
Eduardo Quezada D'Ottone
df11b68acb
Moved POKEMON_EXPANSION define to global.h to fix reading from other branches
2020-11-09 12:58:03 -03:00
ultima-soul
564d75cd67
Merge pull request #577 from AsparagusEduardo/PE-pretSync
...
Sync with Pret
2020-11-07 16:46:06 -08:00
Eduardo Quezada D'Ottone
79edca1ae8
Fixed Pokédex showing by default Female version differences.
2020-11-07 21:24:20 -03:00
Eduardo Quezada D'Ottone
68627882a5
Merge remote-tracking branch 'pret/master' into PE-pretSync
2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
cb6802f01e
Standarized naming schemes.
2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
209ff3aa5e
Fixed spacing.
2020-11-06 18:11:05 -03:00
Eduardo Quezada D'Ottone
ed34e90848
Fixed new-line at EOF
2020-11-06 18:08:45 -03:00
Eduardo Quezada D'Ottone
5e33281350
Support for gender difference mon icons.
2020-11-06 17:48:03 -03:00
GriffinR
8b1c2c946b
Merge pull request #1247 from PidgeyALT/attemptcountfix
...
use constants for ball throw count
2020-11-06 15:41:25 -05:00
