atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16036 commits 2 branches 40 tags 600 MiB
Commit graph

281 commits

Author SHA1 Message Date
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
Alex
68c51f8412
Fixes Spiky Shield Counter interaction (#5402) 
* Fixes Spiky Shield Counter interaction

* Update test/battle/move_effect/protect.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-19 12:00:32 +02:00
PhallenTree
76656e85c2
Fix Quash implementation, adds After You and Quash missing configs + tests (#5400) 
* Fix Quash + After You and Quash configs

* Add tests
 2024-09-19 00:10:29 +02:00
Alex
6ef36837e9
Fixed corruption of the next turn used move caused by Scale Shot (#5397) 2024-09-18 16:58:49 +02:00
Alex
fbea1e7e7e
Fixes Defog used by the wrong side when there is a Substitue and Screen (#5381) 2024-09-14 08:16:20 +02:00
PhallenTree
c7e1e857f3
Fix After You/Shell Trap not updating battlers' actions correctly (#5384) 2024-09-13 18:17:59 +02:00
PhallenTree
100c7dd8ad
Fixes Powder (status) interactions + tests (#5370) 
* Simplified fix from #4638

* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge

* Powder Tests

* Remove duplicate

* Assume Powder is a powder move

* Add config for Powder Rain interaction

* Only primal rain

* Z-Moves fix handled in Canceller_Z_Moves

* Fix BattleScript name

* Make sure Z-Move + Powder still damages user
 2024-09-13 18:08:23 +02:00
Alex
3d8b73300a
Fixes Multi Hit moves removing destiny bond flag in the middle of attack (#5377) 2024-09-12 17:46:59 -04:00
Eduardo Quezada
551c558186 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-11 07:28:02 -03:00
hedara90
c57d149003
Fixes with Pledge combos and absorption abilities (#5364) 
* Fixes with Pledge combos and absorption moves

* Fixed incorrect merge

* Removed superflous if statement

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-10 23:53:55 +02:00
Eduardo Quezada
2a27aad259 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-08 14:50:39 -03:00
hedara90
b8251e3a75
Another Pledge fix, Powder this time (#5341) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-08 16:17:18 +02:00
PhallenTree
d6d2f2033d
Fixes Pledge move combo timeout if frozen (#5340) 
Missing `HITMARKER_UNABLE_TO_USE_MOVE` in the frozen canceller
 2024-09-08 13:41:23 +02:00
hedara90
03e87a7d62
Pledge fail into opponent pledge loop fix (#5339) 
* Pledge fail into opponent pledge loop fix

* Fixed excessively aggressive canceller

* Move the Pledge bit clear to its proper place

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-09-08 10:38:52 +02:00
PhallenTree
68701a9e2d
Fix some Pledge move combo issues (#5330) 
Fix Pledge moves looping, adds tests for pledge+incapacitation situations
 2024-09-08 08:28:16 +02:00
Eduardo Quezada
8533b0c045 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-03 14:39:50 -04:00
Eduardo Quezada
33d5cbd7a2
Moved ASSUMEs to inside GIVEN blocks (#5308) 2024-09-01 23:13:58 +02:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons (#5302) 
* Fixes Tar Shot on Tera mon

* new line
 2024-08-31 12:24:28 -04:00
Alex
addaf40971
Fixes Scale Shot not activating + Known Failing Round test (#5292) 
* Fixes Scale Shot not activating + Known Failing Round test

* Update test/battle/move_effect/multi_hit.c
 2024-08-30 19:36:14 -04:00
Eduardo Quezada
aebbe448b8 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-28 12:58:14 -04:00
SarnPoke
622dead80c
Shed Tail Retarget (#5275) 
Re-targets Shed Tail PR to upcoming
 2024-08-28 13:40:35 +02:00
Alex
98dbf3a575
Fixes Charged up status (#5274) 
Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`
 2024-08-27 20:01:51 +02:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted (#5262) 
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves

* Fix Entry Hazards targeting the wrong side of the field if opponent fainted

* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS

* Alternative fix + Fix gBattlerTarget initially set to 2

* Fix Instruct animation

* Alternative anim fix
 2024-08-27 14:46:56 +02:00
kittenchilly
afd18f06b4
Fix switch out move message (#5258) 2024-08-25 23:29:33 +02:00
Eduardo Quezada
abf60e9c64 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-24 19:44:35 -04:00
hedara90
d379ffef3e
Fixed Confide+Crafty Shield interaction (#5202) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-20 08:24:42 -04:00
Eduardo Quezada
6ac18a6fe5 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-20 08:00:05 -04:00
hedara90
3a6c3d580d
Round Tests (#5196) 
* Round Tests

* Apply suggestions from code review

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-08-19 13:03:47 -04:00
Alex
8607a7fb33
Fixes UB in Cmd_averagestats (#5191) 
* Fixes UB in Cmd_averagestats

* fix test and align default case
 2024-08-17 18:19:22 +02:00
hedara90
bd3d99d7d9
Fixed Retaliate not working correctly with passive damage (#5182) 
* Fixed Retaliate not working correctly when allies fainted from passive end of turn damage

* Changed test parameters to use legal stats

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-16 17:31:28 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07:00
Eduardo Quezada
661ec0a9fd Merge branch '_RHH/master' into _RHH/upcoming 2024-08-14 17:10:20 -04:00
Eduardo Quezada
6f0004ec4e
Removed some hardcoding of move IDs + Gen4/5 Defog (#5156) 
* Removed some hardcoding of move IDs

* Added Defog Gen6+ config (+ updated tests)
 2024-08-14 15:51:34 +02:00
Eduardo Quezada
c625ac6d53
Added multiple missing ability TODO tests (#5163) 2024-08-14 15:43:18 +02:00
Alex
863b96f759
Fixes Stomping Tantrum effect not doubling power in certain situations (#5140) 
* Fixes Stomping Tantrum effect not doubling power in certain situations

* fix dancer test
 2024-08-11 19:05:38 -04:00
PhallenTree
779cedd16f
Fixes Dancer, adds Revelation Dance interactions with Z-Move, Roost and typeless mons (#5133) 
* Add Revelation Dance interactions with typeless mons, Roost and Z-Move

* Fixes Dancer-called moves not updating their type

* Adds Revelation Dance tests

* Make sure target isn't immune in Dancer test

* Missing ... in message

* Missing Assume

* CI ends Dancer test too early?

* Z-Revelation Dance is Breakneck Blitz (Test)

* Fix test (Zoroark too strong?)

* Replace H!Zoroark

* Remove Ability specification

* Remove HP_Bars

* Fix Dancer checking for battlers that don't exist in single battles
 2024-08-11 12:13:46 -04:00
pkmnsnfrn
5635f94036 More changes from typeX to types[X] 2024-08-07 11:35:45 -07:00
Eduardo Quezada
ce74c85e4f
Move effect TODO tests - Volume C (#5094) 2024-08-07 15:52:40 +02:00
Eduardo Quezada
54c19af037
Fixed B_HEAL_BELL_SOUNDPROOF checking for Gen9+ instead of Gen8+ (#5060) 2024-07-29 16:28:32 +02:00
Eduardo Quezada
cc00446eb8 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_9_families.h
 2024-07-26 09:42:52 -04:00
PhallenTree
7b2914c046
Fix Mold Breaker-like abilities, AI Move Accuracy function, Fury Cutter with Parental Bond (#5030) 
* Fix GetBattlerAbility not checking correct battler's action

* Fix Fury Cutter counter being incorrectly incremented on 2nd hit of Parental Bond + test

* Fix AI_SetMoveAccuracy only using attacker's ability

* Review
 2024-07-24 19:36:55 +02:00
Eduardo Quezada
ae48293806 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_ai_util.c
 2024-07-22 23:06:44 -04:00
hedara90
84e249f98a
Some tera tests (#5020) 
* Added tests for Terapagos/tera interactions

* Fixed missed things

* Fixed Terapagos Stellar boost (by Alex)

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-22 20:43:17 +02:00
PhallenTree
aac6ebd3d7
Fixes Sleep Talk, Toxic Debris and Jaboca/Rowap Berry issues; Adds Sleep Talk tests (#5009) 
* Fix Sleep Talk failing with choice item; Added some Sleep Talk tests

* Fix Jaboca, Rowap berries recording Rocky Helmet Effect; Fix Toxic Debris not checking side's toxic spikes count properly in Doubles
 2024-07-21 21:24:05 +02:00
Eduardo Quezada
2b40e79ac3 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	include/battle_util.h
#	src/battle_ai_main.c
 2024-07-14 22:44:00 -04:00
Pawkkie
b084dcd8d3
Fix Upper Hand being used blindly (#4973) 2024-07-14 22:00:51 +02:00
sneed
6aa308e1d8
EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves (#4923) 2024-07-14 15:35:11 +02:00
Pawkkie
c721f1b04a
Smarter Focus Punch and Substitute (#4952) 
* Smarter Focus Punch

* Smarter Substitute, review feedback

* Use HasAnyKnownMove instead of isFirstTurn

* When are we removing agbcc again

* Use HasMoveEffect
 2024-07-14 08:29:27 +02:00
Eduardo Quezada
fb708b7ed3 Merge branch '_RHH/master' into _RHH/upcoming 2024-07-10 10:05:10 -04:00