AlexOn1ine
|
f8266b828b
|
26/01/26 Master to upcoming merge
|
2026-01-26 19:35:43 +01:00 |
|
GGbond
|
21492e0f23
|
Fix Foresight/Miracle Eye repeated-use behavior (#9025)
|
2026-01-26 14:48:39 +01:00 |
|
Eduardo Quezada
|
89da62b02d
|
Remove trailing whitespace - Master (#9011)
|
2026-01-25 10:12:41 +01:00 |
|
GGbond
|
e871913e22
|
Fix Magnetic Flux target handling in singles (#9007)
|
2026-01-24 08:45:19 +01:00 |
|
FosterProgramming
|
fe2c154b89
|
Refactor chooseboxmon (#8491)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-01-22 19:54:19 +01:00 |
|
Alex
|
6c05a08750
|
Refactor OHKO Moves (#8916)
|
2026-01-21 11:55:30 +01:00 |
|
GGbond
|
128beb39e1
|
Fixed several issues with Parting Shot (#8928)
|
2026-01-20 22:06:50 +01:00 |
|
Alex
|
922db5ce4a
|
Move adjustdamage to the damage calc (#8948)
|
2026-01-20 12:30:00 +01:00 |
|
Alex
|
de7aaf854c
|
Misc battle engine changes (#8931)
|
2026-01-16 18:55:22 +01:00 |
|
FosterProgramming
|
550fe9a7de
|
Refactor pokerus and add configs (#7731)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2026-01-14 12:04:33 +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 |
|
Frank DeBlasio
|
a15d9a81f9
|
Adding move animation backgrounds to the Pokemon Sprite Visualizer (#8764)
|
2026-01-11 22:59:14 +01:00 |
|
Eduardo Quezada
|
c631ea1ddd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/masterMerge
|
2026-01-11 15:10:21 -03:00 |
|
Eduardo Quezada
|
4df79828ac
|
Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge
|
2026-01-11 15:06:42 -03:00 |
|
Frank DeBlasio
|
e587cff9dd
|
Refactor exchange service corner (#8840)
|
2026-01-11 18:31:38 +01:00 |
|
GGbond
|
b671adf85f
|
Fixes Nightmare not affecting Comatose and adds various missing tests (#8859)
|
2026-01-11 15:02:41 +00:00 |
|
PhallenTree
|
ad6b64432e
|
Improve IsBattlerSpritePresent's alive check (#8847)
|
2026-01-09 14:59:37 +01:00 |
|
PCG
|
d34c7f0ba6
|
Refactor move relearner and small #8027 follow-up (#8675)
|
2026-01-07 14:49:39 +01:00 |
|
Frank DeBlasio
|
f6be01e92c
|
More battle environment updates (#8809)
|
2026-01-06 22:10:08 +01:00 |
|
Frank DeBlasio
|
faa779ea2c
|
Added Secret Power animations to gBattleEnvironmentInfo (#8807)
|
2026-01-05 23:03:13 +01:00 |
|
FosterProgramming
|
8c9d3b9c7a
|
Add gym leader support for vs seeker and clean vs seeker code (#8172)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2026-01-04 20:03:41 -08:00 |
|
Hedara
|
7fed5c93bb
|
Merge branch 'upcoming' into master-to-upcoming
|
2026-01-04 17:34:20 +01:00 |
|
Hedara
|
82c474bcd0
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/config/battle.h
|
2026-01-04 17:31:25 +01:00 |
|
PhallenTree
|
a06894b5ee
|
Ability Shield allows for ability activation when obtained and Trick cleanup (#8784)
|
2026-01-04 17:23:36 +01:00 |
|
PhallenTree
|
bda2064ecf
|
Fixes Chilly Reception displaying its message when called by another move (#8795)
|
2026-01-04 16:50:43 +01:00 |
|
Hedara
|
78124e88d7
|
Merge commit '0e33bf916e80e4dcf4f96ca0419a8b2fda5da51d' into master-to-upcoming
Conflicts:
src/battle_main.c
test/battle/ability/beads_of_ruin.c
test/battle/ability/commander.c
test/battle/ability/desolate_land.c
test/battle/ability/primordial_sea.c
test/battle/ability/supreme_overlord.c
test/battle/ability/sword_of_ruin.c
test/battle/ability/tablets_of_ruin.c
test/battle/ability/vessel_of_ruin.c
test/battle/ai/ai.c
test/battle/ai/ai_multi.c
test/battle/ai/ai_switching.c
test/battle/gimmick/dynamax.c
test/battle/move_effect/counter.c
test/battle/move_effect/fling.c
test/battle/move_effect/mirror_coat.c
test/battle/move_effect/misty_explosion.c
test/battle/move_effect/protect.c
test/battle/move_effect/psychic_terrain.c
test/battle/move_effect/sticky_web.c
test/battle/trainer_slides.c
|
2026-01-04 11:28:59 +01:00 |
|
Bassoonian
|
eba17e6860
|
Remove credits from code (#8748)
|
2026-01-03 18:21:13 +01:00 |
|
Alex
|
d9da5ee874
|
Fix Red Card / Eject Button interaction (#8780)
|
2026-01-03 16:54:04 +00:00 |
|
Alex
|
e04028420a
|
Further weather consolidation (#8161)
|
2026-01-03 15:39:22 +01:00 |
|
moostoet
|
1510947001
|
Fix Rage generational inaccuracies (#8642)
|
2026-01-03 08:51:31 +01:00 |
|
moostoet
|
0e33bf916e
|
Fix berry activation timing for Yawn sleep and Leech Seed damage (#8776)
|
2026-01-03 08:50:17 +01:00 |
|
Frank DeBlasio
|
667ae0cc70
|
Migrated some strings out of strings.c/strings.h (#8270)
|
2026-01-02 23:48:00 -08:00 |
|
grintoul
|
e82ed111ba
|
Misc style and whitespace cleanup (#8681)
|
2026-01-02 18:01:43 +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 |
|
grintoul
|
dcc584c6d6
|
Fixes incorrect battler used in STRINGID_USEDINSTRUCTEDMOVE (#8704)
|
2025-12-29 21:57:10 +01:00 |
|
hedara90
|
f10d722af7
|
Fix Aqua Ring animation (#8707)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-12-29 21:34:06 +01: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 |
|
FosterProgramming
|
30e5fc6958
|
Refactoring the way teachable learnsets are generated (#8027)
|
2025-12-26 13:13:29 +01:00 |
|
spindrift64
|
582a643d1f
|
fix poisons absorbing toxic spikes when fainting from other hazards (#8644)
|
2025-12-23 21:47:42 +01:00 |
|
Alex
|
4d69a7274f
|
Stockpile / WishFutureKnock / Order up clean up (#8528)
|
2025-12-22 19:57:54 +01:00 |
|
Alex
|
644b04a9f4
|
Move Explosion to attackcanceler and Terrain Boost effect (#8612)
|
2025-12-22 18:52:28 +01:00 |
|
Alex
|
6681b03c9b
|
Refactor Endeavor to use DoFixedDamageMoveCalc func (#8618)
|
2025-12-22 18:33:38 +01:00 |
|
PhallenTree
|
22b78e924d
|
Counter/Mirror Coat/Metal Burst refactor (#8604)
|
2025-12-21 12:25:28 +01: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 |
|
hedara90
|
ada6b5e754
|
Assertf improvements and fixes (#8570)
|
2025-12-18 13:29:46 +01:00 |
|
FosterProgramming
|
bf0e1b1a86
|
Add missing behavior when using focus punch while surviving an OHKO move (#8484)
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 |
|