Alex
f6781a77d4
merge rhh/upcoming
2023-10-25 09:42:19 +02: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