ghoulslash
445e9c4b8b
merge w upcoming
2023-05-01 12:05:07 -04:00
ghoulslash
8cce130643
Add Frostbite status ( #2942 )
2023-05-01 09:45:47 -04:00
Bassoonian
c279830892
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution
2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix
2023-04-26 14:25:36 -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
Bassoonian
b1f75569a1
Merge branch 'upcoming' into rhhupcomingdev
2023-04-25 19:50:26 +02:00
Bassoonian
2aa4d2da38
Fix Ice Heal message
2023-04-25 19:38:47 +02:00
ghoulslash
868838a87d
Add thunder cage case to trap anim IDs ( #2941 )
2023-04-24 14:35:42 -04:00
LOuroboros
a128192bfe
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-04-24 09:36:09 -03:00
Bassoonian
f13c39d784
Thawing out for frostbite
2023-04-23 21:20:23 +02:00
Bassoonian
13f6acf9a1
General mechanics
2023-04-23 19:20:48 +02:00
Bassoonian
a561c6da6a
Add config to Frostbite & allow it to be inflicted
2023-04-22 23:14:49 +02:00
Bassoonian
f50bfb3770
Frostbite hurts at the end of the turn and halves SpA
2023-04-22 18:47:36 +02:00
Bassoonian
623e7c5f25
Add Frostbite status
2023-04-22 18:23:08 +02:00
citrusbolt
6c7f5881e4
Add two EV-related configs ( #2825 )
2023-04-20 10:05:32 -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
Eduardo Quezada
11beec62ee
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/data/pokemon/evolution.h
# src/field_poison.c
2023-04-14 11:31:02 -04:00
Eduardo Quezada
7c29a24110
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413
2023-04-13 17:05:48 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect ( #2883 )
...
* implemented Revival Blessing
2023-04-12 01:14:25 +01:00
ghoulslash
5f4bfd9bb4
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/aiflag
2023-04-10 09:48:49 -04:00
aaghaht
bd54c70020
Add PLA evo items
2023-04-10 10:47:31 +05:30
ghoulslash
afc4b4cdee
add mirror herb
2023-03-28 15:07:37 -04:00
ghoulslash
00d695ac2b
add AI_FLAG_OMNISCIENT
2023-03-28 10:38:48 -04:00
AgustinGDLV
2017bee3f8
fixed Castform + Cherrim
2023-03-27 11:35:23 -07:00
Eduardo Quezada
3888b10769
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
2023-03-27 10:55:38 -03:00
ghoulslash
6574e01e73
Gen. 9 Move Effects, 1st batch ( #2534 )
2023-03-26 16:20:47 -04:00
ghoulslash
dc9f0b5107
Implement Customizable NPC Trainer Parties ( #2733 )
2023-03-26 09:32:51 -04:00
sbird
aea5d79aa2
[trainer_parties] implement fully customizable npc trainer parties
...
fix nature related bug, fix hash generation, add tests
2023-03-25 20:00:04 +01:00
GriffinR
6be9a79b8c
Merge pull request #1871 from GriffinRichards/doc-trendy-sayings
...
Document the trendy sayings word group
2023-03-24 08:05:51 -04:00
Zunawe
492422b6bd
Fix scanner item flag name
2023-03-23 21:47:26 -07:00
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
LOuroboros
7ce5c5fc66
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-03-23 06:27:09 -03:00
Eduardo Quezada D'Ottone
2658fe32c2
Removed ITEM_HAS_EFFECT ( #2840 )
2023-03-23 10:02:32 +01:00
Eduardo Quezada
ef914a2fac
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
2023-03-21 16:13:27 -03:00
Eduardo Quezada
51b716c9d9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319
...
# Conflicts:
# data/battle_scripts_2.s
# include/constants/battle_string_ids.h
# include/constants/songs.h
# src/battle_message.c
# src/data/pokemon/species_info.h
2023-03-19 20:28:56 -03:00
Bassoonian
372c6a1afa
Add new item variables and defines
2023-03-19 20:55:39 +01:00
LOuroboros
f4e8389779
Added Psyblade and Hydro Steam
2023-03-17 09:25:39 -03:00
Eduardo Quezada
0a9ab96390
Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments
2023-03-14 08:54:49 -03:00
GriffinR
0c380862d6
Document the trendy saying word group
2023-03-13 15:58:40 -04:00
Alex
aa29eced1f
Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites
2023-03-13 17:46:53 +01:00
LOuroboros
6dbe772e27
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-03-10 18:23:33 -03:00
Eduardo Quezada
4625a46748
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
2023-03-07 11:26:33 -03:00
DizzyEggg
a04046dbb6
Add tests for Defog and fix Defog battle strings ( #2737 )
...
* start working on defog tests
* defog tests + improve terrain end battlescripts
* newline
2023-03-06 20:35:08 +01:00
GriffinR
bb078e0618
Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments
...
Document music usage to make it easier to search for a specific track
2023-03-05 15:29:38 -05:00
Eduardo Quezada
a6bd35ceab
Review changes
2023-03-05 17:17:39 -03:00
ghoulslash
dec1b16138
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile ( #2790 )
2023-03-05 09:50:47 -05:00
GriffinR
ce6875817f
Merge pull request #1860 from GriffinRichards/metatile-labels
...
Format metatile_labels
2023-03-04 23:36:04 -05:00
Eduardo Quezada
9917f5cc8b
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
...
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
2023-03-03 11:00:50 -03:00
Alex
487e26e700
fix enamorus_t + samuroutt sprite + conflicts
2023-03-02 11:05:59 +01:00
