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 |
|
Alex
|
f374291f69
|
Fixes Wandering Spirit copied ability activation on fainted mon (#7066)
|
2025-06-05 22:47:32 +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 |
|