Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
grintoul
|
dba50c91ea
|
Aura Break tests (#8099)
|
2025-11-01 13:43:31 +01:00 |
|
AlexOn1ine
|
d4e7e7ad36
|
10/11/25 Master to upcoming merge
|
2025-11-01 11:54:17 +01:00 |
|
Eduardo Quezada
|
f66ba68eee
|
Fixed Zygarde Complete disappearing upon catch (#8089)
|
2025-10-31 19:41:46 +01:00 |
|
Alex
|
3a3b947622
|
Fixes intimidate activating on empty field (#8058)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-30 17:51:57 +01:00 |
|
PhallenTree
|
9d06a4fb55
|
Emergency Exit on hazards activation + fix end of turn activation (#8075)
|
2025-10-30 17:01:13 +01:00 |
|
Alex
|
c77c624e9f
|
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083)
|
2025-10-30 16:14:03 +01:00 |
|
Eduardo Quezada
|
814cf53629
|
Fixed Hunger Switch changing forms on switch out while Tera'd (#8080)
|
2025-10-30 15:43:50 +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 |
|
Bassoonian
|
f7cbe4853b
|
Add type enum (#8054)
|
2025-10-27 16:41:22 +00:00 |
|
PhallenTree
|
782c559a20
|
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042)
|
2025-10-26 22:41:16 +01:00 |
|
FosterProgramming
|
6faf35dde9
|
Fix emergency exit not triggering properly during wild battles (#8037)
|
2025-10-26 22:35:27 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Alex
|
8ea947d5a1
|
Fixes Protosynthesis not activating after weather was reset (#8021)
|
2025-10-24 18:53:34 +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 |
|
hedara90
|
3bb6cddffb
|
Fix Minior start of battle form (#7972)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-21 16:39:02 +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 |
|
spindrift64
|
de3c031fc5
|
Fix Anticipation type effectiveness check (#7840)
|
2025-10-16 14:36:07 +02:00 |
|
AlexOn1ine
|
e365add4cf
|
15/10/25 Master to upcoming merge
|
2025-10-15 21:31:00 +02:00 |
|
grintoul
|
7e98dffc51
|
Tests for Battery ability (#7846)
|
2025-10-15 14:31:09 +02:00 |
|
PhallenTree
|
78b11bb35f
|
Fixes Cursed Body failing to disable moves on the last PP (#7940)
|
2025-10-13 13:55:39 +02:00 |
|
Alex
|
eee546df06
|
Item battle effect refactor (#7857)
|
2025-10-12 08:59:33 +02:00 |
|
Raymond Dodge
|
c455665115
|
Add Struggle tests, weakness berry tests and prevent Struggle from activating Silk Scarf and Chilan Berry (#7880)
|
2025-10-08 16:03:20 +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 |
|
Eduardo Quezada
|
13f392987a
|
Fix some failed and assume fail tests with GEN_LATEST = GEN_5 (#7735)
|
2025-10-02 13:27:06 +02:00 |
|
spindrift64
|
2231b2fdca
|
Immunity abilities trigger on turn 0 (leads) (#7814)
|
2025-09-30 19:07:23 +02:00 |
|
khbsd
|
e385c7f59f
|
feat: change defines in constants/abilities.h to an enum (#7006)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-09-29 21:35:09 +02:00 |
|
AlexOn1ine
|
a4470cac2c
|
Master to upcoming merge
|
2025-09-27 22:42:53 +02:00 |
|
Alex
|
3c9f05b367
|
Fixes activation order for a couple abilities (#7732)
|
2025-09-27 18:47:10 +02:00 |
|
FosterProgramming
|
36fae27599
|
Fix catch bug introduced in #7774 (#7782)
|
2025-09-23 17:50:48 +02:00 |
|
Alex
|
a00b16fd90
|
Minor clean up for Lightning Rod / Storm Drain (#7778)
|
2025-09-22 23:47:44 +02:00 |
|
FosterProgramming
|
1d11a2cb0a
|
Improve how test involving ball throw work (#7774)
|
2025-09-22 20:44:12 +02:00 |
|
FosterProgramming
|
db7e062fe1
|
Add some missing move animations to the move animation tests (#7507)
|
2025-09-21 23:27:05 +02:00 |
|
bassforte123
|
abc471e9bd
|
Fixed Ball Fetch Ability (#7764)
|
2025-09-21 13:16:53 +02:00 |
|
Phexi
|
f28b3bf3b8
|
Fix failing test for B_PREFERRED_ICE_WEATHER = B_ICE_WEATHER_SNOW (#7755)
|
2025-09-19 20:38:20 +02:00 |
|
AlexOn1ine
|
bc84e6656d
|
Master to upcoming merge
|
2025-09-17 20:18:51 +02:00 |
|
Alex
|
83bfb34beb
|
Fixes Mycelium Might and Lagging Tail adjusting prio incorrectly (#7742)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-17 18:33:09 +02:00 |
|
grintoul
|
b365221a0c
|
Fix for Levitate and Mold Breaker being seen correctly by switch AI, with Levitate tests (#7748)
|
2025-09-17 18:32:50 +02:00 |
|
Alex
|
74de29a921
|
Bugfixes Batch (#7739)
|
2025-09-16 19:44:06 +02:00 |
|
Alex
|
32f8464fec
|
Attackcanceller fixes and improvements (#7698)
|
2025-09-16 18:00:30 +02:00 |
|
Eduardo Quezada
|
deaf77f619
|
Fix most failed and assume fail tests with GEN_LATEST = GEN_6 (#7696)
|
2025-09-14 20:21:38 +02:00 |
|
hedara90
|
70dec039cb
|
Add tests for Filter, Solid Rock and Prism Armor (#7734)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-09-14 20:19:53 +02:00 |
|
Alex
|
78a05c97ac
|
Refactors ruin ability checks into a field effect (#7711)
|
2025-09-14 14:41:10 +01:00 |
|
surskitty
|
abc0e10558
|
Moving additional effects out of AI_CalcMoveEffectScore and into AI_CalcMoveAdditionalEffectScore (#7727)
|
2025-09-13 10:58:16 +02:00 |
|
Alex
|
92ba0d813d
|
Fixes Sweet Veil not protecting sleep from Yawn status (#7704)
|
2025-09-08 11:51:22 +02:00 |
|
PhallenTree
|
8486e0e045
|
Fixes Weak Armor and items not displaying stat change attributes (#7701)
|
2025-09-07 20:30:00 +02:00 |
|