Commit graph

370 commits

Author SHA1 Message Date
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
2021-09-25 22:00:10 -03:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table
Form change table
2021-09-22 00:04:26 -03:00
LOuroboros
a0a888698e Corrected Bronzor's evo level 2021-08-22 23:19:26 -03:00
ultima-soul
2d8d38f44c Add TM51 through TM100. 2021-07-05 18:11:57 -07:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
ultima-soul
425746763a Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 20:08:43 -07:00
ultima-soul
f3f4d8e608 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 19:52:20 -07:00
ultima-soul
0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07:00
ultima-soul
45fb16c40a
Merge pull request #1494 from LOuroboros/feathers_PE
Corrected the Wings/Feathers #2
2021-06-02 22:56:39 -07:00
LOuroboros
1b13db80fc
Syntax fix
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 16:43:01 -03:00
ExpoSeed
22478b857b
Add {FORM_CHANGE_END} to Silvally and Genesect 2021-05-28 19:24:44 -05:00
Sophie Kirschner
1a4c6d3490 Fixes to species evolution data 2021-05-28 18:16:52 +03:00
Eduardo Quezada D'Ottone
5fd4c35483
Merge pull request #1412 from amiosi/noFlip
restore and add noFlip values
2021-05-21 11:44:11 -04:00
LOuroboros
41bc603110 Wings -> Feathers 2021-05-17 22:06:31 -03:00
LOuroboros
0bc8ed59f5 Wings -> Feathers 2021-05-17 21:58:17 -03:00
ExpoSeed
f922d42988 Refactor hidden abilities 2021-04-16 23:38:35 -05:00
AmbientDinosaur
232acab1a2
Remove superfluous define of LEVEL_UP_END
LEVEL_UP_END is already defined in constants/pokemon.h
2021-04-10 22:55:07 +02:00
LOuroboros
75b6d2837e Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller 2021-04-07 17:10:52 -03:00
ExpoSeed
cf9d5f8563 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-04-04 01:11:32 -05:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
LOuroboros
f04f35f5c3 Added a config for the amount of HP recovered by healing items 2021-04-02 20:34:57 -03:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
ExpoSeed
3655fe52f3 Prison Bottle and Reveal Glass don't exist yet 2021-03-09 11:54:56 -06:00
ExpoSeed
dd73d8fc06 Fix wrong comment 2021-03-03 16:47:31 -06:00
ExpoSeed
6f64c1b2b9 Implement GetFormChangeTargetSpecies 2021-03-03 13:07:50 -06:00
ExpoSeed
aac7028703 Add newline at end of file 2021-03-02 14:21:29 -06:00
ExpoSeed
6db5a98ad9 Delete old form change table 2021-03-02 14:20:39 -06:00
ExpoSeed
ec1a09bcd5 Revamp table 2021-03-02 14:18:34 -06:00
ExpoSeed
7802264732 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-03-01 19:38:13 -06:00
amiosi
d7d8c62753 restore and add noFlip values
sources: vanilla emerald, pokediamond, hgss/bw2 overworlds, oras/usum menu sprites.
missing: bw2 & oras data
2021-02-22 16:04:55 -05:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00
ultima-soul
46e853c13b Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:23:23 -08:00
ultima-soul
daf5e0167e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:06:48 -08:00
amiosi
11e6298a05 tmhm and tutor spacing 2021-02-03 15:08:53 -05:00
amiosi
e62f53b13e fix spacing i missed on tutors and expand to all species
plus reorder kyurem forms to match the rest of the repo
2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6 fix tmhm spacing i missed, extend to all species 2021-02-02 15:10:45 -05:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
248e0b50d7 Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 14:24:36 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
amiosi
42ea6f482b more dex entry spacing 2021-02-02 13:32:55 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
amiosi
940ca8dc19 category decap and length 2021-02-01 15:25:53 -05:00
amiosi
102285d464 mons/moves 2021-02-01 14:37:48 -05:00
amiosi
35f3cdd2f2 decap POKeMON string 2021-02-01 14:19:24 -05:00
amiosi
fe3419fa21 Update level_up_learnsets.h 2021-01-29 15:51:53 -05:00
ExpoSeed
857fc9ce95
Merge pull request #1320 from amiosi/item_expansion
update item effects, prices, names & descriptions
2021-01-28 12:15:11 -06:00
ExpoSeed
34c6771e94 Create form change table 2021-01-27 16:30:43 -06:00
LOuroboros
6e89f8dff2 Corrected Riolu's evo method 2021-01-27 19:02:37 -03:00
ExpoSeed
2e0b02e491
Merge pull request #1322 from amiosi/pokemon_expansion
Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix
2021-01-21 19:16:59 -06:00
amiosi
08eb883939 sounds like a lot of HOOPA 2021-01-21 20:10:38 -05:00
ghoulslash
9b1a482837
Merge pull request #1317 from ultima-soul/form_species_tables_ie
Add Form Species ID Tables
2021-01-20 13:54:58 -07:00
ghoulslash
71f18bfbf4
Merge pull request #1316 from ultima-soul/form_species_tables_be
Add Form Species ID Tables
2021-01-20 13:54:39 -07:00
ghoulslash
b4b1d2b9e2
Merge pull request #1315 from ultima-soul/form_species_tables_pe
Add Form Species ID Tables
2021-01-20 13:54:20 -07:00
ultima-soul
fdc6156f83 Add Form Species ID tables and entries for new mons and forms. 2021-01-20 12:07:29 -08:00
ultima-soul
9663ed0d3c Merge branch 'form_species_tables' into form_species_tables_pe 2021-01-20 12:06:59 -08:00
ultima-soul
d3b0e98325 Merge branch 'form_species_tables' into form_species_tables_be 2021-01-20 11:40:48 -08:00
ultima-soul
f571c8af2a Merge branch 'form_species_tables' into form_species_tables_ie 2021-01-20 11:34: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
LOuroboros
f4d34f70c4 Renamed some X Defend labels to reflect its new name 2021-01-10 01:54:41 -03:00
LOuroboros
db37c4f25c Review correction to src/data/pokemon/item_effects.h 2021-01-09 21:47:58 -03: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
LOuroboros
91c92e9c04 #if X_ITEMS_REWORK == TRUE -> #ifdef BATTLE_ENGINE 2021-01-04 06:49:18 -03:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
amiosi
2e5575385a pr commit 2020-12-30 20:27:37 -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
LOuroboros
c496e0ce6c Tweaked the X Items' effects' entries in src/data/pokemon/item_effects.h 2020-12-08 18:27:03 -03: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
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
ExpoSeed
8b83d88e75 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-11 00:07:10 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -05: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
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +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
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02: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