Eduardo Quezada
b5607209f3
Fixed G-Max Finale test
2023-10-27 09:16:39 -03:00
Eduardo Quezada
59c0de0967
Merge branch 'RHH/master' into RHH/upcoming
2023-10-27 09:16:21 -03: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
Philipp AUER
4aabd09ab3
Fix test_runner.c modern warning ( #3451 )
2023-10-23 19:41:59 +02: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
Martin Griffin
b0b6e16042
Separate ASSIGN_TEST from NEXT_TEST
...
Silences a warning about an invalid pointer when building with modern.
2023-10-23 07:58:45 +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
Martin Griffin
8a6284c408
Fix battle test estimateCost bug ( #3448 )
2023-10-22 10:03:46 -03:00
Alex
8ab2fbd9a2
Fixes tests rng ( #3433 )
...
* Seed RNG before setUp
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2023-10-22 10:20:27 +01:00
Eduardo Quezada
a34c260169
Merge branch 'RHH/master' into RHH/upcoming
2023-10-21 23:59:33 -03:00
Alex
0a6c0261fe
Fixes Make it Rain in double battles ( #3441 )
2023-10-21 23:42:19 +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
Eduardo Quezada D'Ottone
14b7a70254
Dynamax ( #2417 )
2023-10-19 11:32:25 -03: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
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
Eduardo Quezada
6e1d4b4409
Fixed compile on modern + tests
2023-10-15 08:32:25 -03:00
Eduardo Quezada
c0540a3559
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# include/battle.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2023-10-15 00:30:00 -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
Martin Griffin
45897cefbc
Move battle tests off the heap ( #3414 )
2023-10-13 16:31:10 -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
Martin Griffin
cbdba65218
Move battle tests off the heap ( #3413 )
...
* Catch OOM in tests
* Alias gBattleTestRunnerState with sBackupMapData
Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs
to statically-allocated EWRAM_DATA instead of being part of
gBattleTestRunnerState.
2023-10-13 20:29:30 +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
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
DizzyEggg
a4041d0f6a
Fix ASSUMPTIONS not working ( #3368 )
2023-10-10 22:42:36 -03:00
DizzyEggg
403326035e
fix broken move anims in tests ( #3398 )
2023-10-10 22:41:34 -03:00
Eduardo Quezada
f830b0725a
GMAX -> GIGANTAMAX
2023-10-10 18:07:12 -03:00
Eduardo Quezada
070ce214af
Fixed Max Overgrowth test
2023-10-10 11:15:19 -03: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
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00