Commit graph

207 commits

Author SHA1 Message Date
ultima-soul
9663ed0d3c Merge branch 'form_species_tables' into form_species_tables_pe 2021-01-20 12:06:59 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
ultima-soul
feecb8b923
Merge pull request #1331 from amiosi/alola
fix alolan form movesets
2021-01-19 17:07:03 -08:00
amiosi
be1390e7ae renames 2021-01-19 20:03:35 -05:00
ultima-soul
9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines. 2021-01-12 14:22:33 -08:00
Philipp AUER
b5fa0129d5 [pokemon-expansion] Changes as requested by code review
Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-11 21:43:00 +01:00
sbird
95665c24b4 [pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable 2021-01-10 18:30:15 +01:00
ultima-soul
767f26b73c Corrected defines for Item Expansion-introduced items for Gen 8 species data. 2021-01-08 19:06:20 -08:00
amiosi
25e7f36ce9 fix reversed names 2021-01-04 22:12:03 -05:00
amiosi
c83c09fc3a tabs -> spaces 2021-01-04 22:09:09 -05:00
amiosi
24be2c8c39 fix alolan form movesets 2021-01-04 22:04:51 -05:00
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
LOuroboros
32cb306b85
Tweaked evolution.h
Litleo doesn't need to have 2 different evolutions into Pyroar.
2020-12-27 00:10:14 -03:00
ghoulslash
6f05ef01ac
Merge pull request #1306 from ExpoSeed/galar-mon-flags
Add Galarian Form mon flags
2020-12-21 10:05:19 -07:00
ExpoSeed
ef6a7fbf43 Add Galarian Form mon flags 2020-12-18 18:25:24 -06: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
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags
Add mon flags
2020-12-03 15:07:17 -05: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
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
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
ExpoSeed
4db1f02154 Remove ifdefs for vanilla items 2020-11-16 18:58:11 -06:00
ExpoSeed
c8e3104adc ifdef items in base_stats.h 2020-11-15 11:46:38 -06: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
b2f078410f Review changes 2 2020-11-13 16:13:13 -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
Eduardo Quezada D'Ottone
cb6802f01e Standarized naming schemes. 2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
b494b6e987 Fixing Litleo's and Pyroar's gender ratio. 2020-11-06 14:28:10 -03: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
Eduardo Quezada D'Ottone
c598daf228 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-FixTrapinchAbility
# Conflicts:
#	src/data/pokemon/base_stats.h
2020-11-02 19:39:18 -03:00
Eduardo Quezada D'Ottone
910d502df2 Review changes 2020-11-01 19:23:45 -03:00
Eduardo Quezada D'Ottone
014afea3df Fixed Trapinch's evolutions abilities. 2020-11-01 16:59:03 -03:00
Eduardo Quezada D'Ottone
44e066cdb4 Fixed missing abilities. 2020-11-01 15:37:01 -03:00
Eduardo Quezada D'Ottone
2c3d4ec7c7 Moved P_UPDATED_STATS ifs to above typing. 2020-11-01 15:32:50 -03:00
Eduardo Quezada D'Ottone
ad5b728967 Fixed Quick Feet BATTLE_ENGINE define. 2020-11-01 14:50:08 -03:00
Eduardo Quezada D'Ottone
56056c01f4 Fixed identation for real. 2020-11-01 14:45:41 -03:00
Eduardo Quezada
2c098d8294 Merge branch 'pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
#	src/data/pokemon/base_stats.h
2020-10-26 20:06:37 -03:00
Eduardo Quezada
641daafb3f Fixed identation for better readability. 2020-10-25 12:34:48 -03:00
Eduardo Quezada
13a6b70e8c Updating Egg Groups. 2020-10-24 08:04:30 -03:00
Eduardo Quezada
67817ff9b9 Updated abilities. 2020-10-24 07:58:58 -03:00
Eduardo Quezada
1358197af4 Forms. 2020-10-24 07:41:49 -03:00
Eduardo Quezada
e3699ba30a Megas 2020-10-24 07:35:28 -03:00
Eduardo Quezada
f54d866900 Alola Mons 2020-10-24 07:31:09 -03:00
Eduardo Quezada
f8206f8286 Kalos Mon amie. 2020-10-24 07:07:16 -03:00
Eduardo Quezada
ba299cb3fb Unova Mon 2020-10-24 06:56:47 -03:00
Eduardo Quezada
97be3674cd Sinnoh Mon 2020-10-24 06:06:18 -03:00
Eduardo Quezada
545b3bf128 Hoenn mon 2020-10-24 05:25:13 -03:00
Eduardo Quezada
0a8c5e2134 Johto mon 2020-10-24 04:46:45 -03:00
Eduardo Quezada
fa037b14b7 Kanto mon 2020-10-24 04:34:50 -03:00
Eduardo Quezada
5489e55276 Merge branch 'pokemon_expansion' into PR-CommentGen4Abilities 2020-10-24 00:45:52 -03:00
Eduardo Quezada D'Ottone
353f9eca42
Merge pull request #30 from AsparagusEduardo/PE-PokemonConfig
Updated types and stats in configuration file.
2020-10-23 12:40:10 -03:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
Eduardo Quezada D'Ottone
38573ab402
Merge pull request #16 from LOuroboros/deoxys
Added the data of Deoxys' forms
2020-10-22 00:52:40 -03:00
ExpoSeed
1a024b0826
Merge pull request #12 from AsparagusEduardo/PR-TradeSpecificEvo
Added Karrablast/Shelmet evolution method.
2020-10-16 20:55:15 -05:00
Eduardo Quezada
2b95f9fc43 Updated types and stats in config. 2020-10-16 21:04:11 -03:00
Eduardo Quezada
1d76144e19 Commented out Gen 4+ abilities in base_stats.h 2020-10-16 17:05:34 -03:00
LOuroboros
16f4fda35b Tweaked EVO_MAP evolutions
The EVO_MAP evolution method was using numerical IDs instead of proper labels, which wasn't intuitive.
On top of that, there were better maps to choose for some of the species that made use of it.
2020-10-15 06:35:37 -03:00
Eduardo Quezada
34ce08db0b Added Karrablast/Shelmet evolution method. 2020-10-14 20:16:18 -03:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
5794fc69e8 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion 2020-10-04 02:35:23 -05:00
ExpoSeed
227d2dce32 Make description slightly more precise 2020-09-16 12:51:14 -05:00
ExpoSeed
778e6925de Complete TMHM Learnset description 2020-09-16 12:36:11 -05:00
LOuroboros
30cd540888 Implemented the level up learnsets of Deoxys' forms, thanks to UltimaSoul 2020-07-23 13:05:38 -03:00
LOuroboros
a3cc1a2edc Added the base stats of Deoxys' forms, thanks to UltimaSoul 2020-07-23 13:04:01 -03:00
Eduardo Alvaro Quezada D'Ottone
db94e3c065
Removed empty evYields for SpAttack. (#471) 2020-07-22 23:39:08 +02:00
LOuroboros
383872ca92
Added the data of Zygarde's forms (#477)
* Defined species for Zygarde's 10% and Complete forms

* Defined the sprites for Zygarde's 10% and Complete forms

* Added coordinates and entries for the forms of Zygarde in the sprite data tables

* Set the InGame names of Zygarde's forms

* Added the base stats of Zygarde's forms

* Set the level up learnsets for the forms of Zygarde

* Defined the paths for the sprites of Zygarde's forms

* Linked the icons to the species of Zygarde's forms

* Added the icons of Zygarde's forms

* Fixed fuckups and inserted the icons of Zygarde's forms

* Added the cries of Zygarde's forms

* Tweaked the Y coordinate of Zygarde's 10% form's backsprite
2020-07-22 23:37:47 +02:00
Eduardo Quezada
9a2bac5ecd USUM level up movesets.
Commented out Gen4+ moves.
2020-06-24 19:19:09 -04:00
Eduardo Quezada
fb73f7333a Set evolution methods closer to the actual games. 2020-06-13 02:37:29 -04:00
Eduardo Alvaro Quezada D'Ottone
c2b51cf17a
Added missing Primal/Mega Weather Trio base stats. (#376)
* Added missing Mega Rayquaza Base Stats.

* Added Primal Kyogre/Groudon's missing base stats.
2020-05-24 10:21:49 +02:00
AsparagusEduardo
179d84dcd7 Using ability constants for OLD_UNOWN stats 2020-05-16 18:08:56 -04:00
AsparagusEduardo
f6932518b0 Ordered OLD_UNOWN in the same way as the other base stats. 2020-05-03 00:00:01 -04:00
LOuroboros
cda92e066a
Remove Zygarde from src/data/pokemon/evolution.h (#357)
Zygarde doesn't evolve into anything. It definitely doesn't evolve into nothing at Lv100, lol.
2020-04-29 09:05:28 +02:00
Eduardo Alvaro Quezada D'Ottone
e232f6bf03
Fix for Dark Type in party evolution. (#329) 2020-04-16 09:07:31 +02:00
LOuroboros
a387121e4a
Restored the .noFlip parameter to src/data/pokemon/base_stats.h (#325)
* Restored the .noFlip parameter of src/data/pokemon/base_stats.h

* A few noFlip tweaks
2020-04-15 19:38:19 +02:00
GriffinR
b1d131ace2 Convert base_stats.h to UTF-8 2020-02-25 12:46:03 -06:00
Eduardo Alvaro Quezada D'Ottone
70ebc6b55b
Lycanroc forms (#268)
* Midnight Lycanroc

* Dusk Lycanroc
2020-02-22 23:42:16 +01:00
Eduardo Alvaro Quezada D'Ottone
bb10a69f81
Busted Mimikyu (#254)
* Busted Mimikyu

* Fixed back sprite coords.
2020-02-08 19:32:01 +01:00
Eduardo Alvaro Quezada D'Ottone
98867f0cb3
Dex Text Fixes (#253)
- Fixed decap error in Eevee's Pokédex text.
- Fixed missing decap in Mew's Pokédex text.
2020-02-08 15:52:25 +01:00
DizzyEggg
62755e2501 Fix Eevee evolutions no ability 2020-01-18 20:42:04 +01:00
LOuroboros
d1d3ca5312 Various Forms Data (#226)
* Defined species for Shaymin's Sky Form and Giratina's Origin Form

* Defined the sprites for Shaymin's and Giratina's forms

* Added coordinates and entries for the forms of Shaymin and Giratina in the sprite data tables

* Set the InGame names for Shaymin's and Giratina's forms

* Added the base stats of Shaymin's and Giratina's forms

* Set the level up learnsets for the forms of Shaymin and Giratina

* Defined the paths of the sprites for the forms of Shaymin and Giratina

* Linked the icons to the species of Shaymin's and Giratina's forms

* Added the sprites of Shaymin's Sky Form and Giratina's Origin Form

* Added the icons of Shaymin's and Giratina's forms

* Fixed silly mistakes.

* Alright, fixed silly mistakes. For good now.

* Added the data for a lot of Pokémon's forms.
-Darmanitan Zen Mode
-Tornadus, Thundurus and Landorus Therian Forms
-Meloetta Pirouette Form
-Aegislash Blade Form
-Hoopa Unbound Form
-Minior Core Form
-Wishiwashi School Form

* Added the sprites of the Pokémon forms that were just inserted

* Added the sprites for the Black and White Forms of Kyurem
2020-01-01 15:07:56 +01:00
DizzyEggg
f228764545 Remove duplicate Rockruff egg moves 2019-12-30 14:07:31 +01:00
DizzyEggg
89a2ee5be6 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:54:25 +01:00
DizzyEggg
cd4c3b38b5 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:53:59 +01:00
Pokestia
e4731b1289 Pokemon expansion (#211)
* Define species Meltan and Melmetal

Also shifted a few other species numbers

* Define Meltan and Melmetal Sprites

* Add Meltan and Melmetal coordinates and table entries

* Set Meltan and Melmetal ingame names

* Add Meltan and Melmetal base stats

* Add Meltan and Melmetal level up learnsets

* Set Meltan and Melmetal TM learnset

It is still blank because LGPE TMs don't match USUM TMs

* Define Meltan and Melmetal sprite paths

* Add Meltan and Melmetal sprite, icon and front animation

* Fix typo in bas stats

* Add Meltan and Melmetal pokedex entries

* Tab to space learnsets

* Tab to space pokedex text

This includes all mons with tabs in their dex entries.
2019-12-30 13:48:50 +01:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
LOuroboros
060a3566e2
Swapped the item number ID for the actual name of the item in Lopunny-to-Mega Lopunny's evolution method.
Title.
Every single other Mega Evolution is defined with their item's name. Why would this be an exception?
2019-12-19 22:50:52 -03:00
DizzyEggg
1a5c610b5c
Merge pull request #206 from LOuroboros/alolan_forms
Alolan Forms
2019-11-30 15:35:12 +01:00
LOuroboros
ad7cda9169 Replaced the level up learnsets of the Alolan Forms with the same placeholder that many other new Pokémon use. 2019-11-30 09:29:30 -03:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
AJ Fontaine
2d1a780dd8
Fix Hondrew Berry typo 2019-11-28 11:44:13 -05:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00