Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
PhallenTree
91325e83c1
Fixes to Protosynthesis, Quark Drive, Beast Boost, Orichalcum Pulse, Hadron Engine ( #5447 )
...
* Protosynthesis & Quark Drive interactions; Fixes to Beast Boost/Protosynthesis/Quark Drive stat tie priority, Orichalcum Pulse and Hadron Engine stat boost
* Protosynthesis + Quark Drive tests
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
* Update src/battle_util.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-04 11:00:12 +02:00
ghoulslash
be5f2e095e
fix duplicating flute glitch ( #5436 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-03 13:01:18 +02:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) ( #5455 )
2024-10-02 21:20:02 +02:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible ( #5449 )
...
* Fixes recoil moves not triggering berries if possible
* Update battle_script_commands.h
2024-10-01 10:43:58 +02:00
kittenchilly
1c022f4d34
Fix Jubilife Muffin full heal effect + better full heal tests ( #5444 )
2024-09-29 17:05:54 -04:00
Eduardo Quezada
4183fa9d50
Fixed test assumption fail summary fields using more memory than needed ( #5443 )
2024-09-29 14:40:37 -03:00
Pawkkie
5908fbef9c
Wake-Up Slap test typo ( #5442 )
...
* Wake-Up Slap test typo
* Update test/battle/move_effect/wake_up_slap.c
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-09-29 12:34:34 -04:00
PhallenTree
e67d5a23ed
Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive ( #5430 )
...
* Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive)
* Add Snatch interactions with Dancer, Swallow
* Trace fix + cleanup
* Simplify Quash
* Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests
* Fix Booster Energy Ability Popup
* Accidentally removed healing from Swallow
* More Trace cleanup
2024-09-24 18:40:44 +02:00
psf
55086586c5
Revert 5422 ( #5424 )
2024-09-22 16:59:43 -07:00
ghoulslash
acd07ccfc1
add rocky helmet dmg to tangling hair + defiant test to ensure original battler IDs from chaining effects ( #5423 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-22 19:44:18 +02:00
Bassoonian
918d45a623
Fix default tera type changing upon evolution/form change ( #5422 )
2024-09-22 16:33:17 +02:00
ghoulslash
ed005fc345
Fix affection check for exp multiplier ( #5421 )
2024-09-22 08:47:37 -04:00
Bassoonian
d122c0a222
Fix affection check for exp multiplier
2024-09-22 14:14:15 +02:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative ( #5418 )
...
* settotemboost use callnative
* Update src/battle_main.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-22 11:25:42 +02:00
kleenxfeu
16e8be1233
Mega evolution animation is a little smoother ( #4816 )
...
* Smoother primal/mega animation
* Just to make the CI run. It needs to run
* Update src/battle_anim_effects_3.c
---------
Co-authored-by: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-21 23:47:19 +02:00
Bassoonian
832a7b286d
Update item_use.c ( #5415 )
2024-09-21 21:22:30 +02:00
kittenchilly
39a8a77d3d
Play point animation when sending a follower into battle ( #5406 )
...
* Add point animation when sending a follower into battle
* Update trainers.h
2024-09-21 20:28:20 +02:00
kittenchilly
f7d2e62ccc
Fix Switcheroo giving score even if the opponent has no held item ( #5412 )
2024-09-21 18:51:08 +02:00
Alex
68c51f8412
Fixes Spiky Shield Counter interaction ( #5402 )
...
* Fixes Spiky Shield Counter interaction
* Update test/battle/move_effect/protect.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-19 12:00:32 +02:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects ( #5391 )
...
* Ogerpon masks were missing their hold effects
* fix wrong num
* test
* correct tests and additional fix
* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
PhallenTree
76656e85c2
Fix Quash implementation, adds After You and Quash missing configs + tests ( #5400 )
...
* Fix Quash + After You and Quash configs
* Add tests
2024-09-19 00:10:29 +02:00
nescioquid
ac2b41ae71
Typo fixes and Growth move description change ( #5398 )
...
* changes Growth's move description to account for Gen 5+ behavior
* completes B_DIVE_BALL_MODIFIER comment
* fixes typos and incongruent spacing in various files
* Update src/data/moves_info.h
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-18 23:03:36 +02:00
Alex
6ef36837e9
Fixed corruption of the next turn used move caused by Scale Shot ( #5397 )
2024-09-18 16:58:49 +02:00
RavePossum
27db57f854
fallback on default BW popup theme to reduce potential for error ( #5392 )
2024-09-18 16:57:13 +02:00
Alex
95dac7c4ac
Remove potential uninitialized behavior ( #5393 )
...
`MAX_BATTLERS_COUNT` makes more sense to use here because we iterate over max battlers in the first place.
2024-09-17 20:58:43 +02:00
Eduardo Quezada
6116b8b04e
Start 1.9.3 cycle
2024-09-16 11:57:41 -03:00
Eduardo Quezada
889a02d263
Version 1.9.2 ( #5357 )
...
* Version 1.9.2
* Apply suggestions from code review
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
* Updated to latest master
* Updated to latest master
* Fix last PR
* Corrected order + Pumpkaboo/Gourgeist credits
---------
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-09-16 12:12:34 -03:00
hedara90
3433567188
Gourgeist and Pumpkaboo follower sizes ( #5390 )
...
* Gourgeist sizes
* Gourgeist all sizes
* Pumpkaboo small
* Added all sizes of Pumpkaboo
* Resized Gourgeist (no more Titan)
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-15 15:28:04 -03:00
Bassoonian
0b429a8649
Merrp merge (September 9th) ( #5359 )
2024-09-15 13:21:39 +02:00
Eduardo Quezada
f720916633
CI fix attempt
2024-09-15 02:25:12 -03:00
Alex
0d7c193e4c
fixes Micle Berry not increasing accuracy on the next turn ( #5358 )
...
* fixes Micle Berry not increasing accuracy on the next turn
* adds bitfield instead of using protect struct
* test from pawkkie
* ndebug
* renaming
* delete redundant comment
* typo
* micle berry more detailed descriptions
2024-09-14 19:55:03 -04:00
Liamjd14
9d483cee5d
Enable asym for followers issue #5382 ( #5385 )
...
* Applies asym code to followers
galarian slowbro
tinkaton line
scovillain
2024-09-14 20:21:34 +02:00
Pawkkie
79776bf6bb
ShouldSwitchIfWonderGuard tests and cleanup ( #5383 )
2024-09-14 10:45:26 +02:00
Eduardo Quezada
5954d662a5
Rebuild of makefile 7: Test Runner
2024-09-13 15:26:42 -03:00
Eduardo Quezada
bee1452c8e
Rebuild of makefile 6: File-specific stuff
2024-09-13 14:38:43 -03:00
Eduardo Quezada
5ea1f39a9d
Rebuild of makefile 5: trainerproc
2024-09-13 14:27:40 -03:00
PhallenTree
c7e1e857f3
Fix After You/Shell Trap not updating battlers' actions correctly ( #5384 )
2024-09-13 18:17:59 +02:00
PhallenTree
100c7dd8ad
Fixes Powder (status) interactions + tests ( #5370 )
...
* Simplified fix from #4638
* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge
* Powder Tests
* Remove duplicate
* Assume Powder is a powder move
* Add config for Powder Rain interaction
* Only primal rain
* Z-Moves fix handled in Canceller_Z_Moves
* Fix BattleScript name
* Make sure Z-Move + Powder still damages user
2024-09-13 18:08:23 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example ( #5309 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
Eduardo Quezada
8c0580828f
Apply suggestions from code review
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-13 09:27:16 -03:00
Alex
3d8b73300a
Fixes Multi Hit moves removing destiny bond flag in the middle of attack ( #5377 )
2024-09-12 17:46:59 -04:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
Eduardo Quezada
5790200e2d
Rebuild of makefile 4: Teachable learnset helper
2024-09-11 20:05:18 -03:00
Eduardo Quezada
5f8c915826
Rebuild of makefile 3: ANALYZE
2024-09-11 19:40:52 -03:00
Eduardo Quezada
83872ab89f
Rebuild of makefile 2: -Wall and UNUSED_ERROR
2024-09-11 19:31:40 -03:00
Eduardo Quezada
20e937a724
Rebuild of makefile 1: Modern as default
2024-09-11 16:33:11 -03:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Eduardo Quezada
cdf781f726
Fixed Toxic Thread stat increase ( #5369 )
2024-09-11 11:18:58 +02:00
hedara90
c57d149003
Fixes with Pledge combos and absorption abilities ( #5364 )
...
* Fixes with Pledge combos and absorption moves
* Fixed incorrect merge
* Removed superflous if statement
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-10 23:53:55 +02:00
