Commit graph

14933 commits

Author SHA1 Message Date
Alex
1d83ce430c
Follow up to #4579: wrong naming (#4591) 2024-05-18 17:05:25 +02:00
kittenchilly
4b221b5802
Get rid of gItemIconTable (#4579)
* Get rid of gItemIconTable

* Move the script to the folder
2024-05-18 10:22:26 +02:00
kittenchilly
b4ece97d42
Fix held items in the PC sometimes using the shorter font when unneccesary (#4588) 2024-05-17 00:42:48 +02:00
ghoulslash
dd3de40f4d
AI_CalcPartyMonDamage set saved flag for SetBattlerData (#4586)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-17 00:40:38 +02:00
Alex
faf61e62fb
Adds move Spicy Extract (#4211)
* Adds move Spicy Extract

* remove uneeded line

* anim, new tests, acc change

* Clear Amulet, Contrary interaction

* ai

* correction

* simplify script a bit

* clean up

* Spicy Extract script overhaul

* merge rhh/upcoming

* alignment

* AI changes/additions

* add Foul Play check

* Remove useless ai checks

* remove wrong test

* review issues
2024-05-16 11:03:50 +02:00
Bassoonian
7d84cd62ef
Add on release item config (#4577) 2024-05-15 23:46:25 +02:00
ghoulslash
9c6dfb7c0c
Move RestoreBattlerData out of Ai_CalcDmg and add SaveBattlerData Protections (#4156)
* move restorebattlerdata out of Ai_CalcDmg

* fix SetBattlerdata calls

* add saved field to struct AI_SavedBattleMon to prevent overwriting saved mon info

* AI_CalcPartyMonDamage set opposing battler known data

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-15 20:39:03 +02:00
Eduardo Quezada
ab682ce900 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/data/items.h
#	src/pokemon_summary_screen.c
2024-05-15 09:58:21 -04:00
Bassoonian
bbb6ade9e8
Fix debug ability u8 (#4576) 2024-05-15 11:56:58 +02:00
TheLastMudkip
d591f25829
Update Avalanche to be Single Target (#4581)
Avalanche is a single target move in doubles.
Currently it is bugged to be a spread move this change corrects that.

Source:
https://bulbapedia.bulbagarden.net/wiki/Avalanche_(move)
2024-05-15 08:51:59 +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
Alex
7fefe757b8
Adds AI_GetBattlerAbility (#4555)
* Adds AI_GetBattlerAbility

* Update src/battle_ai_util.c

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>

---------

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
2024-05-14 16:16:20 +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
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
Eduardo Quezada
0f5297423f Fixed Knock Off upcoming test 2024-05-13 11:25:49 -04:00
Eduardo Quezada
d4eb94db92 Fixed master test move name 2024-05-13 11:25:23 -04:00
Eduardo Quezada
3219a48adf Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_script_commands.c
2024-05-13 11:00:12 -04: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
a8bb82778a
Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557) 2024-05-12 15:07:43 +02:00
Eduardo Quezada
be37820bd9 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_script_commands.c
2024-05-11 19:53:19 -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
WillKolada
9c4aba116e
Prevents Terastallization UI from making part of the Safari Zone battle UI invisible (#4529)
* Update battle_terastal.c

Checks if the Safari Zone flag is set to avoid making part of the battle UI invisible.

* Update src/battle_terastal.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-09 10:27:46 +02:00
sneed
d07d7a0082
Transform GFX uses the correct battler index (#4486) 2024-05-09 10:11:55 +02:00
sneed
0a64ab1298
Rewrote GetItemIconPicOrPalette (again) to factor in customized HM counts (#4487)
* GetItemIconPicOrPalette factors custom HM counts

* remove the extra else
2024-05-09 09:29:18 +02:00
PhallenTree
63254a8fdc
Fixes Thief and Covet used by an opponent not stealing items (#4506)
* Fixes MOVE_EFFECT_STEAL_ITEM (Thief and Covet)

* Fix stealing consumed item

* Removed unnecessary instructions

* Removes unnecessary check for item to trigger Sticky Hold
2024-05-09 09:22:56 +02:00
sneed
b3a4553860
Dynamic Multichoice no longer plays sound on init (#4480) 2024-05-09 08:44:22 +02:00
sneed
432c4f233c
fix ai caring about fixed damage moves' resists (#4524) 2024-05-08 14:03:59 +02:00
WillKolada
b04d153a24
Expanded AI awareness of moves that don't work against Dynamax Pokemon (#4521)
* 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
2024-05-07 22:47:20 +02:00
ghoulslash
5538095785
Replace hp checks with IsBattlerAlive (#4429)
* add IsBattlerAlive to flame/toxic orb, convert a bunch of .hp != 0 and .hp == 0 checks to IsBattlerAlive

* remove redundant IsBattlerAlive checks on flame/toxic orb

* Update src/battle_util.c

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-07 16:39:02 +02:00