Commit Graph

14532 Commits

Author SHA1 Message Date
FosterProgramming
63fbcce1cd
Reduce battle heap usge outside main battle screen (#9906)
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-05-03 16:07:32 +02:00
FosterProgramming
8c5cbb1363
Remove two unused functions from src/event_object_movement.c (#9911) 2026-05-03 06:36:46 -07:00
Hedara
2182675ea6 Fix stray tab in C file 2026-05-03 15:09:48 +02:00
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
Alex
95be9f7ed4
IsAnyTargetAffected and GetDynamicMoveType changes (#9898) 2026-05-02 18:56:59 +01:00
Alex
4c41f277db
Fix Ruin abilities respecting each other even if deactivated (#9901)
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
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2026-05-02 18:55:49 +01:00
mudskip
74ba82ba85
fix (namebox): back 2 back namebox no longer flickers (#9905)
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-05-02 17:55:46 +02:00
Kildemal
fab0777918
fix(debug_menu): fix flicker when used when map pop-up active (#9872)
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-05-02 09:52:00 +02:00
FosterProgramming
57f3f4a0b6
Safari fixes (#9882)
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-05-01 16:46:02 +02:00
cawtds
1cf36d1d82
Fix compiling with -O0 (#9888) 2026-05-01 16:45:02 +02:00
Alex
cfb4f864e9
Fixes Ruin abilities / gastro acid interaction (#9880) 2026-05-01 14:18:43 +01:00
FosterProgramming
84e02096fc
Move follower check before trainer hill check whene selecting script (#9883)
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-05-01 00:30:41 +02:00
hedara90
7b7a66dc13
Move animation fixes (#9855)
Co-authored-by: Hedara <hedara90@gmail.com>
2026-04-30 23:28:05 +02: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
9f23b871f9 Migrate to INCGFX (pret#2283) 2026-04-30 14:25:01 +01:00
PhallenTree
47f01e61ba
Make healthbox invisible for previous mon after opening party screen (#9864)
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-29 21:22:09 +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
cawtds
3efb836f72 Fix UB in GetBattleMoveCategory (#9875)
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-29 10:26:11 +01:00
Alex
39842afcb6
Adds CalcValue struct to MoveEnd (#9859)
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-26 19:12:30 +01:00
luuma
ef38442a36
Fix area screen data having dependence on player's current location, rather than the map header (#9727)
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
Co-authored-by: grintoul <166724814+grintoul1@users.noreply.github.com>
2026-04-25 23:21:58 +02:00
PhallenTree
e5ad623b0a
Change order of enduring damage effects (#9854)
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-25 21:38:23 +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
hedara90
47c3252abf
25/04/26 Master to upcoming merge (#9851) 2026-04-25 19:00:57 +02:00
FosterProgramming
fc6d083821
Cleanup and tests for ow_abilities.c (#9850) 2026-04-25 18:02:26 +02:00
AlexOn1ine
ba209b9733 25/04/26 Master to upcoming merge 2026-04-25 16:26:29 +02:00
GGbond
e01d5a9352
Fix Moody not activating on the switch-in turn end (#9798) 2026-04-25 16:04:13 +02:00
grintoul
972bffb89f
Adds tests for switch battle messages and switch AI bugfix (#9799) 2026-04-25 16:03:17 +02:00
GGbond
5cd36f241d
Fix Magician target selection priority for spread moves (#9818) 2026-04-25 15:59:50 +02:00
GGbond
4b8a6accab
Fix Neutralizing Gas end-of-effect handling for Core Enforcer and Baton Pass Gastro Acid transfer (#9829) 2026-04-25 15:17:15 +02:00
cawtds
1721877a64
Fix wrong param getting passed for berry trees in some config (#9848) 2026-04-25 15:16:13 +02:00
FosterProgramming
e598049a38
Fix egg from daycare not receiving default moveset (#9844)
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-25 14:22:40 +02:00
GGbond
ed642adc64
Fix Lucky Chant side status lookup in IsCriticalHit (#9849) 2026-04-25 14:06:42 +02:00
Hedara
af5bf96575 Fix fishing chain behaviour on shiny encounter 2026-04-24 21:18:17 +02:00
moostoet
2a5af6a895
Fix forced shiny eggs losing shininess on hatch (#9842)
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-24 15:12:55 +02:00
psf
187c2de42e
23/04/26 Master to upcoming merge (#9837)
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 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
GGbond
fd072d5dfb
Fix Synchronize incorrectly activating when the holder inflicts status with its own move (#9828)
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-23 18:45:33 +02:00
FosterProgramming
be6874cf59
Fix declaration after label (#9835) 2026-04-23 17:40:09 +02:00
GGbond
ed56a8eec5
Fix action order when Stall and Lagging Tail both apply (#9817) 2026-04-23 17:39:28 +02:00
Alex
7ad665dfd2
Clean up for eject item changes (#9832)
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 08:22:11 +01: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
BluSunrize
96d810edc8
Adjust documentation for poke balls in trainer parties (#9831)
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-22 09:38:12 +01: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
ef4220be66
Fix Shield Dust/Covert Cloak interactions for Poison Touch, Toxic Chain, and Stench (#9715) 2026-04-22 08:49:10 +02:00
John Cooper McDonald
a5ea34b2b0
Add every missing asymmetrical overworld sprite for gens 1 - 7 (#9792)
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-22 00:58:29 +02:00
hedara90
06332649ce
Fix frlg intro trying to create too many sprites (#9822) 2026-04-22 00:45:15 +02:00