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
a127cb32bb
Removed pointless use of preproc directives
2022-03-30 02:05:54 -03: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
0a65fd316c
Fixed Enigma Berry check in CanMegaEvolve
2022-03-20 12:21:15 -03:00
ghoulslash
f53de6ae87
fix toxic/flame orb. use CanBeX'ed functions
2022-03-08 15:16:17 -05:00
ghoulslash
92487db470
add config check for B_GLARE_GHOST
2022-02-25 08:20:56 -05:00
ghoulslash
e4ef3cc3b4
move glare effectiveness exception to code
2022-02-24 22:06:18 -05: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
b33f7aed8d
Oopsie
2022-01-25 23:31:23 -03:00
LOuroboros
7916ff5f47
Further updated CanFling
2022-01-25 21:02:26 -03: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
b7df21b263
Optimized use of GetBattlerAbility
2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions
2022-01-22 19:01:45 -03:00
ghoulslash
7182f290c1
fix harvest activation msg
2022-01-16 12:39:08 -05:00
ghoulslash
f3b9e6bb63
Merge pull request #1976 from kleeenexfeu/patch-2
...
[battle_engine] Moxie interaction with spread move/follow me fix
2022-01-16 10:58:50 -05:00
LOuroboros
24b5a5709a
Allow Galarian Darmanitan's Zen Mode to work
2022-01-10 23:01:18 -03:00
Eduardo Quezada D'Ottone
eba4c36189
Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS
...
Yawn now uses B_SLEEP_TURNS
2022-01-07 21:56:06 -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
TheXaman
328b501394
Update src/battle_util.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-01-05 18:54:42 +01:00
TheXaman
9733f92c7f
Yawn now uses B_SLEEP_TURNS, resolves #1873
2022-01-05 18:48:01 +01:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
W1serV1ser
58a5a9cbec
Simplified skyDropTargets storage and made other minor improvements
...
A lot of these changes are based on ghoulslash's version of Sky Drop.
2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports
2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
6d17156f74
Merge pull request #1934 from BuffelSaft/fix-burmy
...
Fix Burmy form change
2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone
4ca9f406f6
Merge pull request #1947 from LOuroboros/lightBall
...
Updated Light Ball's effect and improved readability
2021-12-18 15:03:18 -03:00
Eduardo Quezada D'Ottone
3a24bc8298
Merge branch 'battle_engine' into DizzyEggg-patch-1
2021-12-18 14:52:19 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy
2021-12-18 13:38:12 -03:00
Eduardo Quezada D'Ottone
aa2b2e6a70
Merge pull request #1929 from ultima-soul/battle_engine_sync
...
Battle Engine Upstream Sync
2021-12-09 20:02:45 -03:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
DizzyEggg
0a7dd2edd6
Fix Intimidate affecting fainted mons
2021-12-07 12:19:27 +01:00
kleeenexfeu
340d505116
Moxie/follow me fix
2021-12-04 17:41:31 +01: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
ghoulslash
e2af9ec3b4
ice type immunity to sheer cold
2021-11-26 11:49:49 -05:00
LOuroboros
68c557fd46
Updated Light Ball's effect and improved readability
2021-11-24 19:04:15 -03:00
ghoulslash
5c52abd856
gen3 sport move functionality behind config
2021-11-23 21:20:32 -05:00
ghoulslash
b5bc8bb346
fix B_SPORT_DMG_REDUCTION
2021-11-23 18:37:27 -05:00
ghoulslash
e3ddad2d11
add sport effects back
2021-11-23 18:36:10 -05:00
BuffelSaft
cca7ec8c58
Fix and rename GetMoveTargetType
...
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 12:09:54 +13:00
kleeenexfeu
1a3561bb0b
space
2021-11-23 13:48:03 +01:00
kleeenexfeu
6ceffaaf3e
recalculate turn order after relevant actions
2021-11-23 13:46:36 +01: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
499fb8071d
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-23 17:12:24 +13:00
BuffelSaft
fa0b5188bb
Dynamic move targeting
...
Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 16:56:11 +13:00
BuffelSaft
62f01e89d7
Fix Burmy form change
...
Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.
2021-11-23 00:46:43 +13:00
W1serV1ser
5d1228fc2e
More spacing and format fixes
2021-11-21 15:42:31 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
ghoulslash
3fb62f74c6
fix rampage cancelling
2021-11-20 18:35:56 -05:00
W1serV1ser
844a0217f7
Fixed spacing, added braces, and reverted comment
2021-11-20 12:04:21 -08:00
