AlexOn1ine
4babfd003e
rhh merge/upcoming
2025-02-09 14:04:21 +01:00
AlexOn1ine
f2bd88a7f9
EndTurnEffectsOrder Refactor
2025-02-09 13:48:08 +01:00
ghoulslash
dc21befcc9
CanAbilityX Function Cleanup ( #6183 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-05 16:48:51 +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
b1831daa98
Adds static assert for DamageCalculationData ( #6063 )
2025-01-21 21:15:25 +01:00
Alex
ac9c8ac3bb
Replace WEATHER_HAS_EFFECT with HasWeatherEffect ( #6069 )
2025-01-21 08:43:45 +01:00
cawtds
75d5edad08
Fix UB when accessing move result flags ( #6030 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-01-15 21:30:25 +01: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
0fefb444de
Multiple removals of hardcoded move IDs ( #5964 )
2025-01-10 17:07:32 -05:00
PhallenTree
c10287b4c1
Fixes various Dynamax HP conversions/calculations ( #5933 )
2025-01-07 20:08:31 +01:00
Alex
5317371fea
Last fix for Sparkling Aria / Covert Cloak / Shield Dust interaction ( #5956 )
2025-01-06 12:03:41 +01:00
ghoulslash
03684c6539
Battle Weather Refactor ( #5833 )
2025-01-04 07:33:25 -05:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Eduardo Quezada
e1275594c5
Renamed OW type effectiveness function for clarity ( #5917 )
2024-12-31 22:55:42 +01:00
Eduardo Quezada
004efd1e5a
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-31 18:38:03 -03:00
Alex
51cfb96fd5
Fixes Sparkling Aria Shield Dust / Covert Cloak interaction ( #5911 )
2024-12-31 12:52:16 +01:00
Alex
9d30299148
Fixes Stance Change, Sleep Talk interaction ( #5909 )
2024-12-31 00:38:01 +01:00
AlexOn1ine
74f1d7cb80
merge rhh/upcomig
2024-12-28 21:03:34 +01:00
Alex
5900a01061
Atk Canceller refactor / reorder / clean up ( #5885 )
2024-12-27 21:14:05 +01:00
Alex
8edf14423a
Refactors argument into a union ( #5853 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-12-23 15:51:35 -03:00
AlexOn1ine
99fef0260f
Battle Weather Refactor
2024-12-19 20:50:08 +01:00
Pawkkie
da2a1e2aba
Destiny Bond fails on repeated use in Gen 7+ ( #5652 )
2024-12-05 22:29:20 +01:00
Eduardo Quezada
a92350fb53
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-04 18:55:56 -03:00
Pawkkie
599f4d339b
Adds SleepClauseBlock enum to CanBeSlept ( #5773 )
2024-12-04 21:54:31 +01:00
Eduardo Quezada
68b5b63ecb
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/hp_reduction
2024-12-04 12:04:47 -03:00
Alex
70224f0ea3
Fixes items preventing other switch in effects ( #5732 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-12-03 11:15:29 -05:00
Martin Griffin
993663d9b0
Variadic IS_BATTLER_OF_TYPE and GetBattlerTypes ( #5708 )
2024-12-03 13:12:54 +01:00
Pawkkie
b15f7ad4f1
Sleep Clause global config ( #5762 )
2024-12-02 16:35:28 -05:00
AlexOn1ine
d95dbadccc
merge rhh/upcoming
2024-12-02 19:00:55 +01:00
AlexOn1ine
aa61f24e81
clean up
2024-12-02 18:25:24 +01:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE ( #5566 )
...
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-02 09:06:03 +01:00
Eduardo Quezada
7010080465
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.10.0
2024-12-01 14:28:12 -03:00
Alex
0ca588943b
Fixes choiced moves not locked in after ability block ( #5738 )
2024-12-01 13:45:35 +01:00
AlexOn1ine
97b30cb712
simultaneous hp reduction
2024-11-23 08:35:01 +01:00
Eduardo Quezada
b2ef363ac8
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-19 14:19:53 -03:00
AERDU
5388ed0cad
Mimicry updates typing with RemoveAllTerrains() ( #5666 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-11-17 10:21:01 +01:00
Alex
d5f8e9cc0e
Combines CalculateMoveDamage arguments into a struct ( #5570 )
2024-10-31 07:59:28 +01:00
Alex
1454644376
Removes duplicate code in AI functions ( #5457 )
...
* Make functions CanAbilityAbsorbMove and CanAbilityBlockMove
* clean up
* Replace ai code with CanAbilityBlockMove / CanAbilityAbsorbMove
* Adds CanPartnerAbilityBlockMove
* Use switches instead of if-blocks
* solve potential bug in singles with spread attacks
* fix test
* revert other fix
* flash fire does not increase a stat
* left a comment for a future test and addition
* remove more checks
* comment was incorrect. it only applies to storm drain and lightning rod
* revert ndebug
* revert minor change
* Update src/battle_util.c
2024-10-09 15:50:59 +02:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
PhallenTree
e67d5a23ed
Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive ( #5430 )
...
* Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive)
* Add Snatch interactions with Dancer, Swallow
* Trace fix + cleanup
* Simplify Quash
* Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests
* Fix Booster Energy Ability Popup
* Accidentally removed healing from Swallow
* More Trace cleanup
2024-09-24 18:40:44 +02:00
Eduardo Quezada
aebbe448b8
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-28 12:58:14 -04:00
hedara90
51a127fcb5
Better implementation of the obedience fix ( #5245 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-25 11:20:26 +02:00
Eduardo Quezada
6ac18a6fe5
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-20 08:00:05 -04:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests ( #5170 )
...
* Adds Harvest tests
* Adds Pickup in-battle effect + tests
* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)
* Change canPickupItem to bit field
* Make RandomUniformExcept inclusive (higher end) + convert bitfield
* Use CantPickupItem in PickupHasValidTargetc check
* Review
2024-08-16 15:37:23 +02:00
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
Alex
dbb9ee874b
Change GET_MOVE_TYPE to a function ( #5090 )
...
* Change GET_MOVE_TYPE to a function
* add in battle check to GetMoveType function, move it to battle_util.c
* Update src/battle_util.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Update src/battle_util.c
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-05 22:02:31 -04:00
Eduardo Quezada
18aff2db3b
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_anim_script.inc
# data/battle_anim_scripts.s
# include/constants/battle_anim.h
# src/battle_anim.c
# src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
