Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
Alex
|
d00563d830
|
Changed White Herb hold effect name (#6815)
|
2025-05-11 11:34:47 +02:00 |
|
Alex
|
0ad3f929ab
|
Fixes Berserk Gene infinite loop (#6813)
|
2025-05-11 11:34:16 +02:00 |
|
spindrift64
|
3b91a964c9
|
Fix Iron Ball type effectiveness check (#6794)
|
2025-05-09 22:23:44 +02:00 |
|
spindrift64
|
5e190d0782
|
Fix gems activating for moves that don't deal type damage (#6789)
|
2025-05-08 20:17:32 +02:00 |
|
spindrift64
|
0742741dd3
|
Fix Life Orb inflicting self damage when using status moves (#6767) (#6773)
|
2025-05-04 22:26:12 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02:00 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +02:00 |
|
Eduardo Quezada
|
d2a4b5ef84
|
Changed Tackle for Scratch in tests (#6730)
|
2025-04-30 17:18:52 -04:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +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 |
|
AlexOn1ine
|
e2e012c3a9
|
conflicts
|
2025-04-21 15:50:57 +02:00 |
|
Eduardo Quezada
|
c650199909
|
Added missing gMovesInfo encapsulation (#6656)
|
2025-04-20 22:36:27 +02:00 |
|
Alex
|
2a03f881d4
|
Fixes Big Root Leech Seed heal amount (#6638)
|
2025-04-18 16:07:18 -04:00 |
|
AlexOn1ine
|
fd0766c7fa
|
17-04-25-master-merge
|
2025-04-17 14:14:37 +02:00 |
|
Bassoonian
|
075efd36c1
|
Big Root tests (#6601)
|
2025-04-13 21:16:05 +02:00 |
|
Alex
|
caa878002a
|
Remove redundant bit for Throat Spray (#6593)
|
2025-04-13 16:22:04 +02:00 |
|
Alex
|
edb196e851
|
Fixes Red Card against Dynamaxed mons (#6526)
|
2025-04-02 14:28:53 +02:00 |
|
Alex
|
79a2ec1ce2
|
Fixes Emergency Exit and Eject Pack (#6459)
|
2025-03-29 14:04:01 +01:00 |
|
Alex
|
ce3d6a924a
|
Fixes clear body type effect and clear amulet against protect effects (#6482)
|
2025-03-28 11:35:06 +01:00 |
|
Alex
|
10412e1a47
|
Fixes protective pads against Protects secondary effects (#6474)
|
2025-03-25 16:30:15 +01:00 |
|
PhallenTree
|
ddab689a07
|
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435)
|
2025-03-16 23:10:20 +01:00 |
|
ghoulslash
|
26c73dca32
|
move red card dancer tests to dancer.c
|
2025-03-03 17:01:15 -05: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 |
|
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 |
|
Alex
|
750098d5c9
|
Fixes Shell Bell for Spread Moves (#6303)
|
2025-02-20 10:14:54 +01:00 |
|
Eduardo Quezada
|
3507862164
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-12 09:30:59 -03:00 |
|
Eduardo Quezada
|
99cb40d896
|
Added test support for 5 battle configs (#5914)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-09 22:29:23 +01:00 |
|
Eduardo Quezada
|
621d2ef83d
|
Fixed missing move encapsulation in upcoming (#6226)
|
2025-02-09 20:03:53 +01:00 |
|
Eduardo Quezada
|
e29e1c6ca7
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-07 15:33:26 -03:00 |
|
ghoulslash
|
96ee24c726
|
Minor Terrain Seed Test Improvement (#6207)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-02-07 16:40:10 +01: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
|
a34a3cad36
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-26 22:57:11 -03:00 |
|
PhallenTree
|
0339f684c3
|
Fix seeds softlocking the game when a battler with a Surge ability enters the field (#6110)
|
2025-01-26 12:21:19 +01:00 |
|
Eduardo Quezada
|
cd84e07341
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-23 23:01:25 -03:00 |
|
Alex
|
f2840cb047
|
Fixes Eject Pack triggering twice on Intimidate (#6072)
|
2025-01-21 17:58:52 -05:00 |
|
Eduardo Quezada
|
ed505cfb5f
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-21 19:32:51 -03:00 |
|
Alex
|
b2f2a8c9fb
|
Fixes Rapid Spin / Toxic Debris interaction (#6023)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-01-21 21:43:54 +01:00 |
|
Eduardo Quezada
|
ce40c3356c
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-12 08:42:57 -03:00 |
|
Alex
|
2da547908e
|
Fixes Shell Bell inlcuding heal amount from Future Sight when triggered (#5962)
|
2025-01-12 00:27:31 +01:00 |
|
Eduardo Quezada
|
8821779815
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-11 08:07:15 -03:00 |
|
Alex
|
5391b451ae
|
Shell Bell Clean up / Simplification and Tests (#5924)
|
2025-01-07 21:50:23 +01:00 |
|
Alex
|
c3833fa55f
|
Fixes Parting Shot / Eject Pack interaction (#5963)
|
2025-01-07 15:24:12 -05:00 |
|
wiz1989
|
5bfc25a4ff
|
changed data according to suggestions from the PR
|
2025-01-07 15:33:22 +01:00 |
|
wiz1989
|
04da838d88
|
Innards Out and Future Sight interaction
|
2025-01-07 14:00:09 +01:00 |
|
Alex
|
5317371fea
|
Last fix for Sparkling Aria / Covert Cloak / Shield Dust interaction (#5956)
|
2025-01-06 12:03:41 +01:00 |
|
Eduardo Quezada
|
a50c78bb1e
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-01 18:34:42 -03:00 |
|