Commit graph

14985 commits

Author SHA1 Message Date
hedara90
d999092689
Upgraded Dragon Darts Animation (#4620)
* Upgraded Dragon Darts Animation

* Fixed Dragon Darts not workin in link battles

* Apply suggestions from code review

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-28 10:17:52 +02:00
Eduardo Quezada
80b193280d Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h
2024-05-27 10:13:42 -04:00
Eduardo Quezada
069161b716 Untag release 2024-05-27 09:31:06 -04:00
Eduardo Quezada
680c5581d4 Fixed changelog inaccuracy 2024-05-27 09:14:35 -04:00
Eduardo Quezada
767a1c7937
Version 1.8.4 (#4639)
* Version 1.8.4

* Missing labels
2024-05-27 09:06:34 -04:00
Philipp AUER
431cb64b3e
Pre-1.8.4 pret merge (2024/05/26) (v2) (#4637) 2024-05-27 12:40:41 +02:00
Eduardo Quezada
acd62b0065
Reverted bad implementation of Sparkling Aria+Covert Cloak/Shield Dust (#4634) 2024-05-27 06:38:05 +02:00
Rachel
94af656f17
Explicitly define Gengar's 3rd ability slot (Hidden Ability) (#4633) 2024-05-26 21:50:12 -04:00
Eduardo Quezada
9e72271c8e Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526
# Conflicts:
#	src/battle_anim_poison.c
#	src/pokemon.c
#	src/pokemon_icon.c
2024-05-26 18:34:26 -04:00
Pawkkie
c279aa23c6
Belch AI Scoring Fix (#4616)
* Belch scoring fix and test

* Add assumptions for pocket

* Update test to AI_SINGLE_BATTLE_TEST

* Alex's fixes

* Missed reverting a line

* Mucked up spacing mb

* Mucked up the spacing fix mb MB
2024-05-26 22:23:04 +02:00
kittenchilly
2e07dbb0ee
Add Gen 9 and PLA footprints + update some footprints (#4621)
* PLA footprints

* Gen 9 Starters

* Gen 9 Cross Gen Evos

* Question mark

* Gen 9 regular mons

* Gen 9 Paradox mons

* Gen 9 legendaries and mythicals

* Past gen mon footprint changes
2024-05-26 22:20:51 +02:00
Alex
4f1df84acf
Make AI see Loaded Dice hold effect for multi hit moves that strike 5… (#4622)
* Make AI see Loaded Dice hold effect for multi hit moves that strike 5 times

* Update battle_ai_util.c
2024-05-26 22:19:45 +02:00
Eduardo Quezada
8f38089127
Added failsafe in HGSS dex for Egg Groups without text defined (#4628)
* Added failsafe in HGSS dex for Egg Groups without text defined

* Fixed stringvar
2024-05-26 19:38:22 +02:00
Eduardo Quezada
ee1d0339f9
Fixed HITMARKER_PASSIVE_DAMAGE whitespace (#4629) 2024-05-26 19:37:58 +02:00
hedara90
487dc92119
Fixing bugs with Moxie clones+Dynamax, Fling Flinch infinite loop and Focus Sash+foreseen moves (#4625)
* Fixed Elixirs not being able to be used unless the first move was missing PP

* Revert "Pokedex Plus fixes (#4514)"

This reverts commit 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

* Revert "Fixed Elixirs not being able to be used unless the first move was missing PP"

This reverts commit 313f2e5526.

* Initial Testing of Focus Sash+Future Sight

* Fixed infinite loop when flinging Razor Fang on a mon that's already moved

* Fixed Moxie clones not triggering on pokemon fainted by Max Moves

* Fixed Focus Sash enduring another time if broken by foreseen moves

* 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>

* Added assumptions to tests

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-26 17:01:20 +02:00
cawtds
474f929c02
Fix dire hit being used on incorrect target (#4626)
* fix getboxmondata for evolutiontracker if compiled with agbcc

* fix dire hit being used on incorrect battler
2024-05-26 00:06:55 +02:00
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
Rachel
c129423a69
Fix move descriptions for Feint and Feint Attack (#4617) 2024-05-24 11:19:55 +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
ba07d2b3d4
Renames evolution methods the were labeled as evo level (#4607)
* [FIX] EVO_LEVEL_MOVE_TWENTY_TIMES -> EVO_USE_MOVE_TWENTY_TIMES

* rename evo_level_recoil_damage

* change EVO_LEVEL_ITEM_COUNT_999
2024-05-22 11:06:24 +02:00
Alex
973146c725
BS_SetGlaiveRush formatting (#4610)
Please merge my OCD induced change.
2024-05-22 00:55:20 +02:00
sneed
7b8348773b
Triple kick calcs use strikeCount (#4608) 2024-05-21 16:45:32 -04: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
moostoet
85ca0645a9
Add configuration to prevent permanent item theft (Covet / Thief) from NPCs (#4605)
* feat: implement logic for gen5+ covet/thief

* refactor: add define, misc. changes

* fix: define parenthesises

* fix: revert to bool32

* fix: formatting
2024-05-20 22:52:12 +02: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
Bassoonian
bc9f09744d
Egg Move Refactor (#4534)
* Egg Move Refactor

* Update python file and fix formatting
2024-05-19 13:47:15 +02:00
Jaizu
ef03daf6d4 Fix Pokeblock script missing a releaseall 2024-05-19 12:52:04 +02:00
sneed
334668be26
Restore sassy nature effect (#4598) 2024-05-19 11:43:28 +02:00
Frank DeBlasio
849bd0c8bb
Consolidate natures (#4562)
* Added NatureInfo struct

* Added back animation variants to struct

* Added PokeBlock animations to struct

* Added Battle Palace info to struct

* Added nature girl messages to struct

* Reordered gNaturesInfo to match struct order

* Refactored nature stat table

* Fixed battle dome nature calculation

* Fixed neutral nature values

* Fixed bracket layout
2024-05-19 10:14:31 +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
Bassoonian
d811cd1c4c
Add egg cycle length config (#4596) 2024-05-18 14:59:32 -04: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
Alex
1d83ce430c
Follow up to #4579: wrong naming (#4591) 2024-05-18 17:05:25 +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
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
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
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
cawtds
6f12da0a67
Fix special evolution triggering twice in certain situations (#4553) 2024-05-16 13:45:08 -07: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
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