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 |
|
spindrift64
|
f4f82f2394
|
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814)
|
2025-05-10 22:55:28 +02:00 |
|
Alex
|
6fe5f6530a
|
General MoveEnd clean up and Fell Stinger adjustments (#6674)
|
2025-05-07 00:30:43 +02:00 |
|
Alex
|
4e7b1f2a97
|
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762)
|
2025-05-06 12:07:01 +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 |
|
Eduardo Quezada
|
d2a4b5ef84
|
Changed Tackle for Scratch in tests (#6730)
|
2025-04-30 17:18:52 -04: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 |
|
Alex
|
afcba8d9cd
|
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719)
|
2025-04-29 23:25:56 +02:00 |
|
Pawkkie
|
7a3cf5d3a3
|
Improve AI's defense against Focus Punch (#6713)
|
2025-04-28 08:34:09 +02:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +02:00 |
|
Alex
|
87bd59b6f4
|
Fixes Z and Max moves dmg reduction against side protection - upcoming (#6698)
|
2025-04-26 23:37:15 +02:00 |
|
Alex
|
1cd4d23969
|
Fixes Z and Max moves dmg reduction against side protection (#6697)
|
2025-04-26 21:46:41 +02:00 |
|
Bassoonian
|
d53c616e06
|
Adds a whole bunch of new tests (#6685)
|
2025-04-24 20:13:03 +02:00 |
|
Alex
|
d3fe5c4640
|
Some Me First tests plus minor clean up (#6678)
|
2025-04-23 12:18:57 +02:00 |
|
Alex
|
dfb1cd2ec0
|
Refactor hit escape moves to use moveend (#6671)
|
2025-04-21 22:52:55 +02:00 |
|
AlexOn1ine
|
e2e012c3a9
|
conflicts
|
2025-04-21 15:50:57 +02:00 |
|
Alex
|
db7e45f1d6
|
Sky Drop clean up and tests (#6218)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 23:07:46 +02:00 |
|
Eduardo Quezada
|
c650199909
|
Added missing gMovesInfo encapsulation (#6656)
|
2025-04-20 22:36:27 +02:00 |
|
PhallenTree
|
bd64ab599b
|
Fixes Ally Switch cancelling partner's moves targeting that side of the field (#6647)
|
2025-04-19 20:24:00 +02:00 |
|
AlexOn1ine
|
fd0766c7fa
|
17-04-25-master-merge
|
2025-04-17 14:14:37 +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 |
|
Alex
|
4aca2fdcd3
|
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-10 15:01:02 +02:00 |
|
AlexOn1ine
|
e8cc3c81f8
|
conflicts
|
2025-04-06 14:59:12 +02:00 |
|
Alex
|
5b9077e207
|
Refactor / Simlify Cmd_adjustdamage and remove redundancy (#6499)
|
2025-04-02 23:52:54 +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
|
adf4928fe0
|
Fixes timesGotHit not increasing on forced switch out (#6493)
|
2025-03-29 19:33:50 +01:00 |
|
hedara90
|
8b3428923c
|
Changed KNOWN_FAILING test (#6492)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-28 21:20:50 +01:00 |
|
Alex
|
ce3d6a924a
|
Fixes clear body type effect and clear amulet against protect effects (#6482)
|
2025-03-28 11:35:06 +01:00 |
|
AlexOn1ine
|
ae640f0714
|
25-03-25 master to upcoming merge
|
2025-03-25 21:39:58 +01:00 |
|
hedara90
|
ecab04d881
|
Sucker punch vs struggle (#6475)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-25 13:22:41 +01:00 |
|
AlexOn1ine
|
3c632b8b44
|
19-03-25 master to upcoming merge
|
2025-03-19 17:12:47 +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 |
|
PhallenTree
|
cf9ee2caee
|
Fixes Toxic Spikes Absorbed message (#6448)
|
2025-03-19 13:46:23 +01:00 |
|
hedara90
|
7663fb8870
|
Move category test cleanup (#6447)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-19 13:44:46 +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
|
bd2d9f63ea
|
Fixes hazards not respecting tera types (#6431)
|
2025-03-16 22:05:21 -04:00 |
|
AlexOn1ine
|
4adb908a6b
|
review comments
|
2025-03-12 23:41:28 +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 |
|
AlexOn1ine
|
06315ff084
|
first review batch
|
2025-03-08 21:24:22 +01:00 |
|
Alex
|
7a3acdf7fe
|
Change ability to abilityNum in CreateTrainerMon (#6370)
|
2025-03-03 08:58:37 +01: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 |
|
Pawkkie
|
b109c4c36b
|
Fix Substitute / Shed Tail Switch AI (#6334)
|
2025-02-25 13:06:39 +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 |
|