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
7f4accdae4
fix room service switching in effect
2021-09-03 11:16:16 -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
7d251c39f7
Correct Liquidation and Sparkling Aria
...
Liquidation is affected by Sheer Force, Sparkling Aria should hit both foes and ally.
2021-09-02 16:05:36 +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
ExpoSeed
a58641cd70
Merge pull request #1603 from LOuroboros/megaEvoString
...
Tweaked sText_MegaEvoEvolved
2021-08-26 19:33:39 -05: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
LOuroboros
2c35006627
Tweaked sText_MegaEvoEvolved
2021-08-24 18:33:56 -03:00
ultima-soul
b620349da0
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-16 15:43:27 -07:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2
...
Document item menu
2021-08-15 12:01:57 -04:00
ghoulslash
0bbbd1e7a9
fix electric/misty yawn/rest interactions
2021-08-12 14:08:41 -06: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
PikalaxALT
c7fc6ac893
Merge pull request #1492 from Kurausukun/cgbsound
...
Fix CgbSound Fakematches (Thanks to Revo)
2021-08-11 19:55:44 -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
GriffinR
034b7f0513
Fix conflicting PC window names
2021-08-11 19:14:50 -04:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2
2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc
...
Document player pc
2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2
...
Document frontier pass
2021-08-11 17:40:55 -04:00
GriffinR
d951d7c363
Use tag constants in region_map.c
2021-08-11 09:31:20 -04:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
Kurausukun
2e892c6961
unsigned int -> u32
2021-08-08 22:22:50 -04:00
Kurausukun
ddb3911d0d
oops
2021-08-08 20:49:29 -04:00
Kurausukun
0bceaab046
rename variable
2021-08-08 20:34:16 -04:00
Kurausukun
b51d025f1c
port cgb fakematching fixes (thanks to revo)
2021-08-08 20:33:21 -04:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc
2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8
Document player pc
2021-08-02 13:58:40 -04:00
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2
2021-07-31 13:30:40 -04:00
GriffinR
602855ea99
Document frontier pass
2021-07-31 13:28:08 -04:00
GriffinR
459b20d762
Merge pull request #1479 from PikalaxALT/flatten_sprite_pos
...
Flatten pos fields in struct Sprite
2021-07-27 18:02:00 -04:00
ghoulslash
fd61770c34
water bubble prevents burn
2021-07-25 07:53:44 -06:00
ghoulslash
eadd09bebd
block item use under embargo
2021-07-25 07:39:02 -06:00
sphericalice
71de6ea939
Use the correct constant for PSS page comparison
2021-07-24 18:54:37 +01:00
ghoulslash
e6a2d2226f
Merge pull request #1540 from DizzyEggg/rage_powder
...
Rage powder updated to gen6
2021-07-24 07:15:58 -06:00
