BuffelSaft
6df3975fc6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-05 14:32:33 +13:00
LOuroboros
22f7e81bef
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry
2021-11-04 12:25:26 -03:00
LOuroboros
b64d506809
Made a function to lift Mimicry's effect
2021-11-04 12:20:31 -03:00
BuffelSaft
b615bc6dcd
Merge pull request #1854 from AsparagusEduardo/BE_UndoForm
...
Refactored UndoFormChange to make it more user friendly
2021-11-04 17:30:55 +13:00
BuffelSaft
e930dae278
Remove ability pop up for Hunger Switch
...
Morpeko should change form each turn without showing its ability.
2021-11-04 15:40:26 +13:00
BuffelSaft
616be576fc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-04 15:29:38 +13:00
Eduardo Quezada D'Ottone
05850f0f65
Refactored UndoFormChange to make it more user friendly
2021-11-03 22:05:02 -03:00
BuffelSaft
eeb40daede
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2
2021-11-04 13:52:58 +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
LOuroboros
f6628e301f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry
2021-11-03 20:43:33 -03:00
LOuroboros
f0d7c75ec8
Syntax corrections
2021-11-03 17:48:04 -03:00
BuffelSaft
6ce1f01b8c
Hunger Switch and Aura Wheel
...
Implement the ability Hunger Switch and the move Aura Wheel.
2021-11-03 19:45:03 +13:00
BuffelSaft
d33bcc335b
Revert Poison Touch target check
...
This would prevent Poison Touch activating if the target hurt itself.
2021-11-03 14:49:14 +13:00
BuffelSaft
f323e2c047
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil
2021-11-03 14:18:28 +13:00
BuffelSaft
d99fd30e4d
Looping battle script, correct message
...
Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"
2021-11-03 11:51:20 +13:00
LOuroboros
69b42de0d9
Implemented Mimicry
...
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-11-02 14:44:55 -03:00
ghoulslash
ffcba355b0
merge w be
2021-11-02 10:36:08 -04:00
BuffelSaft
95435b5f7f
Pastel Veil switchin effect attempt
...
Battle script isn't working for partner for some reason.
2021-11-02 23:06:10 +13:00
BuffelSaft
b97a250acc
Merge pull request #1512 from ghoulslash/utility_umbrella
...
Utility Umbrella
2021-11-02 16:28:52 +13:00
ghoulslash
b5d20da927
merge with be
2021-11-01 11:36:18 -04:00
LOuroboros
30a8281d32
Fixed battlerId in Poison Touch's confusionSeldDmg check
2021-11-01 11:56:25 -03:00
ghoulslash
52d4d1cd34
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella
2021-10-31 11:40:00 -04:00
ghoulslash
bc170f3a43
merge with be
2021-10-31 11:04:39 -04:00
ghoulslash
1925874d35
hunger switch unaffected by wandering spirit
2021-10-30 11:18:50 -04:00
ghoulslash
f4537b1213
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit
2021-10-30 09:14:32 -04:00
BuffelSaft
52054e4bfe
Fix Corrosion, Poison Touch
...
- CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 21:12:18 +13:00
BuffelSaft
47bfeaeecd
Implement Gorilla Tactics
...
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed
merge w be
2021-10-29 22:33:50 -04:00
BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix
...
Fix iteam healing after a failed move
2021-10-30 15:25:28 +13:00
ghoulslash
2502820e83
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 09:03:14 -04:00
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -04:00
Eduardo Quezada D'Ottone
773c773bac
Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
...
# Conflicts:
# include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
Eduardo Quezada D'Ottone
70aeaf288f
Rough Skin damage config
2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone
8bdcbb856d
Ghosts can now escape any wild battle
2021-10-23 11:41:31 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists
2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone
d0253640fb
Merge pull request #1739 from LOuroboros/primalReversionBE
...
Implemented Primal Reversion
2021-10-22 22:27:45 -03:00
LOuroboros
cf027176a8
Made ENDTURN_RETALIATE use constants
2021-10-22 11:43:38 -03:00
LOuroboros
34fe0c54be
Fixed Retaliate timer's value decrease
...
I made an oopsie, basically.
Thanks to Xavion#9504 for the fix.
2021-10-21 09:11:12 -03:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
ghoulslash
eda99fcf29
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
...
Add gStatutes4
2021-10-19 08:45:47 -04:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
Eduardo Quezada D'Ottone
df817fb2ab
Merge pull request #1772 from LOuroboros/gravApple
...
Added Grav Apple's power boost
2021-10-17 09:51:29 -03:00
LOuroboros
59cfbe55c1
Gave Grav Apple a move effect of its own
2021-10-17 09:27:35 -03:00
Eduardo Quezada D'Ottone
9ebc436a9d
Merge pull request #1776 from ghoulslash/move_target
...
Expand move target field to u16
2021-10-16 18:27:29 -03:00
ghoulslash
5509ceea04
expand move target field
2021-10-16 16:10:45 -04:00
ghoulslash
611076c24d
move prankster to ABILITYEFFECT_MOVES_BLOCK
2021-10-16 10:15:15 -04:00
LOuroboros
c2e25272b0
Added Grav Apple's power boost
2021-10-16 07:02:26 -03:00
BuffelSaft
df2223a5bc
Merge pull request #1745 from LOuroboros/retaliate
...
Implemented Retaliate's effect
2021-10-16 22:49:32 +13:00
