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
LOuroboros
5281fe63fc
Update NUM_TECHNICAL_MACHINES
2022-01-08 21:27:29 -03:00
Eduardo Quezada D'Ottone
4f9e6faa48
Merge branch 'item_expansion' into flingIE
2022-01-02 18:31:03 -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
5a8e51d858
Filled in missing items' sprite data
2021-12-31 16:27:06 -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
ultima-soul
349262ebc3
Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync
2021-12-03 17:31:02 -08:00
ultima-soul
d408b56549
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
ultima-soul
d0623d7b71
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-27 21:40:08 -08:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
Eduardo Quezada D'Ottone
31d7719429
Merge pull request #1913 from LOuroboros/healingItems
...
Changed I_LEGACY_HEALING_ITEMS
2021-11-20 23:37:24 -03:00
LOuroboros
ad8582064b
#elif without condition bad, #else good
2021-11-19 18:49:30 -03:00
GriffinR
c89dfd9f56
Finish updating macro comments
2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6
Distinguish 'virtual object' names from object events
2021-11-17 23:40:53 -05:00
GriffinR
b9fa18bdd4
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros
2021-11-17 22:03:37 -05:00
GriffinR
c940b67716
Continue macro comment updating
2021-11-17 17:45:59 -05:00
GriffinR
c1970a4bc8
Remove dead sub references
2021-11-17 15:47:47 -05:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
...
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR
eb95ac0b9c
Document field_tasks
2021-11-17 14:44:42 -05:00
LOuroboros
7ae30f8913
I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY
...
Also fixed its inaccurate description.
2021-11-17 07:15:14 -03:00
LOuroboros
7d71fe6ce8
I_NEW_VITAMIN_EV_CAP -> I_VITAMIN_EV_CAP
2021-11-16 21:25:03 -03:00
GriffinR
61aa9c3ba9
More updating event macro comments
2021-11-16 17:46:34 -05:00
LOuroboros
f62ec0630a
Updated Vitamins cap
2021-11-16 18:36:49 -03:00
GriffinR
d414787932
Some TV clean-up
2021-11-16 16:22:17 -05:00
GriffinR
5d9c31a610
Label slot machine ids, fix GetPriceReduction
2021-11-16 15:43:52 -05:00
GriffinR
63c5905914
Continue updating event macro comments
2021-11-16 13:10:23 -05:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
c1130592fa
Drop some overworld prefixes
2021-11-15 10:58:05 -05:00
GriffinR
65d3b58374
Add PARTY_NOTHING_CHOSEN
2021-11-15 10:57:06 -05:00
LOuroboros
ea12dfdf2c
Implemented Fling
2021-11-15 12:41:00 -03:00
GriffinR
4275cf4b90
Rename pokenav match call files
2021-11-15 01:30:21 -05:00
GriffinR
14d78d7633
Finish match call menu doc
2021-11-15 01:20:03 -05:00
GriffinR
c779d03b3e
Rename pokenav_match_call_ui
2021-11-15 00:21:40 -05:00
GriffinR
d4d4234283
Finish pokenav list ui doc
2021-11-15 00:09:02 -05:00
Wiz
927f9d27df
Designate gBattleAnimBgImage_Attract and related as arrays
2021-11-14 17:08:03 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim
2021-11-13 23:26:46 -05:00
GriffinR
159bb37bbe
Merge branch 'master' into fix_saveblock_reorder
2021-11-13 23:19:57 -05:00
GriffinR
9a932cd9c3
Merge pull request #1549 from GriffinRichards/doc-binterface
...
Document remaining symbols in battle_interface, palette, and save
2021-11-13 23:19:08 -05:00
ProjectRevoTPP
9d3345a6d6
Enforce structs to enforce save block order for modern toolchains.
2021-11-13 21:41:16 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata
...
Clean up sound, add CRY_MODE constants
2021-11-13 15:54:40 -05:00
GriffinR
b3e593dff5
Continue pokenav list ui doc
2021-11-13 15:52:58 -05:00
GriffinR
ec05157568
Move pokenav list item union out of list struct
2021-11-13 11:27:11 -05:00
