hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +02:00 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02:00 |
|
Alex
|
afcba8d9cd
|
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719)
|
2025-04-29 23:25:56 +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 |
|
Alex
|
1cd4d23969
|
Fixes Z and Max moves dmg reduction against side protection (#6697)
|
2025-04-26 21:46:41 +02:00 |
|
hedara90
|
5cd7bd77b3
|
Fix various Toxic Spikes interactions (#6690)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-24 17:06:47 +02:00 |
|
Alex
|
20799d5835
|
Remove misleading comment (#6684)
|
2025-04-23 14:24:25 +02:00 |
|
Alex
|
71cfab6477
|
Fixes Magician Life Orb interaction (#6676)
|
2025-04-22 21:01:00 +02:00 |
|
PhallenTree
|
007d7e712e
|
Fixes Neutralizing Gas activating again after switch-in (#6667)
|
2025-04-21 19:14:53 +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 |
|
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
|
fedbce510b
|
Fixes commander activation on a fainted mon (#6632)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:49:18 +02:00 |
|
Eduardo Quezada
|
c650199909
|
Added missing gMovesInfo encapsulation (#6656)
|
2025-04-20 22:36:27 +02:00 |
|
Bivurnum
|
d342b373f0
|
Fix no eligible mons when only the partner wins in multi battle (#6626)
|
2025-04-19 14:15:13 +02:00 |
|
Alex
|
6b09480912
|
Fixes some restore issues (#6629)
|
2025-04-18 16:57:04 -04:00 |
|
Alex
|
37f72bb237
|
Fix Mirror Armor and Obstruct interaction (#6630)a
|
2025-04-18 16:21:57 -04:00 |
|
AlexOn1ine
|
2d1b2f28c4
|
Fixes Gulp Missile freezing the game if when attacker fainted
|
2025-04-17 19:46:16 +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 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
Alex
|
edb196e851
|
Fixes Red Card against Dynamaxed mons (#6526)
|
2025-04-02 14:28:53 +02:00 |
|
Hedara
|
881d924cf3
|
Fix using items to heal partner in battle
|
2025-04-01 10:38:12 +02:00 |
|
Alex
|
093e265515
|
Fixes Destiny Bond against Dynamax no failing (#6501)
|
2025-03-30 14:18:21 +02:00 |
|
Alex
|
388389714b
|
Rename removelishtscreenreflect to removescreens (#6495)
|
2025-03-30 10:52:24 +02:00 |
|
Alex
|
adf4928fe0
|
Fixes timesGotHit not increasing on forced switch out (#6493)
|
2025-03-29 19:33:50 +01:00 |
|
Alex
|
79a2ec1ce2
|
Fixes Emergency Exit and Eject Pack (#6459)
|
2025-03-29 14:04:01 +01:00 |
|
Alex
|
ce3d6a924a
|
Fixes clear body type effect and clear amulet against protect effects (#6482)
|
2025-03-28 11:35:06 +01:00 |
|
Alex
|
10412e1a47
|
Fixes protective pads against Protects secondary effects (#6474)
|
2025-03-25 16:30:15 +01:00 |
|
hedara90
|
ecab04d881
|
Sucker punch vs struggle (#6475)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-25 13:22:41 +01:00 |
|
Alex
|
1d6d6a2bdf
|
Fixes choice move locking at the wrong time (#6467)
|
2025-03-24 14:59:36 +01:00 |
|
Alex
|
b93976c980
|
Fixes Cheek Pouch mutating damage (#6466)
|
2025-03-23 23:34:24 +01:00 |
|
Alex
|
8dfd3bd278
|
Fixes Magic Coat message when move is bounced back (#6419)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-03-19 13:57:48 +01:00 |
|
Alex
|
4193963096
|
Fixes Cotton Spore failing if one of the targets blocks it (#6418)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
|
2025-03-18 15:41:37 +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 |
|
Alex
|
079017549d
|
Wrong argumet usage in CalcCritChanceStage (#6429)
|
2025-03-16 14:58:46 +01:00 |
|
hedara90
|
3ca4ce2444
|
Fixed Parental Bond with two-turn attacks (#6408)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-12 20:54:32 +01:00 |
|
Alex
|
3def0e751b
|
Fixes crash damage move against absorbing abilities (#6361)
|
2025-03-09 20:54:58 +01:00 |
|
PhallenTree
|
fe4046a900
|
Fix tests
|
2025-03-04 11:34:07 +00:00 |
|
PhallenTree
|
e750dca08a
|
Reorder Dancer activation
|
2025-03-04 11:02:33 +00: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 |
|
Hedara
|
06d31bc8ea
|
Merge branch 'master' into final-1.10-master-upcoming-merge
|
2025-02-26 22:07:10 +01:00 |
|
hedara90
|
56a3819b61
|
Fixed protect not resetting the counter in earlier gens (#6342)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-26 15:07:54 +01:00 |
|
Alex
|
cf481b1343
|
Fixes recoil moves causing recoil when absorbed (#6341)
|
2025-02-26 10:43:23 +01:00 |
|
Alex
|
13acf18d74
|
Fixes effect paralyze not being absorbed by absorbing abilities (#6338)
|
2025-02-25 22:28:10 +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 |
|
PhallenTree
|
9479b67964
|
Remove pursuitSwitchByMove and additional if statement (#6326)
|
2025-02-23 11:49:00 +01:00 |
|
Alex
|
3dd0f95ddd
|
Fixes Tera Shell activating on moves that have no effect on target (#6271)
|
2025-02-21 23:11:07 +01:00 |
|
Eduardo Quezada
|
fe7ed22f5b
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-20 19:44:00 -03: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 |
|