ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
ghoulslash
a1e3700d10
Merge pull request #1299 from LOuroboros/cacophony
...
Cacophony
2020-12-21 09:47:52 -07:00
ghoulslash
547d602524
Merge pull request #1304 from LOuroboros/patch-2
...
Corrected the ability 1 of Calyrex's forms
2020-12-20 21:56:26 -07:00
LOuroboros
cb9faeed3d
Corrected the ability 1 of Calyrex's forms
...
There isn't an `ABILITY_AS_ONE` defined in the `include/constants/abilities.h` of the battle_engine branch, so this wasn't building a ROM correctly.
https://github.com/rh-hideout/pokeemerald-expansion/blob/pokemon_expansion/src/data/pokemon/base_stats.h#L34158
https://github.com/rh-hideout/pokeemerald-expansion/blob/battle_engine/include/constants/abilities.h#L290
2020-12-18 08:17:49 -03:00
ghoulslash
a842f35428
Merge pull request #1301 from ultima-soul/gen_8_mon_data
...
Add Gen 8 Pokémon Data
2020-12-17 20:52:15 -07:00
Pyredrid
467a977590
Merge pull request #1297 from LOuroboros/mandibuzz
...
Corrected the icon sprite of Mandibuzz
2020-12-17 16:36:03 -05:00
LOuroboros
d4a1a573cb
I am so very sorry for my own stupidity
2020-12-17 16:07:07 -03:00
ultima-soul
ad67068f7e
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data
2020-12-16 13:28:42 -08:00
ultima-soul
c675c92a1d
Add Gen 8 Pokemon data.
2020-12-16 12:57:36 -08:00
LOuroboros
83ffb80379
Restored abilities.h
2020-12-14 16:31:46 -03:00
LOuroboros
1c5b514a67
Temporarily removed abilities.h
2020-12-14 16:30:56 -03:00
LOuroboros
77871c5eda
Dealt with Cacophony
...
By copy-pasting back in the BE's include/constants/abilities.h and commenting out the 2 instances where ABILITY_CACOPHONY is normally used in this branch.
2020-12-14 16:26:00 -03:00
LOuroboros
c8cf0a09a0
Corrected the icon sprite of Mandibuzz
...
It was Mienfoo's, for some odd reason.
2020-12-14 16:19:38 -03:00
ghoulslash
476acbb339
Merge pull request #1274 from Jaizu/patch-7
...
Change Pidgey front animation
2020-12-13 17:16:39 -07:00
Eduardo Quezada D'Ottone
735b9d18d0
Merge pull request #1280 from LOuroboros/abilitiesPE
...
Reverted include/constants/abilities.h to vanilla
2020-12-12 19:51:52 -03:00
LOuroboros
8b5a5a1896
Reverted include/constants/abilities.h to vanilla
...
With the new abilities introduced by the battle_engine in src/data/pokemon/base_stats.h behind locked behind that branch's defined label, we don't need to define them in this branch anymore.
2020-12-10 16:38:29 -03:00
Jaizu
8b46a3b305
Change Pidgey front animation
2020-12-07 12:07:50 +01:00
Eduardo Quezada D'Ottone
f9978f2a5a
Merge pull request #1267 from LOuroboros/patch-1
...
Updated abilities.h
2020-12-06 13:50:32 -03:00
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
