Hedara
|
85d3de7561
|
Merge branch 'master' into master-merge
Conflicts:
docs/tutorials/mon_generation.md
src/battle_ai_main.c
src/pokemon_sprite_visualizer.c
test/battle/ai/ai_switching.c
|
2026-03-20 22:48:44 +01:00 |
|
Eduardo Quezada
|
021882000e
|
Clean unused function from header (#9541)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-03-18 22:56:42 +01:00 |
|
Alex
|
f6a838e1d8
|
Adds ai calcs for Bolt Beak, Payback and Analytic (#9548)
|
2026-03-18 22:55:18 +01:00 |
|
Pawkkie
|
2c965d02b6
|
Switch AI sees stat, volatile, status, and HP changes on switchin in calcs (#9124)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-18 11:10:03 -04:00 |
|
Bassoonian
|
b4c311a308
|
Add Species enum (#9507)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>
|
2026-03-17 12:47:48 +00:00 |
|
Eduardo Quezada
|
730d0a1fe8
|
Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge
|
2026-03-14 15:45:44 -03:00 |
|
Alex
|
60eeba987f
|
Minor IsBattlerWeatherAffected refactor (#9510)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-13 19:18:44 +00:00 |
|
Alex
|
c114dfbc84
|
Refactor Sky Drop and rampage confusion (#9249)
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
|
2026-03-10 16:12:28 +00:00 |
|
Alex
|
8e89d71b52
|
Fix order of failure for spread moves (#9472)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-03-08 17:14:49 +01:00 |
|
Alex
|
0c20d91508
|
Refactor synchronize and cure berry timing (#9446)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-07 15:38:53 +00:00 |
|
Alex
|
138a8f90c6
|
Minor dancer clean up/consolidation (#9417)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2026-03-06 15:15:14 +00:00 |
|
Alex
|
563f5fef7c
|
Fling Refactor (#9176)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-03 10:43:00 +01:00 |
|
Alex
|
9b3157ab1f
|
Adds bridge between battle engine and ai calcs (#9116)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-01 14:30:50 -05:00 |
|
GGbond
|
3278f4b1d4
|
AI avoids bad moves when a faster foe is predicted to go semi-invulnerable (#9358)
|
2026-03-01 12:56:07 -05:00 |
|
PhallenTree
|
cf18d086b6
|
Adds CancelerSetTargets and improves Pre Attack Effects (#9178)
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
|
2026-02-14 20:54:01 +01:00 |
|
Hedara
|
0c447063e1
|
Merge branch 'master' into master-merge
Conflicts:
data/battle_anim_scripts.s
include/battle_util.h
include/constants/expansion.h
src/battle_anim_dark.c
src/battle_anim_effects_1.c
src/battle_anim_normal.c
src/battle_hold_effects.c
src/battle_script_commands.c
src/battle_util.c
src/debug.c
|
2026-02-04 12:46:59 +01:00 |
|
PhallenTree
|
022f5eb52e
|
Fixes Infiltrator and adds config for Substitute interaction (#9073)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-01-30 14:14:35 +01:00 |
|
PhallenTree
|
502ff9ed8a
|
Fixes Fling Booster Energy being prevented by target Paradox mon (#9050)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-01-29 19:01:37 +01:00 |
|
Eduardo Quezada
|
278739ee66
|
Form Change Improvements (#8850)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-01-29 00:35:08 +01:00 |
|
Eduardo Quezada
|
4a4a72f9fb
|
Added enum BattlerId type checks (#8954)
|
2026-01-28 09:32:03 +01:00 |
|
Alex
|
da62ebcffd
|
Move attack canceler to the move resolution file (#8921)
|
2026-01-21 12:11:37 +01:00 |
|
Alex
|
6c05a08750
|
Refactor OHKO Moves (#8916)
|
2026-01-21 11:55:30 +01:00 |
|
Bassoonian
|
36fcd9c6b2
|
Adds `Item` enum (#8897)
|
2026-01-17 02:26:09 -08:00 |
|
Bassoonian
|
786c3d948f
|
Battle file cleanup & documentation (#8903)
|
2026-01-14 12:17:21 +01:00 |
|
Alex
|
bb41e5622c
|
Refactor move target failure (#8696)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2026-01-13 15:13:38 -08:00 |
|
Alex
|
550469891a
|
Add setpreattackadditionaleffect and use it for brick break / spectra… (#8719)
|
2026-01-12 17:13:39 +01:00 |
|
Alex
|
c76c3b37bb
|
Refactor protect failure to match vanilla (#8832)
|
2026-01-10 18:23:01 +01:00 |
|
PhallenTree
|
bda2064ecf
|
Fixes Chilly Reception displaying its message when called by another move (#8795)
|
2026-01-04 16:50:43 +01:00 |
|
Bassoonian
|
01fd137182
|
Convert `IsMonBannedFromSkyBattles` table to species flag (#8793)
|
2026-01-04 16:03:15 +01:00 |
|
Bassoonian
|
66df755e9a
|
Extra enum typechecking (#8786)
|
2026-01-04 12:48:21 +01:00 |
|
Bassoonian
|
3755e51a24
|
Move enum (#8739)
|
2026-01-03 17:43:48 +01:00 |
|
AlexOn1ine
|
a1948b7c40
|
01/01/26 Master to upcoming merge
|
2026-01-01 10:24:19 +01:00 |
|
grintoul
|
a71fc91484
|
Trainer slides for multiple trainers and multibattles (#7588)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-12-30 20:28:53 +00:00 |
|
Alex
|
3a8fdf9fad
|
Create battle_move_resolution.c (#8703)
|
2025-12-29 16:13:45 +01:00 |
|
PhallenTree
|
d5c40bbbdd
|
Add Move End Faint Block (#8673)
|
2025-12-28 20:44:39 +01:00 |
|
Alex
|
ac221a3aa8
|
Fix incorrectly applied change in atkcanceler (#8641)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-12-24 01:16:26 +01:00 |
|
Alex
|
644b04a9f4
|
Move Explosion to attackcanceler and Terrain Boost effect (#8612)
|
2025-12-22 18:52:28 +01:00 |
|
ghostyboyy97
|
a901d227cc
|
fix (scoring): AI_IsMoveEffectInPlus - AI should not see secondary effect of Sheer Force boosted moves as beneficial (#8579)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-12-19 12:40:46 -05:00 |
|
Hedara
|
e4ae9317c9
|
Merge branch 'master' into master-to-upcoming
Manual fixes to Lunar Dance handling
Conflicts:
include/battle_util.h
src/battle_ai_main.c
src/battle_ai_switch.c
src/battle_ai_util.c
src/battle_end_turn.c
src/battle_script_commands.c
src/battle_util.c
test/battle/ai/ai_doubles.c
test/battle/move_effect/snatch.c
test/battle/spread_moves.c
|
2025-12-19 15:31:37 +01:00 |
|
Alex
|
71a1967b7b
|
Move target type refactor (#8513)
|
2025-12-18 13:12:41 +01:00 |
|
FosterProgramming
|
bf0e1b1a86
|
Add missing behavior when using focus punch while surviving an OHKO move (#8484)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-12-17 00:56:59 +01:00 |
|
Alex
|
4ae2f03e02
|
Move disable struct members to battle mon volatiles (#8540)
|
2025-12-16 15:53:35 +01:00 |
|
moostoet
|
755bec128b
|
Fix incorrect "last to move" check for Analytic, Snatch, and Magic Coat (#8536)
|
2025-12-15 15:56:17 +01:00 |
|
Pawkkie
|
612ff122bf
|
Fix switch AI caring about super effective Snore (#8500)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-12-15 10:27:33 +01:00 |
|
Alex
|
5509268d6b
|
Fix potential bug with CanBattlerGetOrLoseItem (#8518)
|
2025-12-13 13:14:48 -05:00 |
|
Alex
|
889d11fa02
|
Add fieldStatuses argument to Ai_CalcDamage for switch in calc (#8490)
|
2025-12-10 11:50:26 -05:00 |
|
Eduardo Quezada
|
04da8aa285
|
Allow Starting Statuses beyond 15 (#8485)
|
2025-12-09 16:24:23 +01:00 |
|
AlexOn1ine
|
23cefec579
|
08/12/25 master to upcoming merge
|
2025-12-08 18:15:19 +01:00 |
|
Alex
|
a42f921939
|
Streamline unable to use move flags (#8415)
|
2025-12-07 18:41:48 +01:00 |
|
Alex
|
0fd0e50d8a
|
Renames for struct BattleContext and DamageContext (#8426)
|
2025-12-04 13:52:15 -05:00 |
|