18854 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
4e7ce0b663 Merge branch 'battle_engine' into BE_configs
# Conflicts:
#	include/constants/battle_config.h
2022-05-07 10:25:34 -04:00
ghoulslash
07579bd42b prevent ally pollen puff selection under heal block. add some ai checks for heal block 2022-05-07 09:56:32 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock
Add missing Heal Block functionalities
2022-05-07 09:13:18 -04:00
ghoulslash
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam
Steel Beam Move Effect Implementation
2022-05-07 08:40:34 -04:00
ghoulslash
a88ed6562e
Merge pull request #2115 from AgustinGDLV/spotlight
fixed spotlight function
2022-05-07 08:23:13 -04:00
ghoulslash
f63a451517
Merge pull request #2110 from Sneed69/gen8rattled
Gen 8 Intimidate triggers Rattled
2022-05-07 08:20:39 -04:00
ghoulslash
b876e24a34
Merge pull request #2108 from AsparagusEduardo/IE_AbilityPatch
Ability Patch
2022-05-07 08:17:02 -04:00
ghoulslash
52dff039b9
Merge pull request #2114 from AgustinGDLV/shed_shell
fixed shed shell
2022-05-07 08:15:10 -04:00
ghoulslash
f821bd313e
Merge pull request #2116 from AgustinGDLV/bolt_beak
fixed bolt beak switch-in boost
2022-05-07 08:13:05 -04:00
AgustinGDLV
2ffff788b4 fixed Fling 2022-05-06 22:29:40 -07:00
AgustinGDLV
542a0f07b4 fixed bug bite / bestow 2022-05-06 22:07:25 -07:00
BuffelSaft
3e645b1839 IsMoveAffectedByParentalBond supports dynamic move targeting
Update IsMoveAffectedByParentalBond to properly handle Expanding Force.
2022-05-07 14:37:02 +12:00
BuffelSaft
57003c62fd EFFECT_SOLAR_BEAM
Fix definition.
2022-05-07 14:20:56 +12:00
BuffelSaft
3e1934ebe3 Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE
Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.
2022-05-07 14:20:37 +12:00
BuffelSaft
8693db632b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-07 12:27:20 +12:00
AgustinGDLV
0cb6529ae2 functional but not perfect implementation 2022-05-06 14:53:16 -07:00
sneed
ef7cd3cdfe BattleScript_DefiantActivates rename 2022-05-06 11:15:24 +03:00
AgustinGDLV
382cd41d12 realized hold effect is defined already 2022-05-05 22:49:46 -07:00
AgustinGDLV
74cc8c5ecb fixed bolt beak switch-in boost 2022-05-05 22:37:28 -07:00
LOuroboros
43053d2e6c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-05-06 02:22:14 -03:00
AgustinGDLV
aff1d3949f fixed spotlight function 2022-05-05 21:58:16 -07:00
AgustinGDLV
07b42d62ef fixed shed shell 2022-05-05 20:46:45 -07:00
AgustinGDLV
e730d64945 corrections 2022-05-05 15:54:33 -07:00
AgustinGDLV
03c48b4f3f compatibility with evo_battle 2022-05-05 15:46:53 -07:00
AgustinGDLV
e343c73cd8 fixed compile error + small tweaks 2022-05-05 15:17:31 -07:00
AgustinGDLV
616e26121f added new line 2022-05-05 12:02:34 -07:00
AgustinGDLV
7d42f93861 added special overworld evo changes 2022-05-05 11:55:31 -07:00
AgustinGDLV
6235970722 added special battle evo changes 2022-05-05 11:41:27 -07:00
sneed
6c23eb431d Heal Pulse and Pollen Puff 2022-05-05 13:56:59 +03:00
sneed
865b771db7 initial commit 2022-05-05 00:57:19 +03:00
Ariel A
c82510e22b Gamma shift now ignores special sprite palette tags (lights, emotes). 2022-05-03 23:51:31 -04:00
Ariel A
b46a8b16ca Added time-of-day related follower messages. 2022-05-03 23:20:43 -04:00
Ariel A
19df355574 Merge branch 'romhack' into lighting 2022-05-03 23:01:52 -04:00
Ariel A
831c73c18c Added system for conditional follower messages. 2022-05-03 23:01:02 -04:00
Eduardo Quezada D'Ottone
49905cee04 Ability Patch 2022-05-03 14:14:04 -04:00
sneed
00e9d02889 minor change 2022-05-03 15:06:56 +03:00
sneed
60d7d8f97e Initial Commit 2022-05-03 03:38:44 +03:00
sneed
b17d1f7816 Add generation specific interactions 2022-05-02 17:56:09 +03:00
sneed
f96fc60ac4 removed brackets 2022-05-02 06:20:49 +03:00
sneed
23870a40a8 Initial commit 2022-05-02 06:04:16 +03:00
sneed
be6148d876 Add missing Heal Block functionalities 2022-05-02 04:54:25 +03:00
Eduardo Quezada D'Ottone
a4118e891f
Merge pull request #2104 from Sneed69/dex_pic_fix
Fix potential dex pic bug
2022-05-01 21:37:20 -04:00
sneed
12082e033d Fix potential dex pic bug 2022-05-02 04:02:58 +03:00
Ariel A
9993f72186 Updated remote_build to use --force-with-lease instead of --force. 2022-05-01 14:23:45 -04:00
ghoulslash
f0d74b60ff
Merge pull request #1932 from BuffelSaft/gen_8_moves_batch2
Gen 8 moves batch + Beak Blast
2022-05-01 07:47:11 -04:00
BuffelSaft
cbf0a6704b Set Sticky Web user to Court Change user
This is for Mirror Armor to track the current user of Sticky Web/the mon that caused the stat drop.
2022-05-01 12:54:33 +12:00
Ariel A
4534dcf1c4 Merge branch 'romhack' into lighting 2022-04-30 17:14:39 -04:00
Ariel A
7d4015dc5f Changed default follower elevation to player's current elevation. 2022-04-30 17:07:50 -04:00
Ariel A
5e1c6e0f25 Fixed GetFollowerObject being able to sometimes return removed/inactive objects. 2022-04-30 16:22:57 -04:00
Ariel A
1ad46e52c2 Merge branch 'romhack' into lighting 2022-04-28 23:22:57 -04:00