Commit graph

15048 commits

Author SHA1 Message Date
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
sneed
d07d7a0082
Transform GFX uses the correct battler index (#4486) 2024-05-09 10:11:55 +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
Nopinou
82b626aef1
fix and tweak level cap code (#4505)
Co-authored-by: Baptiste-Lecoutre <59924283+Baptiste-Lecoutre@users.noreply.github.com>
2024-05-07 15:53:09 +02:00
BlueAnthem37510
2d7c79e860
Gulp missile not triggering on faint fix and added form change type (#4502)
* Cramorant faint fix and add form change type

* Fixed formatting, renamed form change type, changed various to callnative

* Fix oops broke everything except gulp missile

* Improved condition order

* remove extra line

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Added requested changes

---------

Co-authored-by: BlueAnthem37510 <a@a.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-07 06:44:17 -04:00
Eduardo Quezada
eca47fe209 Non-tagged release 2024-05-06 14:51:48 -04:00
Eduardo Quezada
7e43916e57
Version 1.8.3 (#4499)
* Moved changelogs to folders by minor version

* Version 1.8.3
2024-05-06 14:44:37 -04:00
Eduardo Quezada
4ce8a05d5d
Add tests to complement PR4500 (#4511) 2024-05-06 19:59:37 +02:00
lolbinarycat
b2fda17c06
Make filepath links in readme relative (#4509)
This allows programs like emacs to open the proper file when
clicking them.

Co-authored-by: binarycat <binarycat@envs.net>
2024-05-06 12:18:15 -04:00
cawtds
d98a4cb9a5
Fixed evolution tracker updates (#4503)
* update evolution tracker correctly

* Update src/battle_script_commands.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-06 12:07:22 +02:00
Eduardo Quezada
5ec08ee98c
Small Battle Test reorganization (#4504)
* Fixed test folders + Chud Chew test name fixes

* Adjusted file names + merged Burn Up and Double Shock files

* Added Spit Up/Swallow files that point to Stockpile's file

* Multiple changes (see description)

- Moved secondary effect files to their own folder.
- Split hit_set_entry_hazards.c to separate files for Spikes/Stealth Rock.
- Grouped Hex/Venoshock to the same file
2024-05-06 09:36:52 +02:00
Eduardo Quezada
e20cb62de6
Fixed Steam Roller AI check affecting Terrain setting effects (#4498)
* Fixed battle_ai_util.c whitespace

* Add arguments check

* Parenthesis

* Update src/battle_ai_util.c

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

* Added AI tests by AlexOn1ine

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-06 00:54:28 +02:00
Alex
41138f101c
Fix Red Card, Endured Damage interaction (#4482) 2024-05-05 14:29:59 +02:00
Eduardo Quezada
bcb230f3c9
Fixed Flute Items being consumed in battle (#4496) 2024-05-05 14:26:30 +02:00
PhallenTree
f07ef07855
Fixes various abilities' switch-in messages (#4500)
* Fixes Costar, Zero to Hero, Supreme Overlord and Ruin abilities' switch-in messages

* Fixed typo in Supreme Overlord's String Id

* Fixes spacing in battle_string_ids.h
2024-05-05 14:25:40 +02:00
Eduardo Quezada
4410c1b797
Improve Eject Pack test names (#4497) 2024-05-05 11:58:11 +02:00
PhallenTree
ff2d1bb02c
Fixes Assist (#4491) 2024-05-04 16:59:47 +02:00
PhallenTree
adbb5a44c8
Fixes no effect on Diamond Storm, typo on Mortal Spin (#4489) 2024-05-04 15:11:32 +02:00
Eduardo Quezada
22f9eee509 Added trainerproc to .gitignore 2024-05-02 14:01:22 -04:00
Alex
6d397f9867
Fixes Magic Bounce in double battles (#4464)
* Fixes Magic Bounce in double battles

* Add Double Battle check
2024-05-02 14:23:46 +02:00
WillKolada
2aed78ebbb
Update IsDamageMoveUsable to check for Steel Roller viability (#4476)
* 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.
2024-05-02 08:42:08 +02:00
Eduardo Quezada
d59ef3710a
Fixed Future Sight script whitespace (#4475) 2024-05-02 00:15:56 +02:00
hedara90
77e17247cd
Color change fixes (#4472)
* Fixed forseen moves not triggering Color Change and added tests for Color Change

* Added issue number to Known Failing test

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-05-01 23:23:37 +02:00
Alex
48d71b0de1
Hard Level Caps issues (#4420)
* Fix 1 exp gain on hard level caps

* Level Cap issues

* fix compile

* brackets
2024-04-30 13:59:02 +02:00
PhallenTree
6ad443c9a8
Fixes Eject Items causing wrong pokemon to take damage from entry hazards (#4465)
* Fix hazards damaging the wrong pokemon using eject items

* Added Stealth Rock test as requested

* Added Stealth Rock double battle test
2024-04-29 23:16:58 +02:00
Alex
c1f92b088e
Eject Pack fix (#4463) 2024-04-29 13:21:33 +02:00