Commit Graph

6790 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
ae26a7529c Restored FRLG items 2021-11-11 22:26:58 -03:00
Eduardo Quezada D'Ottone
6f728f2fa1
Merge pull request #1561 from ultima-soul/item_id_revamp
Item ID Revamp
2021-11-11 06:23:58 -03:00
ultima-soul
c74e19c062 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-11-09 20:58:19 -08:00
ultima-soul
69e3719f75 Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar. 2021-11-09 19:19:48 -08:00
Eduardo Quezada D'Ottone
75d9f1ccb5
Merge pull request #1866 from LOuroboros/orbs
Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs
2021-11-05 17:50:17 -03:00
LOuroboros
ab2dab9d05 Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs 2021-11-05 17:42:12 -03:00
Eduardo Quezada D'Ottone
18c84fc732
Merge pull request #1864 from LOuroboros/soulDewIE
Added an item config for the Soul Dew
2021-11-05 17:09:58 -03:00
LOuroboros
05c7f7ebfb Fixed the comment for I_SOUL_DEW_BOOST 2021-11-05 10:39:27 -03:00
LOuroboros
10a3c8f119 Added an item config for the Soul Dew 2021-11-04 17:29:17 -03:00
ghoulslash
56bd570d7d
Merge pull request #1812 from BuffelSaft/berry_data
Add missing berry data
2021-10-26 08:36:03 -04:00
BuffelSaft
1429170d16 Fix long descriptions
Just noticed some of these didn't fit in the box.
2021-10-26 16:45:49 +13:00
BuffelSaft
adcf563ba1 Add missing berry data
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
2021-10-26 14:42:06 +13:00
Eduardo Quezada D'Ottone
11ae046abe
Merge pull request #1809 from LOuroboros/orbsSprites
Replaced the Red and Blue Orbs' sprites
2021-10-23 14:12:58 -03:00
LOuroboros
d31700d2ac Replaced the Red and Blue Orbs' sprites 2021-10-23 13:49:02 -03:00
Eduardo Quezada D'Ottone
d769920a15
Merge pull request #1740 from LOuroboros/primalReversionIE
Primal Reversion related tweaks for the IE
2021-10-22 22:28:15 -03:00
ghoulslash
16a133bf54
Merge pull request #1766 from AsparagusEduardo/fix_gogglesIE
Saftety Goggles typo for Item Expansion
2021-10-15 10:13:53 -04:00
Eduardo Quezada D'Ottone
b9816f0f28 Saftety Goggles typo for Item Expansion 2021-10-14 20:38:13 -03:00
ultima-soul
8e25d314bb Fix Safari Ball disappearing while capturing and restore Timer Ball's third frame usage. 2021-10-12 11:43:48 -07:00
LOuroboros
34533a9047 Adjusted the data of the Red and Blue Orbs 2021-10-09 00:53:35 -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
ExpoSeed
2e9eb0e490
Merge pull request #1718 from ultima-soul/form_change_item_data
Assign FORM_ITEM_USE Constants
2021-10-05 15:37:53 -05:00
ultima-soul
7f5204a09f
Merge pull request #1691 from AsparagusEduardo/item_sitrus
Sitrus Berry Gen4+ heal. Credit to SBird1337
2021-10-04 15:18:12 -07:00
Eduardo Quezada D'Ottone
fd9b2eddbe
Update src/data/items.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-10-04 19:05:47 -03:00
ultima-soul
50ab03e9c1 Assign FORM_ITEM_USE constants to secondaryId for appropriate items. 2021-10-03 09:39:26 -07:00
BuffelSaft
75c2832afe
Merge pull request #1697 from AsparagusEduardo/fix_cobaBerry
Fixed Coba Berry's typing
2021-09-29 15:43:31 +13:00
Eduardo Quezada D'Ottone
c3087de712 Fixed Coba Berry's typing 2021-09-28 22:13:39 -03:00
Eduardo Quezada D'Ottone
6c265152dd
Merge pull request #1695 from ultima-soul/mental_herb_desc
Enable Mental Herb Description Toggling Based on B_MENTAL_HERB Config
2021-09-27 18:54:47 -03:00
ultima-soul
de35894669 Enable Mental Herb description toggling based on B_MENTAL_HERB config. 2021-09-27 14:26:07 -07:00
Eduardo Quezada D'Ottone
ff24b15241 derp 2021-09-27 00:00:24 -03:00
Eduardo Quezada D'Ottone
91feaecb04 Hold effect update 2021-09-26 23:45:39 -03:00
Eduardo Quezada D'Ottone
4fbe4da7d0 Sitrus Berry Gen4+ heal. Credit to SBird1337 2021-09-26 18:46:34 -03:00
Eduardo Quezada D'Ottone
3ab909f165
Merge pull request #1687 from LOuroboros/mentalHerb
Sync include/constants/hold_effects.h
2021-09-26 11:19:15 -03:00
Eduardo Quezada D'Ottone
869cb1ede6
Merge pull request #1686 from LOuroboros/patch-2
Fix Dream Ball's effect's code
2021-09-25 21:25:33 -03:00
LOuroboros
a49676ab55 Set the right holdEffectParam to the terrain seeds 2021-09-25 21:09:38 -03:00
LOuroboros
813d114132 Synced include/constants/hold_effects.h with the BE 2021-09-25 20:58:07 -03:00
LOuroboros
ab08ef18f7
Update battle_script_commands.c 2021-09-25 20:42:34 -03:00
Eduardo Quezada D'Ottone
48492997f3
Merge pull request #1681 from ghoulslash/dream_ball
Dream ball checks comatose
2021-09-25 11:53:17 -03:00
ghoulslash
9ab29e993c add battle engine define check 2021-09-24 08:58:51 -04:00
ghoulslash
4aeeb71393 dream ball checks comatose 2021-09-24 08:57:10 -04:00
Eduardo Quezada D'Ottone
3ef87ec722
Merge pull request #1416 from ExpoSeed/IE/item-use-form-change
Support form changes with PE
2021-09-22 00:05:11 -03:00
Eduardo Quezada D'Ottone
f4814ae502
Merge pull request #1627 from ghoulslash/item_expansion
Update Mental Herb Description
2021-09-20 22:41:01 -03:00
ghoulslash
136fbb5862 fix swapped descs 2021-09-20 21:33:50 -04:00
ultima-soul
2cda676b50
Merge pull request #1628 from LOuroboros/patch-2
Sync hold_effects.h with the BE
2021-09-04 11:57:49 -07:00
LOuroboros
376b65f6bf
Update hold_effects.h 2021-09-04 15:36:47 -03:00
ghoulslash
3066e09e68 decap pokemon in mental herb 2021-09-04 08:43:33 -04:00
ghoulslash
f682e409f0 update mental herb desc 2021-09-04 08:19:57 -04:00
ultima-soul
5cb73a012c Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-08-30 11:57:27 -07:00
ExpoSeed
29b6276e64
Merge pull request #1595 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
2021-08-16 19:47:39 -05:00
ultima-soul
840e2bc3f9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-16 16:33:34 -07:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
Document item menu
2021-08-15 12:01:57 -04:00