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
GriffinR
0aa06c307b
Merge pull request #1251 from ExpoSeed/patch-1
...
Document bugged IV inheritance difference
2020-11-17 14:25:36 -05: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
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
ae4525d170
Fixed the pal. of Arceus' Fighting and Flying forms
2020-11-16 18:39:49 -03: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
afeb0c5ae4
Fixed Greninja form species names.
2020-11-14 09:10:16 -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
LOuroboros
47c0a38401
Added Rayquaza's Mega Evolution to the list of evolutions
2020-11-11 15:19:56 -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
Eduardo Quezada D'Ottone
79edca1ae8
Fixed Pokédex showing by default Female version differences.
2020-11-07 21:24:20 -03:00
luckytyphlosion
4b748d32cc
Bugfix for ChooseMoveOrAction_Doubles.
2020-11-07 18:21:17 -05: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
Eduardo Quezada D'Ottone
d7fbaa6cbf
Support for gender palettes.
2020-11-06 17:12:57 -03:00
PikalaxALT
75b12b86dc
Merge pull request #1246 from PikalaxALT/simplify_ram_reset
...
Simplify RAM reset adaptation for modern
2020-11-06 15:00:40 -05:00
MCboy
e31158d017
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
Eduardo Quezada D'Ottone
3849f7dd5d
Female Eevee backsprite.
2020-11-06 16:45:25 -03:00
MCboy
3b91735e63
use constants for ball throw count
2020-11-06 22:59:46 +03:30
Eduardo Quezada D'Ottone
4d4b111327
Front pic gender differences for Eevee
2020-11-06 16:21:45 -03:00
PikalaxALT
3112cf5726
swi --> svc
2020-11-06 12:34:57 -05:00
PikalaxALT
c70c44fa48
Simplify RAM reset adaptation for modern
2020-11-06 12:29:40 -05:00
Eduardo Quezada D'Ottone
b494b6e987
Fixing Litleo's and Pyroar's gender ratio.
2020-11-06 14:28:10 -03:00
GriffinR
1220f0655c
Revert to original battle factory gcc 10 fix
2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a
Fix typo
2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735
Condense fix for battle factory on gcc 10
2020-11-04 16:43:59 -05:00
Eduardo Quezada D'Ottone
6cb73c1e8a
Fixed Trapinch's evolutions abilities. ( #555 ) from AsparagusEduardo
...
Fixed Trapinch's evolutions abilities.
2020-11-04 18:23:15 -03:00
GriffinR
c59a818462
Fix battle factory on gcc 10
2020-11-04 15:35:22 -05:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
Eduardo Quezada D'Ottone
0c6dc6abab
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# graphics/pokemon/burmy/footprint.png
# graphics/pokemon/gastrodon/footprint.png
# graphics/pokemon/rotom/footprint.png
# graphics/pokemon/shellos/footprint.png
# graphics/pokemon/wormadam/footprint.png
# include/constants/species.h
# src/data/pokemon/base_stats.h
2020-11-03 00:13:51 -03:00
aaaaaa123456789
ca950a8daf
Solve merge conflicts from previous commit
2020-11-02 22:18:26 -03:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
