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

522 commits

Author SHA1 Message Date
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
hedara90
b641c6f4fa
Fixed incorrect weather damage rounding when maxHP <16 (#5183) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-16 23:02:49 +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
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
hedara90
45f10d734f
Fixed Ice Face, implemented tests (#5171) 
* Fixed Ice Face, implemented tests

* Fixed agbcc and bad battle mon looping

* Fixed the ShouldChangeFormInWeather function again

* Cleaned up End of Turn weather form changes, simplified Ice Face

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-15 13:51:39 +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
hedara90
cfa7316ea0
Made the speed tie test use PASSES_RANDOMLY (#5092) 
* Made the speed tie test use PASSES_RANDOMLY
* Hack to allow results with PASSES_RANDOMLY

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2024-08-13 21:08:24 +01:00
Alex
a8cd459370
Fixes Purifying Salt not halving dmg for dynamic move types (#5145) 
* Fixes Purifying Salt not halving dmg for dynamic move types

* forgot to add
 2024-08-12 15:54:24 -04: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
Pawkkie
9f845a79e5
Fix Switch AI Bug: AI never switching out when it could be OHKO'd (#5089) 
* Fix switch AI bug

* Forgot to save a file lol

* Fix infinite loop test compatibility
 2024-08-07 15:58:39 +02:00
Eduardo Quezada
ce74c85e4f
Move effect TODO tests - Volume C (#5094) 2024-08-07 15:52:40 +02:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description (#5093) 
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive

* Fixes Fickle Beam's description

* Alternative fix

* Remove extra newLine
 2024-08-06 10:45:30 +02:00
Martin Griffin
9d97537ee2
Fix speed ties (#4780) 
* Fix speed ties

* fixup! Fix speed ties

* fixup! Fix speed ties

* fixup! fixup! Fix speed ties

* fixup! Fix speed ties

* Workaround for Comatose-Ditto interaction
 2024-08-03 17:29:47 +02:00
Eduardo Quezada
57fc0fd3b9 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-01 08:36:11 -04:00
Alex
de8002e9e0
Removes unnecessary checks for Shield Dust and Covert Cloak (#5073) 
* Removes unnecessary checks for Shield Dust and Covert Cloak

* remove redundant include

* Update test/battle/ability/shield_dust.c

Co-authored-by: hedara90 <90hedara@gmail.com>

* Update test/battle/hold_effect/covert_cloak.c

Co-authored-by: hedara90 <90hedara@gmail.com>

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
 2024-08-01 09:58:14 +02:00
Eduardo Quezada
8450268b74 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/data/battle_anim.h
 2024-07-31 18:13:19 -04:00
Alex
e6175b5b84
Fixes spread damage in double battles (#5064) 
* Fixes spread move damage in doubles

* add DoubleBattle check

* add additional check to test

* restore trainer party
 2024-07-31 12:20:57 +02:00
PhallenTree
ab9f8e69fb
Fixes Stalwart/Propeller Tail, Life Orb on confusion, Remove Status wrong battlescripts (#5061) 
* Fix swapped BattleScripts in MoveEffectRemoveStatus for Freeze/Frostbite

* Fix Life Orb damaging the user if they hit themselves in confusion

* Fix Stalwart/Propeller Tail not ignoring redirection from Storm Drain/Lightning Rod

* Parametrize Species
 2024-07-30 10:36:22 +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
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
AlexOn1ine
8b2774e07d Fixes cantBeSurpressed ability check for breakable abilities 2024-07-26 20:19:58 +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
hedara90
3f4b4adae5
Updated reference to config location to new location (#5026) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-23 14:09:32 -04: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
sneed
3fa6bf46db
Test battlers always have their forced abilities (#4707) 
* Test battlers always have their forced abilities

* indentation
 2024-07-21 21:20:39 +02:00
Eduardo Quezada
98eb4e5027 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/frontier_util.c
#	test/battle/ai/ai.c
 2024-07-19 09:20:05 -04:00
Bassoonian
f2311b4c97
Add trainer class ball test (#4999) 2024-07-19 12:30:06 +02:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments (#4928) 
* Replace Opportunist todo tests with proper tests

* add failing test

* desc

* Fixes to Opportunist and Mirror Herb adjustments

* more tests

* some fixes

* first turn events switch

* simple enum + revert test desc
 2024-07-19 11:01:46 +02:00
fakuzatsu
0625c90277
fix tests when B_USE_FROSTBITE is TRUE (#4986) 2024-07-17 23:23:52 +02:00
Pawkkie
b5a7185841
Fix U-Turn With Ace Mon (#4748) (#4972) 
* Fix U-Turn With Ace Mon

* ASSUME for test
 2024-07-15 09:19:41 +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
Bassoonian
f6d2b2861a
Fix Tera indicators (#4960) 
* Fix Tera indicators

* Better fix
 2024-07-13 23:08:43 +02:00
Alex
5e2e2e9fce
Minor shouldUseGimmick refactor (#4962) 2024-07-13 20:56:18 +02:00
Alex
edc883d038
Refactors residual damage (#4945) 
* Refactors damage non types

* correction

* Refactor weather damage script

* new line

* correction

* there was a hail test already

* ndebug

* add sandstorm test

* Update src/battle_script_commands.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-07-13 12:12:40 +02:00
Alex
7b6ff1b560
Fixes Trace turn order (#4941) 
* Fixes Trace turn order

* Update battle_script_commands.c

* Update test/battle/ability/trace.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-07-10 22:29:26 +02:00