Commit graph

11246 commits

Author SHA1 Message Date
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
Eduardo Quezada D'Ottone
b4e456aeca
Merge pull request #1607 from BuffelSaft/mega-icon
Move mega indicator for lv 100 mons
2021-09-26 17:40:36 -03:00
Eduardo Quezada D'Ottone
d220d25aab
Merge pull request #1666 from LOuroboros/bKGD_PE
Fix the 'bKGD: invalid index' error
2021-09-26 11:39:26 -03:00
Eduardo Quezada D'Ottone
3ab909f165
Merge pull request #1687 from LOuroboros/mentalHerb
Sync include/constants/hold_effects.h
2021-09-26 11:19:15 -03:00
LOuroboros
872d2a7008 Made this build again 2021-09-25 22:33:07 -03:00
LOuroboros
1b039062da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-09-25 22:20:34 -03:00
Eduardo Quezada D'Ottone
c574825974
Merge pull request #1689 from LOuroboros/itemUseDay
Added a day time exclusive equivalent to `FORM_USE_ITEM`
2021-09-25 22:11:51 -03:00
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
2021-09-25 22:00:10 -03:00
Eduardo Quezada D'Ottone
869cb1ede6
Merge pull request #1686 from LOuroboros/patch-2
Fix Dream Ball's effect's code
2021-09-25 21:25:33 -03:00
LOuroboros
a49676ab55 Set the right holdEffectParam to the terrain seeds 2021-09-25 21:09:38 -03:00
LOuroboros
813d114132 Synced include/constants/hold_effects.h with the BE 2021-09-25 20:58:07 -03:00
LOuroboros
ab08ef18f7
Update battle_script_commands.c 2021-09-25 20:42:34 -03:00
Eduardo Quezada D'Ottone
082dd1cb23
Merge pull request #1685 from LOuroboros/formIcon
Fixed form icon subpriority
2021-09-25 20:07:26 -03:00
LOuroboros
87bc1f502a Fixed form icon subpriority 2021-09-25 19:58:12 -03:00
Eduardo Quezada D'Ottone
48492997f3
Merge pull request #1681 from ghoulslash/dream_ball
Dream ball checks comatose
2021-09-25 11:53:17 -03:00
Eduardo Quezada D'Ottone
6f9d862fd1
Merge pull request #1682 from Syreldar/fix-retaliate-naming
Fixed Retaliate's naming.
2021-09-25 11:53:04 -03:00
GriffinR
db057eb86b Relocate battle_message comment 2021-09-24 17:33:18 -04:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
Syreldar
4c05520bf3 Fixed Retaliate's naming. 2021-09-24 16:02:26 +02:00
ghoulslash
9ab29e993c add battle engine define check 2021-09-24 08:58:51 -04:00
ghoulslash
4aeeb71393 dream ball checks comatose 2021-09-24 08:57:10 -04:00
ghoulslash
1125459259
Merge pull request #1680 from LOuroboros/blackSludge
Completed Black Sludge's effect
2021-09-24 06:48:40 -06:00