LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03:00
sneed
928d3c5a28
change form on weather fade
2022-05-19 15:08:03 +03:00
ghoulslash
07b0ce9737
add inner focus ability popup msg
2022-05-08 17:57:30 -04:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs
...
Once again, Battle Configs
2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks
...
Primal Reversion Tweaks
2022-05-07 11:04:23 -04:00
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
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
sneed
ef7cd3cdfe
BattleScript_DefiantActivates rename
2022-05-06 11:15:24 +03:00
sneed
6c23eb431d
Heal Pulse and Pollen Puff
2022-05-05 13:56:59 +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
BuffelSaft
af6242f2e0
Requested changes, Sticky Web edge case
...
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
2022-04-27 21:51:10 +12:00
BuffelSaft
5358cc0a00
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-04-25 13:38:13 +12:00
LOuroboros
434f6cf5ad
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-03-26 08:43:55 -03:00
LOuroboros
387bf07e3c
Update battle_scripts_1.s
2022-03-20 19:00:21 -03:00
LOuroboros
aca51e843e
Update battle_scripts_1.s
2022-03-14 16:14:32 -03:00
ghoulslash
e4ef3cc3b4
move glare effectiveness exception to code
2022-02-24 22:06:18 -05:00
BuffelSaft
6a119c5a30
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-02-13 21:06:15 +13:00
Eduardo Quezada D'Ottone
c849197a88
Config for Minimize raising 2 stages
2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone
d73e6faab8
Config for Growth being affected by sunlight
2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks
2022-02-12 23:08:12 -03:00
ghoulslash
209279c207
fix psycho shift string printing
2022-02-09 14:30:30 -05:00
BuffelSaft
0a27b575dc
Fix merge error in battle scripts
2022-01-27 17:24:11 +13:00
BuffelSaft
9d1800f53e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-01-27 17:18:51 +13:00
LOuroboros
8eaf0718ec
Review changes
...
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician
2022-01-15 13:06:13 -03:00
LOuroboros
69f678b3fc
Put the new B_WAIT_TIME_SHORTEST to use
2022-01-11 20:21:12 -03:00
LOuroboros
b2965e5522
Added a pause to BattleScript_ProteanActivates
2022-01-11 20:15:47 -03:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine
...
Added Sky Drop to Battle Engine
2022-01-07 18:14:40 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles
...
Multi battle updates
2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
4d6f54e8d6
Merge pull request #2007 from ghoulslash/be/roleplay
...
Update Role Play
2021-12-25 11:37:57 -03:00
ghoulslash
93a7e139ec
merge w be
2021-12-24 09:40:12 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
ghoulslash
b6b5d862f4
update role play mechanics
2021-12-23 08:37:11 -05:00
LOuroboros
ffe35fbb06
Updated defeat condition on multi battles
2021-12-19 08:30:43 -03:00
ghoulslash
31bbc4ddde
prevent stat-raising damage effects if battle will end
2021-12-17 10:24:07 -05:00
ghoulslash
c0e408bfab
fix aqua ring heal anim
2021-12-05 14:44:22 -05:00
ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
LOuroboros
f2dd7bce99
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks
2021-11-30 20:39:58 -03:00
BuffelSaft
a89ce0c38a
Swapped webs don't trigger Defiant
...
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?
Also, fix Sticky Web not activating Defiant.
2021-11-23 22:54:30 +13:00
BuffelSaft
d2eb5f0e61
Remove shell trap effect code
...
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
2021-11-22 14:46:47 +13:00
BuffelSaft
42b8f18cb1
Remove Corrosive Gas code
...
This was not working at all in testing, so it can be done by a separate PR later.
2021-11-22 14:35:01 +13:00
BuffelSaft
70f0018c08
Partially implement Shell Trap
...
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
2021-11-22 14:14:41 +13:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08:00
BuffelSaft
14a2e86313
Fix Scale Shot
...
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
2021-11-19 21:57:32 +13:00
BuffelSaft
86efd69370
Finish/fix Beak Blast
...
This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.
2021-11-19 20:19:10 +13:00
BuffelSaft
98712e576e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-19 17:48:11 +13:00
