Commit graph

8270 commits

Author SHA1 Message Date
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
BuffelSaft
1ee841146f Fix recoil occurring on zero damage attack
The "x was hit with recoil!" message was appearing when the target was immune due to protection or an ability - this should fix that and handle any other cases where 0 damage is dealt.
2021-10-02 15:08:15 +13:00
LOuroboros
f3ded43a88 Implemented Battle Bond 2021-10-01 22:49:17 -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
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
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
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
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
b4e456aeca
Merge pull request #1607 from BuffelSaft/mega-icon
Move mega indicator for lv 100 mons
2021-09-26 17:40:36 -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
6f9d862fd1
Merge pull request #1682 from Syreldar/fix-retaliate-naming
Fixed Retaliate's naming.
2021-09-25 11:53:04 -03:00
Syreldar
4c05520bf3 Fixed Retaliate's naming. 2021-09-24 16:02:26 +02:00
ghoulslash
1125459259
Merge pull request #1680 from LOuroboros/blackSludge
Completed Black Sludge's effect
2021-09-24 06:48:40 -06:00
LOuroboros
8a2921ef71 Completed Black Sludge's effect 2021-09-24 07:01:48 -03:00
Eduardo Quezada D'Ottone
13a464ffa4
Merge pull request #1673 from ghoulslash/gen8_move_effects
Gen8 move effects Fixes
2021-09-23 18:04:20 -03:00
ultima-soul
3b951aeb83
Merge pull request #1360 from ghoulslash/prankster
Prankster Gen 7
2021-09-23 12:27:15 -07:00
ultima-soul
fe6a11e5ec
Update asm/macros/battle_script.inc 2021-09-23 12:26:36 -07:00
ghoulslash
767e25bfed
Update asm/macros/battle_script.inc
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-09-23 13:19:12 -06:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f syntax fixes. Use BlocksPrankster for perish song battle script 2021-09-23 14:35:37 -04:00
ghoulslash
8a9d28d97f
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-09-23 12:21:36 -06:00
ghoulslash
2cea541b2a
Update src/battle_script_commands.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-09-23 12:21:26 -06:00
ghoulslash
d4a153bf14
Update data/battle_scripts_1.s
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-09-23 12:21:16 -06:00
BuffelSaft
f49a486a8c Replace tabs with spaces 2021-09-23 16:55:05 +12:00
BuffelSaft
530998c4b7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-09-23 16:41:35 +12:00
BuffelSaft
2f03ac31b9 Multihit refactor and Parental Bond
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
2021-09-23 14:31:21 +12:00
ghoulslash
6ec1a74948 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 21:51:45 -04:00
ghoulslash
936f2c7bcb fix eject pack weak armor special case 2021-09-22 21:51:37 -04:00
Eduardo Quezada D'Ottone
2c66aa84b6
Merge pull request #1378 from ghoulslash/gen8_move_effects
Several Gen 8 Move Effects
2021-09-22 22:48:29 -03:00
ghoulslash
9bf2ffe459 fix lash out stat fell 2021-09-22 21:15:02 -04:00
ghoulslash
d738297f24 merge with be 2021-09-22 16:26:09 -04:00
ghoulslash
3559a1b8e6 fix prankster + magic coat 2021-09-22 16:09:23 -04:00
ghoulslash
a10a8714fc
Merge pull request #1672 from rh-hideout/revert-1671-scaldThawConfig
Revert "Scald thaw flag config for Gen 5"
2021-09-22 11:48:29 -06:00
ghoulslash
f7b90bab93
Merge pull request #1670 from SBird1337/ai/expected-value
[ai] use expected value move dmg calculation
2021-09-22 10:15:37 -06:00
sbird
303e31ae25 [ai] use expected value to simulate EFFECT_PSYWAVE 2021-09-22 18:05:58 +02:00
ghoulslash
8cc0bb6ac0
Merge pull request #1652 from BuffelSaft/multi-hit-resist-berry
Fix multihit moves vs damage reducing berries
2021-09-22 09:42:53 -06:00
ghoulslash
a01690cd57
Merge pull request #1665 from BuffelSaft/download
Fix Download
2021-09-22 09:40:48 -06:00
Eduardo Quezada D'Ottone
707d49242e
Revert "Scald thaw flag config for Gen 5" 2021-09-22 12:31:23 -03:00
ghoulslash
fb17176a26
Merge pull request #1667 from AsparagusEduardo/fix_IllusionEgg
Adds missing check for Egg in Illusion
2021-09-22 09:01:31 -06:00
ghoulslash
c5eeab88dc
Merge pull request #1671 from AsparagusEduardo/scaldThawConfig
Scald thaw flag config for Gen 5
2021-09-22 09:01:11 -06:00
Eduardo Quezada D'Ottone
1795154754
Merge pull request #1668 from BuffelSaft/foulplay
Fix Foul Play
2021-09-22 11:49:42 -03:00
ghoulslash
1309eea8ec Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 09:43:48 -04:00
ghoulslash
13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00