Commit Graph
100 Commits
Author SHA1 Message Date
LOuroboros fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
LOuroboros ac606364e9 Removed ITEM_ENIGMA_BERRY_E_READER usage 2021-12-03 15:44:12 -03:00
LOuroboros 2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00
LOuroboros e7bef25fb1 Updated hold_effects.h 2021-12-01 13:32:43 -03:00
LOuroboros b042eb6436 gBattleTerrainTable -> sBattleTerrainTable 2021-11-28 01:22:27 -03:00
LOuroboros ad8582064b #elif without condition bad, #else good 2021-11-19 18:49:30 -03:00
LOuroboros 7ae30f8913 I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY
Also fixed its inaccurate description.
2021-11-17 07:15:14 -03:00
LOuroboros 7d71fe6ce8 I_NEW_VITAMIN_EV_CAP -> I_VITAMIN_EV_CAP 2021-11-16 21:25:03 -03:00
LOuroboros f62ec0630a Updated Vitamins cap 2021-11-16 18:36:49 -03:00
LOuroboros ad5bcd06cf Fixed a small buffer overflow in AI_CV_Recycle_ItemsToEncourage 2021-11-11 22:27:17 -03:00
LOuroboros b358f774dd Fixed the offensive boost of the Soul Dew 2021-11-07 14:40:18 -03:00
LOuroboros c2e8c1058f Force set gSwapDamageCategory's initial value in Photon Geyser's and Shell Side Arm's calculations 2021-11-05 23:07:26 -03:00
LOuroboros 4bdbef9a9d Use the right defensive target stats during Shell Side Arm calculation 2021-11-05 22:21:50 -03:00
LOuroboros ab2dab9d05 Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs 2021-11-05 17:42:12 -03:00
LOuroboros b23d5db598 Oops 2021-11-05 13:02:16 -03:00
LOuroboros 5f458c9cd3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-05 10:58:53 -03:00
LOuroboros 13029cd3b3 Tweaked VARIOUS_PHOTON_GEYSER_CHECK and VARIOUS_SHELL_SIDE_ARM_CHECK 2021-11-05 10:55:57 -03:00
LOuroboros 05c7f7ebfb Fixed the comment for I_SOUL_DEW_BOOST 2021-11-05 10:39:27 -03:00
LOuroboros d15eeeb8eb Fixed the comment for B_SOUL_DEW_BOOST 2021-11-05 10:37:41 -03:00
LOuroboros 9a3739d2bd Review changes 2021-11-04 21:01:48 -03:00
LOuroboros 10a3c8f119 Added an item config for the Soul Dew 2021-11-04 17:29:17 -03:00
LOuroboros 671cbabc3d Added a battle config for the Soul Dew 2021-11-04 17:25:31 -03:00
LOuroboros 22f7e81bef Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-04 12:25:26 -03:00
LOuroboros b64d506809 Made a function to lift Mimicry's effect 2021-11-04 12:20:31 -03:00
LOuroboros 4f251e6ec2 Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN 2021-11-04 12:13:55 -03:00
LOuroboros b931e34172 Handled Mimicry's interaction with Steel Roller's effect 2021-11-03 23:23:28 -03:00
LOuroboros f6628e301f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-03 20:43:33 -03:00
LOuroboros f0d7c75ec8 Syntax corrections 2021-11-03 17:48:04 -03:00
LOuroboros af6e72ecfe Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-03 08:56:01 -03:00
LOuroboros 69b42de0d9 Implemented Mimicry
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-11-02 14:44:55 -03:00
LOuroboros 30a8281d32 Fixed battlerId in Poison Touch's confusionSeldDmg check 2021-11-01 11:56:25 -03:00
LOuroboros 0ddcb69c65 Fixed Move_SPECIAL_REND typo 2021-10-30 12:14:28 -03:00
LOuroboros 10cda70129 Fixed Pikalax's PR 2021-10-30 11:51:29 -03:00
LOuroboros 7574af3558 Fixed charmap comment about the FONT text controller 2021-10-29 19:08:24 -03:00
LOuroboros cde0ce878c EXT_CTRL_CODE_SIZE -> EXT_CTRL_CODE_FONT 2021-10-29 19:00:07 -03:00
LOuroboros 5536bce88d SIZE -> FONT 2021-10-29 18:39:31 -03:00
LOuroboros a77f058146 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-10-28 14:24:43 -03:00
LOuroboros 82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
LOuroboros 2803b840e5 Updated Shadow Force's move data 2021-10-28 13:52:35 -03:00
LOuroboros 28522f3ffb Fixed Hyperspace Fury not breaking through protections
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
LOuroboros 8c35a68060 Quick syntax tweaks 2021-10-27 11:19:39 -03:00
LOuroboros de157919b0 Added animations for Shell Side Arm 2021-10-27 11:14:17 -03:00
LOuroboros ad95fa3d15 Updated Shell Side Arm's description 2021-10-27 11:14:12 -03:00
LOuroboros d5b5090d52 Fixed BattleScript_EffectPhotonGeyser 2021-10-27 11:14:08 -03:00
LOuroboros fc7f1acf20 Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser 2021-10-27 11:13:59 -03:00
LOuroboros 1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
LOuroboros 442376e75b Replaced jumpifbyte with jumpifhalfword in a few BattleScripts 2021-10-25 16:36:17 -03:00
LOuroboros d31700d2ac Replaced the Red and Blue Orbs' sprites 2021-10-23 13:49:02 -03:00
LOuroboros f182e9b9fd Added .sym files to .gitignore 2021-10-23 11:17:23 -03:00
LOuroboros 4c90cbe625 Repositioned the gMoveResultFlags check 2021-10-22 19:58:27 -03:00
LOuroboros cf027176a8 Made ENDTURN_RETALIATE use constants 2021-10-22 11:43:38 -03:00
LOuroboros 24876ac5e3 Small tweak for BattleScript_EffectRapidSpin 2021-10-22 07:21:31 -03:00
LOuroboros dd82e051bd Fixed Rapid Spin raising Speed even when the move fails 2021-10-22 07:21:10 -03:00
LOuroboros 34fe0c54be Fixed Retaliate timer's value decrease
I made an oopsie, basically.
Thanks to Xavion#9504 for the fix.
2021-10-21 09:11:12 -03:00
LOuroboros a6315ffc75 Implemented Plasma Fists 2021-10-19 09:50:18 -03:00
LOuroboros da70accc3e Oopsie 2021-10-19 08:02:36 -03:00
LOuroboros d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
LOuroboros 2dea4f6782 Forgot to port over a return for jumpifcantreverttoprimal 2021-10-19 07:23:02 -03:00
LOuroboros 25255475a7 AI will now take Grav Apple's new effect in consideration 2021-10-18 10:05:19 -03:00
LOuroboros e7ad7319e3 Updated Glare 2021-10-17 12:03:35 -03:00
LOuroboros dcea8e45ed Fixed jumpifspecies 2021-10-17 10:51:55 -03:00
LOuroboros 5d0350cdbc Set the right .effect to Dynamax Cannon 2021-10-17 10:08:30 -03:00
LOuroborosandEduardo Quezada D'Ottone d6304099ac Review optimization
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-10-17 09:42:31 -03:00
LOuroboros 59cfbe55c1 Gave Grav Apple a move effect of its own 2021-10-17 09:27:35 -03:00
LOuroboros c2e25272b0 Added Grav Apple's power boost 2021-10-16 07:02:26 -03:00
LOuroboros 3b6ceb1dfa Turned Retaliate into a side timer 2021-10-16 06:04:04 -03:00
LOuroboros 2bf8022673 Changed how SIDE_STATUS_RETALIATE is cleared 2021-10-15 07:30:05 -03:00
LOuroboros 3a25bce185 Turned Retaliate's effect into a side status 2021-10-15 06:03:48 -03:00
LOuroboros 1f97198267 Oops, I forgot to take the opponent's side into account 2021-10-15 05:02:14 -03:00
LOuroboros 6c550cd749 Implemented Retaliate's effect 2021-10-11 03:19:21 -03:00
LOuroboros 2a7d78e68b Oopsie 2021-10-09 01:55:36 -03:00
LOuroboros 2120545649 Oopsie 2021-10-09 01:07:27 -03:00
LOuroboros 34533a9047 Adjusted the data of the Red and Blue Orbs 2021-10-09 00:53:35 -03:00
LOuroboros 91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
LOuroboros b7fd767e8c Added primal reversions to gEvolutionTable 2021-10-09 00:21:47 -03: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
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
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
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
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
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
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
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