grintoul1
0f6d505b33
Start of 1.17.2 cycle
2026-09-29 21:15:23 +02:00
grintoul1
bb1093a7c7
1.17.1 Release
2026-09-29 21:09:28 +02:00
FosterProgramming
75b806a3ab
ModifyPersonalityForNature cleanup duplicate ( #10821 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
2026-09-20 15:16:24 -07:00
Alex
0fa15e3ccd
Fix two turn attack message wait and remove visual config ( #10788 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
2026-09-14 11:07:04 +01:00
Linathan
d74f64dc9f
Add Regulation M-C (v1.2.0) data changes from Pokémon Champions ( #10777 )
...
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain >
2026-09-11 08:13:05 +02:00
Enrico Drago
456a6e65b1
Fix custom multi-battle return and party detection ( #10773 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
2026-09-09 21:20:14 +02:00
Enrico Drago
cafe0221ce
Fix Sheer Force suppressing King's Rock and Razor Fang flinches ( #10741 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
2026-09-06 17:48:41 +02:00
Enrico Drago
803c03ddc7
Coding TODOs and currently KNOWN_FAILING regression tests 1/3 ( #10698 )
...
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com >
2026-09-03 11:18:09 +02:00
Hedara
6f93eaf61e
Start of 1.17.1 cycle
2026-08-31 19:35:17 +02:00
Hedara
e8bd1cd7b0
1.17.0 Release
2026-08-31 18:50:08 +02:00
Hedara
e42988b47c
Merge branch 'upcoming' into expansion-release
2026-08-31 17:31:50 +02:00
Hedara
3796c72237
1.16.4 release
2026-08-31 17:06:26 +02:00
Hedara
da9a744793
Merge branch 'master' into master-to-upcoming
...
Conflicts:
src/debug.c
src/script_menu.c
2026-08-31 15:57:57 +02:00
Hedara
d074de32c2
Merge commit 'c65e93f20a5275ab03b07d6f6411096a82a60ffd' into pret-merge
...
Conflicts:
include/battle_anim.h
src/battle_anim_utility_funcs.c
src/battle_interface.c
src/battle_intro.c
2026-08-31 11:39:10 +02:00
AlexOn1ine
e9d47d21bb
27/08/26 master to upcoming merge
2026-08-27 19:09:14 +02:00
AZero13
c65e93f20a
Move StartMonScrollingBgMask to battle_anim_utility_func.c ( #2330 )
...
So we don't need to do any extern shenanigans.
2026-08-26 11:40:45 +01:00
grintoul
82598c4d88
Fix AI not calcing crit when high enough crit stage ( #10700 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
2026-08-23 20:04:17 -04:00
Enrico Drago
8fe975f9ca
Fix battler invisibility during move selection ( #10692 )
...
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com >
2026-08-22 20:07:04 +02:00
Enrico Drago
49ad9f9c1b
Split move target selection and resolution ( #10690 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
CI / build (push) Has been cancelled
2026-08-22 18:02:28 +01:00
Enrico Drago
26bf3fdcb5
Fix Shell Trap being delayed after a spread move hit ( #10682 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com >
2026-08-22 18:01:43 +01:00
Enrico Drago
8bb9f16f85
Unify default move targeting between tests and in-game ( #10659 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2026-08-22 15:25:30 +01:00
Enrico Drago
bb6f399bce
Recalculate Ash-Greninja's stats after Battle Bond activates ( #10683 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
2026-08-21 23:27:39 +02:00
Alex
65e769362c
Add MSG_DISPLAY constants and helper function for strings with wait ( #10640 )
2026-08-19 18:48:48 +01:00
Alex
57f11c47ce
Fix Acupressure targetting opposing mon ( #10645 )
2026-08-17 17:50:56 +01:00
FosterProgramming
795c262f44
Fix gimmick slides ( #10624 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2026-08-17 18:19:28 +02:00
Alex
bab3911c35
Remove redundant embargo and heal block flags ( #10630 )
2026-08-12 11:13:26 +01:00
Alex
d4f1de79ae
Fix Z-Move and Dmax moves incorrect dmg calcs ( #10616 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
2026-08-11 09:44:13 +02:00
AlexOn1ine
21958737f0
09/06/26 Master to upcoming merge
2026-08-09 17:52:26 +02:00
grintoul
d61368e31c
Fix sleep clause in Multibattles + test ( #10608 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
2026-08-09 14:29:58 +02:00
Alex
1242c88a10
Change SetMoveEffect into a function table and move to a new file ( #10593 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
CI / build (push) Has been cancelled
2026-08-07 21:19:10 +02:00
Alex
32320410eb
Fix Scrappy not bypassing Ghosts types if ability was changed ( #10600 )
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-08-07 13:37:53 +01:00
Alex
88e70d8185
Move Substitute check to move resolution and remove acc check in scripts ( #10595 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com >
2026-08-07 12:32:20 +01:00
PhallenTree
f119b5586f
Revert "Simplify IsAnyTargetAffected" ( #10588 )
2026-08-05 12:32:09 +02:00
FosterProgramming
9df1444765
Another debug menu refactor ( #10121 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
CI / build (push) Has been cancelled
2026-08-04 14:14:39 +02:00
John Cooper McDonald
9450f2c031
Implement opponent HP percentage display ( #10025 )
2026-08-04 13:04:45 +02:00
FosterProgramming
4a39c64fe4
Rework simultaneous palette fade ( #10573 )
...
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com >
2026-08-04 12:54:22 +02:00
Alex
35ff109e9d
Simplify IsAnyTargetAffected ( #10576 )
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-08-04 09:23:55 +01:00
FosterProgramming
af9773f8e9
Fix trainer slide form change ( #10571 )
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-08-03 21:26:00 +02:00
Linathan
718de8d57d
Fix HP bars emitting for non-present battlers and extraneous result battle messages ( #10566 )
...
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain >
2026-08-03 16:34:00 +02:00
moostoet
44da4add28
Fix freeze when a stat-change move follows Own Tempo-blocked Swagger or No Retreat ( #10569 )
2026-08-02 20:55:49 +02:00
Alex
c2b9232ba7
Replaced / Removed some battlerAbsent checks in favor of IsBattlerAlive ( #10459 )
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-08-02 19:22:47 +02:00
moostoet
0956a1388d
Prevent Protect AI from blocking ally beneficial-hit setups in doubles ( #9448 )
2026-08-02 11:22:11 -04:00
grintoul
a242cd18ac
Remove BATTLE_PARTNER and BATTLE_OPPOSITE macros ( #10542 )
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-08-02 08:52:32 +02:00
FosterProgramming
08d5cea971
Minor field move fixes (upcoming) ( #10548 )
...
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
CI / build (push) Has been cancelled
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com >
2026-08-01 12:21:56 +02:00
Alex
d636217e0a
X items fix ( #10556 )
2026-07-30 22:21:26 +02:00
Alex
d5545d0199
Pret merge (30th of July 2026) ( #10555 )
...
Co-authored-by: kittenchilly <23617175+kittenchilly@users.noreply.github.com >
Co-authored-by: Thomas Winwood <twwinwood@gmail.com >
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com >
Co-authored-by: mike-goutokuji <gfunni234@gmail.com >
Co-authored-by: Estellar <137097857+estellarc@users.noreply.github.com >
Co-authored-by: Mike-Goutokuji <83477269+mike-goutokuji@users.noreply.github.com >
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com >
Co-authored-by: AZero13 <83477269+SiliconA-Z@users.noreply.github.com >
Co-authored-by: GriffinR <griffin.g.richards@gmail.com >
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com >
Co-authored-by: aichiya <59616111+aichiya@users.noreply.github.com >
Co-authored-by: Frank <fdeblasio1004@gmail.com >
Co-authored-by: Hedara <hedara90@gmail.com >
2026-07-30 22:08:37 +02:00
Jamie Foster
428f00f25f
remove unused function
2026-07-30 20:19:41 +02:00
Hedara
220b3f3fc6
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
src/pokeball.c
src/scrcmd.c
2026-07-30 20:15:46 +02:00
Hedara
480fb465f5
Merge commit '81a28d6f57337639454165603145039bf2cdb795' into pret-merge
...
The conflict list doesn't tell the whole story about this
Expansion is now using both generators
Match call had to be adjusted
Conflicts:
include/constants/wild_encounter.h
json_data_rules.mk
src/data/wild_encounters.json.txt
src/wild_encounter.c
2026-07-30 19:55:45 +02:00
PCG06
f74eb38443
30/07/26 master to upcoming merge
2026-07-30 16:28:08 +05:30
