ghoulslash
0bca01cb74
mental herb fixes
2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a
merge with be
2021-09-15 12:54:39 -04:00
ghoulslash
f9cc09dc48
tweak formula
2021-09-09 13:54:16 -04:00
ghoulslash
92429c7649
better echoed voice power boost
2021-09-09 13:38:46 -04:00
ghoulslash
6915b029bd
fix echoed voice power boost
2021-09-09 11:15:58 -04:00
ghoulslash
e93ad2e255
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble
2021-09-06 09:24:28 -04:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost
...
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
2021-09-06 11:32:53 +02:00
BuffelSaft
734e0aa74d
Add brackets
...
Oops!
2021-09-06 20:56:02 +12:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2
...
Fix many Disguise bugs
2021-09-06 10:32:37 +02:00
BuffelSaft
bdbb4b5f7e
Fix many Disguise bugs
...
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 18:27:42 +12:00
ghoulslash
a9cbaa5966
fix mental herb encore, heal block
2021-09-04 08:40:43 -04:00
ghoulslash
d66f3910d9
Merge branch 'mental_herb' of github.com:ghoulslash/pokeemerald into mental_herb
2021-09-03 17:41:09 -04:00
ghoulslash
933696b3cd
merge with be
2021-09-03 17:41:00 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine
...
Implement Pickpocket
2021-09-02 11:33:34 -07:00
BuffelSaft
13636f8691
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
...
moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
2021-09-02 16:15:58 +12:00
ExpoSeed
1f75f6e201
Merge pull request #1605 from LOuroboros/canEvolve
...
Corrected `CanEvolve` function
2021-08-26 19:32:22 -05:00
BuffelSaft
bb89d03a1d
Fix Venoshock
...
Damage should double if target is poisoned, not attacker.
2021-08-25 22:57:10 +12:00
LOuroboros
e42d329fc6
Small tweak
2021-08-25 02:16:38 -03:00
LOuroboros
d270892a6b
Corrected CanEvolve function
2021-08-25 01:56:25 -03:00
ghoulslash
7b0e60c705
some tweaks
2021-08-12 12:44:53 -06:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ghoulslash
fd61770c34
water bubble prevents burn
2021-07-25 07:53:44 -06:00
ghoulslash
e6a2d2226f
Merge pull request #1540 from DizzyEggg/rage_powder
...
Rage powder updated to gen6
2021-07-24 07:15:58 -06:00
BuffelSaft
d2d7b6ffef
Remove Mimikyu check from loop
...
More efficient than checking in each loop iteration.
2021-07-16 18:09:41 +12:00
BuffelSaft
90fdb74ccb
Remove UndoFormChangeOnSwitch
...
Handle switching out Mimikyu Busted in UndoFormChange.
2021-07-16 17:56:53 +12:00
BuffelSaft
63faa6e3a9
Fix Disguise reverting on switch out
...
Make Mimikyu's disguise stay busted when it's switched out.
2021-07-11 14:15:24 +12:00
DizzyEggg
800e2395c0
Merge pull request #1542 from BuffelSaft/thaw_moves_2
...
Fix Thawing Moves, Add FLAG_THAW_USER
2021-06-19 13:47:51 +02:00
BuffelSaft
87279ecab9
Fix CANCELLER_FROZEN
...
Now checks if current move will thaw user before trying to defrost it.
2021-06-19 11:31:46 +12:00
BuffelSaft
e6a8faec1e
Fix thawing moves
...
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
2021-06-10 23:48:18 +12:00
DizzyEggg
179ac9c1e1
Fix Imposter looplock
2021-06-10 13:45:24 +02:00
DizzyEggg
f27dcab784
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
LOuroboros
d849c31ee8
Followed Ghoulslash's suggestion
2021-06-08 11:56:03 -03:00
LOuroboros
2c1237365b
Fixed Emergency Exit
...
The ability was getting triggered even if the user was the only Pokémon alive in the party.
2021-06-07 22:39:53 -03:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags
...
Rename flags
2021-06-04 19:33:45 -07:00
ExpoSeed
aefd5e26d1
Update src/battle_util.c
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-04 21:26:15 -05:00
ExpoSeed
ec2c140ecb
Disambiguate Thousand Arrows flag from other flags
2021-06-04 19:34:37 -05:00
ExpoSeed
15914d7af8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags
2021-06-04 19:00:29 -05:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious
...
Tweaked Oblivious
2021-06-04 16:51:38 -07:00
LOuroboros
b552db7193
Tweaked the Oblivious immunities
...
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-04 19:23:07 -03:00
ultima-soul
72f23ff7ba
Merge pull request #1507 from ghoulslash/flower_gift
...
Add Sunny Check to Flower Gift Ally Boosts
2021-06-02 23:35:59 -07:00
BuffelSaft
2a6b989c92
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press
2021-06-02 12:41:28 +12:00
ghoulslash
c91240068c
add sun check to flower gift ally boosts
2021-05-23 14:45:21 -06:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows
...
Fix Thousand Arrows
2021-05-21 11:40:13 -04:00
ultima-soul
e864c39a5d
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-05-04 10:04:35 -07:00
ghoulslash
1ccf43b5f7
Merge pull request #1451 from LOuroboros/stench
...
Implemented Stench's battle effect
2021-05-04 09:41:13 -06:00
ghoulslash
a3e6fe1ef4
Merge pull request #1442 from LOuroboros/patch-1
...
Fixed Punk Rock
2021-05-04 09:37:54 -06:00
ghoulslash
984f49747f
Merge pull request #1454 from LOuroboros/HandleAction_UseMove
...
Minor syntax tweaks to HandleAction_UseMove
2021-05-04 09:37:10 -06:00
ghoulslash
e343090a8b
Merge pull request #1479 from BuffelSaft/orb_fix
...
Fix Toxic Orb and Flame Orb affecting Pokemon they shouldn't
2021-05-04 09:31:58 -06:00
