ghoulslash
b33a8b0cb4
move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use
2022-06-05 11:09:04 -04:00
ghoulslash
c694e0cb90
merge w be
2022-06-05 08:22:24 -04:00
sneed
5934acbdc5
IS_BATTLER_OF_TYPE ignores 3rd type if mystery
2022-06-01 22:21:32 +03:00
BuffelSaft
16570e8c3f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-22 12:55:55 +12:00
Eduardo Quezada D'Ottone
f80bab897f
Merge pull request #2112 from AgustinGDLV/evo_battle
...
Gen 8 Evolution Mechanics (Battle Engine)
2022-05-09 17:40:19 -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
BuffelSaft
8693db632b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-07 12:27:20 +12:00
AgustinGDLV
e730d64945
corrections
2022-05-05 15:54:33 -07: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
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -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
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks
2022-02-12 23:08:12 -03: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
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
7d75e16312
Small documentation and cleanup
2022-01-20 12:25:48 -03:00
ghoulslash
035b2332af
cache ai damage, effectiveness calcs
2022-01-13 11:28:27 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy
2021-12-18 13:38:12 -03:00
ultima-soul
b0b8b9bf46
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
SonikkuA-DatH
b6fff16a7d
Update battle.h
2021-12-03 18:04:44 -08: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
19af517bbb
Edited pointless or useless Primal Reversion code
...
Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion.
Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion.
Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.
2021-12-01 00:56:33 -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
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
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
BuffelSaft
50d0cd52e8
Clean up Corrosive Gas
...
Remove code and unused move effect.
2021-11-22 15:13:54 +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
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
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -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
BuffelSaft
bcaa17ffb3
Finish/tidy up Court Change
...
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
2021-11-21 17:20:45 +13:00
ghoulslash
37ab20e29c
fix wish
2021-11-20 16:49:04 -05:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08: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
BuffelSaft
16a4fc9062
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-19 16:33:24 +13:00
LOuroboros
a01fd2eb7a
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d
Fling tweaks
...
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
2021-11-15 12:40:10 -03:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
BuffelSaft
04867ac0d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-13 17:33:25 +13:00
BuffelSaft
e2599c2469
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-10 14:31:32 +13:00
BuffelSaft
72d12a575d
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-11-07 12:13:18 +13:00
Eduardo Quezada D'Ottone
4e6a459b14
Optimized terrain timers
2021-11-06 19:46:52 -03:00
ghoulslash
41bf1dc2f4
merge w be
2021-11-06 10:40:57 -04:00
LOuroboros
5f458c9cd3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-05 10:58:53 -03:00
BuffelSaft
28e78cb6c4
Gen 8 moves initial commit
...
Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 19:50:54 +13:00
Eduardo Quezada D'Ottone
6ee2a3aba1
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# src/battle_main.c
2021-11-03 20:44:25 -03:00
ghoulslash
48c29a9cd8
proper mirror armor sticky web targeting
2021-11-03 15:05:52 -04:00
