Commit graph

11618 commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
57ea20bc6d Implemented modern effect of struggle with config 2021-10-02 13:32:36 -03:00
LOuroboros
a18b9c5b32 Quick tweaks
-Use the species name for sText_AttackerBecameAshSpecies
-Make Battle Bond not activate if the opposing party doesn't have 2 members or more.
2021-10-02 11:21:11 -03:00
Eduardo Quezada D'Ottone
63c6e73eb8 Fixed Sleep talk being canceled by the user being asleep.. 2021-10-02 09:38:43 -03:00
Eduardo Quezada D'Ottone
16d032e99d Fix Unnerve not canceling out type resist berries. 2021-10-02 02:01:34 -03:00
Eduardo Quezada D'Ottone
b322a42fea
Merge pull request #1587 from BuffelSaft/shields-down
Fix Shields Down
2021-10-02 00:12:29 -03:00
BuffelSaft
57d2e21117 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into shields-down 2021-10-02 15:51:48 +13:00
BuffelSaft
611da31ae3 Fix form ID check
The six here should be a seven, and replacing it with this function call is better than hard-coding it.
2021-10-02 15:51:16 +13:00
LOuroboros
c464b1b5dd STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES 2021-10-01 23:12:59 -03:00
LOuroboros
f3ded43a88 Implemented Battle Bond 2021-10-01 22:49:17 -03:00
Eduardo Quezada D'Ottone
7287560521 Fixed confuse berries affecting the wrong battler. 2021-10-01 18:28:51 -03:00
Eduardo Quezada D'Ottone
f616760fc9
Merge pull request #1349 from LOuroboros/gulp_missile
Implemented Gulp Missile
2021-10-01 16:53:51 -03:00
Eduardo Quezada D'Ottone
9980108f40
Merge pull request #1701 from LOuroboros/safariZone
Fixed Safari Zone
2021-10-01 09:07:16 -03:00
LOuroboros
f691769647 Fixed Def stat reduction 2021-10-01 06:29:21 -03:00
LOuroboros
43e73ac576 Fixed Safari Zone 2021-10-01 05:25:25 -03:00
LOuroboros
a506bf03c6 Corrected Flower Veil check 2021-10-01 02:14:46 -03:00
Eduardo Quezada D'Ottone
4ba03a6d54 Fixed corruption bug when giving too many items from bag into boxes. 2021-09-30 22:47:25 -03:00
Eduardo Quezada D'Ottone
5593a83783 Fixed compile 2021-09-30 22:35:28 -03:00
Eduardo Quezada D'Ottone
5bf300f97c Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE 2021-09-30 22:12:02 -03:00
Eduardo Quezada D'Ottone
0fd9d2c0d5 Optimized so it only changes forms when moving items. 2021-09-30 21:55:21 -03:00
Eduardo Quezada D'Ottone
b60aab1f6a Fixed crash 2021-09-30 20:34:42 -03:00
GriffinR
001a25e49c
Merge pull request #1507 from GriffinRichards/doc-walda
Document Walda Phrase
2021-09-30 12:27:20 -04:00
GriffinR
27d69ea8e6
Merge pull request #1508 from Pokestia/master
Use compact weather macros
2021-09-30 11:23:13 -04:00
LOuroboros
d7e651696b Even more fixes
-Changed the way in which Gulp Missile checks for a fainted opponent, just in case the reason why the attacker's defense wasn't being lowered is that the script was falling into BattleScript_GulpMissileNoSecondEffectGulping
-Took into account max Defense stat stage, because I forgot to do that too.
-Slightly changed the Defense reduction code, just in case.
-Fixed the text string that was printed. Gulp Missile doesn't raise a stat, after all.
-Fixed the script that was being called if the attacker has Clear Body, and also added jumps for Full Metal Body, White Smoke and Flower Veil.
2021-09-30 10:37:49 -03:00
Pokestia
38a4dea402 Rename Battle Weather flags 2021-09-30 12:08:20 +02:00
LOuroboros
0389dbf9f2 More fixes
-Removed IsBattlerAlive check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Turns out Cramorant can change form even on single wild battles.
-Added a check for IsBattlerAlive in the case ABILITY_GULP_MISSILE of ABILITYEFFECT_MOVE_END, because otherwise, for whatever reason, the user was trying to trigger the Gulping effect even in its base form.
-Set the stat to change for the Gulping effect from within the battle script. The rest of the effect is handled there, so may as well.
-Fixed the check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Apparently, a silent species change was happening because of the order of the checks. Thanks to AsparagusEduardo for pointing this one out.
-Fixed the secondary effect of a target's Gulp Missile affecting an attacker that has fainted.
-Fixed the Defense reduction of the Gulping effect bypassing Clear Body.
2021-09-29 23:18:22 -03:00
Eduardo Quezada D'Ottone
f9b9e4ec33 Updated Arceus' forms' animations 2021-09-29 22:34:37 -03:00
Eduardo Quezada D'Ottone
e6c81d2862 Fixed form change when swapping items 2021-09-29 22:05:30 -03:00
Eduardo Quezada D'Ottone
9114f3d1dc Fixed lag and icons getting stuck when giving an item from the bag 2021-09-29 22:05:20 -03:00
Pokestia
e699965332 Use compact weather macros 2021-09-29 17:45:39 +02:00
Eduardo Quezada D'Ottone
1f559df27d Final function name 2021-09-29 02:14:32 -03:00
Eduardo Quezada D'Ottone
52781969ab Update icon in party menu 2021-09-29 02:14:23 -03:00
Eduardo Quezada D'Ottone
7c9a3f338a Updates icon in box menu 2021-09-29 02:14:13 -03:00
Eduardo Quezada D'Ottone
9ad505d7e8 Mosaic effect when changing forms 2021-09-29 02:14:02 -03:00
Eduardo Quezada D'Ottone
55b61313a4 PSS uses form change table for holding items.
# Conflicts:
#	src/pokemon.c
2021-09-29 02:13:44 -03:00
Eduardo Quezada D'Ottone
fdd284b50b Hold Item party menu 2021-09-29 02:06:03 -03:00
GriffinR
e270ee1a74
Merge pull request #1506 from GriffinRichards/single-doc
Document some single-remaining symbols
2021-09-29 00:10:09 -04:00
BuffelSaft
75c2832afe
Merge pull request #1697 from AsparagusEduardo/fix_cobaBerry
Fixed Coba Berry's typing
2021-09-29 15:43:31 +13:00
GriffinR
154e8a271a
Merge pull request #1505 from GriffinRichards/tag-none
Add TAG_NONE
2021-09-28 22:22:09 -04:00
Eduardo Quezada D'Ottone
c3087de712 Fixed Coba Berry's typing 2021-09-28 22:13:39 -03:00
ghoulslash
e75a8fb67c merge ai move and item decisions. AI will prefer to defeat player over healing 2021-09-27 21:03:27 -04:00
LOuroboros
e783cde387 Another small condition fix and small optimization
-Checking for IsBattlerAlive is incorrect because Gulp Missile's counterattack should happen even if Cramorant faints.
-Made the code a bit more readable.
2021-09-27 21:33:19 -03:00
LOuroboros
ceffaa4e76 Another condition fix
I accidentally broke Gulp Missile's interaction with the user's Dive, lol.
2021-09-27 20:12:32 -03:00
Eduardo Quezada D'Ottone
6c265152dd
Merge pull request #1695 from ultima-soul/mental_herb_desc
Enable Mental Herb Description Toggling Based on B_MENTAL_HERB Config
2021-09-27 18:54:47 -03:00
ultima-soul
de35894669 Enable Mental Herb description toggling based on B_MENTAL_HERB config. 2021-09-27 14:26:07 -07:00
LOuroboros
a49ea33dd0 A lot of fixes
-Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle.
-Fixed Gulp Missile activating if the only/last target has already fainted.
-Fixed Gulp Missile's Gorging animation, though it still uses Tackle's.
-Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard.
-Fixed Gulp Missile changing Cramorant's form if Surf failed.
2021-09-27 08:57:09 -03:00
Eduardo Quezada D'Ottone
ff24b15241 derp 2021-09-27 00:00:24 -03:00
Eduardo Quezada D'Ottone
91feaecb04 Hold effect update 2021-09-26 23:45:39 -03:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone
4fbe4da7d0 Sitrus Berry Gen4+ heal. Credit to SBird1337 2021-09-26 18:46:34 -03:00
GriffinR
8a79ca3818 Document walda_phrase 2021-09-26 17:01:39 -04:00