LOuroboros
f82c946ff3
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:26:27 -03:00
LOuroboros
af2f70e000
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:21:40 -03:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
Eduardo Quezada D'Ottone
3bbaf5a15d
Optimized SpeciesHasGenderDifference into Base Stat flag
2022-01-01 19:24:34 -03:00
LOuroboros
b88d9c4cdc
Updated gItemEffectTable
...
-Rearranged the entries therein, keeping them consistent with the item ID order.
-Removed pointless duplicates of certain effects such as the Full Heal's.
-Added entries for the items that needed one.
-gItemEffect_EvoStone -> gItemEffect_EvoItem.
2022-01-01 19:02:40 -03:00
ghoulslash
2736223b1b
Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems
...
Form changing by holding items
2021-12-21 09:10:23 -05:00
ghoulslash
b4cc5e3cd8
Merge pull request #1952 from AsparagusEduardo/PE_natureEvo
...
Added Nature evolution methods
2021-12-20 14:08:47 -05:00
Eduardo Quezada D'Ottone
7e3282fba5
Merge pull request #1972 from LOuroboros/spaces
...
Removed weird spaces in 7 dex descriptions
2021-12-19 20:14:05 -03:00
Eduardo Quezada D'Ottone
8b49f8f925
Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems
2021-12-19 12:08:52 -03:00
ultima-soul
18afd06f6d
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-18 00:28:18 -08:00
ultima-soul
b0b8b9bf46
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
TheXaman
f6d9b74a1a
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug
2021-12-10 16:48:46 +01:00
ultima-soul
349262ebc3
Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync
2021-12-03 17:31:02 -08:00
Eduardo Quezada D'Ottone
96b8d21b7a
Added form switching + Button icons
2021-12-03 19:32:31 -03:00
LOuroboros
4ca9005797
Removed weird spaces in 7 dex descriptions
2021-12-03 18:34:14 -03:00
Eduardo Quezada D'Ottone
fa995894b7
Added Nature evolution methods
2021-11-27 20:46:19 -03:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
LOuroboros
7ae30f8913
I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY
...
Also fixed its inaccurate description.
2021-11-17 07:15:14 -03:00
Eduardo Quezada D'Ottone
f3013d8ee9
Standarized Solarbeam into Solar Beam
2021-11-01 18:36:35 -03:00
LOuroboros
b7fd767e8c
Added primal reversions to gEvolutionTable
2021-10-09 00:21:47 -03:00
ultima-soul
06f36595d6
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
2021-10-05 19:25:52 -07:00
Eduardo Quezada D'Ottone
2b54b48b04
Merge branch 'PokemonExpansion' into PE_FormChangeHoldItems
...
# Conflicts:
# src/pokemon.c
2021-10-05 21:13:36 -03:00
ultima-soul
78d2215196
Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding.
2021-10-03 10:16:09 -07:00
GriffinR
6e62c057f5
Document remaining symbols in pokemon.c
2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone
fdd284b50b
Hold Item party menu
2021-09-29 02:06:03 -03:00
Eduardo Quezada D'Ottone
4fbe4da7d0
Sitrus Berry Gen4+ heal. Credit to SBird1337
2021-09-26 18:46:34 -03:00
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
