1466 Commits

Author SHA1 Message Date
Vex
7b686b6749
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-25 23:01:11 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect (#6806) 2025-05-15 10:45:48 +02:00
Alex
75cd16dae0
Fix potential bug in BattleScript_FriskActivates (#6850) 2025-05-15 10:44:37 +02:00
ghoulslash
d4c64d3b67 rename berrystatraise script to consumablestatraise 2025-05-12 21:11:25 -04:00
ghoulslash
14a66d612f combine BattleScript_BerryStatRaiseRet and BattleScript_BerryStatRaiseEnd2, check ripen popup doesn't trigger except on berries 2025-05-12 21:06:12 -04:00
PhallenTree
a6b02b00c0
Fixes restoretarget on empty stack when using G-Max Gravitas (#6827) 2025-05-12 15:16:40 +02:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop (#6813) 2025-05-11 11:34:16 +02:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814) 2025-05-10 22:55:28 +02:00
Alex
9259b7ee69
Bugfixes batch (#6750) 2025-05-02 20:14:27 +02:00
Hedara
4873589c65 Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
	asm/macros/battle_script.inc
	data/battle_anim_scripts.s
	include/battle.h
	include/battle_controllers.h
	include/battle_setup.h
	include/constants/battle.h
	src/battle_anim_normal.c
	src/battle_anim_utility_funcs.c
	src/battle_bg.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
PhallenTree
91fc406b0a
Fixes Mirror Armor stat drops not being stopped by Substitute (#6675) 2025-04-22 19:54:04 +02:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction (#6645)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-21 17:33:29 +02:00
Alex
c4edfd2988
Fix gBattlerTarget OOB for Gravity and Perish Song (#6662) 2025-04-21 13:53:04 +02:00
cawtds
0069ec1f0c
Fix captivate-oblivious interaction and related test (#6653) 2025-04-21 11:01:01 +02:00
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:52 +02:00
Alex
6b09480912
Fixes some restore issues (#6629) 2025-04-18 16:57:04 -04:00
PhallenTree
3b05d7934f
Fixes wrong battler's Illusion wearing off when the Attacker faints and fixes Illusion tests (#6596) 2025-04-14 18:17:24 +02:00
PhallenTree
353e4ae619
Fixes Dynamax reversion animation when fainting (#6597) 2025-04-13 17:41:00 +02:00
Alex
8dd2fee4a9
Fixes Will-O-Wisp not being blocked by Thermal Exchange (#6534) 2025-04-04 23:01:10 +02:00
Alex
edb196e851
Fixes Red Card against Dynamaxed mons (#6526) 2025-04-02 14:28:53 +02:00
PhallenTree
ea59e858fb
Fixes Hone Claws checking the wrong stats for its stat change animation and Stockpile drops being stopped by stat reduction prevention effects (#6522) 2025-04-01 21:03:04 +02:00
Alex
388389714b
Rename removelishtscreenreflect to removescreens (#6495) 2025-03-30 10:52:24 +02:00
Alex
79a2ec1ce2
Fixes Emergency Exit and Eject Pack (#6459) 2025-03-29 14:04:01 +01:00
Alex
7ead90aeff
Fixs Aftermath ability popup message (#6491) 2025-03-29 09:45:59 +01:00
Alex
99a3d01877
Fixes dynamax reversion when ejected out + anim fix (#6416)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-17 19:57:38 +01:00
PhallenTree
ddab689a07
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435) 2025-03-16 23:10:20 +01:00
Alex
3def0e751b
Fixes crash damage move against absorbing abilities (#6361) 2025-03-09 20:54:58 +01:00
ghoulslash
d44eff4e0c fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly 2025-03-03 14:56:08 -05:00
Hedara
06d31bc8ea Merge branch 'master' into final-1.10-master-upcoming-merge 2025-02-26 22:07:10 +01:00
Alex
13acf18d74
Fixes effect paralyze not being absorbed by absorbing abilities (#6338) 2025-02-25 22:28:10 +01:00
PhallenTree
320c6cf11f
Fixes Coaching on semi-invulnerable ally, Air Balloon being stolen, Immunity abilities being ignored by Mold Breaker (#6327) 2025-02-23 20:50:52 +01:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03:00
Alex
767ea38dbf
Fixes doesnt effect message for Thunder Wave (#6304)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-20 19:18:27 -03:00
PhallenTree
f6ff64cdbe
Fixes Brick Break/Psychic Fangs/Raging Bull breaking screens if target is immune (#6308) 2025-02-20 12:55:10 -03:00
PhallenTree
5340dc8687
Fixes non-Ghost type Curse animation (#6299) 2025-02-19 18:09:06 +01:00
Alex
b2f45fcf1f
Restoretarget in Rototiller script + Tests (#6296) 2025-02-18 20:43:07 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up (#6272) 2025-02-17 22:07:30 +01:00
PhallenTree
b1c597495b
Fixes Called moves ignoring redirection (#6267) 2025-02-14 13:47:02 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
PhallenTree
cf5b95cee8
Fixes Expanding Force and Spectral Thief move animations (#6185) 2025-02-09 22:34:48 +01:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +01:00
ghoulslash
6f541bb449
Fix Liquid Ooze + Leech Seed Test (#6217)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-08 22:42:25 +01:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time (#6197)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-02-07 16:24:05 -05:00
Alex
765a12f520
Convert max effects to normal move effects (#6143) 2025-02-06 21:02:39 -03:00
Hedara
27da389d1e Merge branch 'master' into master-to-upcoming 2025-02-06 13:05:02 +01:00
PhallenTree
5238665a7a
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction (#6171) 2025-02-03 18:31:14 +01:00
Eduardo Quezada
64c5113b23 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-02 14:18:13 -03:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01:00
Alex
89cfd85b8f
Fixes battler mutation during the intim script (#6151)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-31 21:49:26 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01:00