4864 Commits

Author SHA1 Message Date
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
Evan
ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00
Evan
07a4400d50 finish switch in ability messages 2020-11-19 11:42:00 -07:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
ultima-soul
fdfe330330
Merge pull request #519 from Pyredrid/doublescriptedwilds
Added commands for scripted double wild battles
2020-11-18 08:57:19 -08:00
Evan
5c658c6950 config option for terrain bg change 2020-11-17 20:26:09 -07:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -07:00
ultima-soul
e15a86caae Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8. 2020-11-17 10:32:24 -08:00
kageru
6f91f7e0e3
Use more constants in Battle Tower code 2020-11-17 17:40:26 +01:00
ultima-soul
63bd0ec836 Remove Cacophony and fix some Gen 8 ability descriptions to fit. 2020-11-16 15:42:09 -08:00
ultima-soul
e32659d4bb Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities. 2020-11-16 13:50:26 -08:00
TheXaman
6422164d31 Added moves, trainer edits and fixed abilities, now only possible ones including hidden when using PE
Give all TMs, watch credits, change trainer name/gender/id

implemented moves
2020-11-16 19:45:53 +01:00
Eduardo Quezada D'Ottone
4da357aef4 Fixed compatibility with Pokémon Expansion 2020-11-15 13:35:02 -03:00
LOuroboros
890144f153
Defined Isle of Armor moves
Straight up copied from the battle_engine branch.
2020-11-15 13:05:49 -03:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves
LGPE & Isle of Armor move data.
2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone
f0154028ff Review changes 2 2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone
29c33b908b
Apply suggestions from code review
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2020-11-13 21:34:37 -03:00
Evan
66152538ec add back accidentally deleted item theft battle type checks 2020-11-13 13:42:49 -07:00
Eduardo Quezada D'Ottone
54630ff5a9 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
#	src/data/pokemon/evolution.h
2020-11-13 16:40:31 -03:00
Eduardo Quezada D'Ottone
b2f078410f Review changes 2 2020-11-13 16:13:13 -03:00
Eduardo Quezada D'Ottone
26db02e95a Review changes 1 2020-11-13 15:36:36 -03:00
Evan
a05d8f7d43 fix conflicts 2020-11-13 11:21:15 -07:00
Evan
435f928aa4 opponent trainer theft config option. Clean up code a bit 2020-11-13 11:00:44 -07:00
Eduardo Quezada D'Ottone
e87f0f1ddb Review changes 2020-11-13 14:51:50 -03:00
ultima-soul
236d7145ae
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances
Added config option for Steel type resistances.
2020-11-12 23:25:21 -08:00
Evan
64bcac4589 move pickpocket to back of moveend sequence 2020-11-12 23:30:00 -07:00
ultima-soul
c3423b4212
Merge pull request #1206 from ExpoSeed/type-changing-moves
Refactor move effects for type changing moves
2020-11-12 19:10:48 -08:00
Evan
520f00f4ae add pickpocket 2020-11-11 18:08:46 -07:00
Eduardo Quezada D'Ottone
4b9d0d8e24 Added config option for Steel type resistances. 2020-11-11 17:48:02 -03:00
LOuroboros
6f122ac8f8 Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility 2020-11-11 15:18:39 -03:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
Implemented Wish Mega Evolution
2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
caf6253ba3 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
#	src/pokemon_icon.c
2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone
d97932c009 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
#	src/pokemon.c
2020-11-10 19:29:50 -03:00
Eduardo Quezada D'Ottone
e021a4aa87
Critical Capture Config Option And Catching Charm #556 from ghoulslash
Critical Capture Config Option And Catching Charm
2020-11-10 17:31:08 -03:00
Eduardo Quezada D'Ottone
e6f8d57f08 Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
# Conflicts:
#	include/constants/battle_string_ids.h
2020-11-10 17:28:17 -03:00
ghoulslash
7a9476323c
Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences
Support for Gender Differences
2020-11-10 12:31:03 -07:00
LOuroboros
bb4f00737e B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE 2020-11-10 14:26:47 -03:00
Evan
de0518121e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-10 09:00:30 -07:00
LOuroboros
a25190f357 A few things.
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
2020-11-10 10:34:51 -03:00
LOuroboros
e179b9b5fe Updated Intimidate to Gen. 8 standard 2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone
6f29abbe0e
Plate type data and hold effect #1207 from ExpoSeed 2020-11-09 15:24:13 -03:00
Eduardo Quezada D'Ottone
b19ee3c554 Capitalization. 2020-11-09 14:53:10 -03:00
Eduardo Quezada D'Ottone
03c7843e45 Capitalization 2020-11-09 14:52:58 -03:00
Eduardo Quezada D'Ottone
33ed87e2cb Capitalization 2020-11-09 14:52:18 -03:00
Eduardo Quezada D'Ottone
3a984136e7 Updated comment. 2020-11-09 14:50:18 -03:00
Eduardo Quezada D'Ottone
690307dbf9 Updated comment. 2020-11-09 14:49:23 -03:00
Eduardo Quezada D'Ottone
102e686a94 Updated comment. 2020-11-09 14:48:47 -03:00
Eduardo Quezada D'Ottone
bacabf03a8 Review changes. 2020-11-09 13:45:08 -03:00
Eduardo Quezada D'Ottone
df11b68acb Moved POKEMON_EXPANSION define to global.h to fix reading from other branches 2020-11-09 12:58:03 -03:00