ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 05:35:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,399 Commits 1 Branch 0 Tags 235 MiB
75b6d2837e
Commit Graph

430 Commits

Author SHA1 Message Date
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
LOuroboros
f04f35f5c3 Added a config for the amount of HP recovered by healing items 2021-04-02 20:34:57 -03:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred 2021-03-29 20:56:15 -04:00
GriffinR
dea07dc865 Standardize intro gfx names 2021-03-29 20:48:48 -04:00
GriffinR
357c5439f5 Document some credits 2021-03-29 08:52:40 -04:00
GriffinR
c86cc8b371 Document intro, start intro_credits/credits 2021-03-28 23:13:56 -04:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
GriffinR
4077c53338 A few labels in party, start, option menus 2021-03-22 15:30:19 -05:00
GriffinR
8eafe1fd4e Move pointillism points array to src 2021-03-18 17:36:18 -05:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem 
Document PokemonUseItemEffects
 2021-02-22 12:15:19 -05:00
GriffinR
64fc585cc3 Document pokenav ribbons summary screen 2021-02-18 11:33:55 -05:00
SphericalIce
70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00: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
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd 
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
 2021-02-01 21:04:00 -05:00
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
GriffinR
12af03cd62 Label bard music pitch table 2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec Index gBardSounds_Moves and gBardSounds_Pokemon with constants 2021-01-28 15:55:33 -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
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05:00
amiosi
44a0983624 missed some 2021-01-22 07:43:48 -05:00
amiosi
9456382a32 yellow shmellow 2021-01-21 19:05:01 -05:00
amiosi
184dad1874 changes according to review 2021-01-21 19:04:26 -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
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
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
ghoulslash
b006f04ad5
Merge pull request #1256 from ghoulslash/item_expansion 
add z crystal and z ring
 2021-01-15 11:50:54 -07:00
ExpoSeed
5250aaf265
Merge pull request #1277 from LOuroboros/x_items_IE 
Reworked the effects of the X Items #2
 2021-01-15 12:04:54 -06:00
GriffinR
8e06d5679c Index gBardSoundsTable 2021-01-14 03:54:59 -05:00
GriffinR
46e0a0607d Array count for easy chat word groups 2021-01-14 03:48:49 -05:00
GriffinR
f63bc6e27a Index sTMHMMoves 2021-01-14 03:41:28 -05:00
ghoulslash
e013c44340
Merge pull request #1319 from LOuroboros/item_tweaks 
Updated the type-enhancing items' boost
 2021-01-12 09:24:55 -07:00
amiosi
7e91129332 may as well do the rest 2021-01-11 20:18:23 -05:00
amiosi
eaca987879 more fixes 
light ball and gen 6 evolution held items
 2021-01-11 19:54:41 -05:00
amiosi
3aadd69303 fixes 
pokeblock berries and evolution items
 2021-01-11 19:49:03 -05:00
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
amiosi
8d7d819cde beast ball cannot be sold 2021-01-10 15:08:48 -05: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
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
GriffinR
0ca76fc179 Some decoration labels, use constant for tileset size 2021-01-04 16:27:57 -06:00
GriffinR
039108284d Clean up gDecorations with gItems format 2021-01-04 16:27:57 -06:00
LOuroboros
91c92e9c04 #if X_ITEMS_REWORK == TRUE -> #ifdef BATTLE_ENGINE 2021-01-04 06:49:18 -03:00