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 |
|
GriffinR
|
cacd6410bf
|
Drop double underscore 'empty' macros
|
2021-10-05 08:54:15 -04:00 |
|
GriffinR
|
394c52a7be
|
Clean up roamer.c
|
2021-10-04 18:32:04 -04: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 |
|
GriffinR
|
6e62c057f5
|
Document remaining symbols in pokemon.c
|
2021-10-02 23:48:12 -04:00 |
|
GriffinR
|
739e7d3c31
|
Document summary screen sprite manager
|
2021-10-02 23:47:59 -04:00 |
|
GriffinR
|
001a25e49c
|
Merge pull request #1507 from GriffinRichards/doc-walda
Document Walda Phrase
|
2021-09-30 12:27:20 -04:00 |
|
GriffinR
|
27d69ea8e6
|
Merge pull request #1508 from Pokestia/master
Use compact weather macros
|
2021-09-30 11:23:13 -04:00 |
|
Pokestia
|
38a4dea402
|
Rename Battle Weather flags
|
2021-09-30 12:08:20 +02:00 |
|
Pokestia
|
e699965332
|
Use compact weather macros
|
2021-09-29 17:45:39 +02:00 |
|
GriffinR
|
e270ee1a74
|
Merge pull request #1506 from GriffinRichards/single-doc
Document some single-remaining symbols
|
2021-09-29 00:10:09 -04:00 |
|
BuffelSaft
|
75c2832afe
|
Merge pull request #1697 from AsparagusEduardo/fix_cobaBerry
Fixed Coba Berry's typing
|
2021-09-29 15:43:31 +13:00 |
|
GriffinR
|
154e8a271a
|
Merge pull request #1505 from GriffinRichards/tag-none
Add TAG_NONE
|
2021-09-28 22:22:09 -04: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 |
|
GriffinR
|
8a79ca3818
|
Document walda_phrase
|
2021-09-26 17:01:39 -04: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 |
|
GriffinR
|
db057eb86b
|
Relocate battle_message comment
|
2021-09-24 17:33:18 -04:00 |
|
GriffinR
|
a66d7e1b43
|
Document some single-remaining symbols
|
2021-09-24 17:14:20 -04:00 |
|
GriffinR
|
42d2fefe02
|
Merge branch 'master' into tag-none
|
2021-09-24 10:17:34 -04: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 |
|
GriffinR
|
09fd4fc4c5
|
Merge pull request #1504 from LOuroboros/staticRegionMapSecIdToPopUpThemeIdMapping
Renamed gRegionMapSectionId_To_PopUpThemeIdMapping
|
2021-09-23 22:48:42 -04:00 |
|
LOuroboros
|
ac599589ec
|
gRegionMapSectionId_To_PopUpThemeIdMapping -> sRegionMapSectionId_To_PopUpThemeIdMapping
|
2021-09-23 23:36:37 -03:00 |
|
GriffinR
|
9d0f9042fe
|
Merge pull request #1498 from LOuroboros/trailingSpaces
Removed trailing spaces in the most relevant files
|
2021-09-23 21:49:49 -04:00 |
|
GriffinR
|
a6ab2eb883
|
Merge branch 'master' into trailingSpaces
|
2021-09-23 21:39:21 -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 |
|
GriffinR
|
f8f7617946
|
Add TAG_NONE
|
2021-09-14 13:14:14 -04:00 |
|
PikalaxALT
|
0c2e9a5b4c
|
Merge pull request #1502 from GriffinRichards/clean-lilycovelady
Clean up Lilycove Lady
|
2021-09-09 16:04:08 -04:00 |
|
GriffinR
|
cbf8863e5b
|
Clean up Lilycove Lady
|
2021-09-09 15:24:34 -04:00 |
|
GriffinR
|
4037cf147b
|
Merge pull request #1500 from GriffinRichards/fix-healthboxgfx
Move more gfx symbols into gHealthboxElementsGfxTable
|
2021-09-06 21:47:44 -04:00 |
|
GriffinR
|
b183a793a1
|
Move more gfx symbols into gHealthboxElementsGfxTable
|
2021-09-06 17:45:10 -04:00 |
|
GriffinR
|
4dbaca9dc6
|
Merge pull request #1499 from froggestspirit/master
Identify unknown healthbox GFX
|
2021-09-06 16:54:28 -04:00 |
|
froggestspirit
|
71da126dbb
|
case
|
2021-09-06 16:41:59 -04:00 |
|
froggestspirit
|
5f755757f9
|
Const rename
|
2021-09-06 11:40:40 -04:00 |
|
froggestspirit
|
f8a24cdd6f
|
Identify unknown healthbox GFX
|
2021-09-06 10:42:05 -04:00 |
|