Commit graph

567 commits

Author SHA1 Message Date
Alex
42c43a3f8f
Adds Commander and Order Up (#5246)
* Adds Commander

* review points

* new line

* correction

* regression / double targeting still broken

* fix wrong target order

* transform fixes

* haze test

* fixes, tests

* bring back wrongly removed else if case

* Eject Pack / Button test + fix

* red card fix

* test fixes

* Fixes Tatsu being hit by multi hit move

* change transform check

* fix test + revert change

* Fix Tatsugiri attacking after freed up from Dozo in the same turn

* Dragon Darts tests

* fix test

* review comments

* assumtion in wrong file

* Order Up test fixes

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
2024-09-29 22:45:50 +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
ghoulslash
acd07ccfc1
add rocky helmet dmg to tangling hair + defiant test to ensure original battler IDs from chaining effects (#5423)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-22 19:44:18 +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
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects (#5391)
* Ogerpon masks were missing their hold effects

* fix wrong num

* test

* correct tests and additional fix

* added hold effect to battle debug
2024-09-19 00:25:53 +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
0d7c193e4c
fixes Micle Berry not increasing accuracy on the next turn (#5358)
* fixes Micle Berry not increasing accuracy on the next turn

* adds bitfield instead of using protect struct

* test from pawkkie

* ndebug

* renaming

* delete redundant comment

* typo

* micle berry more detailed descriptions
2024-09-14 19:55:03 -04:00
Pawkkie
79776bf6bb
ShouldSwitchIfWonderGuard tests and cleanup (#5383) 2024-09-14 10:45:26 +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
Pawkkie
047289a639
Improve AI's Skill Swap handling in double battles (#5360)
* Improve AI contrary

* Update src/battle_ai_util.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Fix additionalEffects loop

* moves[i] to aiMove

* Update src/battle_ai_util.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-11 00:00:29 +02: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
Alex
389e5c20dd
Fixes berries missing timing (#5300)
* Fixes berries missing timing

* salac berry test
2024-09-09 10:40:56 -03: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
hedara90
fb1f12aa1b
Fixed Max Attacks into Max Guards message printing (#5312)
* Fixed Max Attacks into Max Guards message printing

* Updated the solution

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-02 13:58:10 +02:00
Eduardo Quezada
33d5cbd7a2
Moved ASSUMEs to inside GIVEN blocks (#5308) 2024-09-01 23:13:58 +02:00
Eduardo Quezada
484acdc138
Convert 8 various to callnatives (#5172)
* Convert 8 various to callnatives

* Address review comments
2024-09-01 15:12:43 +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
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names (#5296)
* Fix Max and G-Max Moves bypassing absorbing abilities

* Fix G-Max Corviknight and Centiskorch speciesName

* Remove some outdated comments

* Missing Dynamax check

* Add Max Quake and Max Overgrowth to test
2024-08-31 12:39:37 +02: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
74a790f09c Chilly Reception AI 2024-08-26 19:11:33 -05:00
Pawkkie
e9c8bd0548
Revert "Chilly Reception AI" (#5270) 2024-08-26 16:58:15 -07:00
Pawkkie
a9f31dcc4f
Chilly Reception AI (#5265) 2024-08-26 18:57:17 -04:00
hedara90
2e43ffd5f7
Fixed Snore not hitting twice with Parental Bond (#5264)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 21:59:39 +02:00
kittenchilly
80ad7f15cc Chilly Reception AI 2024-08-26 13:09:50 -05:00
kittenchilly
afd18f06b4
Fix switch out move message (#5258) 2024-08-25 23:29:33 +02:00
Alex
92038129e2
Fixes Purifying Salt being poisoned by Toxic Spikes (#5252) 2024-08-25 09:06:03 -04:00
Eduardo Quezada
abf60e9c64 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-24 19:44:35 -04:00
hedara90
572972235e
Disguise tests (#5249)
* Start new Disguise tests

* Finished disguise tests

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-24 20:22:50 +02:00
kittenchilly
2fed75f7c5
Adaptability, Aerilate, Aftermath tests (#5242)
* Adaptability, Aerilate, Aftermath tests

* Update test/battle/ability/aerilate.c

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

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-24 10:53:19 -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
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… (#5209)
* Fixes weather abilities not activating when Cloud Nine user leaves the field

* parametrize
2024-08-20 07:24:48 -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
PhallenTree
bc5f40e518
Adds missing Wind Rider activation and tests (#5207)
* Adds missing Wind Rider activation + tests

* Adds test for opponent setting up Tailwind

* Update src/battle_util.c

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-19 15:25:44 +02: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