Nephrite
923d22b42b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into secondary_effects_overhaul_merge
2024-01-01 03:50:36 +09:00
Alex
cc32e378d6
Adds some Indigo Disk moves ( #3853 )
...
* Burning Bulwark
* Fickle Beam
* Alluring Voice
* Electro Shot
* forgot sheer force flag for alluring voice
* review changes
* additional alluring voice test
* Simple Allruing Voice animation
* Update battle.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-30 20:20:12 +01:00
Nephrite
77c722ea09
Obsoleted 22 more effects
...
Also added a better way of calculating battle_tv score properly; to do: Make it Rain
2023-12-27 17:43:20 +09:00
Eduardo Quezada D'Ottone
442620cf6b
Renamed Battle Move "Split" to the proper "Category" ( #3774 )
2023-12-20 10:08:26 +01:00
Nephrite
4a1a6c5625
Battlemove refactored (recoil, crit and Z moves) ( #3575 )
...
* Unified EFFECT_RECOIL
Combined EFFECT_RECOIL_25/33/50/33_STATUS into a single EFFECT; added an extra field to BattleMove 'secondaryData' that contains the franction of HP recoil; argument still holds status effect for Flare Blitz/Volt Tackle
* BattleMove struct change
Added critrate, recoil, multihit fields, made zMove into a union of effect/powerOverride for status/non-status moves respectively. Added new recoil field and zMove field to all moves. To-do: crit rate, multihit
* Critrate field added
Moves use a critRate field instead of a flag - obsoletes EFFECT_ALWAYS_CRIT
* Just a little define
Makes clear that critBoost = 3 means ALWAYS CRIT
* Added a proper recoil field
Just to make it unambiguous and flexible - can finally have a move with 69% recoil.
* Fixed AI damage calculation for multi-strike moves
* Fixes + removed unused effects
* Tests fixes
Two to fix: pass when run in isolation but not when the whole group is run, which is annoying...
* Minor fixes
* Minor tweaks
* Fixed move effects
* recoil tests
---------
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-12-19 16:10:07 +01:00
Alex
44e81d4f4c
Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword ( #3614 )
...
* Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword
* use bitfield
* battler fix
* fields
2023-12-12 00:08:44 +01:00
Martin Griffin
5fe564f014
Detect 'NOT x; NOT y;' ( #3459 )
...
Fix Purifying Salt to be immune to statuses from secondary effects.
2023-10-24 09:55:32 +02:00
Eduardo Quezada
f3a65c0315
Merge branch 'RHH/master' into RHH/upcoming
2023-09-26 09:12:28 -03:00
DizzyEggg
e0e49a9933
Fix protect recoil issue and add tests for protect ( #3321 )
...
* fix protect recoil issue and add tests for protect
* test for #3312 and baneful bunker fix
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* more recoil moves for protect test
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* rename spiky shield test
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-26 07:26:23 -03:00
