AlexOn1ine
|
15d9342fe5
|
30/11/25 master to upcoming merge
|
2025-11-30 14:57:50 +01:00 |
|
hedara90
|
ce858f51b2
|
27/11/25 Master to upcoming merge (#8359)
|
2025-11-27 21:07:59 +01:00 |
|
PhallenTree
|
c36fc5c4b7
|
Fixes Beak Blast burning after Beak Blast was already used (#8361)
|
2025-11-27 20:07:45 +01:00 |
|
FosterProgramming
|
7085d30263
|
Fix substitute graphic not disappearing after using a pivor move (#8340)
|
2025-11-27 19:09:40 +01:00 |
|
Alex
|
2d628aca0e
|
Move end clear bits clean up (#8354)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-11-27 17:42:16 +01:00 |
|
AlexOn1ine
|
68300e0f9a
|
27/11/25 Master to upcoming merge
|
2025-11-27 13:39:12 +01:00 |
|
moostoet
|
fbc640d692
|
Refactor Beat Up handling for Gen 3/4 defaults, fix crit check, and expand test coverage (#8307)
|
2025-11-25 22:18:51 +01:00 |
|
PhallenTree
|
10ef7f7839
|
More Neutralizing Gas cleanup (#8335)
|
2025-11-23 17:29:50 +01:00 |
|
Alex
|
c2fba193a6
|
Fix Upper Hand failure still activating Protean (#8329)
|
2025-11-23 12:36:28 +01:00 |
|
Alex
|
8d3be426fd
|
Remove leftover scrtipt redirection (#8317)
|
2025-11-23 09:42:43 +01:00 |
|
AlexOn1ine
|
aa20b2bc0f
|
master to upcoming merge
|
2025-11-22 10:39:52 +01:00 |
|
PhallenTree
|
65a5d1e7d8
|
Fixes Neutralizing Gas displaying message when exiting with multiple users (#8318)
|
2025-11-21 19:58:02 +01:00 |
|
FosterProgramming
|
7229305ff9
|
Fix max move message against semi invulnerable target (#8313)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-11-21 15:15:01 +01:00 |
|
FosterProgramming
|
7ec0a1db9a
|
Fix bug where defiant/competitive would pass their stat change to the next target (#8312)
|
2025-11-21 11:14:25 +01:00 |
|
FosterProgramming
|
acdfa39f76
|
Make switchout abilities trigger after a pokemon has returned to its ball (#8304)
|
2025-11-20 17:19:06 +01:00 |
|
AlexOn1ine
|
93cc143134
|
conflicts
|
2025-11-11 13:12:00 +01:00 |
|
PhallenTree
|
649798449e
|
Powder Move blocking cleanup (#8194)
|
2025-11-10 21:01:35 +01:00 |
|
Alex
|
6c383fac96
|
Fixes Magician for spread moves (#8170)
|
2025-11-09 18:10:11 +01:00 |
|
FosterProgramming
|
bdaf4ae3b3
|
Fix destiny knot behavior and add tests (#8174)
|
2025-11-09 15:03:43 +01:00 |
|
grintoul1
|
c230e54678
|
Master to Upcoming merge 20251107
|
2025-11-07 22:45:57 +00:00 |
|
PhallenTree
|
b8dc1968f3
|
Fixes Receiver not immediately activating copied Soul Heart (#8162)
|
2025-11-07 19:23:00 +01:00 |
|
Alex
|
dea7d02e76
|
Adjust faint battler script (#8137)
|
2025-11-04 20:57:49 +00:00 |
|
Alex
|
41aba41838
|
Attackstring hitmarker clean up (#8136)
|
2025-11-04 18:35:48 +00:00 |
|
AlexOn1ine
|
d4e7e7ad36
|
10/11/25 Master to upcoming merge
|
2025-11-01 11:54:17 +01:00 |
|
Alex
|
1c1a98ee45
|
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-30 23:14:02 +01:00 |
|
Alex
|
ff557e3d0c
|
Clean up for item hold effect refactor (#8014)
|
2025-10-30 21:07:37 +01:00 |
|
Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
Alex
|
c77c624e9f
|
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083)
|
2025-10-30 16:14:03 +01:00 |
|
Hedara
|
a2ef3284dd
|
Merge branch 'master' into master-to-upcoming
Conflicts:
data/battle_scripts_1.s
include/battle_util.h
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-10-29 18:42:59 +01:00 |
|
Alex
|
dd875b87bc
|
Combine Simple Beam and Worry Seed into one effect (#8039)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-29 15:20:12 +01:00 |
|
Alex
|
ea60c32fbe
|
Fixes Liquid Ooze dmg not blocked by Magic Guard (#8036)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-29 15:19:50 +01:00 |
|
FosterProgramming
|
fd07daf0d8
|
Fix nature power string and add support for evnvironment in tests (#8068)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-28 19:23:16 +01:00 |
|
PhallenTree
|
782c559a20
|
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042)
|
2025-10-26 22:41:16 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Alex
|
7ebb939cbc
|
Remove usage of gBattlerTarget for MirrorHerb/Opportunist (#8033)
|
2025-10-25 13:52:40 +02:00 |
|
Alex
|
eb1be34d47
|
Fix Salt Cure script (#8005)
|
2025-10-24 18:53:53 +02:00 |
|
FosterProgramming
|
8c87522415
|
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026)
|
2025-10-24 11:50:19 +02:00 |
|
Alex
|
786859b6bb
|
Fix Fling Mental Herb message (#7984)
|
2025-10-19 22:38:27 +02:00 |
|
Alex
|
cb0d503f66
|
Decouple passive hp updates from move damage updates (#7942)
|
2025-10-19 16:40:13 +02:00 |
|
PhallenTree
|
38221b9de5
|
Fixes Shields Down incorrectly preventing status on Minior Core form (#7968)
|
2025-10-17 20:40:37 +02:00 |
|
FosterProgramming
|
864377f99a
|
Fix Cherim and Castfrom not reverting to baseform when Teraform Zero is triggered (#7961)
|
2025-10-16 19:19:31 +02:00 |
|
AlexOn1ine
|
e365add4cf
|
15/10/25 Master to upcoming merge
|
2025-10-15 21:31:00 +02:00 |
|
Alex
|
2daa8f3c88
|
Remove EffectHitSetTerrain script to use moveeffect (#7938)
|
2025-10-13 15:39:10 +02:00 |
|
FosterProgramming
|
daf642fdbf
|
Fix multiple battle arena bugs (#7941)
|
2025-10-13 13:12:50 +02:00 |
|
Alex
|
eee546df06
|
Item battle effect refactor (#7857)
|
2025-10-12 08:59:33 +02:00 |
|
Alex
|
798bf0a322
|
Removes a few redundant hitmarkers (#7915)
|
2025-10-11 15:03:23 +02:00 |
|
PhallenTree
|
4d12c35eb3
|
Fixes Steadfast not activating + tests (#7886)
|
2025-10-08 16:01:29 +02:00 |
|
AlexOn1ine
|
870b93aad9
|
06/10/25 Master to upcoming merge
|
2025-10-06 19:42:42 +02:00 |
|
Bassoonian
|
6267cef403
|
Streamline tryheal macros (#7830)
|
2025-10-01 13:45:20 +02:00 |
|
Alex
|
3ea095a941
|
More White Herb fixes/clean up (#7826)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-30 21:16:02 +02:00 |
|