Eduardo Quezada
b48e5770be
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-11 15:58:42 -03:00
Alex
b55c87f73f
Fixes Take heart ( #5658 )
...
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:58:09 -05:00
Alex
a8351e305c
Fixes Red Card / Eject Pack interaction with Emergency Exit ( #5657 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:56:51 -05:00
Eduardo Quezada
e005ffb576
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-06 10:01:48 -03:00
Alex
dc740b4e9a
Fixes Magic Coat message ( #5645 )
2024-11-06 10:09:00 +01:00
Eduardo Quezada
ee2535be96
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-03 12:21:22 -03:00
Alex
45d063dcf8
Fixes Dragon Tail using the effect twice during a Parental Bond attack ( #5630 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-02 09:38:29 -03:00
Martin Griffin
ca2fffc5d0
Fix explicitSpeed check
...
Add 'Speed(...)' calls where required.
2024-11-01 17:06:23 +00:00
Alex
d5f8e9cc0e
Combines CalculateMoveDamage arguments into a struct ( #5570 )
2024-10-31 07:59:28 +01:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids ( #5560 )
2024-10-28 18:03:15 +01:00
Eduardo Quezada
e8b8ca19a9
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-28 12:13:55 -03:00
Alex
e9ab070e7d
Fix damage calc modifiers ( #5604 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-27 18:47:02 -03:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines ( #5581 )
2024-10-27 20:15:11 +01:00
GhoulMage
6819dd3c37
New AI flag for marking the two last Pokémon as Ace Pokémon. ( #5587 )
2024-10-27 11:32:45 -04:00
Eduardo Quezada
5d4ab8cc7e
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-27 08:02:45 -03:00
hedara90
2ccc91e091
Fixed broken Starting Terrain test ( #5582 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-27 10:36:31 +01:00
kittenchilly
9ec9a9a4f9
More post-#3240 cleanup ( #5593 )
2024-10-26 19:50:20 -03:00
Alex
ad16fa76f2
Fixes Magic Guard not preventing Salt Cure ( #5583 )
2024-10-26 10:11:45 +02:00
Pawkkie
7413d107ae
Should switch refactor to facilitate switch prediction ( #5466 )
...
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-10-25 13:04:42 +02:00
GhoulMage
be98de71d5
Fixed damage test ( #5574 )
2024-10-24 18:12:31 +02:00
Eduardo Quezada
afa7ab9b2e
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-24 07:47:52 -03:00
Pawkkie
b892ad4da6
Shed Skin chance fix ( #5558 )
2024-10-24 11:59:49 +02:00
ghoulslash
f1b639a504
Add basic Steam Engine, Guard Dog Tests ( #5569 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-23 11:46:58 +02:00
Pawkkie
03eda5749d
Healer ability tests ( #5559 )
2024-10-22 19:02:28 +02:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards ( #3240 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-21 14:52:45 -03:00
Eduardo Quezada
3205f377d5
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-21 08:18:44 -03:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects ( #5549 )
2024-10-20 21:44:28 +02:00
Bassoonian
601438e980
Centralise AI Tests trainer name ( #5532 )
2024-10-19 17:51:20 -03:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation ( #5490 )
...
* revival blessing fixes, add anim
* fix lunar blessing anim
* Added support for Revival Blessing in tests
* Added test to confirm absent flag fix
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-19 11:34:58 -03:00
ghoulslash
8bb8500456
add curious medicine test ( #5540 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-19 14:03:57 +02:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
Alex
2e7d856ee3
Removes Crit Chance preproc ( #5520 )
...
* Removes Crit Chance preproc
* renamed the function wrongly before pushing
* add assumes back where needed
* addresses review comments
* GetHoldEffectCritChanceIncrease
* remove redudant var call
* define for gen1 leek scale
* gen1 adjustments and fix test
* inline leek check
* clean up
2024-10-16 19:01:38 +02:00
Pawkkie
9882e0aea6
Refactor ShouldSwitchIfAllBadMoves ( #5452 )
...
* Refactor ShouldSwitchIfAllBadMoves
* Rest of bugfix
* Enable Shed Tail test
* Revert "Enable Shed Tail test"
This reverts commit e0b9a3affc
.
* Better names for i, j
* Fix MAX_MON_MOVES that should be MAX_BATTLERS_COUNT
* battlerIndex / moveIndex fix
* Update src/battle_controller_player_partner.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-16 11:22:48 -04:00
AlexOn1ine
d044f53c72
Adds tests and Costar fix from PR #5526
2024-10-16 10:51:41 +02:00
ghoulslash
1cdc91ce53
Add Costar Tests, Download Test for Doubles ( #5526 )
...
* add download double battle test
* fix costar and add test
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-16 10:44:01 +02:00
Alex
ed65c4a2f7
Fixes Partner targeting and Acupressure/Ally Switch interaction ( #5446 )
...
* Fixes Partner targeting and Acupressure/Ally Switch interaction
* More tests
* Update test/battle/move.c
2024-10-15 17:04:35 -04:00
Eduardo Quezada
0a4b3a8dd7
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-12 16:23:27 -03:00
ghoulslash
353915ef64
Add various tests, add RNG_RANDOM_TARGET ( #5438 )
...
* burn dmg test depends on config
* burn and frostbite tests use B_BURN_DAMAGE config for denom val
* update kings shield test with config
* add RNG_RANDOM_TARGET, use SetRandomTarget in HandleAction_UseMove target acquisition, update uproar test to PASSES_RANDOMLY since test will fail if you target the soundproof voltorb. Slightly faster UproarWakeUpCheck
* add sticky web+contrary test
* add EXPECT_EQ to contrary+sticky web test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update src/battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update test/battle/move_effect/uproar.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* fix test
* syntax fix
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 23:47:46 +02:00
Pawkkie
464c90a862
ShouldSwitchIfGameStatePrompt Tests ( #5462 )
...
* Weird tests plz help <3
* better RNG tag names?
* DATA.trial for data to reset between trials
* Fix Wonder Guard test
* Unused errors
* Finish new tests
* Split fix into its own PR
* Spacing
* Rename RNG_AI_SWITCH_TOXICD
* Forgot to save file lol
---------
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-10-11 19:57:19 +02:00
PhallenTree
8d2d62273b
Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs ( #5493 )
...
* Updated ability popups of Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, Fix Doodle and Role Play issues
* More Doodle fixes
* Add tests
* Fix Doodle not activating if partner is fainted and its ability cannot be suppressed
* Fix tests compile
* Commander cantBeOverwritten
* Add battle script for Overwrite then Regular ability
2024-10-10 18:36:01 +02:00
Bassoonian
806321f3c8
Update shed_tail.c ( #5494 )
2024-10-09 18:24:39 +02:00
Eduardo Quezada
ee00c251ae
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-08 14:52:12 -03:00
Pawkkie
efad9a32a9
Fix AI tests using PASSES_RANDOMLY ( #5486 )
2024-10-08 13:04:35 -04:00
Eduardo Quezada
a7fca616b0
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-04 14:28:13 -03:00
wiz1989
6f59d26753
updated Conversion 2 mechanics to 5+ ( #5453 )
...
* updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2
* fixes and added new test cases
* bugfixing and added EWRAM u16 gLastUsedMoveType
* update after Pawkkie review
---------
Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>
2024-10-04 12:42:15 -04:00
PhallenTree
91325e83c1
Fixes to Protosynthesis, Quark Drive, Beast Boost, Orichalcum Pulse, Hadron Engine ( #5447 )
...
* Protosynthesis & Quark Drive interactions; Fixes to Beast Boost/Protosynthesis/Quark Drive stat tie priority, Orichalcum Pulse and Hadron Engine stat boost
* Protosynthesis + Quark Drive tests
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-04 11:00:12 +02:00
Eduardo Quezada
80af2af9ad
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-03 14:33:01 -03:00
psf
2597d8a35a
Updated species defines ( #5075 )
...
* First version of new defines
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Removed old defines
* Removed old defines
* Removed old defines and cleaned up some macros
* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs
* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599
* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
2024-10-02 18:24:57 -03:00
Bassoonian
7852dc3e47
Update commander.c ( #5458 )
2024-10-02 22:36:20 +02:00
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) ( #5456 )
2024-10-02 21:20:23 +02:00