2206 Commits

Author SHA1 Message Date
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
Alex
ac9c8ac3bb
Replace WEATHER_HAS_EFFECT with HasWeatherEffect (#6069) 2025-01-21 08:43:45 +01:00
Alex
da9943d3b8
Clean up array access by using index instead of dereferencing the value (#6057) 2025-01-20 16:44:22 +01:00
Alex
3977b66c91
Remove redundant line in Cmd_setcharge (#6053) 2025-01-19 22:45:26 +01:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
ghoulslash
37cbae5e54
Fix Symbiosis Needing battler Argument + Tests (#6039)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-18 14:44:07 +01:00
Eduardo Quezada
cacd07db9a Merge branch '_RHH/master' into _RHH/upcoming 2025-01-17 13:49:32 -03:00
Alex
c46f8541f9
Fixes self effect moves not procing for spread moves when battler 3 w… (#6020) 2025-01-14 15:18:00 -05:00
Alex
1c3ce75a60
Wrong undefs (#6024) 2025-01-14 14:01:10 -05:00
Alex
f1eebc978d
Fixes defrosting if frozon mon is not damaged by opponent (#6016)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-13 10:09:55 +01:00
Eduardo Quezada
ce40c3356c Merge branch '_RHH/master' into _RHH/upcoming 2025-01-12 08:42:57 -03:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues (#6005) 2025-01-12 09:49:19 +01:00
Alex
2da547908e
Fixes Shell Bell inlcuding heal amount from Future Sight when triggered (#5962) 2025-01-12 00:27:31 +01:00
Alex
ddef67bbb1
Future Sight Innards Out follow up for upcoming (#5998) 2025-01-12 00:25:50 +01:00
Alex
8f34c76395
Removes Resource Flags and moves fields to DisableStruct (#5945) 2025-01-11 09:39:10 -03:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Alex
6e5f40d506
Introduces BattlerState struct for the Battle Engine (#5954) 2025-01-11 07:12:22 -03:00
Eduardo Quezada
c33c38e020
Remove form change function footguns (#5995) 2025-01-11 09:57:39 +01:00
Pawkkie
f8151f0be5
Missed two uses of new hazard type enum (#5996) 2025-01-10 20:14:15 -03:00
Eduardo Quezada
0fefb444de
Multiple removals of hardcoded move IDs (#5964) 2025-01-10 17:07:32 -05:00
Alex
75a2d419e1
Follo up for Innards Out / Future Sight interaction (#5967) 2025-01-10 16:59:37 +01: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
PhallenTree
c10287b4c1
Fixes various Dynamax HP conversions/calculations (#5933) 2025-01-07 20:08:31 +01:00
wiz1989
5bfc25a4ff changed data according to suggestions from the PR 2025-01-07 15:33:22 +01:00