Commit graph

14976 commits

Author SHA1 Message Date
BlueAnthem37510
a507af300e
Sceptilite & Salandit sprite fixes (#4614)
Co-authored-by: BlueAnthem37510 <a@a.com>
2024-05-24 11:28:35 +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
GriffinR
18f84b78f2
Merge pull request #1998 from Sneed69/define-POKE_ICON_BASE_PAL_TAG
Move POKE_ICON_BASE_PAL_TAG to a header
2024-05-22 20:29:12 -04:00
sneed
b592c6eae5 Add POKE_ICON_BASE_PAL_TAG to a header 2024-05-23 02:45:22 +03: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
Alex
973146c725
BS_SetGlaiveRush formatting (#4610)
Please merge my OCD induced change.
2024-05-22 00:55:20 +02:00
GriffinR
aa4fa925c2
Merge pull request #1995 from Jaizu/adjust_friendship
Make AdjustFriendship more readable
2024-05-21 12:01:53 -04:00
GriffinR
999731fbf1
Merge pull request #1996 from Jaizu/fix_pokeblocks
Fix Pokeblock script missing a releaseall
2024-05-21 11:58:08 -04: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
Alex
57ec87387d
Fixes freeze on Galvanize Explosion against Volt Absorb (#4601) 2024-05-19 21:29:54 +02:00
Jaizu
ef03daf6d4 Fix Pokeblock script missing a releaseall 2024-05-19 12:52:04 +02:00
Pawkkie
35e90b896d
Adjust description of FREE_MATCH_CALL (#4590)
* Adjust description of FREE_MATCH_CALL

* Shorten comment
2024-05-19 10:13:14 +02:00
kittenchilly
b7fc2b447a
Add Stellar Tera Shard sprite (#4595)
* Add Stellar Tera Shard sprite

* Update items.h
2024-05-18 22:20:47 +02:00
hedara90
4ccfd5355d
Fixed Elixir only being useable if the first move was missing PP (#4594)
* Fixed Elixir only being useable is the first move was missing PP

* Update restore_pp.c

Commented out the test that doesn't actually test what it's supposed to due to current test system.

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-05-18 19:55:31 +02:00
Cafei
a28ee83b06
sawsbuck sprites (#4592) 2024-05-18 17:07:27 +02:00
sneed
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
2024-05-18 10:53:01 +02:00
Alex
635db6312c
AI respects partner when using spread moves in double battles (#4518)
* Fixes Earthquake AI in double battles

* earthquake_ai_fix

* Use CompareDamagingMoves to fix spread damage issue
2024-05-17 00:41:55 +02:00
cawtds
6f12da0a67
Fix special evolution triggering twice in certain situations (#4553) 2024-05-16 13:45:08 -07:00
Bassoonian
d235a716fe
Add missing EOF newlines to species_info files (#4584) 2024-05-15 21:11:30 +02:00
Eduardo Quezada
3a1b4951c6
Added missing Move Effect TODO tests - Volume A (#4569)
* Added missing TODO tests - Volume A

* Update test/battle/move_effect/autotomize.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-15 20:48:10 +02:00
sneed
00fc5b94f2
Various AI switching logic fixes Part 2 (#4572)
* AI can calc hail and sandstorm damage again

* reverse weatherImpact hp calculation sign

* add missing toxic damage calculation
2024-05-15 17:51:47 +02:00
Isaac Rivera
e5b33a0434
Add check for Magic Guard to avoid taking recoil damage (#4578)
* Add check for Magic Guard to avoid taking recoil damage

* add test to verify a mon with magic guard does not take recoil damage

followed format from "Steel Beam hp loss is prevented by Magic Guard" test

* update format of tests with magic guard and some form of recoil damage
2024-05-15 15:40:40 +02:00
Bassoonian
bbb6ade9e8
Fix debug ability u8 (#4576) 2024-05-15 11:56:58 +02:00
kittenchilly
35362fbd24
Update various sprites to ones from PokeCommunity (#4554)
* Updated battle sprites

* Update icon sprites

* Revert appletun change
2024-05-14 18:28:50 +02:00
Bassoonian
2e7c32019f
Update items.h (#4574) 2024-05-14 17:36:12 +02:00
Isaac Rivera
08bdc85359
Adds tests to verify Parental Bond doesn't affect EFFECT_MULTI_HIT moves (#4573)
* Adds tests to verify that Parental Bond does not affect moves with EFFECT_MULTI_HIT

* actually make kanga mega evolve in tests

* add celebrate for opponent and "not animation" on 5th hit

* update test strings
2024-05-14 17:28:14 +02:00
sneed
d71d5f7f1e
fix incorrect usage of ANIM_PLAYER_LEFT and _RIGHT (#4560) 2024-05-14 13:44:46 +02:00
PhallenTree
5cc7330f33
Fixes cries in move animations ignoring Illusion (#4564)
* Fixes cries in move animations not taking into account the ability Illusion

* Fixes cry for Link Battles
2024-05-14 13:34:36 +02:00
Isaac Rivera
dd6e91eaf7
Add check for MULTI_HIT moves in IsMoveAffectedByParentalBond (#4570) 2024-05-14 13:32:44 +02:00
TheJamesLJ
9cd3fbb232
Opponents Shaymin Sky form correctly reverts on frozen status (#4559)
* Fixed Shaymin form change with incorrect status condition

* Fixed Shaymin receiving damage again after changing form

* PR feedback updates - fixed missing commas in battle script

* Added Shaymin form change test by @AlexOn1ine
2024-05-14 13:28:10 +02:00
sneed
23b8804790
Various AI switching logic fixes (#4571) 2024-05-14 13:09:26 +02:00
Jaizu
411d7e6177 Make AdjustFriendship more readable 2024-05-14 12:48:20 +02:00
Bassoonian
cd1f4a8e94
Fixed C0ntest (#4563) 2024-05-13 14:04:41 -04:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything (#3949)" (#4525)
This reverts commit e2d70d440e, reversing
changes made to 0d2b400953.

# Conflicts:
#	gflib/text.c
#	include/config/decap.h
#	src/battle_message.c
#	src/item.c
2024-05-13 19:19:37 +02:00
hedara90
ebdc9ffc39
Fixed some moves' on-hit effects bypassing Substitutes where they shouldn't and some other things discovered along the way (#4558)
* Fixed some moves' on-hit effects bypassing Substitutes where they shouldn't.
Fixed Sparkling Aria interaction with Shield Dust in Singles vs Doubles.
Fixed Wake-Up Slap and Smelling Salts getting boosted damage where they shouldn't vs Substitutes.

* Cleaned up check for Sparkling Aria+Shield Dust interaction and fixed for agbcc.
Fixed logic for checking if moves should do extra damage on statused targets.
Wrote tests for Wake-Up Slap and Smelling Salts receicing extra damage on statused targets.
Wrote tests to check Thousand Arrows type effectiveness vs ungrounded Flying types.

* Update src/battle_util.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>

* Update src/battle_script_commands.c

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

* Update test/battle/ability/shield_dust.c

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

* Update test/battle/item_effect/covert_cloak.c

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

* Update test/battle/item_effect/covert_cloak.c

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

* Update test/battle/item_effect/covert_cloak.c

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

* Update test/battle/move_effect/smelling_salts.c

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

* Update test/battle/move_effect/thousand_arrows.c

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

* Update test/battle/move_effect/wake_up_slap.c

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

* Update test/battle/move_effect/wake_up_slap.c

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

* Update test/battle/move_effect/wake_up_slap.c

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

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-13 13:33:04 +02:00
WillKolada
fdd0063b6c
Updated AI scores for Status moves that Dynamax Pokemon are immune to (#4523)
* Update IsDamageMoveUsable to check for Steel Roller viability

* Condense terrain flag checks and renamed IsDamageMoveUsable

IsDamageMoveUsable is now named IsDamageMoveUnusable to more accurately reflect the boolean it returns.

* Made the AI aware of when more moves will fail against Dynamax Pokemon

Turns out Dynamax Pokemon are immune to quite a few moves. The AI is only aware of one of these at present--the Low Kick/Grass Knot effect, which I learned when the AI tried to Heavy Slam my Dynamaxed Pokemon. These additional cases should prevent the AI from selecting moves that have no effect against Dynamax Pokemon, though it may still select moves whose secondary effect won't work on Dynamaxed Pokemon (such as Fake Out or Circle Throw).

* Update battle_ai_util.c

Now handles damaging moves that Dynamax Pokemon are immune to

* Update scores for Status moves Dynamax Pokemon are immune to

* Extra parentheses oops

* Update pokemon.h

Added "doesntAffectDynamax" flag to MoveInfo

* Update pokemon.h

Replaced comma with semicolon (I'm using the online editor for this lol, sorry for all the commits)

* Update moves_info.h

Set the "doesntAffectDynamax" flag to TRUE for moves that have no effect on Dynamaxed targets.

* Update battle_dynamax.c

IsMoveBlockedByDynamax now simply returns the move's "doesntAffectDynamax" flag.

* Revert "Update pokemon.h"

This reverts commit 7edde776f8.

Revert "Update pokemon.h"

This reverts commit ed01b18d75.

Revert "Update moves_info.h"

This reverts commit bc42e7bccf.

Revert "Update battle_dynamax.c"

This reverts commit 29dbdce850.

* Update battle_ai_main.c

Made the new conditions consistent as separate checks.

* Update battle_ai_main.c

Whitespace formatting fixes. Sorry, lost track of what I'd changed and what I hadn't.
2024-05-13 11:27:17 +02:00
Cafei
eae221b9cf
A bunch of Pokemon sprite changes and fixes (#4552)
* A bunch of sprite fixes

- New Basculin Blue and White animations to fix their entry animations
- New Xerneas Neutral entry animation derived from its Active form animation
- Recolored Iron Hands and Iron Bundle back sprites

* Requested changes
2024-05-12 16:08:10 -04:00
Cafei
571d7bc436
Fix silent Oricorio Pom-Pom cry (#4551)
* Fix Oricorio Pom-Pom silent cry

* Silly mistake, thanks for pointing it out
2024-05-12 15:45:34 -04:00
TheJamesLJ
b66738ff8d
Multiple sprite updates (#4541)
* Updated Mega Mewtwo Y sprite to fix transparent eye pixel

* Updated Keldeo Resolute sprite to a two framed animation

* Updated Keldeo Resolute sprite to increase definition to facial features

* Improved Keldeo Resolutes second frame to match BW2 original & changed front animation

* Added Meloetta Pirouette front anim

* Updated Meloetta Pirouette anim frame to a dip
2024-05-12 15:43:49 -04:00
Alex
56cee80fbf
Explosion and Mind Blown / Steel Beam refactor (CFRU port) (#4516)
* Explosion and Mind Blown / Steel Beam refactor (CFRU port)

* forgot ndebug

* Restored EFFECT_MIND_BLOWN

* requested changes

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-12 11:41:18 -04:00
sneed
f502ba2a69
Stat stage related AI fixes (#4548)
* stat stage related AI fixes

* add more ai fixes and 2 tests

* use legal ability in tests

* Fix test and remove mold breaker check

* Use DoesBattlerIgnoreAbilityChecks
2024-05-11 19:03:19 +02:00
PhallenTree
8de4ed5a7c
Fixes Copycat issues with Z-Moves and 2 turn moves (#4549)
* Fixes Copycat 2-turn moves animation

* Fixes Copycat being able to call Z-Moves
2024-05-11 14:16:35 +02:00
Cafei
1ef7e11ef2
Unown entry animation fix (#4546)
- Changed all anim_front.png into front.png
- Set PLACEHOLDER_ANIM_SINGLE_FRAME in front_pic_anims.h
2024-05-10 18:20:25 -04:00
PhallenTree
833decb0df
Fix Mr. Mime's typing (#4547) 2024-05-10 18:12:09 -04:00
WillKolada
4c5260c82e
Changed item descriptions to prevent text overflowing into scroll menus (#4540)
* Changed Dubious Disc description to prevent overflow

The first line of the Dubious Disc description was too long. A few letters would escape the box in the Bag and in Marts. This brings them in line.

* Changed Ice Beam and Blizzard Frostbite descriptions

These descriptions also overflowed, even more so than the Dubious Disc.
2024-05-10 23:01:37 +02:00
Alex
d247a77927
Fixes Future Sight freeze/weird behavior (#4543) 2024-05-10 23:00:32 +02:00
ghoulslash
e122ba28be
fix battle script clearing specialBattleType (#4536)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-09 16:22:46 +02:00
Bassoonian
f12773dbb8
Fix possible agbcc corruption for tree mutations (#4535) 2024-05-09 16:22:17 +02:00
hedara90
dd0c3a9ee5
Fixed moves with HP cost triggering effects where they shouldn't (#4533)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-05-09 15:22:48 +02:00
cawtds
fcfc6b60f2
fix getboxmondata for evolutiontracker if compiled with agbcc (#4510) 2024-05-09 15:19:13 +02:00