19859 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hedara	0c447063e1	Merge branch 'master' into master-merge ... Conflicts: data/battle_anim_scripts.s include/battle_util.h include/constants/expansion.h src/battle_anim_dark.c src/battle_anim_effects_1.c src/battle_anim_normal.c src/battle_hold_effects.c src/battle_script_commands.c src/battle_util.c src/debug.c	2026-02-04 12:46:59 +01:00
Frank DeBlasio	dafbe66df4	Converted break_screen_animation from a macro to a function (#9115)	2026-02-04 09:54:14 +01:00
GGbond	564cc3e73e	Fix Instruct failing improperly when the instructed move isn't in the target's moveset (#9113)	2026-02-03 17:32:39 +00:00
Alex	c4e42eae1d	Move SubtractClamped to util.c from battle_util.c (#9120)	2026-02-03 11:27:50 +00:00
hedara90	e772770426	Battle Heap and Animation Test fixes (#9118) ... Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2026-02-03 11:41:50 +01:00
khbsd	703d108548	fix(battle ui): standardize hp bar color logic for GEN_5 and up (#9083)	2026-02-03 11:16:00 +01:00
GGbond	4bf88de669	Fix Leppa Berry PP restore target under forced-consumption effects (#9108)	2026-02-02 20:49:49 +01:00
psf	03c63f5e4a	NO_WHITEOUT now prevent forfeits from B_RUN_TRAINER_BATTLE (#9112)	2026-02-02 18:35:58 +00:00
Alex	45410b94f7	Delete irrelevant battle type comments for expansion (#9082)	2026-02-02 14:21:13 +01:00
Alex	69fc092589	Adds Parabolic Charge spread damage healing test (#9094)	2026-02-02 14:12:15 +01:00
FosterProgramming	46ccdd72ce	Fix statement after label issue in chooseboxmon (#9093)	2026-02-02 09:42:38 +01:00
FosterProgramming	bc52fd3036	Rename ow_synchronize.c (#9097)	2026-02-02 09:41:07 +01:00
Estellar	65b1b5dd06	sPlayerAvatarGfxToStateFlag's graphics id to u16 (#9101)	2026-02-02 09:40:26 +01:00
GriffinR	63390a940e	Merge pull request #2226 from fdeblasio/matchCallDocumentation ... Improved Match Call text variables	2026-02-01 13:16:34 -05:00
psf	cbabc4a828	1.14.3 release (#9105)	2026-02-01 08:42:36 -08:00
Hedara	c8b0d1b08c	1.14.4 cycle start	2026-02-01 17:13:46 +01:00
Hedara	2d17ad27f9	Expansion 1.14.3 release	2026-02-01 17:13:23 +01:00
FosterProgramming	c43dd0c3ca	Fix special var collision with battle frontier tutors (#9072)	2026-02-01 15:57:21 +00:00
GGbond	ac37c963ae	Prevent Incinerate from burning items under Sticky Hold (#9068)	2026-02-01 15:55:40 +00:00
Eduardo Quezada	4d52960780	Fix Tranformed mon changing forms when fainting (#9106)	2026-02-01 16:52:53 +01:00
Alex	90e4cc4906	Pret merge (31st of January 2026) (#9099) ... Co-authored-by: Martin Griffin <martinrgriffin@gmail.com> Co-authored-by: Hedara <hedara90@gmail.com>	2026-01-31 22:49:53 +01:00
Pawkkie	3c08fac37b	Fix doubles moves bad / choice lock bad switch AI (#9078)	2026-01-31 14:43:34 -05:00
Hedara	e758d55a03	Merge remote-tracking branch 'pret/master' into pret-merge ... Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor Conflicts: asm/macros/battle_anim_script.inc data/battle_anim_scripts.s include/constants/battle_anim.h src/battle_anim_bug.c src/battle_anim_dragon.c src/battle_anim_effects_1.c src/battle_anim_normal.c	2026-01-31 19:20:54 +01:00
PhallenTree	109a3cd9e7	Clear Selection Scripts to prevents consequent fails (#9095)	2026-01-31 18:37:16 +01:00
PhallenTree	5d5f655b80	Fixes Infiltrator test battler not using intended move (#9096)	2026-01-31 18:36:56 +01:00
GGbond	a0b8c1f980	Fix Electroweb crash by correcting target sprite resolution (#9091)	2026-01-31 09:35:17 +01:00
FosterProgramming	d6aac051fb	Fix debug menu using female icon with male palette (#9092)	2026-01-31 08:19:59 +00:00
grintoul	2daf7e98e8	Remove trainers_frlg.h from repo for gitignore (#9081)	2026-01-30 21:59:28 +00:00
ChrispyChris27	95d3258ef1	Fixes creation of certain overworld sprites in object_event_pic_tables_followers.h (#9065)	2026-01-30 16:42:51 -05:00
John Cooper McDonald	1278ffeba0	Z-A Mega sprites from PokeCommunity (#8945)	2026-01-30 22:30:08 +01:00
allcontributors[bot]	0cb34d3605	add ChrispyChris27 as a contributor for code (#9067) ... Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>	2026-01-30 16:23:37 -05:00
hedara90	e620a0a001	Add aif2pcm to gitignore (#9077) ... Co-authored-by: Hedara <hedara90@gmail.com>	2026-01-30 22:19:51 +01:00
hedara90	e3321fa6d8	Remove aif2pcm (#9076) ... Co-authored-by: Hedara <hedara90@gmail.com>	2026-01-30 22:19:05 +01:00
Kildemal	b28878d639	Fixes wild mon target choice in double battles (#9075)	2026-01-30 16:18:49 +01:00
Alex	7dca2712ac	Clean up redundant item assignment after it was stolen (#9044)	2026-01-30 15:24:05 +01:00
hedara90	cbebe2da10	30/01/26 Master to upcoming merge (#9074)	2026-01-30 14:28:40 +01:00
PhallenTree	022f5eb52e	Fixes Infiltrator and adds config for Substitute interaction (#9073)	2026-01-30 14:14:35 +01:00
Alex	829488e761	Merge branch 'upcoming' into master-merge-3	2026-01-30 12:55:34 +01:00
AlexOn1ine	396c64c22a	30/01/26 Master to upcoming merge	2026-01-30 12:49:21 +01:00
Frank DeBlasio	ee1e02b2ef	Corrected Stone Axe and Ceaseless Edge descriptions (#9062)	2026-01-30 01:11:04 +00:00
GGbond	6928d54d46	Fix Pickpocket moveend target checks and Thief/Covet handoff (#9037)	2026-01-29 19:02:35 +01:00
PhallenTree	502ff9ed8a	Fixes Fling Booster Energy being prevented by target Paradox mon (#9050)	2026-01-29 19:01:37 +01:00
GGbond	08dd7da30c	Fix AI wakeup-turn detection to consider Early Bird (#9053)	2026-01-29 18:33:36 +01:00
Alex	c3b462a139	Mold Breaker, Last Resort, Assume and Tantrum fixes (#9047)	2026-01-29 15:09:07 +01:00
GGbond	4198a5cb85	Fix Forewarn edge cases and random selection (#9049)	2026-01-29 13:54:28 +01:00
Eduardo Quezada	278739ee66	Form Change Improvements (#8850) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2026-01-29 00:35:08 +01:00
Bassoonian	b3b56b3767	Fix FRLG comment oversight in `script_cmd_table.inc` (#9043)	2026-01-28 13:37:48 -08:00
Bassoonian	9afdd698d9	Fix another FRLG style oversight (#9046)	2026-01-28 13:37:21 -08:00
cawtds	ea102b358d	documentation on how to use frlg (#9045)	2026-01-28 13:35:38 -08:00
Frank DeBlasio	db3e5cc1fd	Consolidated common steps for Brick Break, Psychic Fang, and Raging Bull's animations (#9020)	2026-01-28 17:47:00 +01:00