8038 Commits

Author	SHA1	Message	Date
grintoul1	fa2fc6e663	Trainer struct adjustments to remove previous impact to ROM	2026-02-06 22:26:17 +00:00
grintoul1	85623a69c7	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into twelves	2026-02-06 20:14:00 +00:00
Alex	63fc5bf0fe	Strength Sap fixes (#9130)	2026-02-06 15:11:23 +01:00
grintoul1	0b76898362	Initial twelves party showcase	2026-02-05 23:26:45 +00:00
grintoul1	2d1de0468d	Fixed 6v6 multi party menu; started on 12v12 multi showcase	2026-02-05 21:46:42 +00:00
Pawkkie	354cdab5e0	Fix AI_FLAG_RANDOMIZE_SWITCHIN logic (#9128)	2026-02-05 21:24:14 +01:00
John Cooper McDonald	e9e1247fa5	Add all of the Z-A mega stone sprites (#9143)	2026-02-05 20:14:06 +01:00
PhallenTree	75d2ac742b	Fixes Dancer activating on missed moves and Neutralizing Gas interaction (#9129)	2026-02-05 16:07:18 +01:00
grintoul1	89a833e709	Removed battle type flag and separate test system; Added helper function and config for default multi team chopping; party menu still shambles	2026-02-04 23:05:56 +00:00
grintoul1	e751acb499	First AI tests checking all party slots can be used	2026-02-04 16:46:42 +00:00
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
grintoul1	0dba87ec97	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into twelves	2026-02-04 11:17:29 +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
Alex	45410b94f7	Delete irrelevant battle type comments for expansion (#9082)	2026-02-02 14:21:13 +01: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
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
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
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
PhallenTree	502ff9ed8a	Fixes Fling Booster Energy being prevented by target Paradox mon (#9050)	2026-01-29 19:01:37 +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
cawtds	97e83ebe6a	Add FRLG (#7423)	2026-01-28 17:41:12 +01:00
Frank DeBlasio	e80ae56903	Even more battle environment updates (#8835)	2026-01-28 16:00:14 +01:00
Alex	0c44cc1b27	Move Target failure follow up (#8986) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2026-01-28 15:48:14 +01:00
Eduardo Quezada	4a4a72f9fb	Added enum BattlerId type checks (#8954)	2026-01-28 09:32:03 +01:00
grintoul1	7e069a83b1	Merge branch 'upcoming' of github.com:rh-hideout/pokeemerald-expansion into twelves	2026-01-27 19:37:34 +00:00
grintoul1	5d95ad4f2b	Removed or cleaned up some early functions, and some old multi test system code	2026-01-27 19:34:05 +00:00
grintoul1	1f619a595a	WIP commit - Removed GetSideParty and GetPartyAndIndexFromSideAndSlot	2026-01-27 19:13:13 +00:00
grintoul1	c4fdf273f8	WIP commit - tests passing; need to fix party menu issues then actually start on the 12s	2026-01-27 19:04:38 +00:00
GGbond	aafc581460	Fix Psych Up wrong battler message and Gen 6+ crit ratio copying (#9015)	2026-01-27 15:44:42 +01:00
grintoul1	3e4a5f72c2	WIP commit - battler 2/3 sprites fixed T1; also can now switch post KO; currently switching from party menu is bugged	2026-01-27 05:05:33 +00:00
AlexOn1ine	f8266b828b	26/01/26 Master to upcoming merge	2026-01-26 19:35:43 +01:00
GGbond	21492e0f23	Fix Foresight/Miracle Eye repeated-use behavior (#9025)	2026-01-26 14:48:39 +01:00
grintoul1	e20a560cc3	WIP commit - further gParties changes throughout repo	2026-01-26 02:05:51 +00:00
Eduardo Quezada	b07fe3f826	Fixed Link Overworld (#9014)	2026-01-25 14:59:26 +01:00
khbsd	12970602ce	fix: IsDoubleBattle() return value (#9012)	2026-01-25 10:15:01 +01:00
Eduardo Quezada	89da62b02d	Remove trailing whitespace - Master (#9011)	2026-01-25 10:12:41 +01:00
grintoul1	8b27224ed6	Merge branch 'upcoming' of github.com:rh-hideout/pokeemerald-expansion into twelves	2026-01-23 16:07:42 +00:00
khbsd	2d09384229	fix: add __attribute__((packed)) to enum Direction (#8994)	2026-01-23 11:38:13 +01:00
FosterProgramming	fe2c154b89	Refactor chooseboxmon (#8491) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2026-01-22 19:54:19 +01:00
Bassoonian	fb4c8ef62c	More type checking across the repo (#8988)	2026-01-22 17:40:09 +01:00
Bassoonian	61f8a50751	Add even more type checking (#8972)	2026-01-21 12:56:13 +01:00
Alex	da62ebcffd	Move attack canceler to the move resolution file (#8921)	2026-01-21 12:11:37 +01:00
Alex	6c05a08750	Refactor OHKO Moves (#8916)	2026-01-21 11:55:30 +01:00
GGbond	128beb39e1	Fixed several issues with Parting Shot (#8928)	2026-01-20 22:06:50 +01:00