atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7110 commits 2 branches 40 tags 600 MiB
Commit graph

556 commits

Author SHA1 Message Date
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union 
Document link_rfu / Union Room
 2021-10-15 22:44:01 -04:00
Eduardo Quezada D'Ottone
b9816f0f28 Saftety Goggles typo for Item Expansion 2021-10-14 20:38:13 -03:00
GriffinR
f23e0beeba Rename battle anim cmds, move its data, name remaining symbols 2021-10-11 13:18:21 -04:00
LOuroboros
34533a9047 Adjusted the data of the Red and Blue Orbs 2021-10-09 00:53:35 -03:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union 2021-10-07 16:10:35 -04:00
GriffinR
6aaf50ee27 Rename GF Gname, Rfu, finish bulk of Union Room, more link doc 2021-10-07 10:43:03 -04: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
GriffinR
6e62c057f5 Document remaining symbols in pokemon.c 2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone
c3087de712 Fixed Coba Berry's typing 2021-09-28 22:13:39 -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
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
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -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
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
GriffinR
cbf8863e5b Clean up Lilycove Lady 2021-09-09 15:24:34 -04: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
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
GriffinR
e01ae55c13 Start more link_rfu_2 documentation 2021-08-15 15:13:42 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
ultima-soul
ad8cfda831 Add and rearrange Key Items. 2021-07-06 17:03:46 -07: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
9e0b866f09 Rearranged Poke Ball item ids. 2021-06-18 21:46:20 -07:00
Jaizu
a500b04a51
Feathr > Feather 
We do have enough space to put the whole word.
 2021-06-03 12:08:31 +02:00
ultima-soul
fc19023087
Merge pull request #1493 from LOuroboros/feathers 
Corrected the Wings/Feathers
 2021-06-02 22:56:16 -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
ultima-soul
1f859e340d
Merge pull request #1415 from ghoulslash/item_expansion 
Add Berry Hold Effects
 2021-05-24 11:07:35 -07:00
ghoulslash
64815a5f85
Update src/data/items.h 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-05-24 10:18:05 -06:00
ghoulslash
5aa1b5b1ee
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:59 -06:00
ghoulslash
39974b05f7
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:55 -06:00
ghoulslash
a3b092c9a3
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:51 -06:00
ghoulslash
6b868a028a
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:47 -06:00
ghoulslash
aafc8e2109
Update src/data/items.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-24 10:17:39 -06:00
ghoulslash
f7c00d2366
Update src/data/items.h 
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
 2021-05-24 10:17:34 -06:00
Eduardo Quezada D'Ottone
ff296efb5c
Merge pull request #1484 from LOuroboros/patch-1 
Corrected the item descriptions of some berries
 2021-05-21 11:41:14 -04:00
LOuroboros
0bc8ed59f5 Wings -> Feathers 2021-05-17 21:58:17 -03:00
LOuroboros
972ed0d5a7 Adjusted the item data of the Wings/Feathers 
Now they work. Yay.
 2021-05-17 21:34:42 -03:00
ultima-soul
88861abb29
Merge pull request #1470 from ultima-soul/item_expansion_sync 
Item Expansion Upstream Sync
 2021-05-13 20:56:23 -07:00
LOuroboros
16573a36eb
Update item_descriptions.h 2021-05-08 18:32:37 -03:00
ghoulslash
6703517f6d
Merge pull request #1456 from ExpoSeed/IE/razor-claw 
Razor claw effect
 2021-05-04 09:33:40 -06:00
ultima-soul
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -07:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims 
Document battler affine anims, default pokeball throw
 2021-04-28 13:56:42 -04:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil 
Some Contest clean up
 2021-04-27 02:29:41 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata 
Document trade sequence animation, some trade cleanup
 2021-04-26 13:26:12 -04:00
GriffinR
e40f89b175 Move unknown data table, reference with species 2021-04-25 02:19:01 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR
04af378904 Document trade sequence animation, some trade cleanup 2021-04-20 05:50:39 -04:00
GriffinR
52495e889f Doc storage - cleanup 2021-04-18 01:44:25 -04:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR
a1ed59450e Doc storage - wallpaper and titles 2021-04-15 16:09:41 -04:00
ghoulslash
98bccaa35d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-04-10 14:28:07 -06:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field 
Document field
 2021-04-10 13:05:51 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04: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
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
GriffinR
802d2b2f0f Label Kyogre/Groudon anims 2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
ExpoSeed
5eed23b5d8 Razor claw effect 2021-04-05 23:19:03 -05:00
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
ExpoSeed
3517baae2d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into IE/item-use-form-change 2021-04-04 01:21:18 -05: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
ExpoSeed
08bd8f8403 Support form changes with PE 2021-03-03 15:34:22 -06:00
Evan
791fd5e709 finish berry hold effects 2021-03-03 09:25:25 -07: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