Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number ( #1732 )
2023-08-09 10:51:01 -04:00
Salem
78c4d07b23
Add Berserk Gene Item ( #2893 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-25 15:03:57 -04:00
AgustinGDLV
2eabcea86e
Battle Item Refactor ( #2902 )
...
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
2023-04-14 19:25:50 +01:00
aaghaht
bd54c70020
Add PLA evo items
2023-04-10 10:47:31 +05:30
Bassoonian
e601719c91
Add new PLA form change items
2023-03-24 00:04:08 +01:00
Bassoonian
80d0efae0c
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev
2023-03-23 23:04:23 +01:00
Eduardo Quezada D'Ottone
2658fe32c2
Removed ITEM_HAS_EFFECT ( #2840 )
2023-03-23 10:02:32 +01:00
Bassoonian
372c6a1afa
Add new item variables and defines
2023-03-19 20:55:39 +01:00
Eduardo Quezada
a044774896
Added Gen9 item data and fixed Punching Glove's effect
2023-01-24 16:47:54 -03:00
Eduardo Quezada
68b474c0f0
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
...
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
2022-10-07 14:52:32 -03:00
GriffinR
1107ff954d
Clean up shop.c
2022-09-22 15:08:17 -04:00
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-08-25 22:40:19 -04:00
AgustinGDLV
e204527f43
changed candy item parameters
2022-08-25 15:52:47 -07: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
b25c89f8a1
Removed Redundant Key Stone item
2021-12-31 18:22:23 -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
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
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03: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
ae26a7529c
Restored FRLG items
2021-11-11 22:26:58 -03:00
ultima-soul
69e3719f75
Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar.
2021-11-09 19:19:48 -08:00
Eduardo Quezada D'Ottone
f3013d8ee9
Standarized Solarbeam into Solar Beam
2021-11-01 18:36:35 -03: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
ultima-soul
bca67ac683
Refactor Poke Ball code to not rely on Master Ball being the first item internally.
2021-06-11 18:22:50 -07:00
LOuroboros
0bc8ed59f5
Wings -> Feathers
2021-05-17 21:58:17 -03: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
1cac608dbe
Document mail
2021-02-24 11:03:39 -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
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
Evan
a0ae0ece53
add ultranecrozium-z and update z crystal data
2020-12-08 09:55:50 -07:00
Evan
539a88207e
add z crystal and z ring
2020-11-29 10:00:03 -05:00
LOuroboros
61b41f3599
Removed unused labels for expanded TMs
2020-10-24 09:57:11 -03:00
Evan
d64b926469
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion
2020-10-19 11:22:41 -06:00
ExpoSeed
c3113b43bb
Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion
2020-10-04 02:36:07 -05:00
GriffinR
66bd1e6d3f
Use constants for item digits
2020-09-25 11:18:52 -04:00
DizzyEggg
35559d6b71
Merge with master
2020-08-27 10:58:31 +02:00
Evan
f923f5198e
add oval charm
2020-07-16 09:48:25 -06:00
DizzyEggg
6537310387
Merge with master
2020-07-15 10:23:58 +02:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld
2020-07-15 00:40:47 -04:00
Eduardo Quezada
b31efcd6e3
Renamed constant,
2020-07-12 01:49:32 -04:00
GriffinR
abdf7cbf02
Label fishing effect functions
2020-06-29 16:53:38 -04:00
Eduardo Quezada
7244b80fc6
Created constant for easier Ball Expansion.
2020-06-21 02:36:46 -04:00
