Eduardo Quezada
57c1dd97bb
Merge branch 'RHH/master' into RHH/upcoming
2023-11-03 21:59:08 -03:00
DizzyEggg
8b359c2ca4
fix psychic terrain blocking moves it shouldnt block ( #3521 )
2023-11-03 21:01:02 +01:00
DizzyEggg
90d9334f0b
Fix Sap Sipper not blocking Bullet Seed ( #3516 )
...
* Fix Sap Sipper not blocking bullet seed
* add defiant sticky web test
2023-11-02 11:43:06 +01:00
Alex
53b7e4bf66
Remove powerfulMoveEffects array ( #3515 )
...
* Remove powerfulMoveEffects array
* Solar Beam test
2023-11-02 08:44:23 +01:00
DizzyEggg
47341f3f30
Fix Anger Shell activation ( #3508 )
2023-11-01 14:55:50 +01:00
DizzyEggg
7eb1b12224
Fix Knock Off healing berries ( #3509 )
2023-11-01 14:47:31 +01:00
Alex
64ba52d214
Remove redundant AI score increases ( #3504 )
...
* Remove redundant AI score increases
* review applied
* fix score
2023-10-31 13:41:22 +01:00
Eduardo Quezada D'Ottone
2dfae911aa
Added config for Weak Armor's Gen 5-6 effect ( #3498 )
2023-10-30 17:18:00 -03:00
Eduardo Quezada
e28d0c627a
Merge branch 'RHH/master' into RHH/upcoming
2023-10-30 16:51:04 -03:00
DizzyEggg
72dad4d7c6
Fix Weak Armor interrupting multi hit moves ( #3497 )
2023-10-30 16:44:42 -03:00
Eduardo Quezada
242d68487a
Weak Armor tests
2023-10-30 14:31:28 -03:00
Eduardo Quezada
908af87846
Merge branch 'RHH/master' into RHH/upcoming
2023-10-30 11:00:24 -03:00
Eduardo Quezada
71ba501b94
Fixed tests on modern
2023-10-30 10:58:30 -03:00
Eduardo Quezada
661becc3b6
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2
...
# Conflicts:
# src/debug.c
2023-10-30 08:05:14 -03:00
DizzyEggg
f4be01f0ac
Fix strength sap on substitute ( #3486 )
...
* tests for strenth sap
* fix strength sap on substitute
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-10-30 11:58:15 +01:00
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