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
cdb28f038f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into shields-down
2021-09-02 11:36:55 +12:00
ghoulslash
dd83e37261
Merge pull request #1615 from LOuroboros/choiceUTurn
...
Fixed U-turn and Choice Items interaction
2021-09-01 06:00:02 -06:00
ghoulslash
39a254f80d
fix sprite pos changes
2021-09-01 07:45:41 -04:00
ghoulslash
dfe59992d3
merge with be
2021-09-01 07:37:45 -04: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
88476e0ac2
remove 2nd case in CanThrowBall
2021-08-31 12:59:20 -04:00
ghoulslash
e4fb9c4593
fix throwing ball in wild doubles
2021-08-31 12:51:03 -04:00
LOuroboros
69b7910f47
Gave an entrance animation to Delta Stream
2021-08-31 00:15:17 -03:00
LOuroboros
97ce02464b
Removed small redundancy
2021-08-30 22:09:33 -03:00
LOuroboros
d0fd883ec7
Small comment tweak
2021-08-30 21:49:45 -03:00
LOuroboros
0a38054925
Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly
2021-08-30 21:21:07 -03:00
LOuroboros
e39dc493fc
A couple of improvements, courtesy of Syreldar
...
-Optimized the checks for `WEATHER_RAIN_PRIMAL` and `WEATHER_SUN_PRIMAL` in `Cmd_attackcanceler`.
-Moved the dmg calculation effect of `WEATHER_STRONG_WINDS` to the `CalcFinalDmg` function.
2021-08-30 20:55:48 -03:00
LOuroboros
c0c6821f62
Made AI_CheckBadMove take the primal weathers into account
...
Credits to Syreldar.
Also took the chance and removed trailing spaces from the file.
2021-08-30 20:55:43 -03:00
LOuroboros
216d8f0608
Solved game freezing issue
...
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -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
1d1546c7b2
Suggested changes
2021-08-26 19:00:43 +12:00
ghoulslash
b6d0996467
Merge pull request #1606 from BuffelSaft/venoshock
...
Fix Venoshock
2021-08-25 13:53:24 -06:00
BuffelSaft
bc298d242f
Move mega indicator for lv 100 mons
...
Indicator sprite overlaps the "100" without this.
2021-08-25 23:15:30 +12: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
ExpoSeed
38120afbac
Merge pull request #1593 from ultima-soul/battle_engine_sync
...
Battle Engine Upstream Sync
2021-08-16 19:47:35 -05: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
d344612346
fix last used ball window in wild doubles
2021-08-12 14:49:17 -06:00
ghoulslash
a2d885c0d4
merge with be
2021-08-12 14:48:58 -06:00
ghoulslash
85f98300ff
use B_WAIT_TIME_SHORT and B_WAIT_TIME_LONG
2021-08-12 14:14:51 -06: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
