Commit graph

710 commits

Author SHA1 Message Date
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
sneed
1241cbe79f
FIx mummy and lingering aroma abilities (#4731)
* FIx mummy ability

..and lingering aroma.
Adds tests for both.

* merge the tests

* new line

* add 2 more tests

Mummy and Lingering Aroma don't replace each other
Mummy doesn't replace abilities that can't be suppressed
2024-06-07 11:46:07 +02:00
sneed
7fd0239370
Rampage moves always confuse on final turn (#4722)
* rampage moves confuse on the final turn

* fix B_RAMPAGE_CANCELLING < GEN_5

* Remove pointless assumes
2024-06-05 05:38:04 +02:00
Eduardo Quezada
dce10ab705 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	test/species.c
2024-06-04 16:47:29 -04:00
kittenchilly
7f8f480ecb
Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types (#4438)
* Add FORM_CHANGE_BATTLE_TERASTALLIZATION and allow species to force tera types

* Fix form change not changing tera type

* Update form_species_tables.h

* Address reviews

* Can't change the forced Tera Type anymore

* Revert "Can't change the forced Tera Type anymore"

This reverts commit 67157250ef.

* Fix a lot of things

* Oops

* Update pokemon.h

* Update pokemon.h

* Address reviews

* Update tera_starstorm.c

* Update test/battle/gimmick/terastal.c

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-06-04 13:38:49 +02:00
sneed
87e2526665
Add switching message macros for tests (#4717)
* Add switching message macros

* Add test
2024-06-03 19:59:28 -04:00
sneed
e60e6b6008
Fix Mirror Armor and Sticky Web interaction (#4713)
* fix Mirror Armor and Sticky Web interaction

* fix strings
2024-06-03 21:19:54 +02:00
Pawkkie
6dc8b82e92
Gale Wings test (#4694)
* Gale Wings test

* Condense conditional
2024-06-02 19:16:00 +02:00
Pawkkie
22ee823bc1 Review feedback 2024-06-02 12:43:21 -04:00
Salem
2d1ef1fcd7
Fix issues when building tests with agbcc (#4689)
* fix build errors with agbcc

* make clean removes build/test and build/modern-test regardless of MODERN setting
2024-06-02 11:12:08 -04:00
Eduardo Quezada
941e32a14f Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_main.c
#	test/battle/move_effect/body_press.c
2024-06-01 19:55:53 -04:00
Pawkkie
5fd3532e16 Fix assumptions 2024-06-01 12:39:10 -04:00
Pawkkie
2e0c653807 Fix Sweet Scent assume 2024-06-01 11:39:41 -04:00
Eduardo Quezada
0a8284ce9f
Added missing Move Effect TODO tests - Volume B (#4682)
* Added missing Move Effect TODO tests - Volume B

* Apply suggestions from code review

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

* Removed unused bulldoze effect file

* Removed individual tests for Baton Pass + Status1 in favor of the existing single test

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-01 15:07:51 +02:00
Eduardo Quezada
0be643a517
Set TYPE_NONE as type 0 + other type data tweaks (#4462)
* Set TYPE_MYSTERY as type 0

* Remove redundant TYPE_NONE

* Moved Gen 1-3 type damage categories to gTypesInfo

* Set TYPE_NONE as 0 instead

* Grouped type info to a single file

* Fixed sTypeEffectivenessTable static name

* Adjusted MON_DATA_TERA_TYPE to account for shift in type IDs

* oops, missed the extern

* Moved Tera Type RGB values to gTypesInfo

* Fixed Tera Type test

* Added option test feature to set IVs

* Hidden Power type test

* Tera Type safeguard in givemon

* Removed isHiddenPowerType for a future PR that refactors Hidden Power

* Review changes
2024-06-01 07:38:22 +02:00
Pawkkie
cb1b4bc9a0
Switch AI uses trapping abilities aggressively (#4669)
* Trapping switch AI

* Review feedback, mostly spacing cleanup

* Assume Mawile is Steel type

* Move switching tests into their own file
2024-06-01 07:30:43 +02:00
Pawkkie
587c3e4a6a Review + change additionalEffects in tests to use MoveHasAdditionalEffect 2024-05-31 23:20:15 -04:00
Pawkkie
167a898bc0 WOBBUFFET + cleanup 2024-05-31 22:05:35 -04:00
Pawkkie
292b528e70 First draft 2024-05-31 21:39:26 -04:00
Eduardo Quezada
c79188e3b3 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
2024-05-31 12:04:33 -04:00
Bassoonian
e3959a764b
Rename MgbaPrintf_ to Test_MgbaPrintf (#4642) 2024-05-31 17:54:25 +02:00
Alex
bebc13b5a1
Adjust Ate-Ability code a bit to make it more readable (#4640)
* Adjust Ate-Ability code a bit to make it more readable

* stupid oversight

* fixed

* pull normal type move check out of function

* unused var

* switch and tests

* oversight

* Apply suggestions from code review

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-31 12:22:18 +02:00
Alex
f6e00303b7
Fixes Neutralizing Gas / Intim interaction freezing the game (#4668) 2024-05-31 00:08:04 +02:00
Pawkkie
8d58564569
Test runner set mode (#4661)
* Item icon table glitch

* Test runner uses OPTIONS_BATTLE_STYLE_SET
2024-05-30 21:24:33 +02:00
Pawkkie
a0006d8dfb
AI_FLAG_RISKY Improvements (#4648)
* #defines for damage roll bounds

* Risky AI behavior implemented

* Ignore score penalty to EFFECT_RECOIL_IF_MISS moves if accuracy has been lowered

* Adjust score defines

* EFFECT_MIND_BLOWN

* Use GetBestDmgMoveFromBattler instead of AI_CompareDamagingMoves
2024-05-29 19:54:18 +02:00
Alex
84a7fd86d6
#4635 follow up. Missing test comments (#4647) 2024-05-29 09:56:59 +02:00
Alex
7a393a974a
Adds Dragon Darts effect (CFRU port) (#4612)
* Adds Dragon Darts effect (CFRU port)

* fix test compile

* review
2024-05-28 11:34:56 +02:00
Alex
0570609ce6
Small Ability Effect Move Block refactor (#4635)
* Small Ability Effect Move Block refactor

* combine tests
2024-05-28 10:34:05 +02:00
Pawkkie
be2517415b
Damage roll selection in AI_CalcDamage (#4615)
* Damage roll selection and AI_FLAG_CONSERVATIVE

* Clarify enum names

* Simplify AverageRollDmg line

* Change u8s to u32s

* Turns out Boomburst does a lot of damage lol

* Spacing
2024-05-28 10:21:25 +02:00
PhallenTree
9104c40d43
Fixes Dancer triggering if the move's user didn't act (#4638)
* Fixes Dancer triggering if the user flinched

* Add check to make sure "Pokemon used move" message is kept

* Address review

---------

Co-authored-by: Fltp <fltpessoa2@gmail.com>
2024-05-27 17:07:13 +02:00
Eduardo Quezada
80b193280d Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h
2024-05-27 10:13:42 -04:00
Eduardo Quezada
acd62b0065
Reverted bad implementation of Sparkling Aria+Covert Cloak/Shield Dust (#4634) 2024-05-27 06:38:05 +02:00
Pawkkie
c279aa23c6
Belch AI Scoring Fix (#4616)
* Belch scoring fix and test

* Add assumptions for pocket

* Update test to AI_SINGLE_BATTLE_TEST

* Alex's fixes

* Missed reverting a line

* Mucked up spacing mb

* Mucked up the spacing fix mb MB
2024-05-26 22:23:04 +02:00
Alex
4f1df84acf
Make AI see Loaded Dice hold effect for multi hit moves that strike 5… (#4622)
* Make AI see Loaded Dice hold effect for multi hit moves that strike 5 times

* Update battle_ai_util.c
2024-05-26 22:19:45 +02:00
hedara90
487dc92119
Fixing bugs with Moxie clones+Dynamax, Fling Flinch infinite loop and Focus Sash+foreseen moves (#4625)
* Fixed Elixirs not being able to be used unless the first move was missing PP

* Revert "Pokedex Plus fixes (#4514)"

This reverts commit 982934c4aa.

* Pokedex Plus fixes (#4514)

* Pokedex plus no longer allows browsing unseen evos

* Restore "has no evolutions" printing

* only print "has no evolution" text at 0 depth

* Revert config changes

* fix duplicate icons and removed eevee hardcodes

* add new scope and indentation fixes

* actually introduce new scope

* Revert "Fixed Elixirs not being able to be used unless the first move was missing PP"

This reverts commit 313f2e5526.

* Initial Testing of Focus Sash+Future Sight

* Fixed infinite loop when flinging Razor Fang on a mon that's already moved

* Fixed Moxie clones not triggering on pokemon fainted by Max Moves

* Fixed Focus Sash enduring another time if broken by foreseen moves

* Update src/battle_script_commands.c

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

* Update src/battle_script_commands.c

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

* Added assumptions to tests

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-26 17:01:20 +02:00
sneed
312dcbb8a8
Speed Ignoring effect fixes (#4613)
* Custap ties with Quick Draw, Stall with Mycelium

* add a test
2024-05-24 11:21:35 +02:00
kittenchilly
edab81b658
Fix Inner Focus, Scrappy, etc granting immunity to all stat drops if the attacker has Intimidate (#4606)
* Fix Inner Focus, Scrappy, etc granting immunity to all stat drops if the attacker has Intimidate

* Formatting

* Test

* Update own_tempo.c
2024-05-22 22:20:44 +02:00
cawtds
b73e33618d
Fix status curing of full restore when used on party member (#4603)
* fix getboxmondata for evolutiontracker if compiled with agbcc

* fixed full restore curing status condition when used in battle on party member with missing hp
added more full restore tests

* formatting, removed unused
2024-05-20 00:25:03 +02:00