Commit Graph

3707 Commits

Author SHA1 Message Date
FosterProgramming
ceb0ce5cb1
Move wild encounter related config to wild_encounter config file (#9879)
Some checks are pending
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
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
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
Pawkkie
099aff910c
Shouldswitch refactor to use SwitchContext (#9847)
Some checks are pending
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
AlexOn1ine
7ff83c6542 23/04/26 Master to upcoming merge 2026-04-23 20:24:23 +02:00
BluSunrize
8801d939a5
Refactor rock climb and defog to be defined at all times (#9819)
Some checks are pending
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)
Some checks are pending
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
GGbond
1d87c8b6d7
Fix Embody Aspect not reactivating after Neutralizing Gas ends if it already activated (#9773)
Some checks failed
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)
Some checks failed
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)
Some checks are pending
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
AlexOn1ine
679b0930b3 Master to upcoming merge 14/04/26 2026-04-14 20:14:27 +02:00
PhallenTree
f3443efd9b
Adds queued switches for EndTurn switches (#9717)
Some checks are pending
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)
Some checks are pending
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
amiosi
fc46108a56
resample, add, and fix cries (#8919)
Some checks are pending
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)
Some checks are pending
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
Frank DeBlasio
cc5348e295
Automate regional Pokedex orders (#8930)
Some checks are pending
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)
Some checks are pending
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
grintoul
70340c1135
12v12 capability (#8943)
Some checks are pending
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
FosterProgramming
780805f169
Move relearner refactor (#9006)
Some checks are pending
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-06 11:18:15 -07:00
PhallenTree
611ed45952
Make End Turn events use BattleScriptCall (return instead of end2) (#9680) 2026-04-06 19:26:41 +02:00
Pawkkie
c17a1f1a7f Merge remote-tracking branch 'upstream/master' into master-merge-20260406 2026-04-06 11:44:33 -04:00
Pawkkie
6c40826d14
Config to randomize the order AI mons compute logic in double battles (#9462)
Some checks are pending
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-06 16:38:02 +02:00
Alex
c532ceac79
Magic Bounce / Magic Coat/ Snatch refactor (#9674) 2026-04-06 13:37:11 +01:00
cawtds
becfa70a97
Refactor/trainer pic info (#9475)
Some checks failed
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-03 22:34:59 +02:00
Linathan
32fcd64868
Refactor Battle Messages (#9655)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
2026-04-03 20:27:54 +02:00
PhallenTree
fdea5d56ee
Gen 5+ Uproar with config (#9616)
Some checks are pending
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-02 21:34:21 +02:00
Frank
1cbdd35880 Converted 0 to SOUND_PAN_MIDDLE 2026-04-01 16:32:45 -04:00
Hedara
1b79bd80f9 Start of 1.15.2 cycle 2026-03-30 16:03:40 +02:00
Hedara
fcecfadda6 Expansion 1.15.1 release 2026-03-30 16:03:07 +02:00
Alex
1f45edb04c
BattleCalcValues usage and rename BattleContext back to DamageContext (#9657)
Some checks are pending
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-03-29 15:06:49 -04:00
Eduardo Quezada
9dfe7c4340 Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge20260328 2026-03-28 19:25:08 -03:00
Frank DeBlasio
fb8819b572
Removed STRINGID_PKMNISGLOWING (#9634)
Some checks failed
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-03-26 13:05:45 +01:00
Meister-anon
f13b73ee6d
identified deprecated values (#9578)
Some checks failed
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: Meister-anon <user@DESKTOP-TQ65PS9>
2026-03-24 23:09:30 +01:00
Bivurnum
74e4e2efe2
Improved FRLG Map Previews (#9557)
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>
2026-03-24 22:58:55 +01:00
Frank DeBlasio
5739d24f5d
Fixed Kanto dex cross-gen evolutions (#9617) 2026-03-24 20:50:46 +01:00
PhallenTree
bede100c3e
Adds queued switches for Move End switches (#9494) 2026-03-24 20:00:25 +01:00
Alex
124009500d
Bide Refactor (#9532) 2026-03-24 18:48:31 +00:00
luuma
2322e9d2b0
Fix dex absences for cross gen configs (#9337) 2026-03-24 16:35:50 +01:00
FosterProgramming
d32845cbee
Rework special trainer IDs (#9269)
Some checks are pending
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-03-24 08:34:05 +01:00
PhallenTree
e16cc7a1f2
Makes Poltergeist and Fling messages into a pre attack effect (#9610)
Some checks are pending
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-03-23 20:20:29 +01:00
Frank DeBlasio
7da42d1a95
Fix Kanto object event graphic names (#9537) 2026-03-22 19:48:24 +01:00
Nephrite
47cac73a61
gBerries refactor + untangling berry indices from item IDs (#7305)
Some checks are pending
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-03-21 21:30:09 +01:00
Pawkkie
d12a6a46e5
Add AI contextual damage roll configs (#9568)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-03-19 16:31:20 +01:00
Pawkkie
137670bed2
GenConfig naming cleanup (#9529) 2026-03-19 00:54:39 +01:00