ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-01 08:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,466 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

1063 Commits

Author SHA1 Message Date
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
W1serV1ser
58a5a9cbec Simplified skyDropTargets storage and made other minor improvements 
A lot of these changes are based on ghoulslash's version of Sky Drop.
 2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
a725592a6b
Merge pull request #1999 from ghoulslash/be/moveeffect 
More battle-will-end checks on stat-changing damaging effects
 2021-12-23 20:23:16 -03:00
ghoulslash
b6b5d862f4 update role play mechanics 2021-12-23 08:37:11 -05:00
LOuroboros
cb44de13b3 B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT 2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports 2021-12-19 20:42:15 -03:00
LOuroboros
ffe35fbb06 Updated defeat condition on multi battles 2021-12-19 08:30:43 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03:00
ghoulslash
31bbc4ddde prevent stat-raising damage effects if battle will end 2021-12-17 10:24:07 -05:00
Eduardo Quezada D'Ottone
aa2b2e6a70
Merge pull request #1929 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-12-09 20:02:45 -03:00
ultima-soul
a5afdac0ae Resolved review suggestions for upstream Battle Engine sync. 2021-12-08 12:08:16 -08:00
LOuroboros
a5659f3339 AI partners no longer get exp. 2021-12-04 23:00:57 -03:00
kleeenexfeu
e7321c22f2
Moxie spread move fix 2021-12-04 17:38:26 +01:00
ultima-soul
7369f60c06 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-12-03 17:30:45 -08:00
LOuroboros
ac606364e9
Removed ITEM_ENIGMA_BERRY_E_READER usage 2021-12-03 15:44:12 -03:00
LOuroboros
19af517bbb Edited pointless or useless Primal Reversion code 
Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion.
Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion.
Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.
 2021-12-01 00:56:33 -03:00
LOuroboros
f2dd7bce99 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks 2021-11-30 20:39:58 -03:00
ghoulslash
5c52abd856 gen3 sport move functionality behind config 2021-11-23 21:20:32 -05:00
BuffelSaft
cca7ec8c58 Fix and rename GetMoveTargetType 
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
 2021-11-24 12:09:54 +13:00
BuffelSaft
a89ce0c38a Swapped webs don't trigger Defiant 
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?

Also, fix Sticky Web not activating Defiant.
 2021-11-23 22:54:30 +13:00
BuffelSaft
499fb8071d Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-23 17:12:24 +13:00
BuffelSaft
fa0b5188bb Dynamic move targeting 
Properly implement Expanding Force by replacing all  instances that read move target from gBattleMoves with a function.
 2021-11-23 16:56:11 +13:00
BuffelSaft
ff60882b29 Requested changes 2021-11-23 11:04:39 +13:00
BuffelSaft
62f01e89d7 Fix Burmy form change 
Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.
 2021-11-23 00:46:43 +13:00
BuffelSaft
8118f3bb44 Fix Brick Break 
Should remove the target's screens, not the attacker's.
 2021-11-22 16:17:10 +13:00
BuffelSaft
50d0cd52e8 Clean up Corrosive Gas 
Remove code and unused move effect.
 2021-11-22 15:13:54 +13:00
BuffelSaft
d2eb5f0e61 Remove shell trap effect code 
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
 2021-11-22 14:46:47 +13:00
BuffelSaft
42b8f18cb1 Remove Corrosive Gas code 
This was not working at all in testing, so it can be done by a separate PR later.
 2021-11-22 14:35:01 +13:00
BuffelSaft
70f0018c08 Partially implement Shell Trap 
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
 2021-11-22 14:14:41 +13:00
W1serV1ser
5d1228fc2e More spacing and format fixes 2021-11-21 15:42:31 -08:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
Eduardo Quezada D'Ottone
30a4ef3723
Merge pull request #1924 from ghoulslash/be/wish 
Fix wish
 2021-11-21 14:04:06 -03:00
BuffelSaft
abb67e96e8 Finish Expanding Force 
Hits both foes if the user is affected by Psychic Terrain. Modified targeting is also shown in the move selection screen.
 2021-11-21 21:49:47 +13:00
BuffelSaft
bcaa17ffb3 Finish/tidy up Court Change 
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
 2021-11-21 17:20:45 +13:00
ghoulslash
3fb62f74c6 fix rampage cancelling 2021-11-20 18:35:56 -05:00
ghoulslash
37ab20e29c fix wish 2021-11-20 16:49:04 -05:00
W1serV1ser
c2f81cd5f5 Added Sky Drop 2021-11-20 11:44:48 -08:00
BuffelSaft
14a2e86313 Fix Scale Shot 
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
 2021-11-19 21:57:32 +13:00
BuffelSaft
86efd69370 Finish/fix Beak Blast 
This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.
 2021-11-19 20:19:10 +13:00
BuffelSaft
98712e576e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-19 17:48:11 +13:00
Eduardo Quezada D'Ottone
7dbc94deef Fixed undef 2021-11-15 23:36:52 -03:00
Eduardo Quezada D'Ottone
0af63c04eb Removed redundant uses of STATUS3_GASTRO_ACID check. 2021-11-15 23:29:54 -03:00
Eduardo Quezada D'Ottone
cc833ebb59 Created macro + config for always critting when using high-crit moves 2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone
a1bd6bd52f Updated species that benefit from Leek 2021-11-15 22:30:20 -03:00
LOuroboros
5c485d9769 Fixed Fling when gLastUsedItem is 0 
Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.
 2021-11-15 14:02:33 -03:00
LOuroboros
a01fd2eb7a Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d Fling tweaks 
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
 2021-11-15 12:40:10 -03:00
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks 
Adjusted elements to simplify the conflicts between BE and IE
 2021-11-15 08:27:28 -05:00
Eduardo Quezada D'Ottone
bcbdb353f5 Adjusted elements to simplify the conflicts between BE and IE 2021-11-13 12:10:20 -03:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00