Eduardo Quezada D'Ottone
f78bb4fb84
Merge remote-tracking branch 'pret/master' into item_expansion
...
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-12 17:42:32 -04:00
GriffinR
7143865f6f
Add some battle frontier constant usage
2022-06-09 12:57:28 -04:00
sneed
c8e08edbae
rename item1 and item2 in BaseStats
2022-05-23 19:10:24 +03:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
LOuroboros
12d956872b
Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge
2022-05-13 03:18:37 -03:00
Eduardo Quezada D'Ottone
a896f9aed7
Merge pull request #2133 from Sneed69/cobaberry
...
Coba berry fix
2022-05-12 13:39:50 -04:00
sneed
0c0bea33c7
Update items.h
2022-05-12 18:39:10 +03:00
sneed
eebfed20ad
#elif
2022-05-08 09:58:06 +03:00
sneed
d8256663e3
fix syntax
2022-05-07 22:12:10 +03:00
sneed
5592fa434a
catch < gen7 with engine
2022-05-07 22:01:35 +03:00
sneed
7008c01f25
Update items.h
2022-05-07 21:41:21 +03:00
Eduardo Quezada D'Ottone
49905cee04
Ability Patch
2022-05-03 14:14:04 -04:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer
...
Trainer hill clean up
2022-04-20 00:20:44 -04:00
LOuroboros
eb1834ce84
Merge branch 'master' of https://github.com/pret/pokeemerald into iePret
2022-04-11 01:22:48 -03:00
GriffinR
328b925a08
Move trainer hill map data to bin files
2022-03-31 14:08:31 -04:00
GriffinR
62f3f144ab
Clean up some trainer hill
2022-03-31 12:54:07 -04:00
GriffinR
0a0157b62c
Name unknown_16.png
2022-03-14 15:54:47 -04:00
GriffinR
b1d61b9227
Merge pull request #1641 from GriffinRichards/subsprite-arr-count
...
Use ARRAY_COUNT for obj event subsprite tables
2022-03-03 23:08:52 -05:00
GriffinR
f78f46a1e2
Use ARRAY_COUNT for obj event subsprite tables
2022-03-03 14:54:05 -05:00
ultima-soul
2d3ba500c9
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2022-03-01 15:10:19 -08:00
GriffinR
5d58cdd297
Fix bunny hoppy typo
2022-02-28 13:34:39 -05:00
GriffinR
131ed1916e
Generalize name of party slot without HP
2022-02-15 16:24:19 -05:00
GriffinR
49eca60955
Convert party menu slots to bin files
2022-02-15 16:12:54 -05:00
LOuroboros
52e3cf4f59
Added missing flingPower values
2022-01-22 05:40:29 -03:00
LOuroboros
367ba2d5bf
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE
2022-01-22 05:39:48 -03:00
Eduardo Quezada D'Ottone
02da6cc627
Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb
...
# Conflicts:
# include/graphics.h
# src/data/graphics/items.h
# src/data/item_icon_table.h
# src/data/items.h
# src/data/text/item_descriptions.h
2022-01-16 18:44:03 -03:00
GriffinR
694aa3c65d
Move balls, shop, link, map popups, and bag out of interface
2022-01-11 13:53:23 -05:00
GriffinR
565dd24309
Move party menu graphics out of interface
2022-01-11 11:37:13 -05:00
GriffinR
577e6cc740
Merge pull request #1586 from GriffinRichards/clean-areascreen
...
Clean up pokedex_area_screen
2022-01-06 23:02:23 -05:00
GriffinR
713cd6616e
Add glow tile empty
2022-01-06 22:33:00 -05:00
Eduardo Quezada D'Ottone
4f9e6faa48
Merge branch 'item_expansion' into flingIE
2022-01-02 18:31:03 -03:00
LOuroboros
b88d9c4cdc
Updated gItemEffectTable
...
-Rearranged the entries therein, keeping them consistent with the item ID order.
-Removed pointless duplicates of certain effects such as the Full Heal's.
-Added entries for the items that needed one.
-gItemEffect_EvoStone -> gItemEffect_EvoItem.
2022-01-01 19:02:40 -03:00
LOuroboros
5cdfe0a9fb
Fixed the Lures and adjusted 2 charms' descriptions
2022-01-01 18:03:00 -03:00
LOuroboros
74aa4f29df
Corrections and additions
...
-Fixed a handful of prices
-Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable.
-Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo.
-Fixed small syntax mistakes in src/data/text/item_descriptions.h
-Slightly changed some item descriptions based on AsparagusEduardo's suggestions.
-Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.
2022-01-01 17:17:21 -03:00
Eduardo Quezada D'Ottone
b25c89f8a1
Removed Redundant Key Stone item
2021-12-31 18:22:23 -03:00
LOuroboros
9b1fd796ae
Gave the Gracidea's old hold effect slot to the Enigma Berry
2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone
313df31e7e
Removed Jade Orb, since it has no use besides being a key-lock item.
2021-12-31 17:44:03 -03:00
LOuroboros
0c5652596b
Removed HOLD_EFFECT_GRACIDEA
2021-12-31 17:34:16 -03:00
LOuroboros
e961bdee14
Fixes
...
-Used Buffel Saft's sprite for the Ability Patch.
-Fixed the Mints' descriptions.
-Fixed the Damp Mulch's palette.
-Decapped the Pokémon Box Link's name.
-Fixed the target pocket of the Key Stone and the Dynamax Band.
2021-12-31 17:10:02 -03:00
LOuroboros
5a8e51d858
Filled in missing items' sprite data
2021-12-31 16:27:06 -03:00
LOuroboros
d4dc672088
Filled in missing item data
2021-12-31 13:23:06 -03:00
GriffinR
23f5c9fd5c
Clean up pokedex_area_screen
2021-12-31 00:16:56 -05:00
GriffinR
aadab8b016
Move pokemon and easy chat constants to global, misc clean-up
2021-12-28 18:07:41 -05:00
ghoulslash
7839750d7e
Merge pull request #1926 from AsparagusEduardo/IE_itemDesc
...
Update to item descriptions based on configured effect.
2021-12-21 09:39:11 -05:00
LOuroboros
211c8c684d
Update items.h
2021-12-19 20:30:03 -03:00
LOuroboros
4a74d288d4
Review corrections
2021-12-18 00:01:50 -03:00
LOuroboros
dbca24aa82
[LEAK INFORMED] Documented the unk19 item field
2021-12-17 19:41:39 -03:00
ultima-soul
356cf96654
Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.
2021-12-15 19:33:35 -08:00
ultima-soul
26f29a04fd
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
...
This reverts commit ac2bcece75349262ebc3
2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync
2021-12-09 14:16:05 -08:00
