Commit Graph

8299 Commits

Author SHA1 Message Date
ghoulslash
25a4da71fe remove unused macro 2021-10-12 10:37:59 -04:00
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
ghoulslash
e66820e646
Merge pull request #1744 from AsparagusEduardo/BE_configHiddenPow
Setting for pre-Gen6 Hidden Power Damage.
2021-10-11 15:13:16 -04:00
ghoulslash
6212a3c431
Merge pull request #1703 from AsparagusEduardo/fix_ConfuseBerries
Fixed confuse berries affecting the wrong battler.
2021-10-10 20:21:03 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82 Setting for pre-Gen6 Hidden Power Damage. 2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
3f51132af2
Merge pull request #1733 from ghoulslash/substitute_fix
Fix DoesSubstituteBlockMove calls
2021-10-10 18:53:44 -03:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles
Fix Safety Googles
2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
01f563cb5e Fix infinite loop 2021-10-10 08:46:31 -03:00
BuffelSaft
8a7e6379b6
Merge pull request #1732 from ghoulslash/perish_song
Fix Soundproof cancelling out user's Perish Song
2021-10-10 22:55:20 +13:00
Eduardo Quezada D'Ottone
004f705607
Merge pull request #1549 from ghoulslash/last_ball
add last used ball
2021-10-09 17:27:28 -03:00
BuffelSaft
274e964d91 Fix Safety Googles
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
2021-10-09 15:05:01 +13:00
ghoulslash
db0d9f6235 sound moves targeting user not blocked by own soundproof 2021-10-08 08:22:49 -04:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities
Implement Desolate Land, Primordial Sea and Delta Stream
2021-10-08 20:01:09 +13:00
LOuroboros
359da5313e Handled some edge cases
Gastro Acid, Worry Seed, Simple Beam, Core Enforcer and Transform
2021-10-07 01:53:20 -03:00
LOuroboros
7548e74013 Forgot to clear the primal weathers in some places 2021-10-07 00:43:23 -03:00
ghoulslash
1afc43a0e8 fix DoesSubstituteBlockMove calls 2021-10-06 15:30:44 -04:00
ghoulslash
5f5df066d6 fix perish song + soundproof 2021-10-06 15:18:42 -04:00
ghoulslash
33d19d4e34 syntax fix 2021-10-06 14:19:15 -04:00
ghoulslash
3d24fd5f30 last ball defaults to first bag pocket item 2021-10-06 13:56:04 -04:00
ghoulslash
ee3a2c97ee Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-10-06 13:54:40 -04:00
ghoulslash
1ad8448532 remove saveblock field 2021-10-06 13:54:33 -04:00
ghoulslash
471eab40c8
Merge pull request #1729 from rh-hideout/ai_dynamic_move_types
AI handles dynamic move types
2021-10-06 09:34:08 -04:00
ghoulslash
1f4844c7f5
Merge pull request #1710 from AsparagusEduardo/BE_Struggle
Implemented modern effect of struggle with config
2021-10-06 09:27:10 -04:00
ghoulslash
2a45d9041c
Merge pull request #1716 from AsparagusEduardo/fix_Howl
Updated sound flags for Howl and Heal Bell
2021-10-06 09:25:57 -04:00
ghoulslash
5959eac924
Merge pull request #1705 from AsparagusEduardo/fix_UnnerveResist
Fix Unnerve not canceling out type resist berries.
2021-10-06 09:22:34 -04:00
ghoulslash
245ef1ad2d
Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag
Config for Shadow Tag vs Shadow Tag
2021-10-06 09:02:58 -04:00
ghoulslash
1ec8b84492
Merge pull request #1727 from rh-hideout/simple_beam
Fix Simple Beam
2021-10-06 09:00:19 -04:00
ghoulslash
5bf236fc0d
Merge pull request #1712 from AsparagusEduardo/fix_stickyHold
Fix instances where Gastro Acid is not affecting the ability
2021-10-06 08:55:46 -04:00
LOuroboros
2b32581c14 Fixed infinite loop 2021-10-06 09:27:33 -03:00
LOuroboros
b520fe5d89 Tweaked Strong Winds' animation 2021-10-06 08:38:19 -03:00
LOuroboros
fe5a0a7f04 Oopsie 2021-10-06 08:29:53 -03:00
LOuroboros
a646c3311b Another set of fixes
The ability pop up is supposed to show as weather changing abilities try but fail to activate.
2021-10-06 08:20:50 -03:00
LOuroboros
0f2cc99f45 WEATHER_STRONG_WINDS modifier fix
MulByTypeEffectiveness was the right answer all along.
I also added a short pause to BattleScript_AttackWeakenedByStrongWinds before STRINGID_ATTACKWEAKENEDBSTRONGWINDS is printed.
2021-10-06 07:33:54 -03:00
LOuroboros
b93c746a49 Reverted comment after the previous commit 2021-10-06 06:04:56 -03:00
LOuroboros
dc451167d1 More fixes
-Removed ability popup when Strong Winds weakens a SE Flying-type move
-Went back to the way I handled the dmg calculation for that originally
-Made sure to try to clear the primal weathers in a couple of other battle scripts
-Allowed Drought, Drizzle, Sand Stream and Snow Warning to activate but fail if WEATHER_STRONG_WINDS is in effect.
2021-10-06 05:54:28 -03:00
BuffelSaft
38b816ccdd AI handles dynamic move types
This will make the AI account for the type of moves like Weather Ball, Hidden Power and Revelation Dance when considering abilities that make the useless. E.g. Water-type Hidden Power vs. Storm Drain.
2021-10-06 21:53:30 +13:00
BuffelSaft
a48dec2e31
Merge pull request #1721 from AsparagusEduardo/fix_TrumpCard
Fixed Trump Card's damage check
2021-10-06 15:55:21 +13:00
BuffelSaft
1b663feafb
Merge pull request #1722 from AsparagusEduardo/fix_HeatCrash
Fixed Heat Crash's power table name
2021-10-06 15:39:09 +13:00
BuffelSaft
a6198e5d46 Fix Simple Beam
- No longer freezes the game
- Now fails if the target already has simple
- Explicitly checks and changes the target's ability instead of gActiveBattler's ability
2021-10-06 15:30:52 +13:00
BuffelSaft
2119c33989
Merge pull request #1723 from AsparagusEduardo/fix_PsychicFangs
Fixed Psychic Fangs power
2021-10-06 14:36:53 +13:00
Eduardo Quezada D'Ottone
92f0f6f820 Fixed Psychic Fangs power 2021-10-04 20:20:00 -03:00
Eduardo Quezada D'Ottone
4ab8c95207 Fixed Heat Crash's power table name 2021-10-04 20:17:43 -03:00
Eduardo Quezada D'Ottone
b3167b7d53 Fixed Trump Card's damage check 2021-10-04 19:40:36 -03:00
LOuroboros
dcefb523f8 Tweaks and fixes
-Fixed the Flying-type checks of WEATHER_STRONG_WINDS.
-Fixed the order of actions involving the printing of STRINGID_ATTACKWEAKENEDBSTRONGWINDS.
2021-10-04 08:12:41 -03:00
BuffelSaft
142a83ca96
Merge pull request #1708 from AsparagusEduardo/fix_SleepTalk
Fixed Sleep talk being canceled by the user being asleep..
2021-10-04 00:35:00 +13:00
LOuroboros
64a45d8f48 Tweaked trytoclearprimalweather
Made it so it won't actually try to clear a primal weather if a Pokémon with Desolate Land, Primordial Sea or Delta Stream is present on the field.
2021-10-03 08:24:54 -03:00
LOuroboros
b85b3094c8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev 2021-10-03 07:05:56 -03:00
Eduardo Quezada D'Ottone
1e0ae9a154 Tabs to spaces. 2021-10-02 20:54:04 -03:00
Eduardo Quezada D'Ottone
b5e0a07932
Merge pull request #1704 from LOuroboros/battle_bond
Implemented Battle Bond
2021-10-02 20:07:35 -03:00
Eduardo Quezada D'Ottone
76bdbf164e Updated sound flags for Howl and Heal Bell 2021-10-02 20:00:00 -03:00