8088 Commits

Author	SHA1	Message	Date
Alex	5774dde7ae	Adds smart target type (#8639)	2025-12-30 19:16:03 +01:00
Alex	3a8fdf9fad	Create battle_move_resolution.c (#8703)	2025-12-29 16:13:45 +01:00
Alex	ad2eb18364	Clean up for touchedProtectLike (#8699)	2025-12-28 22:26:58 +01:00
PhallenTree	d5c40bbbdd	Add Move End Faint Block (#8673)	2025-12-28 20:44:39 +01:00
grintoul	6e9f8998b4	Adds EXPECT_FAIL macro to test system to allow for testing of conditions correctly triggering failures (#8553)	2025-12-28 11:21:02 +01:00
Alex	0bdc20b102	Clean up for Wish struct, IsSpreadMove and all learnables file (#8680)	2025-12-27 20:33:47 +00:00
FosterProgramming	e95b4de84e	Add trainers submenu for debug menu (#8399)	2025-12-27 16:57:13 +01:00
hedara90	8de29867d9	Make Porygon not load-bearing (#8688)	2025-12-27 16:26:41 +01:00
Gudf	467a98014a	3-color text fixes (#8672)	2025-12-27 09:18:20 +01:00
Josh	349da0484b	Document m4a xcmd_0C	2025-12-27 01:11:40 +00:00
FosterProgramming	30e5fc6958	Refactoring the way teachable learnsets are generated (#8027)	2025-12-26 13:13:29 +01:00
Pawkkie	24ab5c45c9	Adjust AI two-turn move scoring (#8651)	2025-12-25 02:05:20 +01:00
Pawkkie	0551fcf408	Add Dynamic Switch AI Function (#8629)	2025-12-25 02:02:01 +01:00
Estellar	6feafc614c	Centralize message box and standard frame drawing (#8190)	2025-12-24 16:54:27 +01:00
FosterProgramming	a44da2cc99	Improve make_scr_cmd_constants.py (#8347)	2025-12-24 07:26:51 +01:00
Alex	ac221a3aa8	Fix incorrectly applied change in atkcanceler (#8641)	2025-12-24 01:16:26 +01:00
Alex	4d69a7274f	Stockpile / WishFutureKnock / Order up clean up (#8528)	2025-12-22 19:57:54 +01:00
Pawkkie	42d968ebfb	Consolidate GetIndexMove (#8622)	2025-12-22 19:47:02 +01:00
GGbond	c20d6ca606	Ensure Palafin prioritizes safe Flip Turn for Zero To Hero in battle (#8591)	2025-12-22 12:59:49 -05:00
Alex	644b04a9f4	Move Explosion to attackcanceler and Terrain Boost effect (#8612)	2025-12-22 18:52:28 +01:00
Alex	6681b03c9b	Refactor Endeavor to use DoFixedDamageMoveCalc func (#8618)	2025-12-22 18:33:38 +01:00
grintoul	d55d2b6dfc	Corrects test system Forced Ability handing for multi battles (#8611)	2025-12-22 10:11:21 +01:00
PhallenTree	22b78e924d	Counter/Mirror Coat/Metal Burst refactor (#8604)	2025-12-21 12:25:28 +01:00
Eduardo Quezada	828e12bee6	B_SPORT_DMG_REDUCTION config tests (#8593)	2025-12-20 15:47:46 +01:00
Eduardo Quezada	36e71c8236	B_BINDING_TURNS config tests (#8595)	2025-12-20 15:24:39 +01:00
Martin Griffin	3cde6e2c39	errorf (#8580)	2025-12-20 09:49:56 +01:00
Eduardo Quezada	44b658935f	B_TAILWIND_TURNS config tests (#8592)	2025-12-19 18:21:10 -05:00
ghostyboyy97	a901d227cc	fix (scoring): AI_IsMoveEffectInPlus - AI should not see secondary effect of Sheer Force boosted moves as beneficial (#8579) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-12-19 12:40:46 -05:00
Eduardo Quezada	9451af1c64	B_UPDATED_CONVERSION_2 config tests (#8573)	2025-12-19 16:17:24 +01:00
Hedara	e4ae9317c9	Merge branch 'master' into master-to-upcoming ... Manual fixes to Lunar Dance handling Conflicts: include/battle_util.h src/battle_ai_main.c src/battle_ai_switch.c src/battle_ai_util.c src/battle_end_turn.c src/battle_script_commands.c src/battle_util.c test/battle/ai/ai_doubles.c test/battle/move_effect/snatch.c test/battle/spread_moves.c	2025-12-19 15:31:37 +01:00
Eduardo Quezada	66b6664938	B_REDIRECT_ABILITY_IMMUNITY config tests (#8571)	2025-12-18 23:26:50 -05:00
Eduardo Quezada	914a481308	B_BURN_DAMAGE config tests (#8574)	2025-12-18 18:53:35 -05:00
Eduardo Quezada	dc5ed3a85b	B_SYNCHRONIZE_TOXIC config test (#8572)	2025-12-18 18:52:15 -05:00
Eduardo Quezada	be9879f94a	B_IRON_BALL config test (#8569)	2025-12-18 18:48:54 -05:00
Eduardo Quezada	6e529cf221	B_KLUTZ_FLING_INTERACTION config test (#8568)	2025-12-18 18:45:54 -05:00
Eduardo Quezada	b78fccdb66	B_STURDY config test (#8565)	2025-12-18 17:24:52 -05:00
FosterProgramming	a60df1f71b	Remove another unused deoxys function (#8576)	2025-12-18 19:02:35 +01:00
hedara90	ada6b5e754	Assertf improvements and fixes (#8570)	2025-12-18 13:29:46 +01:00
Alex	71a1967b7b	Move target type refactor (#8513)	2025-12-18 13:12:41 +01:00
Eduardo Quezada	f621755397	Battle Factory move style automation (#8368)	2025-12-17 23:28:50 +01:00
Martin Griffin	09b36afc22	assertf: Formatted asserts (#8196)	2025-12-17 21:15:42 +00:00
Martin Griffin	35255475cb	Use assertf to detect errors	2025-12-17 18:52:02 +00:00
Pawkkie	38519b66e3	Switchin calcs leverage saving / restoring AiLogicData (#8556)	2025-12-17 19:15:38 +01:00
Martin Griffin	cc8c8bd668	assertf: Formatted asserts ... assertf's behavior depends on the build: - In release builds it executes recovery code. - In debug builds it shows a crash screen. When start is pressed it resumes and executes the recovery code. - In test builds it fails the test with an INVALID result.	2025-12-17 17:14:34 +00:00
hedara90	773ca1fde8	Add support for species unique eggs (#8557)	2025-12-17 16:10:02 +01:00
Eduardo Quezada	7b741c77f0	Added Light Ball tests (#8526)	2025-12-17 10:44:44 +01:00
FosterProgramming	bf0e1b1a86	Add missing behavior when using focus punch while surviving an OHKO move (#8484) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-12-17 00:56:59 +01:00
Pawkkie	b82bb5bfa1	Refactor switchin candidates to use battler (#8546)	2025-12-16 21:27:16 +01:00
hedara90	ec1a283b1b	Add SUB_HIT check to tests (#8413) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-12-16 19:19:34 +01:00
Eduardo Quezada	3feeebce9b	Fix GEN_6_ORAS definition (#8537)	2025-12-16 16:12:38 +01:00
Alex	4ae2f03e02	Move disable struct members to battle mon volatiles (#8540)	2025-12-16 15:53:35 +01:00
Eduardo Quezada	60e255ef5f	Finished Wish tests (#8530)	2025-12-16 15:40:21 +01:00
moostoet	755bec128b	Fix incorrect "last to move" check for Analytic, Snatch, and Magic Coat (#8536)	2025-12-15 15:56:17 +01:00
Pawkkie	612ff122bf	Fix switch AI caring about super effective Snore (#8500)	2025-12-15 10:27:33 +01:00
Eduardo Quezada	68aa18d0cb	B_SYMBIOSIS_GEMS tests (#8534)	2025-12-14 16:11:22 -05:00
Eduardo Quezada	5700fb08a2	Expanded B_SANDSTORM_SPDEF_BOOST test (#8532)	2025-12-14 18:14:27 +01:00
psf	e65f30bf60	Add OW_BERRY_COLORS and update gBerries to match (#8353)	2025-12-14 16:56:30 +01:00
Eduardo Quezada	a3a16acd72	Expanded B_EXP_CATCH test (#8527)	2025-12-14 16:38:22 +01:00
Alex	6b83f3b7b0	Add starting-status hazard support (#8302)	2025-12-14 16:30:59 +01:00
Eduardo Quezada	a0a5947590	Added tests for stat-changing moves (#8278) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-12-14 16:24:39 +01:00
PCG	6db75af625	Fix Summary screen lag with move relearner when there's a lot of TMs (#8503)	2025-12-14 14:32:52 +01:00
Moos Toet	35532a112c	fix alignment	2025-12-14 14:26:33 +01:00
Eduardo Quezada	b8ccf6b57e	Battle controller Ball throw cleanup (#8519)	2025-12-14 12:50:23 +01:00
Eduardo Quezada	08a5a319bd	Fix Lunar Dance not checking PP (#8364)	2025-12-14 12:47:01 +01:00
Eduardo Quezada	15b2544e9f	Fixed Wally Tutorial and added option to check from Debug Menu (#8502)	2025-12-14 00:34:12 -05:00
Alex	5509268d6b	Fix potential bug with CanBattlerGetOrLoseItem (#8518)	2025-12-13 13:14:48 -05:00
Moos Toet	29516be23a	simplify name	2025-12-13 18:17:21 +01:00
Moos Toet	dad74300ea	fix: fainted mon on first turn with hazards no longer bugs out	2025-12-13 18:15:03 +01:00
Moos Toet	efbbd4130f	reviewer feedback + additional tests	2025-12-13 16:53:09 +01:00
FosterProgramming	0b1b0c7bc9	Remove vestigial handledeoxys code (#8509)	2025-12-13 00:23:14 +01:00
Pawkkie	67fff22a2f	Improve AI Absorb Handling (#8465) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-12-13 00:21:50 +01:00
Pawkkie	f5c4f403ca	AI ShouldPivot Overhaul (#8486)	2025-12-12 23:04:32 +01:00
Pawkkie	f26f019947	Add AI switchin quality consideration configs (#8508)	2025-12-12 23:03:33 +01:00
Moos Toet	fc2242cd68	Merge remote-tracking branch 'upstream/upcoming' into feat/8245-traps-starting-statuses	2025-12-11 23:04:07 +01:00
Moos Toet	c5b00cc02a	feat: implement logic with new code	2025-12-11 22:52:02 +01:00
jtebbe	4ab2ac3b8d	Add .isRestricted and .isSubLegendary (#8501)	2025-12-11 19:11:30 +01:00
Martin Griffin	7e2215e05a	waitmovementall (#8333)	2025-12-11 14:52:58 +01:00
ghostyboyy97	d1a3eb5d71	fix (scoring): configure GetNoOfHitsToKOBattler to allow optional endure consideration (#8496)	2025-12-10 15:21:52 -05:00
ghostyboyy97	e8884531fe	feat (AI): AI hits to KO considers Endure effects, and self-damage setup move handling (#8482) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-12-10 11:54:18 -05:00
Alex	889d11fa02	Add fieldStatuses argument to Ai_CalcDamage for switch in calc (#8490)	2025-12-10 11:50:26 -05:00
Mitsunee	02c44242f8	Added bugfix for missing no weather case in Cmd_weather_get (#2203)	2025-12-09 22:22:08 -05:00
GriffinR	f0e351b33d	Merge pull request #2171 from ShinyDragonHunter/unused_funcs ... Label unused functions in siirtc.c, m4a.c & rtc.c with the "UNUSED" attribute	2025-12-09 22:14:57 -05:00
GriffinR	bcd5735f76	Merge pull request #2176 from NTx86/gba-fix-object-event-range-type ... Change rangeX and rangeY to u8 in ObjectEvent struct	2025-12-09 21:57:06 -05:00
GriffinR	83b05d5efa	Merge pull request #2201 from mrgriffin/pret-flag-registered-wally ... Fix FLAG_REGISTERED_WALLY	2025-12-09 21:43:30 -05:00
Pawkkie	dafe12f085	Rename Ai_WhichMoveBetter to CompareMoveEffects (#8468)	2025-12-09 19:21:49 +01:00
Eduardo Quezada	04da8aa285	Allow Starting Statuses beyond 15 (#8485)	2025-12-09 16:24:23 +01:00
AlexOn1ine	23cefec579	08/12/25 master to upcoming merge	2025-12-08 18:15:19 +01:00
Moos Toet	91c7bd875c	fix: (WIP) hacky solution using enum, pausing for now	2025-12-08 15:30:53 +01:00
Moos Toet	578d9a33b6	feat: add traps to starting statuses list	2025-12-08 14:15:29 +01:00
Gudf	cb66c35709	Enable 3-color text (#8191)	2025-12-08 12:27:13 +01:00
grintoul	b58787f966	Adds TIE_BREAK_SCORE and TIE_BREAK_TARGET to test system to allow for forced or random move and target selection (#8398)	2025-12-07 16:58:10 -05:00
grintoul	822b898804	Enables AI to score all moves that KO as best damage, and store multiple moves as best damaging move for additional checks (#8425)	2025-12-07 15:59:24 -05:00
Pawkkie	fee619075e	Split battle_ai_switch_items.c in two (#8414)	2025-12-07 19:34:07 +01:00
Alex	a42f921939	Streamline unable to use move flags (#8415)	2025-12-07 18:41:48 +01:00
amiosi	328ec9d708	Generational Move Changes (#8405)	2025-12-06 23:50:58 +01:00
Alex	445cc2ace9	Adds missing cases for Revenge and Assurance doubling power (#8453) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-12-06 19:04:48 +01:00
PhallenTree	02798e9990	Fix Air Balloon message happening when another battler switches in (#8455)	2025-12-06 17:47:53 +01:00
Eduardo Quezada	79cc3f475c	Adjusted battle string IDs to match the order in gBattleStringsTable	2025-12-05 14:01:03 -03:00
grintoul	2e6f941fdf	Decouples BattlerHasAi from battle positions to instead be determined by battler Battle Controller (#8247)	2025-12-05 00:26:28 +01:00
Paccy	47e1ca999a	Add Chooseboxmon special (#5428) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-12-04 22:46:55 +01:00
Alex	0fd0e50d8a	Renames for struct BattleContext and DamageContext (#8426)	2025-12-04 13:52:15 -05:00
Pawkkie	6615310279	Improve self-sacrifice AI (#8427)	2025-12-04 18:57:47 +01:00
Eduardo Quezada	67e95e28e9	WITH_CONFIG Refactor (#7584)	2025-12-04 15:49:52 +01:00
hedara90	22492a6494	Make TRUE and 1 behave the same in config/species_enabled.h (#8421) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-12-04 15:27:50 +01:00
FosterProgramming	f3d43e286d	Fix substitute/defog interactions (#8418)	2025-12-04 15:24:53 +01:00
FosterProgramming	142a5ef08c	Fix illusion not breaking properly when behind substitute (#8423) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-12-04 00:35:38 +01:00
Eduardo Quezada	f49a788bc6	Support Gen 2's Sandstorm not reducing Solar Beam's power (#8422) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-12-03 21:27:39 +01:00
Alex	a73dc0d635	Refactor Multi Hit moves to use a flag instead of effect (#8379) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-12-03 12:12:45 -05:00
Alex	d6d8d8712f	Convert starting statuses to a bitmask (#8233) ... Co-authored-by: hedara90 <90hedara@gmail.com>	2025-12-03 17:23:25 +01:00
Eduardo Quezada	a421142c78	Removed Hold Effects that do nothing (#8420)	2025-12-03 14:12:12 +01:00
moostoet	d0965814fe	Fix Costar not copying partner's critical hit boosts (#8386)	2025-12-02 21:25:52 +01:00
moostoet	dc7aad6be1	Fix Snatch stealing snatched moves (#8350) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-12-02 20:56:30 +01:00
Eduardo Quezada	115694675f	Renamed Config Test system to more general names (#7283)	2025-12-02 11:26:44 -05:00
Alex	49a18df48a	Refactor Fury Cutter and Rollout (#8375)	2025-12-02 16:45:34 +01:00
Alex	a285482310	Make Glaive Rush a MOVE_EFFECT_GLAIVE_RUSH (#8351)	2025-12-02 16:44:31 +01:00
Pawkkie	00b3179f75	Add AI_FLAG_RANDOMIZE_SWITCHINS (#6222)	2025-12-02 15:38:05 +01:00
Hedara	fd39cca2b4	Merge branch 'master' into master-merge ... Conflicts: include/constants/expansion.h	2025-12-01 20:12:22 +01:00
Pawkkie	8d42cb92c2	Add Smarter AI Resist Berry Handling (#8376) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-12-01 19:51:43 +01:00
Salem	29f83ea5e0	Trainerbattle Type Differentiation (#6424) ... Co-authored-by: CallmeEchoo <callmeechoo@github.com> Co-authored-by: Your Name <you@example.com>	2025-12-01 19:28:09 +01:00
Hedara	fcfa2a3d17	Start of 1.14.2 cycle	2025-12-01 17:41:14 +01:00
Hedara	905c580b08	Expansion 1.14.1	2025-12-01 17:35:59 +01:00
moostoet	25623fbade	Smarter AI handling for incoming heals / Revival Blessing (#8325)	2025-12-01 11:26:39 -05:00
FosterProgramming	2a16b94a13	Allow x items to be cross-used in double battles (#8280)	2025-12-01 14:46:03 +01:00
Alex	55fbbfa586	Move crit calculation into the damage calc (#8365) ... Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2025-11-30 13:58:51 -05:00
PhallenTree	1fa97941c8	Updated Focus Punch failure check and moved to attackcanceler (#8360)	2025-11-30 18:37:57 +01:00
Alex	f222bcaff5	Switch-in Events Refactor (#8128)	2025-11-30 08:25:20 -08:00
Hedara	8382382dc9	Start of 1.15.0 cycle	2025-11-30 16:40:52 +01:00
Hedara	2e0e428ffd	Start of 1.14.1 cycle	2025-11-30 16:11:41 +01:00
Hedara	da5a2ca70c	1.14.0 release	2025-11-30 16:00:23 +01:00
Hedara	71fc42947d	Merge branch 'upcoming' into expansion-releases	2025-11-30 15:42:23 +01:00
Hedara	66ea9ac406	1.13.4 release version	2025-11-30 15:41:43 +01:00
AlexOn1ine	15d9342fe5	30/11/25 master to upcoming merge	2025-11-30 14:57:50 +01:00
Hedara	bf1dd201d3	Merge remote-tracking branch 'pret/master' into pret-merge ... Conflicts: INSTALL.md asm/macros/battle_script.inc data/battle_scripts_1.s include/constants/battle.h src/battle_script_commands.c src/battle_util.c	2025-11-30 11:56:57 +01:00
Alex	dfd8daac2e	Fixes Neutralizing Gas / Mold Breaker / Dragon Darts interaction (#8389)	2025-11-30 09:10:43 +01:00
hedara90	ce858f51b2	27/11/25 Master to upcoming merge (#8359)	2025-11-27 21:07:59 +01:00
PhallenTree	c36fc5c4b7	Fixes Beak Blast burning after Beak Blast was already used (#8361)	2025-11-27 20:07:45 +01:00
Alex	2d628aca0e	Move end clear bits clean up (#8354) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-11-27 17:42:16 +01:00
AlexOn1ine	68300e0f9a	27/11/25 Master to upcoming merge	2025-11-27 13:39:12 +01:00
moostoet	fbc640d692	Refactor Beat Up handling for Gen 3/4 defaults, fix crit check, and expand test coverage (#8307)	2025-11-25 22:18:51 +01:00
cawtds	95353565c2	convert SCR_OP to enum, make pattern more lenient	2025-11-25 16:11:47 +01:00
psf	1ea0500b95	Fixed broken friendship from items in battle test and added new test for opposite case (#7872)	2025-11-24 06:55:30 +00:00
FosterProgramming	a4482f0ee2	Rework switch AI and add more tests for ace pokemon flags (#8321)	2025-11-23 19:04:44 +01:00
PhallenTree	10ef7f7839	More Neutralizing Gas cleanup (#8335)	2025-11-23 17:29:50 +01:00
moostoet	935817bf37	Fix Protosynthesis stat boosts ignoring speed drops (#8277)	2025-11-23 16:31:19 +01:00
Alex	c2fba193a6	Fix Upper Hand failure still activating Protean (#8329)	2025-11-23 12:36:28 +01:00
Eduardo Quezada	51a750e61a	Finished fixing tests when setting GEN_LATEST to GEN_5 (#8263)	2025-11-23 12:04:36 +01:00
AlexOn1ine	aa20b2bc0f	master to upcoming merge	2025-11-22 10:39:52 +01:00
FosterProgramming	29ac028c9e	Fix tossing items applying to the wrong stack (#8282)	2025-11-21 22:13:15 -08:00
hedara90	2f5dfa99f4	Make gTestRunnerHeadless into a constant outside of tests (#8306) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-11-20 22:14:34 +01:00
hedara90	cd6d293ad1	Fix some move animations leaking VRAM and freeing already freed tags (#7977) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-11-20 14:19:48 +01:00
mitsunee	c0569cd529	Standardize spelling of "synchronize"	2025-11-19 21:14:45 +01:00
AlexOn1ine	6a28506ee2	19/11/25 Master to upcoming merge	2025-11-19 18:20:30 +01:00
AlexOn1ine	6aa84c8fa1	Canceller -> Canceler rename	2025-11-19 16:06:52 +01:00
moostoet	8c2d31b792	Add AI flag AI_FLAG_KNOW_OPPONENT_PARTY to know all species in party (#8290)	2025-11-18 23:41:04 +01:00
moostoet	0f4d325467	Fix Fur Coat affecting confusion self-damage (#8267)	2025-11-18 23:34:36 +01:00
FosterProgramming	4a69268bd5	Make rainbow effect anim change based on side (#8269)	2025-11-18 23:31:47 +01:00
Eduardo Quezada	0dd73131d0	Test type enum indentation	2025-11-17 09:15:45 -03:00
Bivurnum	48f15b14a2	Follower NPCs no longer move if the player would be forced back onto the same tile. (#8260)	2025-11-16 21:15:06 +01:00
Alex	e445160c92	Adjust Canceler naming to contain only one l (#8258)	2025-11-15 18:44:16 +01:00
mitsunee	73ec0813e1	Standardize spelling of "canceler" ... just a quick grep -r and regex substitution, but didn't see anything wrong in the diffs during a quick proofread	2025-11-15 12:11:32 +01:00
Zimmermann Gyula	772abe6e7d	Implement GSC berry/apricorn tree functionality. (#7777) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-11-14 20:28:55 +01:00
Frank DeBlasio	ca575f2701	Added Gen 6 contest combos (#8251)	2025-11-14 18:24:33 +01:00
Frank DeBlasio	1683b1ff59	Converted options text into COMPOUND_STRINGs (#8248)	2025-11-14 18:23:33 +01:00
Alex	0384b573d2	Moves name box configs into a new file (#8250)	2025-11-14 18:21:59 +01:00
Linathan	8c83a25676	Fixed an issue related to same turn Encore targeting (#8230) ... Co-authored-by: LinathanZel <LinathanZel@github.com>	2025-11-13 11:37:17 +01:00
Frank DeBlasio	6d09eb2402	Added contest config and cleaned up contest category variables (#8178)	2025-11-13 11:29:38 +01:00
Martin Griffin	12b65b565b	DamageContext: chosenMove (#8224)	2025-11-11 21:59:18 +01:00
FosterProgramming	44d4e0c1de	Refactor random functions to be runner specific (#7816)	2025-11-11 20:48:41 +00:00
Alex	bb11d96d86	Merge branch 'upcoming' into 111125	2025-11-11 19:04:54 +01:00
Alex	f28abcab6a	Micro clean up in BattleStruct (#8177)	2025-11-11 17:42:27 +01:00
Eduardo Quezada	2dc36a8ba0	Wrote some missing tests (#8203)	2025-11-11 13:52:24 +01:00
AlexOn1ine	93cc143134	conflicts	2025-11-11 13:12:00 +01:00
PhallenTree	649798449e	Powder Move blocking cleanup (#8194)	2025-11-10 21:01:35 +01:00
Alex	226fd60674	Fix incorrect comments (#8193)	2025-11-10 15:55:58 +01:00
Alex	59d131f599	Fixes wrongly assigned count for Semi Invulnerable state (#8175)	2025-11-10 10:40:47 +01:00
Alex	d9797fa01d	Remove redundant Future Sight flag (#8185)	2025-11-09 22:33:03 +01:00
PCG	d2425c1468	Move Relearners for TMs, Tutors and Egg moves (#8040) ... Co-authored-by: khbsd <khb.dev@gmail.com> Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>	2025-11-09 12:54:01 -08:00
FosterProgramming	3e583f8add	Fix tera tint not applying on activation (#8135)	2025-11-09 18:10:44 +01:00
FosterProgramming	43f9a78da5	Fix recharge moves + add recharge move tests (#8181)	2025-11-09 17:46:22 +01:00
khbsd	f8509c3e65	Sets instant text speed flag to false by default (#8179)	2025-11-09 10:14:22 +01:00
khbsd	82a63a09fe	update: time-based encounters system tuneup and @cawtds' header script (#8158)	2025-11-07 21:25:09 -08:00
grintoul1	c230e54678	Master to Upcoming merge 20251107	2025-11-07 22:45:57 +00:00
khbsd	4d28f7be23	feat: adds stevebeller's instant text and MandL27's faster text printing (#8063)	2025-11-07 23:11:17 +01:00
FosterProgramming	2467584af5	Prevent EXPECT functions from casting negative numbers into unsigned (#7866)	2025-11-07 18:32:15 +01:00
FosterProgramming	cab4ec29da	Add additional comment explaing map name popup transparency side-effects (#8117)	2025-11-07 10:05:50 +01:00
FosterProgramming	97b115d572	Adds an auto-generated include file of script commands (#8156)	2025-11-06 21:10:42 -08:00
FosterProgramming	be7646b67a	Allow vs seekers to work with script not starting with trainerbattle (#8062) ... Co-authored-by: pkmnsnfrn <pkmnsnfrn@gmail.com>	2025-11-06 10:16:19 -08:00
Martin Griffin	c466dce996	Fix FLAG_REGISTERED_WALLY	2025-11-06 13:40:22 +00:00
Alex	fbaaf2d338	Increase number of additional move effects (#8149)	2025-11-06 00:18:12 +00:00
Bassoonian	be4ce5901f	Fix Kyurem typo in swap move tables (#8139)	2025-11-05 14:48:53 +01:00
Alex	0f14a4db57	Clean up ability effect hitmarker (#8138)	2025-11-04 21:44:57 +00:00
Bassoonian	473a0aa44d	Add Legends Z-A content (#7935) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-11-04 22:25:33 +01:00
Alex	41aba41838	Attackstring hitmarker clean up (#8136)	2025-11-04 18:35:48 +00:00
Alex	80b5d81a9a	Create BattleStruct sub struct for event states (#8131)	2025-11-04 18:34:54 +00:00
Alex	be5f6d4801	Fixes hacky SetMoveEffect script calls (#7987)	2025-11-04 17:47:35 +00:00
ghostyboyy97	3c72ca1158	fix (AI scoring): shield dust considerations, IsMoveEffectInMinus self effect edge case, hitsToKO zero-case consideration (#8126) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-11-04 09:35:43 +01:00
Hedara	b0ccddac69	Merge branch 'master' into master-to-upcoming ... Conflicts: include/constants/expansion.h	2025-11-03 11:11:07 +01:00
Hedara	cfdbd19ea8	Start of 1.13.4 cycle	2025-11-01 21:51:24 +01:00
Hedara	f969c126b1	1.13.3 release version	2025-11-01 21:51:06 +01:00
Hedara	5c31b58b81	Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge ... Conflicts: spritesheet_rules.mk tools/mapjson/mapjson.cpp	2025-11-01 15:13:16 +01:00
Hedara	dd17524fc9	Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge ... sha1sum changed Conflicts: include/global.h include/overworld.h include/pokemon.h src/map_name_popup.c src/pokedex_area_screen.c src/pokemon.c	2025-11-01 15:09:20 +01:00
Hedara	67e30c96c0	Merge commit '0965dffe70bb7d4bc229e24e4bc0266a6be6b8c8' into pret-merge ... Conflicts: include/item_menu.h	2025-11-01 14:56:09 +01:00
Hedara	8c4d1269a0	Merge commit 'f2cf20ce9bdf4a9f6cd0300a005ca3ec6ae89e3c' into pret-merge ... Conflicts: INSTALL.md include/battle.h include/save.h src/wild_encounter.c	2025-11-01 14:51:14 +01:00
AlexOn1ine	d4e7e7ad36	10/11/25 Master to upcoming merge	2025-11-01 11:54:17 +01:00
FosterProgramming	6c3f87e74e	Fix bug when a captured pokemon replaces a party member who changed forms (#8091)	2025-10-31 17:50:29 +01:00
Alex	1c1a98ee45	Grudge, Destiny Bond and FaintBattler refactor (#8072) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-10-30 23:14:02 +01:00
Alex	ff557e3d0c	Clean up for item hold effect refactor (#8014)	2025-10-30 21:07:37 +01:00
Estellar	fd84adc421	Minor clean up in menu.c (#8060)	2025-10-30 17:15:15 +01:00
Eduardo Quezada	8de86ba243	Fixed Belly Drum/Contrary interaction at max Attack (#8078)	2025-10-30 17:14:07 +01:00
PhallenTree	9d06a4fb55	Emergency Exit on hazards activation + fix end of turn activation (#8075)	2025-10-30 17:01:13 +01:00
FosterProgramming	44dc720260	Fix namebox bug when reloading the map mid-script (#8073)	2025-10-30 09:13:22 +01:00
Martin Griffin	d1d5435487	Improve undefined map assembler messages (#2196)	2025-10-29 21:34:03 -04:00
Hedara	a2ef3284dd	Merge branch 'master' into master-to-upcoming ... Conflicts: data/battle_scripts_1.s include/battle_util.h include/constants/battle.h src/battle_script_commands.c src/battle_util.c	2025-10-29 18:42:59 +01:00
Alex	dd875b87bc	Combine Simple Beam and Worry Seed into one effect (#8039) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-10-29 15:20:12 +01:00
grintoul	c90e6952f3	Fix Ally Switch being useable in Frontier Link Multi battles (#8059) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-10-28 19:26:10 +01:00
FosterProgramming	fd07daf0d8	Fix nature power string and add support for evnvironment in tests (#8068) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-10-28 19:23:16 +01:00
FosterProgramming	b82a5a4c1c	Fix wrong gimmick spite showing when inputting too fast (#8066)	2025-10-28 17:02:35 +01:00
Bassoonian	f7cbe4853b	Add type enum (#8054)	2025-10-27 16:41:22 +00:00
Bivurnum	6ddabde582	New Feature: ORAS Dowsing (#7211)	2025-10-27 17:41:07 +01:00
grintoul	a32da780c4	Corrects ONE_VS_TWO_BATTLE_TEST to use BATTLE_TEST_ARGS_ONE_VS_TWO (#8061)	2025-10-27 15:24:33 +00:00
PhallenTree	782c559a20	Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042)	2025-10-26 22:41:16 +01:00
Alex	e8ad3c20f7	Fixes compilation error due to #8002 (#8050)	2025-10-26 15:48:59 +01:00
Alex	4ed1c3309d	Decouple (overworld) statuses from ability function (#8002)	2025-10-26 13:57:34 +00:00
khbsd	7b3a2f3aaf	fix: hypertraining a stat now optionally reflects in the summary screen (#8035)	2025-10-25 19:15:03 -07:00
AlexOn1ine	6acabd4ba2	Master to upcoming merge	2025-10-25 16:19:32 +02:00
Bassoonian	be23dfdf2a	Even more enums and documentation (#8029)	2025-10-25 14:37:47 +02:00
hedara90	6eaa09bf5d	Add error messages for trying to send an illegal mon to the PC and fixes index in double wild battles (#7982) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-10-25 14:37:17 +02:00
Alex	65244cbeb4	Moved usedHeldItem to Party State struct (#8006)	2025-10-24 18:56:16 +02:00
Alex	8ea947d5a1	Fixes Protosynthesis not activating after weather was reset (#8021)	2025-10-24 18:53:34 +02:00
grintoul	95c2a6e2b6	Multibattle testing system (#7257) ... Co-authored-by: hedara90 <90hedara@gmail.com> Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2025-10-24 15:00:23 +02:00
FosterProgramming	5348de4abb	Banned species list (#8003)	2025-10-23 21:29:33 +02:00
Bassoonian	fbd702e3a4	Some more documentation and cleanup (#8020)	2025-10-23 20:14:38 +02:00
FosterProgramming	5b4403ddfe	Fix stats defined in tests being overwritteng by stat change (#8018) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-10-23 18:59:15 +02:00
Bassoonian	fb660061ab	Converts some defines to enums and name unnamed enums (#8019)	2025-10-23 18:06:29 +02:00
FosterProgramming	46b122c5ce	Revert HGSS dex and movelist changes (#8016)	2025-10-23 13:52:25 +02:00
Nopinou	f53861ae05	Remove appearedInBattle bitfield & redundant use of sentOut partyState (#8011)	2025-10-22 23:25:18 +02:00
FosterProgramming	1343ddf7c3	Fix badge boost not applying in gen1 and 2 (#8013)	2025-10-22 22:57:04 +02:00
Eduardo Quezada	dc0d910182	Fixed Stomping Tantrum not doubling in damage if the user failed Protect (#8008)	2025-10-22 15:20:44 +02:00
PhallenTree	2416bfb53b	Fixes Echoed Voice base power increase depending on attacker's use of the move (#7997)	2025-10-22 13:39:24 +02:00
FosterProgramming	eac5da89ad	Make movelist calculations happen during compilation instead of runtime (#7967)	2025-10-20 15:31:42 +02:00
Alex	786859b6bb	Fix Fling Mental Herb message (#7984)	2025-10-19 22:38:27 +02:00
DavidJCobb	7fd0029ed7	Add typedefs for MAPSEC and METLOC values (#2183) ... Added typedefs: mapsec_t, metloc_t, and variants for MAPSEC and METLOC values. There are some rough edges that could do with smoothing out, but for now, this gets us close to ideal with a ROM that compares equal. Per feedback, all typedefs to mention the underlying type within the typedef name. The documentation comments reflect and explain the naming convention. Updated comments to reflect the fact that we're no longer using SET8 for a Pokemon's met locations, in favor of a new macro (added by this PR) that adjusts to match the width of whatever is being set.	2025-10-19 17:37:13 +01:00
Alex	cb0d503f66	Decouple passive hp updates from move damage updates (#7942)	2025-10-19 16:40:13 +02:00
Estellar	0965dffe70	Use TaskFunc wherever posible (#2188)	2025-10-18 17:53:50 +01:00
spindrift64	de3c031fc5	Fix Anticipation type effectiveness check (#7840)	2025-10-16 14:36:07 +02:00
AlexOn1ine	e365add4cf	15/10/25 Master to upcoming merge	2025-10-15 21:31:00 +02:00
Alex	a77f8d97a1	Optimize GetWhichBattlerFasterOrTies (#7953)	2025-10-15 15:08:16 +02:00
Alex	3ad78d0079	Clean up follow up for AtkCanceller refactor (#7951)	2025-10-14 18:07:56 +01:00
Estellar	f4f7c38255	Use MainCallback wherever posible (#2184)	2025-10-14 09:41:27 +01:00
Alex	2daa8f3c88	Remove EffectHitSetTerrain script to use moveeffect (#7938)	2025-10-13 15:39:10 +02:00