Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects ( #7002 )
2025-06-25 21:15:40 +02:00
Alex
773ecd4c24
Fixes OOB for Teatime and Flower Shield ( #7214 )
2025-06-25 21:00:49 +02:00
Alex
7d7ffd58ae
Fixes Booster Energy timing activation + Clean up ( #7175 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-06-25 18:20:55 +02:00
Alex
f8551830c9
Adds Gen5+ Encore config ( #7051 )
2025-06-25 15:58:30 +02:00
Hedara
51a5577f65
Merge branch 'master' into master-upcoming
...
Conflicts:
src/battle_controller_safari.c
src/data/moves_info.h
src/graphics.c
2025-06-25 14:17:07 +02:00
Alex
66e8200d95
Use battler arguments for SetMoveEffect ( #7156 )
2025-06-23 15:26:31 +02:00
PhallenTree
98670ca30e
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again ( #7170 )
2025-06-21 00:04:01 +02:00
AlexOn1ine
aabb632894
Master to upcoming merge, 20/06/25
2025-06-20 17:09:58 +02:00
Alex
57feee3743
Add missing flag for Berserk Gene ( #7151 )
2025-06-19 14:26:28 +02:00
PhallenTree
340d815c6d
Stat Change (Animation) Refactor ( #7144 )
2025-06-18 14:24:35 +02:00
Nephrite
06cd3af3ea
Volatile status refactoring ( #6983 )
2025-06-18 07:22:41 +02:00
Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change ( #7139 )
2025-06-17 00:02:25 +02:00
Alex
e2f0767be5
Decouple Status set by ability from SetMoveEffect ( #7125 )
2025-06-16 14:45:21 +01:00
Alex
c120fa71dc
Fixes Ally Switch in multi battles ( #7109 )
2025-06-13 15:18:27 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) ( #7107 )
2025-06-13 14:12:13 +02:00
Hedara
bdd7c5bfa8
Merge branch 'master' into master-merge
...
Conflicts:
src/contest_painting.c
2025-06-09 23:27:18 +02:00
kittenchilly
872bb8785b
Simplify white out messages ( #6961 )
2025-06-08 08:52:37 -07:00
Alex
f374291f69
Fixes Wandering Spirit copied ability activation on fainted mon ( #7066 )
2025-06-05 22:47:32 +02:00
Alex
020be9d5b0
Deprecate sStatusFlagsForMoveEffects ( #7063 )
2025-06-05 14:32:28 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects ( #7048 )
2025-06-03 10:26:25 +02:00
Alex
ede15918cf
Refactors Final Gambit + Tests ( #7005 )
2025-05-31 15:52:53 +02:00
PhallenTree
fa342b2909
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup ( #7004 )
2025-05-31 08:45:46 +02:00
AlexOn1ine
f4c64a2d79
conflicts
2025-05-30 19:20:32 +02:00
Alex
5bdab5163e
Update Supersweet Syrup with eject pack fix ( #7015 )
2025-05-30 11:58:32 +02:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing ( #6993 )
2025-05-27 23:36:00 +02:00
Alex
de463af0df
Fixes weather anim damage being applied to the wrong mon ( #6973 )
2025-05-26 13:22:05 +02:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
Vex
7b686b6749
Fix Wish healing even if the target is Heal Blocked ( #6979 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-25 23:01:11 +02:00
Eduardo Quezada
9554146738
Fixed forfeit money for B_WHITEOUT_MONEY <= GEN_3 ( #6942 )
2025-05-22 14:27:28 +02:00
Bassoonian
54806c8838
Add no-whiteout feature ( #6795 )
2025-05-17 11:20:35 +02:00
AlexOn1ine
35dff24c9b
Master to upcoming merge
2025-05-15 20:37:27 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect ( #6806 )
2025-05-15 10:45:48 +02:00
Alex
75cd16dae0
Fix potential bug in BattleScript_FriskActivates ( #6850 )
2025-05-15 10:44:37 +02:00
Jonathan Lin
b5fbced691
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct ( #6834 )
2025-05-15 09:40:02 +02:00
Eduardo Quezada
3ef61e6451
Combined type-enhancing hold effects ( #6846 )
2025-05-14 13:45:08 +02:00
ghoulslash
d4c64d3b67
rename berrystatraise script to consumablestatraise
2025-05-12 21:11:25 -04:00
ghoulslash
14a66d612f
combine BattleScript_BerryStatRaiseRet and BattleScript_BerryStatRaiseEnd2, check ripen popup doesn't trigger except on berries
2025-05-12 21:06:12 -04:00
Hedara
1abfa7acfa
Merge branch 'master' into master-upcoming
...
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
PhallenTree
a6b02b00c0
Fixes restoretarget on empty stack when using G-Max Gravitas ( #6827 )
2025-05-12 15:16:40 +02:00
Alex
d00563d830
Changed White Herb hold effect name ( #6815 )
2025-05-11 11:34:47 +02:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop ( #6813 )
2025-05-11 11:34:16 +02:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned ( #6814 )
2025-05-10 22:55:28 +02:00
Alex
4342bfb91d
Refactor stockpile resets ( #6810 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-05-10 20:09:38 +02:00
PhallenTree
48c08c0368
Illusion struct cleanup and many Illusion fixes ( #6798 )
2025-05-09 20:41:20 +02:00
Alex
6fe5f6530a
General MoveEnd clean up and Fell Stinger adjustments ( #6674 )
2025-05-07 00:30:43 +02:00
AlexOn1ine
40bf9ae087
conflicts
2025-05-03 10:26:07 +02:00
Alex
9259b7ee69
Bugfixes batch ( #6750 )
2025-05-02 20:14:27 +02:00
Alex
4ff2f3de42
Centralizes non volatile status effect checks ( #6533 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-04-30 11:34:19 -04:00
Hedara
0eeba00d1b
Merge branch 'master' into master-upcoming-2025-04-30
...
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00
Hedara
4873589c65
Merge remote-tracking branch 'pret/master' into new-pret-merge
...
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
AlexOn1ine
e246b20e72
27/04/25 Master to upcoming merge
2025-04-27 09:50:25 +02:00
PhallenTree
91fc406b0a
Fixes Mirror Armor stat drops not being stopped by Substitute ( #6675 )
2025-04-22 19:54:04 +02:00
Alex
dfb1cd2ec0
Refactor hit escape moves to use moveend ( #6671 )
2025-04-21 22:52:55 +02:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction ( #6645 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-21 17:33:29 +02:00
AlexOn1ine
e2e012c3a9
conflicts
2025-04-21 15:50:57 +02:00
Alex
c4edfd2988
Fix gBattlerTarget OOB for Gravity and Perish Song ( #6662 )
2025-04-21 13:53:04 +02:00
cawtds
0069ec1f0c
Fix captivate-oblivious interaction and related test ( #6653 )
2025-04-21 11:01:01 +02:00
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget ( #6627 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:52 +02:00
Alex
6b09480912
Fixes some restore issues ( #6629 )
2025-04-18 16:57:04 -04:00
AlexOn1ine
fd0766c7fa
17-04-25-master-merge
2025-04-17 14:14:37 +02:00
Alex
446521f200
Fix regression from EndTurnRefactor ( #6616 )
2025-04-15 14:06:35 +02:00
PhallenTree
3b05d7934f
Fixes wrong battler's Illusion wearing off when the Attacker faints and fixes Illusion tests ( #6596 )
2025-04-14 18:17:24 +02:00
ghoulslash
81ed774c00
EndTurnEffectOrder Refactor ( #6224 )
2025-04-14 10:57:34 -04:00
PhallenTree
353e4ae619
Fixes Dynamax reversion animation when fainting ( #6597 )
2025-04-13 17:41:00 +02:00
Alex
4aca2fdcd3
Refactor fixed damage moves ( #6449 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 15:01:02 +02:00
psf
17d851e1f9
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles ( #6456 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 14:59:58 +02:00
Hedara
2210e2d410
Merge branch 'master' into upcoming-master
2025-04-09 11:06:38 +02:00
AlexOn1ine
b94e3298fc
dynamax fix
2025-04-06 15:25:12 +02:00
AlexOn1ine
e8cc3c81f8
conflicts
2025-04-06 14:59:12 +02:00
Alex
8dd2fee4a9
Fixes Will-O-Wisp not being blocked by Thermal Exchange ( #6534 )
2025-04-04 23:01:10 +02:00
Alex
c1f18d0765
Refactor protect to allow at least 126 different types of protect eff… ( #6506 )
2025-04-02 17:26:05 +02:00
Alex
ae62c80d0f
Refactors faint target abilities and adds Battle Bond config ( #6519 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-02 16:00:23 +02:00
Alex
edb196e851
Fixes Red Card against Dynamaxed mons ( #6526 )
2025-04-02 14:28:53 +02:00
PhallenTree
ea59e858fb
Fixes Hone Claws checking the wrong stats for its stat change animation and Stockpile drops being stopped by stat reduction prevention effects ( #6522 )
2025-04-01 21:03:04 +02:00
AlexOn1ine
0c35879e02
conflicts
2025-04-01 19:11:55 +02:00
AlexOn1ine
ccebebf64f
31-03-25 Master merge
2025-03-31 18:23:46 +02:00
Alex
388389714b
Rename removelishtscreenreflect to removescreens ( #6495 )
2025-03-30 10:52:24 +02:00
Alex
79a2ec1ce2
Fixes Emergency Exit and Eject Pack ( #6459 )
2025-03-29 14:04:01 +01:00
Alex
7ead90aeff
Fixs Aftermath ability popup message ( #6491 )
2025-03-29 09:45:59 +01:00
Bassoonian
9a23f19575
19-03-25 master to upcoming merge ( #6450 )
2025-03-20 09:57:05 +01:00
Alex
adc2c61fe8
Unifies dynamic move category checks ( #6443 )
2025-03-19 23:06:08 +01:00
AlexOn1ine
3c632b8b44
19-03-25 master to upcoming merge
2025-03-19 17:12:47 +01:00
Alex
99a3d01877
Fixes dynamax reversion when ejected out + anim fix ( #6416 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-17 19:57:38 +01:00
wiz1989
1e2aa18ffe
Added Dynamax/Gigantamax battle messages ( #6440 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-03-17 19:16:43 +01:00
PhallenTree
ddab689a07
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order ( #6435 )
2025-03-16 23:10:20 +01:00
surskitty
7193909fa7
Configuration to make all Hail moves summon Snow or vis versa, to have only one ice weather ( #6149 )
2025-03-12 21:31:45 +01:00
Alex
3def0e751b
Fixes crash damage move against absorbing abilities ( #6361 )
2025-03-09 20:54:58 +01:00
ghoulslash
d44eff4e0c
fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly
2025-03-03 14:56:08 -05:00
AlexOn1ine
0a333dbdc8
merge rhh/upcoming
2025-02-28 00:21:07 +01:00
Hedara
06d31bc8ea
Merge branch 'master' into final-1.10-master-upcoming-merge
2025-02-26 22:07:10 +01:00
Alex
13acf18d74
Fixes effect paralyze not being absorbed by absorbing abilities ( #6338 )
2025-02-25 22:28:10 +01:00
Alex
335233bab5
Update data/battle_scripts_1.s
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-02-23 22:56:46 +01:00
PhallenTree
320c6cf11f
Fixes Coaching on semi-invulnerable ally, Air Balloon being stolen, Immunity abilities being ignored by Mold Breaker ( #6327 )
2025-02-23 20:50:52 +01:00
Eduardo Quezada
fe7ed22f5b
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-20 19:44:00 -03:00
Alex
767ea38dbf
Fixes doesnt effect message for Thunder Wave ( #6304 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-20 19:18:27 -03:00
PhallenTree
f6ff64cdbe
Fixes Brick Break/Psychic Fangs/Raging Bull breaking screens if target is immune ( #6308 )
2025-02-20 12:55:10 -03:00
PhallenTree
5340dc8687
Fixes non-Ghost type Curse animation ( #6299 )
2025-02-19 18:09:06 +01:00
Alex
b2f45fcf1f
Restoretarget in Rototiller script + Tests ( #6296 )
2025-02-18 20:43:07 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up ( #6272 )
2025-02-17 22:07:30 +01:00
PhallenTree
b1c597495b
Fixes Called moves ignoring redirection ( #6267 )
2025-02-14 13:47:02 +01:00
AlexOn1ine
5ee5aa796a
merge rhh/upcoming
2025-02-12 21:01:21 +01:00
AlexOn1ine
ff47ca0f7a
fix healing after magic room ends
2025-02-12 20:16:02 +01:00
AlexOn1ine
f8b45028db
fix grassy terrain healing
2025-02-12 19:33:41 +01:00
Eduardo Quezada
3507862164
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-12 09:30:59 -03:00
AlexOn1ine
b4f17c7506
review comments
2025-02-11 12:06:16 +01:00
PhallenTree
cf5b95cee8
Fixes Expanding Force and Spectral Thief move animations ( #6185 )
2025-02-09 22:34:48 +01:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes ( #6210 )
2025-02-09 21:54:03 +01:00
AlexOn1ine
4babfd003e
rhh merge/upcoming
2025-02-09 14:04:21 +01:00
AlexOn1ine
f2bd88a7f9
EndTurnEffectsOrder Refactor
2025-02-09 13:48:08 +01:00
ghoulslash
6f541bb449
Fix Liquid Ooze + Leech Seed Test ( #6217 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-08 22:42:25 +01:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time ( #6197 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-02-07 16:24:05 -05:00
Alex
765a12f520
Convert max effects to normal move effects ( #6143 )
2025-02-06 21:02:39 -03:00
Hedara
27da389d1e
Merge branch 'master' into master-to-upcoming
2025-02-06 13:05:02 +01:00
PhallenTree
5238665a7a
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction ( #6171 )
2025-02-03 18:31:14 +01:00
Eduardo Quezada
64c5113b23
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-02 14:18:13 -03:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs ( #6154 )
2025-01-31 22:02:26 +01:00
Alex
89cfd85b8f
Fixes battler mutation during the intim script ( #6151 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-31 21:49:26 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +01:00
Eduardo Quezada
f6a86a65ef
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-19 10:32:57 -03:00
ghoulslash
37cbae5e54
Fix Symbiosis Needing battler Argument + Tests ( #6039 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-18 14:44:07 +01:00
Eduardo Quezada
ce40c3356c
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-12 08:42:57 -03:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues ( #6005 )
2025-01-12 09:49:19 +01:00
ghoulslash
03684c6539
Battle Weather Refactor ( #5833 )
2025-01-04 07:33:25 -05:00
Eduardo Quezada
a50c78bb1e
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-01 18:34:42 -03:00
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix ( #5928 )
2025-01-01 21:41:42 +01:00
Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +01:00
Alex
af19b13195
Adds Pledge Side Statuses as Starting Statuses ( #5899 )
2024-12-30 09:18:23 +01:00
Hedara
2088f2a12d
Merge branch 'master' into master-upcoming
2024-12-29 21:43:07 +01:00
ghoulslash
ca31145d36
Fix Salt Cure script ( #5895 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-29 16:51:33 +01:00
AlexOn1ine
74f1d7cb80
merge rhh/upcomig
2024-12-28 21:03:34 +01:00
AlexOn1ine
6a906a3fc1
refactor done
2024-12-28 20:55:59 +01:00
Eduardo Quezada
3bc4126558
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-28 15:28:07 -03:00
AlexOn1ine
9c34634dd6
Draft Change
2024-12-25 11:03:32 +01:00
Eduardo Quezada
e883b7c251
Fixed Wish triggering Disguise ( #5860 )
2024-12-22 23:39:17 +01:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup ( #5812 )
2024-12-21 19:45:50 +01:00
Eduardo Quezada
25075239a2
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-21 08:46:33 -03:00
kittenchilly
c3133193e2
Fix Hit Escape moves giving Exp to the mon that switches in ( #5844 )
2024-12-21 10:30:25 +01:00
Eduardo Quezada
53aebc34dd
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-20 20:48:13 -03:00
PhallenTree
742f7a4875
Fixes Cotton Down and Gulp Missile not interacting correctly with stat reduction prevention effects ( #5841 )
2024-12-20 22:24:23 +01:00
AlexOn1ine
99fef0260f
Battle Weather Refactor
2024-12-19 20:50:08 +01:00
Alex
b22a867e11
Fixes Room Service ( #5827 )
2024-12-19 14:12:01 +01:00
Alex
99ba36b446
Fixes Tidy Up ( #5819 )
2024-12-17 09:47:37 +01:00
Eduardo Quezada
66a2a16bbc
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-08 12:00:29 -03:00
iriv24
cb12bdc220
Fix No Guard failing OHKO Moves into Semi-Invulnerable Pokemon ( #5779 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-07 18:11:45 -03:00
ghoulslash
6e24b6af3d
Gravity fix + Sky Drop Test ( #5780 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-07 14:48:01 +01:00
ghoulslash
a775098e83
Fix octolock + defiant ( #5781 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-07 13:38:34 +01:00
PhallenTree
775ea3b564
Pursuit refactor ( #5707 )
2024-12-06 19:14:46 +01:00
Pawkkie
da2a1e2aba
Destiny Bond fails on repeated use in Gen 7+ ( #5652 )
2024-12-05 22:29:20 +01:00
Eduardo Quezada
a92350fb53
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-04 18:55:56 -03:00
Eduardo Quezada
e4f8b4ccf0
Addressed review changes (minus encapsulation)
2024-12-04 11:31:28 -03:00
Alex
70224f0ea3
Fixes items preventing other switch in effects ( #5732 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-12-03 11:15:29 -05:00
AlexOn1ine
d95dbadccc
merge rhh/upcoming
2024-12-02 19:00:55 +01:00
AlexOn1ine
aa61f24e81
clean up
2024-12-02 18:25:24 +01:00
AlexOn1ine
09c9d8a800
merge rhh/upcoming
2024-12-02 17:45:00 +01:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE ( #5566 )
...
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-02 09:06:03 +01:00
Eduardo Quezada
0322d51887
Split "Do nothing" move effects ( #5613 )
2024-12-02 09:05:04 +01:00
Hedara
f6fdca615f
Merge branch 'master' into master-to-upcoming
2024-11-29 11:32:12 +01:00
AlexOn1ine
97b30cb712
simultaneous hp reduction
2024-11-23 08:35:01 +01:00
Alex
612c8d3ff6
Fixes heal blocked leeach seed in tests ( #5700 )
2024-11-21 17:18:44 +00:00
PhallenTree
596b8b20f4
Fixes Neutralizing Gas crashes + adds missing interaction, Regenerator small fix ( #5694 )
2024-11-21 17:35:05 +01:00
Alex
572ea141af
Fixes Absorb regression caused by #5670 ( #5688 )
2024-11-19 14:56:34 -05:00
Eduardo Quezada
b2ef363ac8
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-19 14:19:53 -03:00
Alex
67c7106fee
Refactors Absorb to use Moveend ( #5670 )
2024-11-17 09:59:04 +01:00
hedara90
a06dc03207
Fixed curse + Protean interaction ( #5663 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-11-12 19:18:37 +01:00
hedara90
1d7e4cf8fc
Cleans up Primal Reversion code ( #5659 )
2024-11-12 13:48:06 +01:00
Alex
b55c87f73f
Fixes Take heart ( #5658 )
...
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:58:09 -05:00
Alex
a8351e305c
Fixes Red Card / Eject Pack interaction with Emergency Exit ( #5657 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:56:51 -05:00
AlexOn1ine
a3fe53dd28
Cleans up Primal Reversion code
2024-11-11 20:31:21 +01:00
Eduardo Quezada
b48e5770be
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-11 15:58:42 -03:00
Eduardo Quezada
e005ffb576
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-06 10:01:48 -03:00
Alex
8581646c22
Convert 3 variouses to callnatives ( #5646 )
2024-11-06 10:09:49 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message ( #5645 )
2024-11-06 10:09:00 +01: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
Eduardo Quezada
495de8d182
Fix Follow Me failing in Single Battles for Gen 6/7 config ( #5542 )
2024-10-19 13:59:49 -03: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
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
0a4b3a8dd7
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-12 16:23:27 -03: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
Alex
42c43a3f8f
Adds Commander and Order Up ( #5246 )
...
* Adds Commander
* review points
* new line
* correction
* regression / double targeting still broken
* fix wrong target order
* transform fixes
* haze test
* fixes, tests
* bring back wrongly removed else if case
* Eject Pack / Button test + fix
* red card fix
* test fixes
* Fixes Tatsu being hit by multi hit move
* change transform check
* fix test + revert change
* Fix Tatsugiri attacking after freed up from Dozo in the same turn
* Dragon Darts tests
* fix test
* review comments
* assumtion in wrong file
* Order Up test fixes
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-09-29 22:45:50 +02:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03: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
Bassoonian
60e2c0f859
Merge item description branch history ( #5419 )
...
* Recreated ghoul's item_desc_header branch
Fixed tabs vs spaces
Fixing whitespace
* Fixed item in header not showing on maximum flash level
* Fixed item icon being affected by thunderstorms
* Shops now set the obtained item flag.
* Fixed build
* fix seashore house
* better soda pop fix, thx asparagus
* fix item icon showing in battle pyramid
* fix hiding item desc in battle pyramid
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-22 12:05:45 +02:00
ghoulslash
4cd23a377d
anger shell use saveattacker ( #5409 )
...
* anger shell use saveattacker
* tabs instead of spaces
* add BattleScript_RestoreAttackerButItFailed for anger shell failure
* Update data/battle_scripts_1.s
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-20 18:19:45 +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
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
Eduardo Quezada
551c558186
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-11 07:28:02 -03:00
Eduardo Quezada
cdf781f726
Fixed Toxic Thread stat increase ( #5369 )
2024-09-11 11:18:58 +02:00
Alex
5089b1d0b4
Adds callnative for soundproofcheck to addtionally check the flag ( #5301 )
...
* Adds callnative for soundproofcheck to addtionally check the flag
* rename callnative, include parish song and missing ability recording
2024-09-09 06:52:26 -03:00
hedara90
d62b7270c8
Fixed trainerslide arguments ( #5344 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-09 10:49:05 +02:00
Eduardo Quezada
8533b0c045
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-03 14:39:50 -04:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons ( #5302 )
...
* Fixes Tar Shot on Tera mon
* new line
2024-08-31 12:24:28 -04:00
Eduardo Quezada
aebbe448b8
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-28 12:58:14 -04:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
Eduardo Quezada
abf60e9c64
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-24 19:44:35 -04:00
Alex
5a320f94d2
Fixes Hyperspace Fury softlock ( #5237 )
...
Fixes #5236
2024-08-21 11:43:57 -04:00
Eduardo Quezada
6ac18a6fe5
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-20 08:00:05 -04:00
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… ( #5209 )
...
* Fixes weather abilities not activating when Cloud Nine user leaves the field
* parametrize
2024-08-20 07:24:48 -04:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests ( #5170 )
...
* Adds Harvest tests
* Adds Pickup in-battle effect + tests
* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)
* Change canPickupItem to bit field
* Make RandomUniformExcept inclusive (higher end) + convert bitfield
* Use CantPickupItem in PickupHasValidTargetc check
* Review
2024-08-16 15:37:23 +02:00
Eduardo Quezada
fe275ef062
Teatime animations use B_WAIT_TIME_LONG ( #5173 )
2024-08-15 13:45:01 +02:00
Alex
4d78d5e507
Fixes Poltergeist missing accuracy check ( #5168 )
2024-08-14 12:07:01 -04:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework ( #5159 )
...
* new move anims + fickle beam rework
* more fickle beam changes
* removed the true for consistency
* ficklebeamboosted gets cleared now
* mortal spin and thunderclap changes
* minor mortal spin pal change
* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description ( #5093 )
...
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive
* Fixes Fickle Beam's description
* Alternative fix
* Remove extra newLine
2024-08-06 10:45:30 +02:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Bassoonian
cfcac0b0f9
Clean up battle scripts ( #4839 )
...
* Clean up battle and anim scripts
* Revert anim cleanup
2024-07-15 16:25:25 +02:00
Alex
edc883d038
Refactors residual damage ( #4945 )
...
* Refactors damage non types
* correction
* Refactor weather damage script
* new line
* correction
* there was a hail test already
* ndebug
* add sandstorm test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 12:12:40 +02:00
Bassoonian
003bd54600
Rename battle terrain to environment
2024-07-13 12:02:18 +02:00
Eduardo Quezada
fb708b7ed3
Merge branch '_RHH/master' into _RHH/upcoming
2024-07-10 10:05:10 -04:00
hedara90
76d760041c
Flame Burst + Substitute fix ( #4939 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-10 13:58:32 +02:00
Eduardo Quezada
de609a2f5b
Added missing redirect abilities Gen 3-4 config ( #4920 )
...
* Added missing redirect abilities Gen 3-4 config
* Combined 3 Battle Script Natives into 1
* Cleaner FindMonThatAbsorbsOpponentsMove
2024-07-07 09:52:59 +02:00
Eduardo Quezada
fcdc9ed65a
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
Alex
dd7b735211
Fixes Grassy Terrain heal turn duration ( #4903 )
2024-07-03 22:53:15 +02:00
sneed
75be596933
fix sticky hold softlock ( #4885 )
2024-06-29 18:54:58 +02:00
DizzyEggg
f2e8482488
Fix how switch-in effects are played out after multiple faints in the same turn ( #4864 )
...
* Multiple switch-ins after fainting
* empty new lines
* Fix failing tests
2024-06-24 20:37:47 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor ( #4449 )
...
* consolidated gimmick checks, triggers, communication, and activation; updated test runner
* fixed improper use of .usableGimmick
* cleaning up battle_dynamax.c, changing function args to u32s
* fixed '#ifdef TESTING' causing errors
* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests
* added support for z-moves in tests, consolidated gimmick fields
* removed ShouldUseMaxMove and .usingMaxMove
* renamed TryChangeZIndicator, updated z move display
* added several z-move tests and fixed various z-move interactions; fixed z-move category calc
* fixed useless battler arg in GetTypeBasedZMove
* added basic test check for bad Z-Move or Mega usage
* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky
* fixed gimmick test logic; fixed damage category override
* fixed mega rayquaza test fail
* consolidated gimmick indicator logic; added graphics to gGimmicksInfo
* removed TeraData struct
* reimplemented AI logic for Z-Moves; no changes
* updated Z-Move and Ultra Burst trigger gfx
* added testrunner check for multiple gimmick use
* fixed duplicate z-move call in test
* reorganized data/graphics/gimmicks.h
* added signature Z-Move ability tests; implemented Guardian of Alola
* fixed bad test update
* fixed Thousand Arrows not affecting Tera Flying; clean-up
* fixed -ate tests
* fixed tera tests
* fixed tera tests really
* fixed last batch of tests
* fixed -ate mega test again
* code review
* code review pt.2
* tweaked CanTera again
* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
DizzyEggg
d0bb03e5a9
Fix AI's right slot switching-in too early ( #4851 )
...
* apply safe switching to trainer doubles battles - with a config
* get rid of the config
* make it compile
2024-06-21 12:17:12 +02:00
Eduardo Quezada
4d6452e14e
Move general config file to the config folder ( #4805 )
2024-06-19 13:42:01 +02:00
Bassoonian
a24b767276
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun
2024-06-18 15:27:06 +02:00
kittenchilly
a118b2caa8
Fix Booster Energy ability popup and message ( #4804 )
2024-06-14 20:22:26 -04:00
DizzyEggg
2716ec5b03
Fix Pursuit not getting Choice-locked on switch-out ( #4801 )
...
* Fix Pursuit not getting Choice-locked on switch-out
* use label
2024-06-14 12:46:03 +02:00
Eduardo Quezada
06153e4280
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle.h
# include/constants/battle_script_commands.h
# include/constants/pokemon.h
# src/battle_ai_util.c
# src/battle_main.c
# src/battle_util.c
# test/battle/ai.c
2024-06-13 11:44:28 -04:00
DizzyEggg
349b402f1b
Fix Soul-Heart changing stats of wrong battler ( #4785 )
2024-06-13 10:57:20 +02:00
Alex
9c72392891
Fixes Shell Side Arm ( #4753 )
...
* Fixes Shell Side Arm
* Fixes to random call
* hardcoded the effect to the move
* minor change
* minor change 2
* applied reviews
2024-06-12 11:21:44 +02:00
Bassoonian
dffaaeaaa6
Add Leader's Crest evolution method ( #4768 )
...
* Add Leader's Crest evolution method
* Fix typo in in HGSS dex
* Update src/pokedex_plus_hgss.c
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
* Update src/battle_script_commands.c
---------
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-12 09:31:59 +02:00
Eduardo Quezada
dce10ab705
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/species.c
2024-06-04 16:47:29 -04:00
kittenchilly
7f8f480ecb
Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types ( #4438 )
...
* Add FORM_CHANGE_BATTLE_TERASTALLIZATION and allow species to force tera types
* Fix form change not changing tera type
* Update form_species_tables.h
* Address reviews
* Can't change the forced Tera Type anymore
* Revert "Can't change the forced Tera Type anymore"
This reverts commit 67157250ef
2024-06-04 13:38:49 +02:00
sneed
e60e6b6008
Fix Mirror Armor and Sticky Web interaction ( #4713 )
...
* fix Mirror Armor and Sticky Web interaction
* fix strings
2024-06-03 21:19:54 +02:00
PhallenTree
085c2f3d43
Moves activation of Guard Dog from HitEscape to HitSwitchTarget ( #4690 )
...
* Removes incorrect activation of Guard Dog
* Adds Guard Dog check on Dragon Tail, Circle Throw
2024-06-02 08:32:18 +02:00
Eduardo Quezada
c79188e3b3
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
# src/battle_util.c
2024-05-31 12:04:33 -04:00
Alex
f6e00303b7
Fixes Neutralizing Gas / Intim interaction freezing the game ( #4668 )
2024-05-31 00:08:04 +02:00
Alex
2c32da6b0a
Update battle_scripts_1.s ( #4653 )
...
#4061 change `ABILITY_FRISK` to use `gBattleScripting.battler` but the script wasn't fully updated. BS_ATTACKER needed to be changed to `BS_SCRIPTING`
2024-05-29 22:30:23 +02:00
ghoulslash
7b1248b167
add savedBattlerAttacker and stack for saved target/attacker ( #4061 )
...
* add saveattacker/savetarget stack
* add safety checks to savedAttackerCount/savedTargetCount
* add testing warnings for saveattacker/savetarget
* update frisk with saveattacker
* restoretarget at end of red card battle scripts, remove testing checks on SaveAttacker,SaveTarget
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-29 21:50:24 +02:00
Alex
0570609ce6
Small Ability Effect Move Block refactor ( #4635 )
...
* Small Ability Effect Move Block refactor
* combine tests
2024-05-28 10:34:05 +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
acd62b0065
Reverted bad implementation of Sparkling Aria+Covert Cloak/Shield Dust ( #4634 )
2024-05-27 06:38:05 +02:00
Eduardo Quezada
ee1d0339f9
Fixed HITMARKER_PASSIVE_DAMAGE whitespace ( #4629 )
2024-05-26 19:37:58 +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
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
57ec87387d
Fixes freeze on Galvanize Explosion against Volt Absorb ( #4601 )
2024-05-19 21:29:54 +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
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
Isaac Rivera
e5b33a0434
Add check for Magic Guard to avoid taking recoil damage ( #4578 )
...
* Add check for Magic Guard to avoid taking recoil damage
* add test to verify a mon with magic guard does not take recoil damage
followed format from "Steel Beam hp loss is prevented by Magic Guard" test
* update format of tests with magic guard and some form of recoil damage
2024-05-15 15:40:40 +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
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
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
