Commit graph

501 commits

Author SHA1 Message Date
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
Eduardo Quezada
fb708b7ed3 Merge branch '_RHH/master' into _RHH/upcoming 2024-07-10 10:05:10 -04:00
hedara90
76d760041c
Flame Burst + Substitute fix (#4939)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-10 13:58:32 +02:00
Alex
637a7072f0
Add missing adjust scores (#4925)
* Add missing adjust scores

* ai log made the test fail
2024-07-08 12:05:32 +02:00
Eduardo Quezada
de609a2f5b
Added missing redirect abilities Gen 3-4 config (#4920)
* Added missing redirect abilities Gen 3-4 config

* Combined 3 Battle Script Natives into 1

* Cleaner FindMonThatAbsorbsOpponentsMove
2024-07-07 09:52:59 +02:00
sneed
60c7588532
IsFinalStrikeEffect uses effect instead of move (#4917)
* IsFinalStrikeEffect uses effect instead of move

* Update test/battle/ability/parental_bond.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-06 09:41:19 +02:00
Eduardo Quezada
fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_util.c
#	src/data/pokemon/species_info/gen_7_families.h
#	test/battle/ability/download.c
#	test/battle/ability/intimidate.c
#	test/battle/ability/supreme_overlord.c
#	test/battle/ability/zero_to_hero.c
#	test/battle/ai/ai.c
#	test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
Alex
dd7b735211
Fixes Grassy Terrain heal turn duration (#4903) 2024-07-03 22:53:15 +02:00
Alex
594633aa15
Remove Duplicate ai code from battle_ai_util.c (#4883)
* Remove Duplicate ai code from battle_ai_util.c

* Add GetBattlerAbility in toxic self check
2024-07-03 10:48:31 +02:00
Pawkkie
47426406c3
Ai tests folder (#4898)
* AI folder for tests

* Move sequence switching tests
2024-07-02 17:49:04 +02:00
Pawkkie
7e167f0b3c
Add AI_FLAG_SEQUENCE_SWITCHING (#4878)
* AI_FLAG_BAD_SWITCHING

* Cleanup and tests, U-Turn / Baton Pass / Parting Shot aren't working properly

* Fix U-Turn etc. tests

* Test overhaul with Egg's suggestions

* Add EFFECT_HIT_SWITCH_TARGET to tests

* Review feedback

* Re-review feedback
2024-07-01 08:53:07 +02:00
sneed
75be596933
fix sticky hold softlock (#4885) 2024-06-29 18:54:58 +02:00
Pawkkie
d1ca1f667f
Smarter Choice AI for Status Moves (#4872)
* Smarter choice item usage

* Clarify test name / line ending

* Review feedback

* Review feedback pt. 2
2024-06-28 09:04:24 +02:00
DizzyEggg
cd5a862b95
Fix Megas gaining abilities after fainting (#4873) 2024-06-26 23:44:01 +02:00
DizzyEggg
f2e8482488
Fix how switch-in effects are played out after multiple faints in the same turn (#4864)
* Multiple switch-ins after fainting

* empty new lines

* Fix failing tests
2024-06-24 20:37:47 +02:00
sneed
ec75a75498
Update plasma_fists.c (#4865) 2024-06-23 21:17:58 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor (#4449)
* consolidated gimmick checks, triggers, communication, and activation; updated test runner

* fixed improper use of .usableGimmick

* cleaning up battle_dynamax.c, changing function args to u32s

* fixed '#ifdef TESTING' causing errors

* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests

* added support for z-moves in tests, consolidated gimmick fields

* removed ShouldUseMaxMove and .usingMaxMove

* renamed TryChangeZIndicator, updated z move display

* added several z-move tests and fixed various z-move interactions; fixed z-move category calc

* fixed useless battler arg in GetTypeBasedZMove

* added basic test check for bad Z-Move or Mega usage

* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky

* fixed gimmick test logic; fixed damage category override

* fixed mega rayquaza test fail

* consolidated gimmick indicator logic; added graphics to gGimmicksInfo

* removed TeraData struct

* reimplemented AI logic for Z-Moves; no changes

* updated Z-Move and Ultra Burst trigger gfx

* added testrunner check for multiple gimmick use

* fixed duplicate z-move call in test

* reorganized data/graphics/gimmicks.h

* added signature Z-Move ability tests; implemented Guardian of Alola

* fixed bad test update

* fixed Thousand Arrows not affecting Tera Flying; clean-up

* fixed -ate tests

* fixed tera tests

* fixed tera tests really

* fixed last batch of tests

* fixed -ate mega test again

* code review

* code review pt.2

* tweaked CanTera again

* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
Alex
e74264f6de
Ported test changes from #4857 (#4859) 2024-06-22 19:39:01 +02:00
DizzyEggg
f73ad41fa1
Tests for post-ko switch scenarios (#4856) 2024-06-22 12:07:36 +02:00
sneed
6893d8dbef
ignoresTargetAbility doesnt ignore the attacker's ability (#4855) 2024-06-22 09:52:25 +02:00
DizzyEggg
438f478146
Fix comatose transform gastro acid interaction (#4852) 2024-06-21 12:19:43 +02:00
sneed
c31f982a7b
Fix fury cutter scaling up to 640 power (#4846)
* Fix fury cutter scaling up to 640 power

* Replace three instances of int i with one int turn

* dynamic test
2024-06-21 08:15:00 +02:00