Commit graph

301 commits

Author SHA1 Message Date
DizzyEggg
0c8fdce1a4
New tests + Sheer Force / Last Resort minor bug fixes (#3378)
* tests for intimidate defiant

* sheer force fix + tests

* white herb tests

* tests for stealth rock, weak armor and last resort fix

* style changes to weak armor test
2023-10-30 11:39:41 +01:00
Alex
f461bc3256
AI_CompareDamagingMoves changes to increase the score by 1 for best moves (#3382)
* Further optimizes AI_CompareDamagingMoves

* viableMove name change + 2 tests

* some issues

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-10-30 10:04:59 +01:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474) 2023-10-27 19:14:45 -03:00
kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) (#3473) 2023-10-27 13:54:55 -03:00
kittenchilly
bd71946372
Remove all trailing whitespace (master) (#3472) 2023-10-27 13:52:44 -03:00
Eduardo Quezada D'Ottone
db00839d64
Fixes Syrup bomb, new Octolock script, some Intim changes + Tests (#3437) 2023-10-27 12:25:55 -03:00
Eduardo Quezada
59c0de0967 Merge branch 'RHH/master' into RHH/upcoming 2023-10-27 09:16:21 -03:00
Alex
25a57d48d9 fixes tests 2023-10-25 10:18:59 +02:00
Alex
f6781a77d4 merge rhh/upcoming 2023-10-25 09:42:19 +02:00
Alex
591ef71e3b
Fixes form change when using switch moves (#3463)
* Fixes form change with switch moves
2023-10-25 08:33:43 +01:00
Martin Griffin
74c08dc955 Merge remote-tracking branch 'rhh/master' into upcoming 2023-10-24 08:58:02 +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
sbird
4488f983be fix -Wmaybe-uninitialized for ModifyPersonalityForNature test 2023-10-24 01:02:02 +02:00
Eduardo Quezada
1137d54b61 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	asm/macros/battle_script.inc
#	src/battle_script_commands.c
2023-10-23 17:36:42 -03:00
Martin Griffin
5fd36a8e39
Fix ModifyPersonalityForNature (#3452) 2023-10-23 09:37:40 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248)
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
LOuroboros
cd59e055c2
Made Reflect Type handle 3rd types (#3303)
* Made Reflect Type handle 3rd types

Misc:
-Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType)
-Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle.
-Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
2023-10-23 10:08:36 +01:00
Eduardo Quezada
bcf0377d9a Merge branch 'RHH/master' into RHH/upcoming 2023-10-22 16:30:26 -03:00
Eduardo Quezada D'Ottone
77e2b0dd2c
Test cleanup and improvements (#3449)
* Fixed duplicated test names

* Test improvements for Jaboca, Kee and Rowap Berries

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

* Lansat Berry test improvements

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

* Jaboca Berry/Bug Bite interaction test

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-10-22 21:22:59 +02:00
Eduardo Quezada
a34c260169 Merge branch 'RHH/master' into RHH/upcoming 2023-10-21 23:59:33 -03:00
Alex
783ec0e957 fixes tests 2023-10-22 01:03:10 +02:00
Alex
0a6c0261fe
Fixes Make it Rain in double battles (#3441) 2023-10-21 23:42:19 +02:00
Alex
123fd45d8e last hyper cutter test 2023-10-20 18:53:49 +02:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move (#3425)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-19 20:16:37 -03:00
Alex
535768838f Hyper Cutter tests 2023-10-19 21:28:27 +02:00
Eduardo Quezada
6348c24be1 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	src/battle_script_commands.c
2023-10-19 08:10:49 -03:00
Alex
ceb6beb254 merge upcoming 2023-10-19 12:30:55 +02:00
Alex
354f84be21 intim changes 2023-10-18 22:14:49 +02:00
Alex
91b6722322 Octolock, more tests 2023-10-18 20:25:34 +02:00
kittenchilly
70985ed3d6
Fixed and more accurate Ruin abilities (#3415) 2023-10-18 08:29:53 -03:00
Eduardo Quezada D'Ottone
fef7171c79
Fixed Parental Bond (#3417) 2023-10-15 12:02:43 -03:00
kittenchilly
28c6a1af49
More weather and type-specific tests (#3260)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-14 22:58:31 -03:00
Eduardo Quezada
a936b78ad5 Merge branch 'RHH/master' into RHH/upcoming 2023-10-14 21:32:20 -03:00
Eduardo Quezada
c6b43d992a Fixed Parental Bond 2023-10-13 21:56:54 -03:00
Alex
1ae26b32e6
Fix Kee Berry and Custap Berry + Tests (#3409)
* Fix Kee Berry and Custap Berry + Tests

* add missing assumes

* fix wrong test files

* fix new line
2023-10-13 23:07:04 +02:00
Eduardo Quezada
3409869f9c Merge branch 'RHH/master' into RHH/upcoming 2023-10-13 17:44:43 -03:00
Bassoonian
231ebea3f0
Tests for 6 more abilities (#3399)
* Tests for 6 more abilities

* Fix most of Egg's comments

* Update Purifying Salt and Leaf Guard

* Parenthesis fixes
2023-10-13 20:50:48 +02:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412)
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
2023-10-13 18:39:35 +02:00
Alex
6ed8ab771b Fix Syrup Bomb and change Octolock 2023-10-13 14:08:44 +02:00
Martin Griffin
311224d32f
Converted most battle preproc ifs to regular ifs (#3392) 2023-10-12 15:28:41 +01:00
Martin Griffin
f5b149b971
Test improvements (#3408)
* Run assumptions on all runners

* Make i const in battle tests

This avoids the pitfall of using i in a PARAMETRIZEd test and confusing
the runner.
2023-10-12 12:14:07 +02:00
Eduardo Quezada
805c65b255 Merge branch 'RHH/master' into RHH/upcoming 2023-10-11 13:14:23 -03:00
Eduardo Quezada
482029d7ec Removed Transistor from master 2023-10-11 13:07:16 -03:00
Eduardo Quezada
186884120c Merge branch 'RHH/master' into RHH/upcoming 2023-10-11 13:02:12 -03:00
Eduardo Quezada D'Ottone
eedc61709d
Various tests + Poison Heal fix + Transistor update (#3385) 2023-10-11 11:34:20 -03:00
Bassoonian
8c9ea8b786 Incorporate requested changes 2023-10-11 16:11:46 +02:00
Alex
0b9126ff53
Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel (#3402)
* initial commit

* done

* clean up
2023-10-11 11:09:50 +02:00
ghoulslash
70fbf9e9df
Opportunist Ability (#2994)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-10-09 22:35:00 -03:00
Eduardo Quezada
2fac60055f Merge branch 'RHH/master' into RHH/upcoming 2023-10-09 22:08:32 -03:00
Alex
36174f12ae
Fixes Salt Cure visual bug if mon fainted by direct attack (#3388)
* Fixes Salt Cure visual bug if mon fainted by direct attack

* Removes duplicate give all tm/hms in the debug menu

* test

* Revert "Removes duplicate give all tm/hms in the debug menu"

This reverts commit 4e80451d6f.
2023-10-09 23:40:38 +02:00
Eduardo Quezada D'Ottone
25540a7fec
Fixed Rivalry's effect + Tests (#3381)
- It was doing the opposite if neither attacker or target were genderless
- It wasn't accounting for genderless mon
2023-10-09 12:14:18 +02:00
Eduardo Quezada
d1c672d3ce Converted most battle preproc ifs to regular ifs 2023-10-08 21:32:15 -03:00
Bassoonian
cee84f0f74 Fix issues and add more ability tests 2023-10-06 15:13:26 +02:00
Bassoonian
9735c5d68e Defeatist, Gale Wings, Poison Heal, Sap Sipper tests 2023-10-05 23:12:30 +02:00
Eduardo Quezada
7c7396c1be Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	src/battle_ai_main.c
2023-10-05 13:31:22 -03:00
Brandon Lourenco
89e4f30867
Roost suppresses the user's Flying-type rather than remove and re-add it. Added tests for EFFECT_ROOST. (#3258)
* Fixed Roost clearing type3 when used by a pure Flying-type. (Gen 5+)

* Created a test file for Roost.

* Marked tests as TODO for now.

* Added more tests for HP healed and type changing.

* Created a function to handle Roost's Flying suppression when getting a battler's type. Added more tests.

* Added test for not-yet-aquired Flying-type. Fixed/rewrote some other tests.

* Now using GetBattlerType() in most relevant places. Fixed some tests.

* Added tests for interactions between Roost and Delta Stream, type-changing effects, Grassy Terrain healing, Levitate, Air Balloon, Magnet Rise, and Telekinesis.

* Added test for interaction between Roost and Reflect Type.

* Gen 4 tests merged with Gen 5+ tests.

* Removed errant space.

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-10-05 09:19:29 +02:00
DizzyEggg
be5683e899
AI battle tests + AI logic fixes (#3361) 2023-10-04 18:53:29 +01:00
Alex
b18d01878f
Fix Battle/Shell Armor + crit chance Tests (#3377)
* Fix Battle/Shell Armor + crit chance Tests

* fix typos

* minor record ability change
2023-10-04 16:46:42 +02:00
Eduardo Quezada
ef1073ddee Merge branch 'RHH/master' into RHH/upcoming 2023-10-02 18:50:15 -03:00
DizzyEggg
a9528e7ade
Fix CreateNPCTrainerPartyForTrainer test failing on modern (#3367) 2023-10-02 18:33:47 -03:00
Eduardo Quezada
ca81aba3b6 Merge branch 'RHH/master' into RHH/upcoming 2023-10-02 14:11:24 -03:00
DizzyEggg
dc119b27c2 Fix Intimidate Contrary in double battles 2023-10-01 19:06:43 +02:00
DizzyEggg
f840f7eb56
Fix Red Card not getting consumed after Sticky Web activation (#3364) 2023-10-01 10:35:12 -03:00
DizzyEggg
10adba3af4
Fixed entry hazards switch in issue (#3316)
* fix entry hazards switch in issue

* accidental known failing fix
2023-10-01 10:30:41 -03:00
DizzyEggg
093c653801
Fixed Berserk gene issue in double battles (#3363)
* fix berserk gene issue + tests

* Update test/battle/hold_effect/berserk_gene.c

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

* Update test/battle/hold_effect/berserk_gene.c

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

* berserk gene review changes

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-01 10:25:04 -03:00
DizzyEggg
8efc34eb7e
flinch tests + protect/flinch fix (#3345) 2023-09-30 20:30:28 -03:00
DizzyEggg
2fcb9bbc9b
Wild battle tests + tests for exp points (#3342)
* Add WIld Battles to test runner + exp tests
2023-09-27 08:35:05 +01: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
ghoulslash
a2640838c9
Fix Seed Sower changing move targets when triggered in double battles (#3341)
Fix Seed Sower changing move targets when triggered in double battles
2023-09-24 21:33:29 -04:00
Eduardo Quezada
566ec93492 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	include/constants/battle_script_commands.h
#	include/constants/battle_string_ids.h
#	src/battle_script_commands.c
#	src/data/battle_moves.h
2023-09-24 20:32:45 -03:00
DizzyEggg
1f1308f2f5 merge ghoul fix and correct test 2023-09-24 14:42:27 +02:00
DizzyEggg
ba03992abd test for seed sower 2023-09-24 14:28:06 +02:00
LOuroboros
35e76e9868
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247)
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-09-24 00:01:18 -03:00
Alex
415d6e9054
Fix Toxic Debris after user faints (#3323) 2023-09-19 15:54:52 +02:00
DizzyEggg
136ea395ac
Fix tests breaking on modern (#3319)
* Fix tests breaking on modern

* modern tests fix - macro and rodata changes

* ld script rodata modern
2023-09-19 12:15:03 +02:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure (#3297) 2023-09-15 11:18:47 -03:00
DizzyEggg
4fb0b55664
Bug bite/Fling enigma berry interaction & tests (#3311) 2023-09-14 14:13:11 -03:00
Eduardo Quezada
f3217c18dc Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	src/battle_util.c
2023-09-14 09:12:12 -03:00
DizzyEggg
7936910f90
Bug Bite - Tests and small fix (#3282)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-14 08:57:30 -03:00
Eduardo Quezada
c9b2a8ae24 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	src/battle_ai_util.c
2023-09-14 08:34:47 -03:00
kittenchilly
2ce3f4db78
Implement Enigma Berry's hold effect + tests (#3300)
* Fix Enigma Berry

* Tests

* Update enigma_berry.c
2023-09-14 13:08:24 +02:00
Alex
ca9e784102
Fixes Toxic Debris + CanTargetFaintAi index issue (#3306)
* Fixes Toxic Debris + CanTargetFaintAi index issue

* swap macro
2023-09-13 10:31:20 +02:00
Alex
09f92719cb
Tests for status curing berries (#3289) 2023-09-10 18:59:12 -03:00
Eduardo Quezada
755e260da4 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	include/constants/battle_move_effects.h
#	test/battle/move_effect/multi_hit.c
2023-09-10 18:38:46 -03:00
Alex
18577ce598
Fix Scale Shot bug and use Canceller Multihit Moves (#3290) 2023-09-10 11:57:19 -03:00
DizzyEggg
dd3334aa82
Battle bond tests and small fix (#3279)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-07 17:23:43 -03:00
Eduardo Quezada
820113d883 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle_scripts.h
#	include/battle_util.h
#	src/battle_script_commands.c
#	src/battle_util.c
2023-09-07 15:13:06 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests (#3191)
* begin fling tests

* fling fixes and tests

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* scripts names change

* fix fling's test file

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-05 06:56:36 -03:00
Eduardo Quezada
1513443c39 Fixed Ultra Burst + Mega Evolution test 2023-08-31 22:33:20 -04:00
Eduardo Quezada
35d7201935 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
#	include/battle_scripts.h
2023-08-31 20:46:53 -04:00
Eduardo Quezada
be152fbee8 Merge branch 'RHH/master' into RHH/pr/master/opponentName 2023-08-29 13:11:32 -04:00
kittenchilly
7ffd31f5de Update ultra_burst.c 2023-08-26 16:42:35 -05:00
kittenchilly
96e39cde0b Update ultra_burst.c 2023-08-26 16:14:24 -05:00
kittenchilly
ac67900c0a Fix test speed 2023-08-26 15:32:10 -05:00
kittenchilly
2e1b137183 Ultra Burst tests 2023-08-26 15:19:47 -05:00
Philipp AUER
905fc6fd4d
Fixed Metronome Item damage multiplier (#3246)
Co-authored-by: sbird <sbird@no.tld>
2023-08-23 19:23:00 -04:00
Eduardo Quezada
d3333812dd Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer 2023-08-17 17:52:28 -04:00
Eduardo Quezada
32c3c33376 Missing master merge organization
My bad ^^;
2023-08-13 19:01:03 -04:00
Eduardo Quezada
09fc48461f Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	test/battle/move_flags/three_strikes.c
#	test/move_flag_strike_count.c
#	test/move_flag_three_strikes.c
#	test/powder_moves.c
#	test/status1.c
2023-08-12 16:31:44 -04:00
Eduardo Quezada D'Ottone
d62c0d6d51
Organized tests into subfolders (#2822) 2023-08-12 20:00:15 +01:00