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 |
|
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
|
8d5d7c7fca
|
Fixes ai moves being recorded without correct index (#6803)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-10 19:38:48 +02:00 |
|
spindrift64
|
3b91a964c9
|
Fix Iron Ball type effectiveness check (#6794)
|
2025-05-09 22:23:44 +02:00 |
|
PhallenTree
|
48c08c0368
|
Illusion struct cleanup and many Illusion fixes (#6798)
|
2025-05-09 20:41:20 +02:00 |
|
Pawkkie
|
da047dfd22
|
Add AI for Zero to Hero Palafin (#6791)
|
2025-05-08 20:33:27 +02:00 |
|
spindrift64
|
5e190d0782
|
Fix gems activating for moves that don't deal type damage (#6789)
|
2025-05-08 20:17:32 +02:00 |
|
hedara90
|
b6b6e91959
|
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-07 16:50:12 +02:00 |
|
Alex
|
7c4fb512a1
|
Fixes Symbiosis not triggering when a weakness berry was consumed (#6782)
|
2025-05-07 11:04:11 +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 |
|
Pawkkie
|
c8fa4442d9
|
Adjust switch AI based on move scoring (#6615)
|
2025-05-06 00:39:44 +02:00 |
|
spindrift64
|
0742741dd3
|
Fix Life Orb inflicting self damage when using status moves (#6767) (#6773)
|
2025-05-04 22:26:12 +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 |
|
hedara90
|
ccda2308a3
|
Add AI_FLAG_PP_STALL_PREVENTION (#6743)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-02 11:30:09 -04:00 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +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
|
96a8035dec
|
Fix party data assignment (#6712)
|
2025-04-28 08:48:21 +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 |
|
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 |
|
PhallenTree
|
34e91dd96f
|
Fixes Unburden doubling speed when affected by Neutralizing Gas (#6691)
|
2025-04-24 15:26:23 +02:00 |
|
Alex
|
d3fe5c4640
|
Some Me First tests plus minor clean up (#6678)
|
2025-04-23 12:18:57 +02:00 |
|
Alex
|
71cfab6477
|
Fixes Magician Life Orb interaction (#6676)
|
2025-04-22 21:01:00 +02:00 |
|
PhallenTree
|
91fc406b0a
|
Fixes Mirror Armor stat drops not being stopped by Substitute (#6675)
|
2025-04-22 19:54:04 +02:00 |
|
Alex
|
72839fc002
|
Fixes Bug Bite eaten berry not ignoring Unnerve (#6666)
|
2025-04-22 00:38:39 +02:00 |
|
Alex
|
dfb1cd2ec0
|
Refactor hit escape moves to use moveend (#6671)
|
2025-04-21 22:52:55 +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 |
|
AlexOn1ine
|
e2e012c3a9
|
conflicts
|
2025-04-21 15:50:57 +02:00 |
|
Eduardo Quezada
|
4e7fa359ef
|
Fixed LGPE move test fail with B_UPDATED_MOVE_DATA to GEN_7 (#6657)
|
2025-04-21 14:48:49 +02:00 |
|
cawtds
|
0069ec1f0c
|
Fix captivate-oblivious interaction and related test (#6653)
|
2025-04-21 11:01:01 +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 |
|
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 |
|
Alex
|
5c02abb101
|
Test for Freeze vs Scald thaw (#6658)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:36:50 +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 |
|
Alex
|
37f72bb237
|
Fix Mirror Armor and Obstruct interaction (#6630)a
|
2025-04-18 16:21:57 -04:00 |
|
Alex
|
2a03f881d4
|
Fixes Big Root Leech Seed heal amount (#6638)
|
2025-04-18 16:07:18 -04:00 |
|
hedara90
|
031fd4d363
|
Fixed Color Change test referring to the wrong mon (#6644)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-18 16:06:22 -04:00 |
|
AlexOn1ine
|
2d1b2f28c4
|
Fixes Gulp Missile freezing the game if when attacker fainted
|
2025-04-17 19:46:16 +02:00 |
|