Alex
addaf40971
Fixes Scale Shot not activating + Known Failing Round test ( #5292 )
...
* Fixes Scale Shot not activating + Known Failing Round test
* Update test/battle/move_effect/multi_hit.c
2024-08-30 19:36:14 -04:00
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees ( #5285 )
...
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
2024-08-29 18:14:46 +02:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
Alex
98dbf3a575
Fixes Charged up status ( #5274 )
...
Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`
2024-08-27 20:01:51 +02:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
laserXdolphin
c406c4cc76
Fixed Ice Fang frostbite and freeze text. The frostbite and freeze texts were swapped. ( #5273 )
2024-08-27 14:33:58 +02:00
Pawkkie
e9c8bd0548
Revert "Chilly Reception AI" ( #5270 )
2024-08-26 16:58:15 -07:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces ( #5261 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Pawkkie
a9f31dcc4f
Chilly Reception AI ( #5265 )
2024-08-26 18:57:17 -04:00
kittenchilly
03b0d066ce
Update battle_ai_main.c
2024-08-26 16:50:58 -05:00
hedara90
2e43ffd5f7
Fixed Snore not hitting twice with Parental Bond ( #5264 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 21:59:39 +02:00
kittenchilly
80ad7f15cc
Chilly Reception AI
2024-08-26 13:09:50 -05:00
SarnPoke
5de0f3cb4a
Add Anger Point/Crit Moves Doubles AI Interaction ( #5244 )
...
* Add Anger Point/Crit Moves AI Interaction
Encourages the AI to use an "always crit" move on its partner, if that partner has the Anger Point ability.
* Add OHKO check
Makes sure that the crit move does not OHKO the partner with Anger Point.
* Fix mistake
Fixes small mistake
* Add Speed Check
Checks if mon is faster than its Anger Point partner when scoring.
2024-08-25 23:38:40 +02:00
kittenchilly
afd18f06b4
Fix switch out move message ( #5258 )
2024-08-25 23:29:33 +02:00
Alex
92038129e2
Fixes Purifying Salt being poisoned by Toxic Spikes ( #5252 )
2024-08-25 09:06:03 -04:00
hedara90
51a127fcb5
Better implementation of the obedience fix ( #5245 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-25 11:20:26 +02:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix ( #5256 )
...
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
2024-08-25 10:03:33 +02:00
kittenchilly
2fed75f7c5
Adaptability, Aerilate, Aftermath tests ( #5242 )
...
* Adaptability, Aerilate, Aftermath tests
* Update test/battle/ability/aerilate.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-08-24 10:53:19 -04:00
PhallenTree
85fe398b50
Fix Starting Status being passed on to future wild battles ( #5248 )
2024-08-24 14:28:24 +02:00
Salem
4208da1e22
add missing break for poison puppeteer ( #5243 )
2024-08-23 18:21:40 +02:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes ( #5142 )
...
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
2024-08-20 20:16:32 +02:00
hedara90
d379ffef3e
Fixed Confide+Crafty Shield interaction ( #5202 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-20 08:24:42 -04:00
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… ( #5209 )
...
* Fixes weather abilities not activating when Cloud Nine user leaves the field
* parametrize
2024-08-20 07:24:48 -04:00
Pawkkie
a111ac496d
Fix typos ( #5221 )
...
Fix typos in move description of Decorate, Collision Course and Electro Drift
2024-08-20 12:44:27 +02:00
PhallenTree
bc5f40e518
Adds missing Wind Rider activation and tests ( #5207 )
...
* Adds missing Wind Rider activation + tests
* Adds test for opponent setting up Tailwind
* Update src/battle_util.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-08-19 15:25:44 +02:00
kittenchilly
a958e61110
Fix using Population Dice with Loaded Dice printing garbage text ( #5195 )
2024-08-17 22:33:11 +02:00
Alex
8607a7fb33
Fixes UB in Cmd_averagestats ( #5191 )
...
* Fixes UB in Cmd_averagestats
* fix test and align default case
2024-08-17 18:19:22 +02:00
Alex
3a0c5c9c6c
Adds missing AI checks for poltergeist ( #5189 )
...
Adds missing AI checks for poltergeist
2024-08-17 18:18:03 +02:00
hedara90
b641c6f4fa
Fixed incorrect weather damage rounding when maxHP <16 ( #5183 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-16 23:02:49 +02:00
hedara90
bd3d99d7d9
Fixed Retaliate not working correctly with passive damage ( #5182 )
...
* Fixed Retaliate not working correctly when allies fainted from passive end of turn damage
* Changed test parameters to use legal stats
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-16 17:31:28 +02:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests ( #5170 )
...
* Adds Harvest tests
* Adds Pickup in-battle effect + tests
* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)
* Change canPickupItem to bit field
* Make RandomUniformExcept inclusive (higher end) + convert bitfield
* Use CantPickupItem in PickupHasValidTargetc check
* Review
2024-08-16 15:37:23 +02:00
hedara90
45f10d734f
Fixed Ice Face, implemented tests ( #5171 )
...
* Fixed Ice Face, implemented tests
* Fixed agbcc and bad battle mon looping
* Fixed the ShouldChangeFormInWeather function again
* Cleaned up End of Turn weather form changes, simplified Ice Face
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-15 13:51:39 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Alex
e3d9bb643f
#5120 Follow up ( #5158 )
...
Consistency change
2024-08-14 18:27:40 +02:00
Alex
9019fed264
Fixes booster energy not increasing speed ( #5167 )
...
* Fixes booster energy not increasing speed
* alternative solution
* forgot else
2024-08-14 18:26:52 +02:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework ( #5159 )
...
* new move anims + fickle beam rework
* more fickle beam changes
* removed the true for consistency
* ficklebeamboosted gets cleared now
* mortal spin and thunderclap changes
* minor mortal spin pal change
* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
Bassoonian
63a1f85d81
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug
2024-08-14 12:33:04 +02:00
GriffinR
a3d5f54b75
Fix type for offset in MapConnection
2024-08-13 19:10:24 +02:00
Alex
a8cd459370
Fixes Purifying Salt not halving dmg for dynamic move types ( #5145 )
...
* Fixes Purifying Salt not halving dmg for dynamic move types
* forgot to add
2024-08-12 15:54:24 -04:00
cawtds
ba1512f864
Fix specific tiles changing to pc tiles when using boxlink/debug pc ( #5141 )
2024-08-12 15:52:55 -04:00
Alex
863b96f759
Fixes Stomping Tantrum effect not doubling power in certain situations ( #5140 )
...
* Fixes Stomping Tantrum effect not doubling power in certain situations
* fix dancer test
2024-08-11 19:05:38 -04:00
PhallenTree
779cedd16f
Fixes Dancer, adds Revelation Dance interactions with Z-Move, Roost and typeless mons ( #5133 )
...
* Add Revelation Dance interactions with typeless mons, Roost and Z-Move
* Fixes Dancer-called moves not updating their type
* Adds Revelation Dance tests
* Make sure target isn't immune in Dancer test
* Missing ... in message
* Missing Assume
* CI ends Dancer test too early?
* Z-Revelation Dance is Breakneck Blitz (Test)
* Fix test (Zoroark too strong?)
* Replace H!Zoroark
* Remove Ability specification
* Remove HP_Bars
* Fix Dancer checking for battlers that don't exist in single battles
2024-08-11 12:13:46 -04:00
Alex
137c15a9ce
Clean up for #4928 ( #5120 )
...
* Clean up for #4928
* agbcc
* review comments
* agbcc
* Update src/battle_util.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-08-11 13:21:49 +02:00
Alex
527cc33e0d
Adjusted AI calcs for Triple Kick Effect ( #5127 )
...
* Adjusted AI calcs for Triple Kick Effect
* use strikeCount
* fix compile
2024-08-11 13:01:10 +02:00
Alex
77afb01477
Fixes Zigzgoon battle being able to use a Gimmick ( #5129 )
...
* Fixes Zigzgoon battle being able to use a Gimmick
* add commit
* Update src/battle_terastal.c
* Update src/battle_dynamax.c
2024-08-11 00:23:51 +02:00
kittenchilly
a4dc9a0480
Add Dowsing Machine expanded name ( #5134 )
2024-08-10 23:59:23 +02:00
Martin Griffin
a5e0738484
trainerproc: Parse line markers ( #5122 )
2024-08-08 20:12:18 +02:00
hedara90
6bbc0601a9
Fixed non-grass Ivy Cudgel breaking battle UI ( #5117 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-08 10:39:38 +02:00
Bassoonian
c390999141
Pret Merge (7th of August) ( #5116 )
2024-08-08 10:23:14 +02:00
Bassoonian
0b1f06b594
Merrp merge (7th of August) ( #5110 )
2024-08-07 22:05:07 +02:00
