2230 Commits

Author SHA1 Message Date
Hedara
06d31bc8ea Merge branch 'master' into final-1.10-master-upcoming-merge 2025-02-26 22:07:10 +01:00
hedara90
56a3819b61
Fixed protect not resetting the counter in earlier gens (#6342)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-26 15:07:54 +01:00
Alex
cf481b1343
Fixes recoil moves causing recoil when absorbed (#6341) 2025-02-26 10:43:23 +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
PhallenTree
9479b67964
Remove pursuitSwitchByMove and additional if statement (#6326) 2025-02-23 11:49:00 +01:00
Alex
3dd0f95ddd
Fixes Tera Shell activating on moves that have no effect on target (#6271) 2025-02-21 23:11:07 +01:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03: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
Alex
de8d25da55
Expand usage of IsBattlerAlly (rename from IsAlly) (#6251) 2025-02-14 12:31:21 +01:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Zatsu
4f3326f3f4
fix for battle ui for add to party menu (#6229) (#6240) 2025-02-12 22:02:25 +01:00
hedara90
f20aebf878
Fixed multi battle forced switches (#6243)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-12 21:57:51 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Alex
075cd4e924
Revert unintentional change (#6239) 2025-02-12 00:27:00 +01:00
Alex
cc9ca81c29
Add abstraction layer for battler positions (#6212) 2025-02-11 11:32:34 -05:00
PhallenTree
cf5b95cee8
Fixes Expanding Force and Spectral Thief move animations (#6185) 2025-02-09 22:34:48 +01: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
d510a3957d
Fixed Future Sight not being affected by Electrify (#6213) 2025-02-09 21:57:29 +01:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +01:00
Eduardo Quezada
621d2ef83d
Fixed missing move encapsulation in upcoming (#6226) 2025-02-09 20:03:53 +01:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box (#6058)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-09 00:54:58 +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
Alex
4fd0c3a5be
Master to upcoming (#6194) 2025-02-06 19:11:10 +01:00
ghoulslash
41bda98031
Unify setreflect/setlightscreen and MOVE_EFFECT_REFLECT/LIGHT_SCREEN (#6196)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-06 18:22:01 +01:00
Hedara
27da389d1e Merge branch 'master' into master-to-upcoming 2025-02-06 13:05:02 +01:00
Alex
b90b1e2546
Clean up - Add ability args instead of calcing the ability again (#6186) 2025-02-04 18:04:05 -05:00
Eduardo Quezada
e9c14e35ca
Cleaned up party data access GetPartyBattlerData (#6172) 2025-02-03 20:34:15 +01:00
PhallenTree
5238665a7a
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction (#6171) 2025-02-03 18:31:14 +01:00
moostoet
ddff2def40
Prevent sameMoveTurns from incrementing when unable to use move (#6167) 2025-02-02 22:11:25 +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
94c98e6233
Clean up follow up for Simultaneous Reduction HP (#6139) 2025-01-29 19:39:19 +01:00
Eduardo Quezada
a34a3cad36 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-26 22:57:11 -03:00
PhallenTree
4158f9251f
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109) 2025-01-26 13:06:11 +01: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
6a3d95b422 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-25 22:29:12 -03:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01:00
Alex
77b677dbf9
Introduces BattleTurnCounter to simplfy timer checks (#6080) 2025-01-25 14:26:38 -05:00
Alex
c4b838587b
Fixes Charge effect not boosting and tests (#6102) 2025-01-25 14:38:18 +01:00
Eduardo Quezada
cd84e07341 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-23 23:01:25 -03:00
psf
b109aa0c92
Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide (#6018) 2025-01-23 16:28:33 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
Eduardo Quezada
af884b1be4
Cleaned up Debug Menu (#6070) 2025-01-22 15:27:08 +01: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
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums (#6071) 2025-01-21 21:19:41 +01:00