Commit Graph

11662 Commits

Author SHA1 Message Date
Pawkkie
7413d107ae
Should switch refactor to facilitate switch prediction (#5466)
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-10-25 13:04:42 +02:00
Eduardo Quezada
afa7ab9b2e Merge branch '_RHH/master' into _RHH/upcoming 2024-10-24 07:47:52 -03:00
Pawkkie
b892ad4da6
Shed Skin chance fix (#5558) 2024-10-24 11:59:49 +02:00
Martin Griffin
2a610443ab
Missing string_util.h include in mini_printf.c 2024-10-23 20:09:29 +01:00
Eduardo Quezada
83439a7f3e
Removed remaining line breaks from #3240 + Prefix wrap fix (#5556) 2024-10-23 10:50:36 +02:00
Pawkkie
03eda5749d
Healer ability tests (#5559) 2024-10-22 19:02:28 +02:00
hedara90
bcfdf41078
Follower female fix (#5475)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-22 12:38:06 -03:00
RavePossum
0ad77db4b4
Fix HGSS dex search printing wrong mon after selecting evos (#5552) 2024-10-22 16:28:11 +02:00
RavePossum
afc89f53b0
Fix weather genie move anims and springtide storm targets (#5553) 2024-10-22 16:27:10 +02:00
Martin Griffin
1421ed1b24
Tests: detect task leaks (#5528) 2024-10-22 10:19:00 +02:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards (#3240)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-21 14:52:45 -03:00
Eduardo Quezada
3205f377d5 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-21 08:18:44 -03:00
Alex
17614f8032
Remove unnecessary gBattlerAttacker usage (#5554) 2024-10-21 07:32:10 -03:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects (#5549) 2024-10-20 21:44:28 +02:00
Alex
5291117687
Global is used instead of passed var (#5546)
In `AI_CalcDamage` a global was used for the Terastorm check instead of passed var
2024-10-20 14:28:36 +02:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation (#5490)
* revival blessing fixes, add anim

* fix lunar blessing anim

* Added support for Revival Blessing in tests

* Added test to confirm absent flag fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-19 11:34:58 -03:00
RavePossum
85197eda5e
Move Relearner and Renaming From Summary Screen (#5513)
* implement move relearner in summary screen

* implement renaming in summary screen

* Enable summary screen rename and relearn by default

* Store original callback when opening screen to invoke later, hide rename/relearn for mons being moved in PC

* add a config to not restore full PP when relearning from summary screen

* hide summary relearner option if mon has no relearnable moves

* add note not to decap RELEARN string

* re-static function that now no longer needs to be accessible elsewhere

* Fix move relearner not showing up if you first select a mon with no moves

* The great curly brace massacre of 2024 (PR feedback)

* sprinkling in some parentheses

* PR feedback 2 (curly braces & whitespace)
2024-10-19 14:43:05 +02:00
psf
8d7996dc5b
Added constant to expansion inclusive copyright magic number (#5413)
* Added constant to expansion inclusive copyright magic number

* Fixed open brackets
2024-10-18 18:06:04 -03:00
kittenchilly
04aa5b7c24
Add more later gen fishing mechanics (#5518)
* Add new fishing bite odds and follower boost

* Sticky

* Update item.h

* Update field_player_avatar.c

* Update field_player_avatar.c
2024-10-18 16:45:31 +02:00
Eduardo Quezada
358c0d0699
Added back GBA sprites via config (#5206)
* Add back older sprites

* Graphics config

* Added GBA most graphical data to gSpeciesInfo

* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files

* GBA mon icons

* Split GBA footprints into separate config

* Separated GBA icons into their own config

* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS

* Moved GBA sprites to regular folder with prefix

* Renamed configs

* Temporarely disabled shadows when GBA sprites are enabled

* Removed remaining files from pokemon_old folder
2024-10-18 13:37:00 +02:00
Bassoonian
3077592e68
Pret merge 2024-10-15 (#5527) 2024-10-17 09:00:18 +02:00
Eduardo Quezada
ee9c6d4912 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-17 00:16:01 -03:00
Eduardo Quezada
e230f379b3
Fixed 10,000,000 Volt Thunderbolt name (#5533) 2024-10-16 17:46:40 -03:00
Alex
2e7d856ee3
Removes Crit Chance preproc (#5520)
* Removes Crit Chance preproc

* renamed the function wrongly before pushing

* add assumes back where needed

* addresses review comments

* GetHoldEffectCritChanceIncrease

* remove redudant var call

* define for gen1 leek scale

* gen1 adjustments and fix test

* inline leek check

* clean up
2024-10-16 19:01:38 +02:00
Pawkkie
9882e0aea6
Refactor ShouldSwitchIfAllBadMoves (#5452)
* Refactor ShouldSwitchIfAllBadMoves

* Rest of bugfix

* Enable Shed Tail test

* Revert "Enable Shed Tail test"

This reverts commit e0b9a3affcf3c465c8743741e5ca61bde6c8cb18.

* Better names for i, j

* Fix MAX_MON_MOVES that should be MAX_BATTLERS_COUNT

* battlerIndex  / moveIndex  fix

* Update src/battle_controller_player_partner.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-16 11:22:48 -04:00
Bassoonian
d4387d880c
Replace hardcoded flute check with consumability check (#5508) 2024-10-16 12:07:34 +02:00
AlexOn1ine
d044f53c72 Adds tests and Costar fix from PR #5526 2024-10-16 10:51:41 +02:00
ghoulslash
1cdc91ce53
Add Costar Tests, Download Test for Doubles (#5526)
* add download double battle test

* fix costar and add test

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-16 10:44:01 +02:00
Eduardo Quezada
9ed153ff93 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015 2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
Alex
ed65c4a2f7
Fixes Partner targeting and Acupressure/Ally Switch interaction (#5446)
* Fixes Partner targeting and Acupressure/Ally Switch interaction

* More tests

* Update test/battle/move.c
2024-10-15 17:04:35 -04:00
Bassoonian
b9ac5d1d8a
Add newline to move relearner string (#5523) 2024-10-15 21:58:58 +02:00
luckytyphlosion
a55c75d350
Get rid of common syms (#2040)
Some checks failed
CI / build (push) Has been cancelled
2024-10-14 23:52:11 -04:00
Eduardo Quezada
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
psf
c82ff7b5b1
Merrp merge (12th of October) (#5514)
Co-authored-by: Ariel A <24759293+aarant@users.noreply.github.com>
Fixes #5482
2024-10-12 10:50:31 -07:00
kittenchilly
743dc4d765
Add text fitting tests for move, ability, item, and pokedex descriptions (#5505) 2024-10-12 19:37:11 +02:00
Bassoonian
eedeaf1ead
Clean up scrcmd PR (#5511)
Renamed CheckPartyHasSpecie to CheckPartyHasSpecies and cleaned up function calls
2024-10-12 10:34:05 -07:00
Bassoonian
8dba27249c Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210 2024-10-12 18:41:33 +02:00
Ariel A
e10005010e Merge branch 'followers' into followers-expanded-id 2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands 2024-10-11 16:27:02 -07:00
ghoulslash
353915ef64
Add various tests, add RNG_RANDOM_TARGET (#5438)
* burn dmg test depends on config

* burn and frostbite tests use B_BURN_DAMAGE config for denom val

* update kings shield test with config

* add RNG_RANDOM_TARGET, use SetRandomTarget in HandleAction_UseMove target acquisition, update uproar test to PASSES_RANDOMLY since test will fail if you target the soundproof voltorb. Slightly faster UproarWakeUpCheck

* add sticky web+contrary test

* add EXPECT_EQ to contrary+sticky web test

* Update src/battle_script_commands.c

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

* Update src/battle_util.c

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

* Update test/battle/move_effect/uproar.c

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

* fix test

* syntax fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 23:47:46 +02:00
SarnPoke
2db1f071fa
Add battle flag that prevents running from wild Pokémon (#5502)
* Add No Running Battle Flag

Adds a flag that if set prevents the player from being able to run from wild battles.

* Formatting battle_util.c

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

* Adjust for pre-Gen 8 Teleport

Addresses the edge case with Teleport when used with under Gen 8 mechanics.

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 21:59:50 +02:00
Pawkkie
464c90a862
ShouldSwitchIfGameStatePrompt Tests (#5462)
* Weird tests plz help <3

* better RNG tag names?

* DATA.trial for data to reset between trials

* Fix Wonder Guard test

* Unused errors

* Finish new tests

* Split fix into its own PR

* Spacing

* Rename RNG_AI_SWITCH_TOXICD

* Forgot to save file lol

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-10-11 19:57:19 +02:00
Bassoonian
d7c5bfee68
Clean up Shedinja code (#5501) 2024-10-11 19:50:41 +02:00
Bassoonian
b5c884504c
Fix negative mutation value (#5504) 2024-10-11 19:49:24 +02:00
kittenchilly
130d6042e0
Add Ion Deluge animation (#5467) 2024-10-10 22:37:57 +02:00
kittenchilly
5b4acea651
Add config to change Vivillon's breeding form (#4813)
* Add config to change Vivillon's default form

* Update daycare.c

* Remove the default form stuff

* Update daycare.c

* Clean up

* Assert and fancy
2024-10-10 21:27:50 +02:00
kittenchilly
8890500b77
Fix P_FRIENDSHIP_EVO_THRESHOLD not checking for Gen 8 (#5503) 2024-10-10 21:26:46 +02:00
PhallenTree
8d2d62273b
Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs (#5493)
* Updated ability popups of Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, Fix Doodle and Role Play issues

* More Doodle fixes

* Add tests

* Fix Doodle not activating if partner is fainted and its ability cannot be suppressed

* Fix tests compile

* Commander cantBeOverwritten

* Add battle script for Overwrite then Regular ability
2024-10-10 18:36:01 +02:00