FosterProgramming
|
63fbcce1cd
|
Reduce battle heap usge outside main battle screen (#9906)
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-05-03 16:07:32 +02:00 |
|
FosterProgramming
|
ceb0ce5cb1
|
Move wild encounter related config to wild_encounter config file (#9879)
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-05-02 22:08:54 +02:00 |
|
Hedara
|
0a876b46ec
|
Merge branch 'master' into master-to-upcoming
Conflicts:
data/battle_scripts_1.s
include/constants/expansion.h
src/field_control_avatar.c
src/ow_abilities.c
|
2026-05-02 21:15:57 +02:00 |
|
mudskip
|
74ba82ba85
|
fix (namebox): back 2 back namebox no longer flickers (#9905)
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-05-02 17:55:46 +02:00 |
|
Hedara
|
b497462a2e
|
Start of 1.15.3 cycle
|
2026-05-01 21:36:31 +02:00 |
|
Hedara
|
6798f72e03
|
Expansion 1.15.2 release
|
2026-05-01 21:36:07 +02:00 |
|
Alex
|
cfb4f864e9
|
Fixes Ruin abilities / gastro acid interaction (#9880)
|
2026-05-01 14:18:43 +01:00 |
|
GGbond
|
8e8c5c318b
|
Fix Innards Out multihit damage basis and Core Enforcer suppression on fainted targets (#9858)
|
2026-04-30 20:19:43 +01:00 |
|
Hedara
|
8e11c5b554
|
Merge branch 'master' into master-merge
Conflicts:
spritesheet_rules.mk
src/data/graphics/items.h
src/data/graphics/trainers.h
src/data/object_events/object_event_graphics.h
src/decoration.c
src/pokedex_area_region_map.c
src/pokemon.c
tools/preproc/c_file.cpp
tools/preproc/c_file.h
|
2026-04-30 18:55:19 +02:00 |
|
Hedara
|
aa8c4d460b
|
Merge commit '3efb836f72c5253dfa6869e836a7daeaa4d6aad7' into master-merge
Conflicts:
src/battle_util.c
src/pokedex_area_screen.c
|
2026-04-30 18:39:28 +02:00 |
|
Martin Griffin
|
2a5dec304c
|
Merge branch 'pret-master-2283' into rhh-master
|
2026-04-30 14:20:42 +01:00 |
|
Bivurnum
|
10ae7f9f54
|
Overworld Encounters (#8434)
Co-authored-by: HashtagMarky <143505183+HashtagMarky@users.noreply.github.com>
Co-authored-by: luuma <31407427+luuma@users.noreply.github.com>
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>
|
2026-04-29 19:36:14 +02:00 |
|
FosterProgramming
|
9651c26b43
|
Fix rare labelling issues with RUN_OVERWORLD_SCRIPT (#9869)
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-04-27 12:06:40 +01:00 |
|
Alex
|
39842afcb6
|
Adds CalcValue struct to MoveEnd (#9859)
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-04-26 19:12:30 +01:00 |
|
Pawkkie
|
099aff910c
|
Shouldswitch refactor to use SwitchContext (#9847)
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-04-25 21:13:00 +02:00 |
|
FosterProgramming
|
fc6d083821
|
Cleanup and tests for ow_abilities.c (#9850)
|
2026-04-25 18:02:26 +02:00 |
|
psf
|
187c2de42e
|
23/04/26 Master to upcoming merge (#9837)
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-04-23 12:11:00 -07:00 |
|
AlexOn1ine
|
7ff83c6542
|
23/04/26 Master to upcoming merge
|
2026-04-23 20:24:23 +02:00 |
|
grintoul
|
f25594e8c7
|
Adds AreMultiPartiesFullTeams and Test_BattlersShareParty handling to tests (#9751)
|
2026-04-23 17:51:38 +01:00 |
|
BluSunrize
|
8801d939a5
|
Refactor rock climb and defog to be defined at all times (#9819)
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-04-23 06:25:32 +02:00 |
|
Alex
|
910e018fc9
|
Adjustments for Eject Items / Mirror Herb / White Herb (#9784)
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-04-22 08:17:57 +01:00 |
|
Nopinou
|
b150c372e6
|
Use GetBattlerTrainer instead of GetBattlerSide in GetBattlerPartyState (#9811)
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-04-19 19:34:56 +02:00 |
|
GGbond
|
1d87c8b6d7
|
Fix Embody Aspect not reactivating after Neutralizing Gas ends if it already activated (#9773)
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-04-18 18:33:30 +02:00 |
|
GGbond
|
1d902eaa58
|
Fix Sheer Force incorrectly suppressing recoil damage (#9682)
|
2026-04-18 12:00:38 +01:00 |
|
FosterProgramming
|
7c1033a479
|
Remove relearner from party menu (#9693)
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-04-16 20:06:03 +02:00 |
|
Linathan
|
1079577272
|
Add Held Berry Animation (#9168)
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-04-15 23:09:51 +02:00 |
|
Alex
|
09c06ca859
|
Clarify isFirstTurn usage with wrappers (#9786)
|
2026-04-14 16:45:43 -04:00 |
|
FosterProgramming
|
63d96455ca
|
Remove template abstraction for pokedex area map (#9765)
|
2026-04-14 20:49:34 +02:00 |
|
AlexOn1ine
|
679b0930b3
|
Master to upcoming merge 14/04/26
|
2026-04-14 20:14:27 +02:00 |
|
hedara90
|
aa6d3b3366
|
Add errorf to sprite creation when at MAX_SPRITES (#9766)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2026-04-14 18:46:49 +01:00 |
|
grintoul
|
d083b017e6
|
Missing enums in inline battler, side, and move functions (#9743)
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-04-14 14:56:02 +02:00 |
|
GGbond
|
91a2ea03af
|
Fix Fling using White Herb or Mental Herb incorrectly removing the target’s held item (#9782)
|
2026-04-14 14:25:10 +02:00 |
|
Pawkkie
|
b1d4130547
|
Isolate AI thinking time tests (#9779)
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-04-14 00:03:24 +02:00 |
|
Pawkkie
|
11ccaced28
|
Use ctx in GetDefenderPartnerAbilitiesModifier (#9710)
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-04-13 21:20:28 +02:00 |
|
Alex
|
ca1bfd5097
|
Remove redundant SetBattlerAiData call in GetMostSuitableMonToSwitchInto (#9757)
|
2026-04-13 12:21:04 -04:00 |
|
PhallenTree
|
f3443efd9b
|
Adds queued switches for EndTurn switches (#9717)
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-04-13 15:13:39 +02:00 |
|
FosterProgramming
|
85128bdeb5
|
Show floor number in map popup (#9461)
|
2026-04-13 10:26:36 +02:00 |
|
Rachel
|
0cd398953c
|
fix: Modernize the conversion formula for imperial weights (#9690)
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: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2026-04-12 20:48:01 +02:00 |
|
Frank DeBlasio
|
888dcc33d2
|
Fix spaces, spelling, and grammar (#9761)
|
2026-04-12 10:22:09 -07:00 |
|
luuma
|
ab24eaec10
|
Mega Sol and Dragonize (#9735)
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: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2026-04-12 13:09:04 +02:00 |
|
moostoet
|
3707e6a52b
|
Implement Wish Passing in ShouldSwitch (#8472)
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-04-10 17:29:09 -04:00 |
|
amiosi
|
fc46108a56
|
resample, add, and fix cries (#8919)
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-04-10 05:55:52 -07:00 |
|
FosterProgramming
|
1c723ee942
|
Reworked event evolution tryspecialevo (#7573)
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-04-10 05:24:20 -07:00 |
|
Martin Griffin
|
8c950fb648
|
Merge branch 'master' into upcoming
|
2026-04-09 20:59:48 +01:00 |
|
Martin Griffin
|
8e5bc0da4d
|
Remove test-specific CFLAGS (#9723)
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-04-09 17:56:31 +02:00 |
|
Frank DeBlasio
|
cc5348e295
|
Automate regional Pokedex orders (#8930)
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-04-09 15:52:32 +01:00 |
|
John Cooper McDonald
|
8e02c319e6
|
Add basic Z-A Mega ability data (from Champions Regulation M-A) (#9678)
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-04-08 22:28:03 +02:00 |
|
Alex
|
1606fa912d
|
Slight restructure for Defog and Tidy Up (#9714)
|
2026-04-08 16:40:23 +01:00 |
|
grintoul
|
70340c1135
|
12v12 capability (#8943)
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-04-07 13:57:29 +02:00 |
|
Martin Griffin
|
48a165c403
|
Support non-contiguous SE/MUS IDs in debug menu (#9713)
|
2026-04-07 13:56:51 +02:00 |
|