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
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM ( #5046 )
2024-07-27 21:41:05 +02:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02: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
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
Eduardo Quezada
9d5e253867
Improved Test Runner Summary ( #4641 )
...
* Filename in list (no proper sorting yet)
* Line number and message in error list + removed sorting
* Style adjustment
* Added missing file/line number to "expected N passes/successes"
* Fixed Known Failing Passing test list
* Separated test list from totals
* Assumption fails list
* Better names
* Filename for KNOWN_FAILINGs passing
* Moved total back to the bottom
* Spaces correction
* Fixed test list count
* Source file for Alloc fails on tests
* Moved sourceLine from BattleTest to Test struct
* Fixed assumptions failed "and more" counter
* Fixed ASSUMPTION block not printing their line numbers
* Fixed when stopLine is printed
* Renamed stopLine to failedAssumptionsBlockLine
2024-07-20 18:22:40 +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
iriv24
684e8af181
Vanilla species names fit in health box without narrowing ( #4979 )
2024-07-15 16:01:36 +01: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
cawtds
a8ae1a0342
added missing minior description + test for missing descriptions ( #4858 )
2024-06-24 12:19:12 +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
Alex
b9138390af
Try fixing toxic_chain.c file ( #4843 )
...
Co-authored-by: AlexOn1ine <pkmnlucid@gmail.com>
2024-06-20 21:49:35 +02:00
Pawkkie
7ae88d8455
Tests for Corrosion, Acrobatics, Hone Claws, Hurricane ( #4708 )
...
* Tests for Corrosion, Acrobatics, Hone Claws, Hurricane
* First review feedback
* Re-review feedback
* Update acrobatics.c
* Review feedback, Sky Drop?
* Separate Sky Drop test
2024-06-20 13:46:01 +02:00
Pawkkie
3c3142172b
Tests point to clear_body.c ( #4837 )
2024-06-20 00:38:56 +02:00
sneed
609754f0f6
Add RandomChance macro and ability trigger chance config ( #4829 )
...
* RandomChance macro, contact ability chance config
* Unify config, add shed skin
2024-06-18 20:13:44 +02:00
sneed
b6d3bdf622
Confusion, cursed body and poison touch trigger chance fixes and tests ( #4831 )
...
* accurate confusion chance and a test
* Accurate Poison Touch chance and tests
* Accurate cursed body chance
* Create cursed_body.c
2024-06-18 20:07:40 +02:00
Alex
f106b21344
Adds Toxic Chain's effect ( #4823 )
2024-06-18 20:04:28 +02:00
Bassoonian
a24b767276
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun
2024-06-18 15:27:06 +02:00
PhallenTree
a26050fbde
Adds Toxic Chain interaction with Knock Off
2024-06-18 11:46:23 +01:00
PhallenTree
161f61284a
Use RandomWeighted; fix Test
2024-06-17 17:48:05 +01:00
PhallenTree
9b8c47ac5c
Add some Toxic Chain tests
2024-06-17 16:51:08 +01:00
sneed
107cb96a98
Tests for Anger Point and Moxie ( #4811 )
...
* Create anger_point.c
* Create moxie.c
* Add extra test and animations
* add another test
2024-06-16 15:02:44 +02:00
DizzyEggg
de7a4e2328
Fix Encore turn amount bug ( #4802 )
...
* Encore 3 turns
* remove duplicate
2024-06-14 13:15:38 +02:00
DizzyEggg
2716ec5b03
Fix Pursuit not getting Choice-locked on switch-out ( #4801 )
...
* Fix Pursuit not getting Choice-locked on switch-out
* use label
2024-06-14 12:46:03 +02:00
DizzyEggg
c7224d9ca7
Fix Relic Song transforming species other than Meloetta ( #4799 )
2024-06-14 10:24:57 +02:00
Pawkkie
a7642da544
Revenge Killer switching factors in Trick Room ( #4794 )
...
* Revenge Killer switching factors in Trick Room
* Comments and float multiplication
2024-06-14 10:18:01 +02:00
DizzyEggg
1a4f277d6f
Tests for Body Press + body press interaction with Wonder room ( #4792 )
2024-06-14 09:43:10 +02:00
DizzyEggg
4b1ff3ad7f
fix starting terrain making all other terrains infinite ( #4795 )
2024-06-14 09:31:21 +02:00
Pawkkie
9ec16f4eb6
Clear Body tests include Full Metal Body and White Smoke ( #4797 )
2024-06-14 09:08:21 +02:00
DizzyEggg
84d13d0abf
Fix Smack Down anim + move anim tests ( #4774 )
...
* Fix Smack Down anim + move anim tests
* really agbcc
* fix undefined reference
* hopefully everything works
2024-06-13 15:30:28 -04:00
ghoulslash
353727a805
Add createmon Script Cmd, Support for 2v1Wild Battles ( #4688 )
...
* add createmon and setwilddoubleflag script cmds to support createing mons at given player or enemy slots and setting up 2v1 battles
* give givemon macro PARTY_SIZE for tests
* style fixes
* add createmon test
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-06-13 19:11:36 +02:00
Eduardo Quezada
43310716af
Fixes to master merge
2024-06-13 11:44:52 -04:00
Eduardo Quezada
06153e4280
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle.h
# include/constants/battle_script_commands.h
# include/constants/pokemon.h
# src/battle_ai_util.c
# src/battle_main.c
# src/battle_util.c
# test/battle/ai.c
2024-06-13 11:44:28 -04:00
DizzyEggg
349b402f1b
Fix Soul-Heart changing stats of wrong battler ( #4785 )
2024-06-13 10:57:20 +02:00
DizzyEggg
8e41b9857f
Fix Revive in double battles ( #4784 )
2024-06-13 10:41:17 +02:00
DizzyEggg
21339cf272
Fix AI not recognising Volt Absorb/FlashFire ( #4781 )
2024-06-12 23:02:45 +02:00
Bassoonian
416519220d
Add evolution tracker check tests ( #4771 )
2024-06-12 15:52:04 -04:00
sneed
000f144465
AI actually avoids contact vs rocky helmet/rough skin ( #4779 )
2024-06-12 20:54:34 +02:00
DizzyEggg
a17259763c
Fix Baton Pass breaking on Memento ( #4773 )
...
* Fix Baton Pass breaking on Memento
* doubled headers
2024-06-12 13:17:18 +02:00
Alex
9c72392891
Fixes Shell Side Arm ( #4753 )
...
* Fixes Shell Side Arm
* Fixes to random call
* hardcoded the effect to the move
* minor change
* minor change 2
* applied reviews
2024-06-12 11:21:44 +02:00
kittenchilly
5ebdcdc9b0
Fix Pokemon in tests not being male by default ( #4766 )
2024-06-12 08:34:36 +01:00
cawtds
4724b5dfd6
Improved Surf/Thunderbolt test ( #4764 )
...
* improved Surf/Thunderbolt test that previously relied on correct AI guess
* remove unnecessary mod
* fixed infinite rng loop
* wrong ability num and readability
* Update src/battle_ai_util.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-12 09:09:15 +02:00
sneed
821d5dccab
AI calculates/stores minimum possible move damage and uses it with AI_FLAG_TRY_TO_FAINT ( #4760 )
...
* AI uses safest option to faint foes
* dont calculate non crit dmg unless it's needed
* struct SimulatedDamage
* add GetDamageByRollType and name DamageRollType
* Parametrize test AI flags
* use simDamage member's instead of dmg & minDmg
2024-06-11 18:28:16 +02:00
Eduardo Quezada
64f82cdd5f
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
# src/battle_util.c
2024-06-11 08:12:03 -04:00
Alex
fd08e59e8d
Clear body tests ( #4685 )
2024-06-11 08:26:31 +02:00
Pawkkie
02ad637849
Review feedback
2024-06-10 21:40:42 -04:00
sneed
178568e05d
Update test/battle/move_effect/tar_shot.c
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-10 22:15:39 +03:00
sneed
d8685bb3b1
tar shot works properly
2024-06-10 22:07:15 +03:00
sneed
aa50bfef28
add test
2024-06-09 23:41:12 +03:00
Pawkkie
55a2c85d95
Review feedback
2024-06-08 20:47:19 -04:00
Pawkkie
a7a89df80f
Review feedback
2024-06-08 20:32:57 -04:00
Pawkkie
b8e199ae9e
Review feedback
2024-06-08 12:37:59 -04:00
sneed
f1911dae59
Fix mycelium might and ability shield ( #4740 )
...
* Fix mycelium might and ability shield
* fix check
2024-06-08 07:27:44 +02:00
sneed
dc742b3077
Fix Berserk, Angel Shell, Wimp Out, Emergency Exit HP threshold ( #4724 )
...
* Fix HadMoreThanHalfHpNowHasLess
* rename the functions
* formatting
2024-06-07 21:54:25 +02:00
sneed
fa81861593
Add newer generation Heal Bell interactions with Soundproof ( #4732 )
...
* newer generation soundproof heal bell interactions
* Fix bugs and rewrite AnyPartyMemberStatused
* add missing check, tests, clean up
* fix ai code and rename battler for clarity
2024-06-07 18:51:21 +02:00
Eduardo Quezada
8b09ef09fa
Merge branch '_RHH/master' into _RHH/upcoming
2024-06-07 12:25:08 -04:00
