17695 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jonathan Lin	b5fbced691	New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)	2025-05-15 09:40:02 +02:00
Pawkkie	d09a06561f	Move out ai structs out of BattleResources (#6741)	2025-05-14 18:11:22 -04:00
AlexOn1ine	56c9549bbe	fix test	2025-05-14 23:45:31 +02:00
AlexOn1ine	19e2bb82b5	clean up	2025-05-14 23:34:43 +02:00
AlexOn1ine	1a773a5916	conflicts	2025-05-14 23:21:33 +02:00
Eduardo Quezada	12bc5a10b7	Removed multiple instances of hardcoded move IDs (#6856)	2025-05-14 22:40:10 +02:00
Eduardo Quezada	3ef61e6451	Combined type-enhancing hold effects (#6846)	2025-05-14 13:45:08 +02:00
Eduardo Quezada	face37e8f3	Battle TV expansion (#6826)	2025-05-13 15:54:54 +02:00
Alex	de79d6de48	Added IsOnPlayerSide (#6832)	2025-05-13 12:38:43 +02:00
Bassoonian	2394195123	Remove non-existent functions from header files (#6825)	2025-05-13 10:52:45 +02:00
Eduardo Quezada	5f0a853e74	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/isOnPlayerSide	2025-05-12 20:58:27 -04:00
Eduardo Quezada	3b6dbf38fd	Review changes	2025-05-12 20:53:14 -04:00
Alex	006abe097e	Add AI_FLAG_PREDICT_MOVES (#6551)	2025-05-12 23:10:10 +02:00
Alex	7f894ef5fb	Fixes a mistake made by me (#6828)	2025-05-12 20:08:00 +02:00
Eduardo Quezada	13071f7019	Added IsOnPlayerSide	2025-05-12 13:53:15 -04:00
Pawkkie	60666b1b13	rename to battlerAtk	2025-05-12 13:45:36 -04:00
Pawkkie	169d22b12c	Update src/battle_ai_main.c ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-05-12 13:42:01 -04:00
Alex	a880cfe6d2	master to upcoming, 2025-05-12 (#6830)	2025-05-12 18:44:35 +02:00
Hedara	1abfa7acfa	Merge branch 'master' into master-upcoming ... Conflicts: include/battle.h include/constants/battle_string_ids.h src/battle_ai_util.c src/battle_main.c src/battle_util.c test/battle/ai/ai.c	2025-05-12 18:21:35 +02:00
hedara90	5f86fd7de6	Changed github CI to use arm-none-eabi-gcc (#6829) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-05-12 16:38:03 +01:00
PhallenTree	a6b02b00c0	Fixes restoretarget on empty stack when using G-Max Gravitas (#6827)	2025-05-12 15:16:40 +02:00
hedara90	2bc82a886a	Add AUTO_GEN_TARGETS for .party files and map_groups_count, but on master (#6824) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-05-11 22:37:11 +02:00
Ruby	2740fdd6e6	Timemacros (#6696)	2025-05-11 12:34:54 +02:00
Eduardo Quezada	eadf89e6f9	Allow different flags for Badge boost (#6805)	2025-05-11 11:36:52 +02:00
Alex	d00563d830	Changed White Herb hold effect name (#6815)	2025-05-11 11:34:47 +02:00
Alex	0ad3f929ab	Fixes Berserk Gene infinite loop (#6813)	2025-05-11 11:34:16 +02:00
spindrift64	f4f82f2394	Toxic Spikes print whether the target is poisoned or badly poisoned (#6814)	2025-05-10 22:55:28 +02:00
Alex	4342bfb91d	Refactor stockpile resets (#6810) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-05-10 20:09:38 +02:00
Alex	8d5d7c7fca	Fixes ai moves being recorded without correct index (#6803) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-05-10 19:38:48 +02:00
spindrift64	3b91a964c9	Fix Iron Ball type effectiveness check (#6794)	2025-05-09 22:23:44 +02:00
AlexOn1ine	d60aba3773	revert changelog changes	2025-05-09 21:50:17 +02:00
AlexOn1ine	4959187d97	fix conflicts	2025-05-09 21:47:53 +02:00
Eduardo Quezada	eee78ddfb9	Fix upcoming compile (#6804)	2025-05-09 21:28:55 +02:00
PhallenTree	48c08c0368	Illusion struct cleanup and many Illusion fixes (#6798)	2025-05-09 20:41:20 +02:00
hedara90	e587757fa6	Added JSON as the preferred data format (#6801)	2025-05-09 15:15:48 +02:00
Eduardo Quezada	392d662c12	Rename GetPartyBattlerData to GetBattlerMon (#6800)	2025-05-09 15:14:09 +02:00
Pawkkie	04cebed982	Fix AI function table to match new u64 flags (#6796)	2025-05-09 12:32:22 +02:00
Alex	9060d401c9	Adds partyState to BattleStruct (#6783)	2025-05-09 12:29:54 +02:00
Pawkkie	92fe602694	missed one	2025-05-08 16:48:03 -04:00
Pawkkie	c7ee329433	Full functionality	2025-05-08 16:45:10 -04:00
Eduardo Quezada	f3113eb865	Add missing uses of IsBattlerAlly (#6793)	2025-05-08 21:18:51 +02:00
Pawkkie	04278dbfac	don't need prints any more	2025-05-08 14:52:13 -04:00
Pawkkie	b48d0c387d	Throw out unnecessary functions	2025-05-08 14:49:49 -04:00
Pawkkie	da047dfd22	Add AI for Zero to Hero Palafin (#6791)	2025-05-08 20:33:27 +02:00
Pawkkie	83b7732fae	Store predictingMove, config for chance	2025-05-08 14:19:43 -04:00
spindrift64	5e190d0782	Fix gems activating for moves that don't deal type damage (#6789)	2025-05-08 20:17:32 +02:00
Pawkkie	63ffe603be	merge fixes	2025-05-08 14:04:27 -04:00
Pawkkie	1e57670b34	Merge remote-tracking branch 'upstream/upcoming' into move-prediction	2025-05-08 13:58:18 -04:00
Eduardo Quezada	5820cc99f6	battle_main enum cleanup (#6788)	2025-05-08 13:34:33 +02:00
i0brendan0	8cc289ef35	Fix rerolls overwriting Fixed Personality (#6774)	2025-05-08 11:28:00 +02:00