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

919 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
13f9919b9e
Merge pull request #2123 from Sneed69/wikiberry_battle 
Update Confuse Berry Hold Effect (Battle Engine)
 2022-05-08 09:02:33 -04:00
Eduardo Quezada D'Ottone
989ec641f4
Merge pull request #2120 from ghoulslash/be/healblock 
Heal Block AI and Pollen Puff Selection Prevention
 2022-05-07 19:29:24 -04:00
sneed
f83875cf0f remove item expansion check 2022-05-07 23:34:38 +03:00
sneed
4c8770fdc2 Update battle_util.c 2022-05-07 21:57:50 +03:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs 
Once again, Battle Configs
 2022-05-07 11:31:25 -04:00
ghoulslash
5456a87b83 fix pollen puff heal blocked battler in CanTargetBattler 2022-05-07 11:27:32 -04:00
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks 
Primal Reversion Tweaks
 2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone
4e7ce0b663 Merge branch 'battle_engine' into BE_configs 
# Conflicts:
#	include/constants/battle_config.h
 2022-05-07 10:25:34 -04:00
ghoulslash
07579bd42b prevent ally pollen puff selection under heal block. add some ai checks for heal block 2022-05-07 09:56:32 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock 
Add missing Heal Block functionalities
 2022-05-07 09:13:18 -04:00
ghoulslash
f63a451517
Merge pull request #2110 from Sneed69/gen8rattled 
Gen 8 Intimidate triggers Rattled
 2022-05-07 08:20:39 -04:00
sneed
ef7cd3cdfe BattleScript_DefiantActivates rename 2022-05-06 11:15:24 +03:00
AgustinGDLV
74cc8c5ecb fixed bolt beak switch-in boost 2022-05-05 22:37:28 -07:00
sneed
6c23eb431d Heal Pulse and Pollen Puff 2022-05-05 13:56:59 +03:00
sneed
865b771db7 initial commit 2022-05-05 00:57:19 +03:00
sneed
b17d1f7816 Add generation specific interactions 2022-05-02 17:56:09 +03:00
sneed
be6148d876 Add missing Heal Block functionalities 2022-05-02 04:54:25 +03:00
BuffelSaft
af6242f2e0 Requested changes, Sticky Web edge case 
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
 2022-04-27 21:51:10 +12:00
BuffelSaft
5358cc0a00 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-04-25 13:38:13 +12:00
LOuroboros
a127cb32bb Removed pointless use of preproc directives 2022-03-30 02:05:54 -03:00
LOuroboros
434f6cf5ad Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-03-26 08:43:55 -03:00
LOuroboros
0a65fd316c Fixed Enigma Berry check in CanMegaEvolve 2022-03-20 12:21:15 -03:00
ghoulslash
f53de6ae87 fix toxic/flame orb. use CanBeX'ed functions 2022-03-08 15:16:17 -05:00
ghoulslash
92487db470 add config check for B_GLARE_GHOST 2022-02-25 08:20:56 -05:00
ghoulslash
e4ef3cc3b4 move glare effectiveness exception to code 2022-02-24 22:06:18 -05:00
Eduardo Quezada D'Ottone
748ce99de3 Config for Ingrain grounding the user 2022-02-13 00:17:37 -03:00
Eduardo Quezada D'Ottone
389a38b3cd Config for Facade being affected by burns 2022-02-12 23:55:54 -03:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks 2022-02-12 23:08:12 -03:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
LOuroboros
b33f7aed8d Oopsie 2022-01-25 23:31:23 -03:00
LOuroboros
7916ff5f47 Further updated CanFling 2022-01-25 21:02:26 -03:00
LOuroboros
8eaf0718ec Review changes 
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
 2022-01-23 19:13:04 -03:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
b7df21b263 Optimized use of GetBattlerAbility 2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions 2022-01-22 19:01:45 -03:00
ghoulslash
7182f290c1 fix harvest activation msg 2022-01-16 12:39:08 -05:00
ghoulslash
f3b9e6bb63
Merge pull request #1976 from kleeenexfeu/patch-2 
[battle_engine]  Moxie interaction with spread move/follow me fix
 2022-01-16 10:58:50 -05:00
LOuroboros
24b5a5709a Allow Galarian Darmanitan's Zen Mode to work 2022-01-10 23:01:18 -03:00
Eduardo Quezada D'Ottone
eba4c36189
Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS 
Yawn now uses B_SLEEP_TURNS
 2022-01-07 21:56:06 -03:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine 
Added Sky Drop to Battle Engine
 2022-01-07 18:14:40 -03:00
TheXaman
328b501394
Update src/battle_util.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-01-05 18:54:42 +01:00
TheXaman
9733f92c7f Yawn now uses B_SLEEP_TURNS, resolves #1873 2022-01-05 18:48:01 +01:00
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
4ab4250d5d
Merge branch 'battle_engine' into be/sports 2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
6d17156f74
Merge pull request #1934 from BuffelSaft/fix-burmy 
Fix Burmy form change
 2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone
4ca9f406f6
Merge pull request #1947 from LOuroboros/lightBall 
Updated Light Ball's effect and improved readability
 2021-12-18 15:03:18 -03:00
Eduardo Quezada D'Ottone
3a24bc8298
Merge branch 'battle_engine' into DizzyEggg-patch-1 2021-12-18 14:52:19 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03: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