ghoulslash
80a48de702
ally cannot block prankster + perish song
2021-09-21 11:54:59 -04:00
ghoulslash
32d19a9b19
syntax fixes. add B_PRANKSTER_DARK_TYPES check to perish song
2021-09-20 21:36:10 -04:00
ghoulslash
faa963fd04
merge with be
2021-09-17 09:07:38 -04:00
ghoulslash
b916d7991c
merge with be
2021-09-16 21:52:29 -04:00
ghoulslash
40fcd257a0
fixes
2021-09-16 19:36:06 -04:00
ghoulslash
806be64935
format fixes
2021-09-16 17:10:41 -04:00
ghoulslash
b6862a4153
fix jumptocalledmove for assist + attackcanceler
2021-09-16 14:01:19 -04:00
ghoulslash
2067f563cd
cannot block your own prankster elevated perish song
2021-09-16 11:47:05 -04:00
ghoulslash
aeafd9e222
perish song + prankster interaction
2021-09-16 11:34:01 -04:00
ghoulslash
85f3982fb9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster
2021-09-15 17:52:45 -04:00
ghoulslash
845e333ba1
fix electric/misty terrain interactions with yawn/rest failures
2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300
merge with be
2021-09-15 16:42:23 -04:00
ghoulslash
801ba039d6
fix red card
2021-09-14 19:18:53 -04:00
ghoulslash
c4ce4c150d
fix eject pack
2021-09-14 15:38:16 -04:00
ghoulslash
60713a8f2d
fix room service activation msg, stat target
2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f
merge with be
2021-09-13 19:40:28 -04:00
ghoulslash
6915b029bd
fix echoed voice power boost
2021-09-09 11:15:58 -04:00
ghoulslash
875bc52d48
fix resist berry item print msg
2021-09-09 10:15:18 -04:00
ghoulslash
5c9c425590
fix power herb actiation message
2021-09-09 10:03:24 -04:00
ghoulslash
b8a71cabd1
merge with be
2021-09-09 09:44:18 -04:00
DizzyEggg
decf65a025
Merge pull request #1580 from ghoulslash/water_bubble
...
Water Bubble Prevents Burn
2021-09-08 20:00:45 +02:00
BuffelSaft
a4b630e6b5
Fix MOVE_EFFECT_REMOVE_STATUS
...
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.
Also, fix Ice Hammer's effect chance.
2021-09-07 16:34:32 +12: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
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2
...
Fix many Disguise bugs
2021-09-06 10:32:37 +02:00
DizzyEggg
fa081d1fc5
Merge pull request #1618 from BuffelSaft/protect-like
...
Fix protect-like moves
2021-09-06 10:24:29 +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
79f39a1fd0
fix eject button
2021-09-03 14:56:36 -04:00
ghoulslash
5c5276b04d
red card fixes
2021-09-03 14:29:28 -04:00
ghoulslash
4e2948012f
poison type still absorbs toxic spikes with heavy duty boots
2021-09-03 13:18:33 -04:00
ghoulslash
c7a587913b
replace statStages checks with CompareStat
2021-09-03 13:13:02 -04:00
ghoulslash
93e2e09148
fix terrain seeds. create generic CompareStat function
2021-09-03 12:17:38 -04:00
ghoulslash
6ce1227447
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 11:05:11 -04:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -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
BuffelSaft
3371773e5c
Move touchedProtectLike to protect structs
...
This makes more sense than putting it in DisableStruct.
2021-09-01 21:34:47 +12:00
BuffelSaft
eb0f0b7ce8
Fix Sucker Punch vs Protect moves
...
Might as well do this here too. Sucker Punch should fail against Protect, not trigger Protect's effects.
2021-09-01 21:32:07 +12:00
BuffelSaft
ea6ce80ad4
Fix protect-like moves
...
Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target.
This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.
2021-09-01 19:57:03 +12:00
LOuroboros
d60545af7a
Fixed U-turn and Choice Items interaction
2021-08-31 23:49:23 -03:00
ghoulslash
5e250853c6
misty terrain blocks toxic spikes
2021-08-12 13:45:50 -06:00
ghoulslash
f050168c55
misty terrain blocks toxic spikes
2021-08-12 13:41:18 -06:00
ghoulslash
c7c0fbc296
merge with be, make AI CanBeStatused functions separate from general util ones
2021-08-12 13:37:53 -06:00
ghoulslash
7b0e60c705
some tweaks
2021-08-12 12:44:53 -06:00
ghoulslash
e3d30602d9
record item effect with trick
2021-08-12 01:29:52 -04:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07: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
