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 |
|
ultima-soul
|
64a48800c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-08-11 17:10:57 -07:00 |
|
PikalaxALT
|
c7fc6ac893
|
Merge pull request #1492 from Kurausukun/cgbsound
Fix CgbSound Fakematches (Thanks to Revo)
|
2021-08-11 19:55:44 -04:00 |
|
GriffinR
|
034b7f0513
|
Fix conflicting PC window names
|
2021-08-11 19:14:50 -04:00 |
|
GriffinR
|
80348e7188
|
Merge branch 'master' into doc-itemmenu2
|
2021-08-11 19:01:47 -04:00 |
|
GriffinR
|
cc51627465
|
Merge pull request #1489 from GriffinRichards/doc-playerpc
Document player pc
|
2021-08-11 18:59:58 -04:00 |
|
GriffinR
|
0bc26d9d79
|
Merge pull request #1488 from GriffinRichards/doc-frontierpass2
Document frontier pass
|
2021-08-11 17:40:55 -04:00 |
|
GriffinR
|
3a14f4472d
|
Merge pull request #1495 from GriffinRichards/fix-symbols
Fix symbols branch commit message, limit to upstream
|
2021-08-11 17:35:31 -04:00 |
|
GriffinR
|
1860b7682f
|
Allow symbols branch on forks
|
2021-08-11 17:19:21 -04:00 |
|
GriffinR
|
5098fbf7bb
|
Fix symbols branch commit message, limit to upstream
|
2021-08-11 17:09:03 -04:00 |
|
GriffinR
|
2fb7440315
|
Merge pull request #1494 from GriffinRichards/tag-regionmap
Use tag constants in region_map.c
|
2021-08-11 12:24:36 -04:00 |
|
GriffinR
|
d951d7c363
|
Use tag constants in region_map.c
|
2021-08-11 09:31:20 -04:00 |
|
GriffinR
|
28a8fe191a
|
Document item menu
|
2021-08-10 22:13:02 -04:00 |
|
Kurausukun
|
2e892c6961
|
unsigned int -> u32
|
2021-08-08 22:22:50 -04:00 |
|
Kurausukun
|
ddb3911d0d
|
oops
|
2021-08-08 20:49:29 -04:00 |
|
Kurausukun
|
0bceaab046
|
rename variable
|
2021-08-08 20:34:16 -04:00 |
|
Kurausukun
|
b51d025f1c
|
port cgb fakematching fixes (thanks to revo)
|
2021-08-08 20:33:21 -04:00 |
|
GriffinR
|
0e33df21b9
|
Merge pull request #1491 from LOuroboros/inconsFlag
Corrected inconsistent flag label spelling
|
2021-08-05 16:41:10 -04:00 |
|
LOuroboros
|
b4c4650186
|
Corrected inconsistent flag label spelling
|
2021-08-05 17:26:03 -03:00 |
|
GriffinR
|
3714963f0d
|
Merge pull request #1490 from GriffinRichards/align-marts
Add align directives to all marts
|
2021-08-05 14:35:45 -04:00 |
|