13262 Commits

Author	SHA1	Message	Date
Pawkkie	939e168c04	Fix AI_DoesChoiceEffectBlockMove typo (#7335)	2025-07-13 19:24:14 +02:00
Pawkkie	06c54a2d60	Fix switching 1v1 calcs not handling 0 (#7131)	2025-07-13 17:45:59 +02:00
Pawkkie	bad2307497	Instant Win option in Battle Debug (#7333)	2025-07-13 11:40:21 -04:00
AlexOn1ine	165e7502bc	Instant Win option in Battle Debug	2025-07-13 16:21:37 +02:00
surskitty	f6b0a15841	Renaming to AI_ASSUME_STATUS_MOVES and making a config for universal status move guessing + disabling the custom tuning.	2025-07-12 18:50:08 -04:00
Pawkkie	1cea65cc76	master to upcoming 2, 2025-07-12 (#7329)	2025-07-12 16:07:05 -04:00
hedara90	14dbbf63d4	Remove competitive syntax config (#7154) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-07-12 13:03:36 -07:00
Hedara	a7e60ae08a	Merge branch 'master' into merge-for-pawkkie	2025-07-12 21:29:30 +02:00
Pawkkie	b55ee2288b	Fix AI seeing switchin abilities wrong in tests (#7328)	2025-07-12 21:28:05 +02:00
Frank DeBlasio	c9ec896312	Refactor battle environment (#4891)	2025-07-12 12:38:06 -04:00
AlexOn1ine	68db4c5a77	12/07/25 master to upcoming merge	2025-07-12 11:55:06 +02:00
surskitty	96274c772d	Also adding Helping Hand.	2025-07-12 00:42:46 -04:00
surskitty	3defa24282	Adding other healing move effects.	2025-07-12 00:41:14 -04:00
Nephrite	a1e67572b6	Replaces STATUS2 usage with volatiles in code (#7262) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-07-11 22:53:49 +02:00
Linathan	9228826ae1	New and polished battle animations (#7074)	2025-07-11 19:14:19 +02:00
Nephrite	7d5a949b71	Bag refactor 2 (#7166)	2025-07-11 11:50:38 +02:00
grintoul	d63f859db6	Multibattles Illusion party boundaries fix (#7308)	2025-07-11 09:53:03 +02:00
surskitty	026b1f25f2	I suspect the test is set up wrong, more than I have the logic wrong. Though that could also be true.	2025-07-11 00:31:47 -04:00
surskitty	3ee93c69ec	Preliminary handling for AI_FLAG_ASSUME_POWERFUL_STATUS, not actually yet called.	2025-07-10 23:38:08 -04:00
hedara90	cb606cee6a	Fix HGSS dex running out of heap (#7317) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-07-10 23:37:06 +02:00
Pawkkie	c5f788444a	Fix choice AI not seeing Gorilla Tactics (#7316)	2025-07-10 22:49:16 +02:00
surskitty	424c127b8b	AI Tests + accompanying bugfixes for Skill Swap, Worry Seed, weather setting in double battles, and Discharging into an ally's lightningrod (#7297)	2025-07-10 16:08:14 -04:00
surskitty	4e558af76e	AI uses After You to help set up Trick Room. (#7310)	2025-07-10 20:03:46 +02:00
surskitty	cb03086c1d	AI checks the partner's moves for Flatter, Swagger, and Soak. (#7306)	2025-07-10 20:02:31 +02:00
Pawkkie	419219bb31	Add AI_FLAG_ASSUME_STAB (#6797)	2025-07-10 19:58:31 +02:00
mudskipper13	0d09e5cce8	battle_interface: overhaul ability pop up (#7227)	2025-07-10 19:09:52 +02:00
Pawkkie	e4d9298200	Fix move comparison scoring (#7301)	2025-07-10 09:51:46 +02:00
surskitty	95a02dddb9	Improved logic for Guard Split and Power Split. (#7298)	2025-07-09 18:11:39 -04:00
Alex	d15c490223	Changes AccuracyCalcHelper into CanMoveSkipAccuracyCalc (#7303)	2025-07-09 17:33:48 -04:00
Pawkkie	d213b1fad7	Fix switch AI not seeing absorbing abilities (#7309)	2025-07-09 17:21:49 -04:00
Eduardo Quezada	b5a13d5e7f	Fixed Flag Vars menu keeping artifacts from bag menu + cleanup (#7226)	2025-07-08 22:00:37 +02:00
khbsd	57dad22ac4	feat: separate water and rock smash encounter rate checks (#7293)	2025-07-08 20:52:42 +02:00
Nephrite	5a6e7749ab	Removed all instances of .chance = 100, SHEER_FORCE_NO_BOOST (#7300)	2025-07-08 16:17:05 +02:00
Alex	31a561201b	Adds hazard queue (#7295)	2025-07-07 15:30:35 -04:00
Alex	7ae97ab6e9	Refactor move Synchronise (#7271)	2025-07-07 13:36:21 -04:00
Alex	0422a013c4	Add Set Hidden Nature option to the debug menu (#7281)	2025-07-07 13:33:57 -04:00
ghoulslash	4cb6afdec9	Ally Switch swap gLastX values (#7290) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-07-07 19:20:23 +02:00
Raymond Dodge	80b9c23d0a	Fix RL compressed data alignment ... `RLUnComp`, like `LZ77UnComp`, expects the source data to be word-aligned. So, to mirror how lz-compressed data is defined as `u32[]` to enforce word-alignment, this changes rl-compressed data to be defined as `u32[]` to enforce word-alignment.	2025-07-06 13:49:47 -04:00
Nephrite	b183b660a1	Added missing braces (#7288)	2025-07-06 15:10:50 +02:00
Alex	f808201945	Fixes Natural Gift moveend execution (#7274)	2025-07-05 15:05:35 -04:00
grintoul	e53709aa25	Fix incorrect status in beneficial ability Guts check (#7285)	2025-07-05 16:51:56 +02:00
surskitty	4052ab337c	Expanding and Refactoring Skill Swap and other ability-changing moves (#7238) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-07-05 14:49:35 +02:00
PhallenTree	38a3963ec2	Fix Psych Up message and cleanup and don't allow switching to self in tests (#7277)	2025-07-05 14:47:36 +02:00
surskitty	c360900a5b	Renaming STATUS1_REFRESH and adding more constants for common STATUS1 checks. (#7284)	2025-07-05 13:46:23 +02:00
Eduardo Quezada	c6a62758a2	Use compound strings in battle debug menu (#7282)	2025-07-05 13:45:20 +02:00
Nephrite	e8abfbce49	Untangled TMs and HMs from item ids (#7173)	2025-07-04 19:07:53 +02:00
Alex	5cfab59209	Fix OOB in Cmd_selectfirstvalidtarget (#7269)	2025-07-04 12:11:32 -04:00
hedara90	56907bc26e	Merrp merge, 2025-06-25 (#7217)	2025-07-04 13:03:09 +02:00
hedara90	beb576f4c5	Set BP of Gyro Ball for attackers with 0 speed to 1 (#7270) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-07-04 11:11:21 +02:00
surskitty	b3f52166df	Changing P_ONLY_OBTAINABLE_SHINIES to truly be Only Obtainable Shinies (#7275)	2025-07-04 11:06:36 +02:00
ghoulslash	31fc32ada8	Prevent AI Recursion (#7279) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-07-03 23:16:40 +02:00
ghoulslash	476e32cad9	Fix redirection abilities triggering on self (#7276) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-07-03 19:19:18 +02:00
AlexOn1ine	734a15478c	Clean up for Moveend	2025-07-02 17:25:03 +02:00
hedara90	ae1d99bb4f	Master to upcoming merge 01/07/25 (#7267)	2025-07-02 11:39:59 +02:00
AlexOn1ine	aa9ff53b81	master to upcoming merge	2025-07-02 10:05:31 +02:00
Alex	c27cc2ed70	Script clean up for Flame Burst and Costar (#7264)	2025-07-02 09:16:05 +02:00
Alex	e503f97f32	Use dedicated functions for Mud/Water Sport (#7248)	2025-07-02 09:08:12 +02:00
cawtds	92b4b7f0a0	Keep removed headers (#7261)	2025-07-02 09:06:23 +02:00
Alex	be2d36b6ee	Fixes instances of battler mutation for abilities (#7250)	2025-07-01 19:48:12 +02:00
Alex	10e55bd18d	Fixes Life Dew playing anim when it is not supposed to + tests (#7239)	2025-07-01 17:49:31 +02:00
Alex	f8fc86275c	Fixes protective pads not protecting from secondary protect effects (#7229)	2025-07-01 17:48:57 +02:00
Alex	89b1a45536	Fixes Ice Spinner and Steel Roller (#7259)	2025-07-01 15:39:22 +01:00
mudskipper13	aae04ffc84	Improve trainer back pic-related data and code (+ smol documentation) (#6821)	2025-06-30 23:50:48 +02:00
Alex	5451e40830	Fixes Toxic Thread animation not being played at the right time (#7247) ... Co-authored-by: hedara90 <90hedara@gmail.com>	2025-06-30 21:41:29 +02:00
hedara90	46d4b7c8c9	Bug Fix: Follower NPCs no longer have glitchy bobbing while underwater (#7232)	2025-06-30 21:39:51 +02:00
GriffinR	aac44d0f91	Merge pull request #2073 from AsparagusEduardo/_pret/pr/pyramidLocation ... Improve Pyramid location documentaion	2025-06-30 13:30:14 -04:00
Eduardo Quezada	7a0cbc12d2	Added CRY_MODE_DYNAMAX (#6933)	2025-06-30 09:45:09 -07:00
GriffinR	0c7c81e02f	Merge branch 'master' into _pret/pr/pyramidLocation	2025-06-30 11:51:45 -04:00
Juanjo	8973006273	[FIX] Prevent caught Pokémon loss in NPC partner battles (#7177)	2025-06-28 10:36:37 +02:00
Alex	a96591dd43	Fixes Scald defrosting target while asleep (#7233)	2025-06-28 10:14:55 +02:00
ghoulslash	3dda407bb0	Jaboca berry triggers instead of being stolen by bug bite (#7237) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-06-28 08:43:50 +02:00
Alex	c5b939a312	Changes pre-proc to a normal if for Item Desc Header (#7231)	2025-06-27 22:31:31 +02:00
Alex	d1577d96ad	Set correct Instruction in Cmd_setnonvolatilestatus (#7236)	2025-06-27 18:37:24 +01:00
Bivurnum	b1200117a9	Better system for Follower NPC running frames (#7222) ... Co-authored-by: hedara90 <90hedara@gmail.com>	2025-06-27 10:12:35 +02:00
psf	b60c897b4a	Add P_ASK_MOVE_CONFIRMATION (#7132)	2025-06-27 10:11:41 +02:00
Bivurnum	9416a783d4	removed unnecessary fnpc underwater update	2025-06-26 16:47:09 -05:00
GriffinR	44c3069895	Add explicit defaults for MAPSEC data	2025-06-26 16:26:59 -04:00
i0brendan0	206d2503d8	Add Gen 2 Moonlight, Morning Sun, Synthesis configuration (#7209) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-06-26 21:00:02 +02:00
hedara90	8bbb84fc96	Fix incorrect type input (#7228) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-26 20:15:22 +02:00
Alex	ed59b2fb0e	Remove redundant move result flag checks (#7223)	2025-06-26 16:08:12 +02:00
Alex	565cf6f7ff	Adds missing healBlockTimer for Baton Pass (#7220)	2025-06-26 15:54:19 +02:00
Alex	4def635e1f	Fixes wrong assignment in TrySymbiosis (#7221)	2025-06-26 15:53:50 +02:00
DizzyEggg	8e7274f3fc	lto support (#7182)	2025-06-26 15:53:14 +02:00
PhallenTree	a82aa618fb	Adds Ability Shield activation message (#7224)	2025-06-26 14:42:32 +02:00
GriffinR	670d3a6c9f	Merge pull request #2152 from GriffinRichards/mapsec-data ... Relax MAPSEC region map data requirements	2025-06-25 22:05:35 -04:00
GriffinR	2a7a4f1e76	Merge pull request #2127 from AsparagusEduardo/_pret/maxLinkPlayers ... Fix other missing instances of MAX_LINK_PLAYERS	2025-06-25 22:05:13 -04:00
Raymond Dodge	6f7dac6d11	Add 'Give Decoration' function to overworld debug menu (#7219) ... Co-authored-by: hedara90 <90hedara@gmail.com>	2025-06-25 22:11:43 +02:00
Alex	6824e7d175	Attackcanceller clean up (#7210)	2025-06-25 21:36:15 +02:00
Bolt-Strike	f217344cb5	Disable unowned evo methods (#7103)	2025-06-25 21:29:59 +02:00
Alex	2531613a52	Fixes Eject Pack not resolving correctly during switch in effects (#7002)	2025-06-25 21:15:40 +02:00
Bivurnum	c6221fa50e	Add debug options for follower NPCs (#7215)	2025-06-25 21:13:43 +02:00
Alex	773ecd4c24	Fixes OOB for Teatime and Flower Shield (#7214)	2025-06-25 21:00:49 +02:00
DizzyEggg	9df5ab16e8	Ensure sMonMarkings_Gfx alignment (#2158)	2025-06-25 19:41:23 +01:00
Eduardo Quezada	f0230d0c8c	Fixed Fake RTC debug menu (#7218)	2025-06-25 20:08:22 +02:00
DizzyEggg	64a6e8817c	Fix sGpuRegBuffer potential alignment issues (#2157)	2025-06-25 17:54:13 +01:00
Alex	7d7ffd58ae	Fixes Booster Energy timing activation + Clean up (#7175) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-06-25 18:20:55 +02:00
Hedara	abf8fa2457	Merge commit '1cc2c7f2a02c350c0d724ab661ea0b78d108df51' into merrp-merge	2025-06-25 17:56:37 +02:00
Hedara	80ec5ff409	Merge commit '143500a1f95bf5951c001ec88db8b9d3f55d43e7' into merrp-merge	2025-06-25 17:22:11 +02:00
Hedara	3ce34c41b6	Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge ... Conflicts: include/follower_helper.h src/follower_helper.c	2025-06-25 17:20:38 +02:00
Hedara	1686797a5e	Merge commit '7612e386419ef913bda5a62a5c8f234190542bb0' into merrp-merge ... Conflicts: src/palette.c	2025-06-25 17:07:13 +02:00
Alex	f8551830c9	Adds Gen5+ Encore config (#7051)	2025-06-25 15:58:30 +02:00
Eduardo Quezada	03d3245a39	Easier expandability of debug menu (#6910)	2025-06-25 15:57:41 +02:00
Hedara	51a5577f65	Merge branch 'master' into master-upcoming ... Conflicts: src/battle_controller_safari.c src/data/moves_info.h src/graphics.c	2025-06-25 14:17:07 +02:00
DizzyEggg	675fb8f60e	Pret merge (24th of June, 2025) (#7206)	2025-06-25 13:58:28 +02:00
Bivurnum	bfb0c2fa73	Added createfollowernpc macro to make a new follower from a gfx id (#7196)	2025-06-25 10:59:25 +02:00
Ariel A	1cc2c7f2a0	fix: destroy shadows during battle transition intro	2025-06-24 20:46:22 -04:00
Ariel A	cab7f8b24b	fix: removed sweet scent field effect dependence on gPaletteDecompressionBuffer	2025-06-24 20:45:52 -04:00
Ariel A	7564262543	Merge branch 'followers' into lighting	2025-06-24 20:44:44 -04:00
Ariel A	685a8a9118	Merge remote-tracking branch 'upstream/master' into followers	2025-06-24 20:39:12 -04:00
Ariel A	143500a1f9	fix: capitalization in follower splash message	2025-06-24 20:20:01 -04:00
Ariel A	1f2fe7396b	feat: added abnormal weather follower message ... Includes support for follower matching != species	2025-06-24 20:19:23 -04:00
Eduardo Quezada	b5956d8eba	Fix healthbox when blending effects happen (#7203)	2025-06-24 23:15:16 +02:00
Eduardo Quezada	b372fa30b6	Fix AI party count calc being maintained between tests (#7200)	2025-06-24 21:03:54 +02:00
cawtds	59350cc32f	Increase party action limit (#7119)	2025-06-24 15:15:04 +02:00
Hedara	726f18f360	Merge remote-tracking branch 'pret/master' into pret-merge ... Conflicts: asm/macros/event.inc data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc data/scripts/trainer_hill.inc include/graphics.h	2025-06-24 10:42:24 +02:00
hedara90	74326023da	Backported Safari catch and add to party fix (#7192) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-24 09:29:20 +02:00
DizzyEggg	93511ceb05	Fix BtlController_EmitChosenMonReturnValue UB (#7197)	2025-06-24 09:28:26 +02:00
Alex	bc95824e8c	Fixes wrong Future Sight indexing (#7198)	2025-06-24 09:04:19 +02:00
DizzyEggg	e1b83d6056	Match graphics declarations with externs (#2089)	2025-06-23 20:31:18 +01:00
Pablo Pena	e449a612f5	fix: use BackPickId to calculate player intro ball throw animation palette (#7193)	2025-06-23 19:45:12 +02:00
Eduardo Quezada	a75a49710f	Fixed debug flag menu sound (#7190)	2025-06-23 15:46:49 +02:00
Alex	66e8200d95	Use battler arguments for SetMoveEffect (#7156)	2025-06-23 15:26:31 +02:00
i0brendan0	0ccf797cce	Fixes Roamers not saving shininess (#7185)	2025-06-23 15:05:01 +02:00
Alex	753eb9f8d8	Fixes Enigma, Kee and Maranga Berry activation timing (#7171)	2025-06-23 13:47:26 +02:00
DizzyEggg	7fdc5a45b6	force RHH Rom Header to always be present (#7187)	2025-06-23 10:38:03 +02:00
DizzyEggg	0dae2cea28	force sGFRomHeader to always be present (#7186)	2025-06-23 10:37:49 +02:00
Bassoonian	c34ec8956d	Master to upcoming merge, 20/06/25 (#7169)	2025-06-23 10:04:44 +02:00
grintoul	6c6daa8b9c	Fixes Rapid Spin description (#7178) (#7181)	2025-06-23 10:02:51 +02:00
GriffinR	4ce83c7d96	Merge pull request #2104 from GriffinRichards/fix-collision-comparison ... Fix collision comparison in PlayerNotOnBikeMoving	2025-06-22 20:05:30 -04:00
DizzyEggg	53f8ae11ff	Move gTradePlatform_Tilemap to header (#2088)	2025-06-22 19:48:37 -04:00
Eduardo Quezada	1f8455c769	Fixed TM and Berries disappearing when sorting (#7168)	2025-06-22 20:39:13 +02:00
Eduardo Quezada	cf7f15faac	Untangle InitBtlControllers functions (#6748)	2025-06-22 16:21:37 +02:00
Eduardo Quezada	b094b70dc5	More battle controller function consolidation. (#6877)	2025-06-21 10:59:41 +02:00
Eduardo Quezada	bca28b40bb	Use argument.type for EFFECT_SOAK (#7141)	2025-06-21 00:04:52 +02:00
PhallenTree	98670ca30e	Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)	2025-06-21 00:04:01 +02:00
AlexOn1ine	aabb632894	Master to upcoming merge, 20/06/25	2025-06-20 17:09:58 +02:00
hedara90	009a47a5dc	Fixed Battle Pyramid mon generation (#7146) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-20 13:19:24 +02:00
Bassoonian	24fdac662e	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196	2025-06-19 14:32:23 +02:00
hedara90	390482d355	Fix debug text order (#7149) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-19 14:26:49 +02:00
Bivurnum	12b2a29607	Bug fix: clear follower npc surf blob on white out (#7153)	2025-06-18 22:50:55 +02:00
Bassoonian	6333702461	Converts more defines to enums and name unnamed enums (#7071) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-06-18 14:30:37 +02:00
PhallenTree	340d815c6d	Stat Change (Animation) Refactor (#7144)	2025-06-18 14:24:35 +02:00
Alex	ab1838ffd8	Repurposes IsMagicGuardProtected into a general function (#7114)	2025-06-18 12:56:03 +02:00
Eduardo Quezada	800829538c	Compound strings for hold effect names (#7140)	2025-06-18 11:38:42 +02:00
Nephrite	a18709fb47	Bag refactor (groundwork for expansion) (#7018)	2025-06-18 10:59:24 +02:00
cawtds	97137aed2d	Improve music/se macros and fix names (#7030)	2025-06-18 10:58:37 +02:00
Nephrite	06cd3af3ea	Volatile status refactoring (#6983)	2025-06-18 07:22:41 +02:00
Zatsu	a765b8b45d	fixes #7129: 'add to full party' feature in the safari zone (#7147)	2025-06-17 21:29:52 +02:00
psf	75fe3e7da6	Fixed typo in sMoveRelearnerMenuState (#2155)	2025-06-17 15:38:33 +01:00
Eduardo Quezada	5966852f8d	Removed Mind Blown effect in favor of move flag (#7138)	2025-06-17 00:02:46 +02:00
Eduardo Quezada	651e87af5f	Converted Relic Song into a proper form change (#7139)	2025-06-17 00:02:25 +02:00
Eduardo Quezada	221ff8ed47	Removed redundant Damp check (#7134)	2025-06-16 22:11:00 +02:00
Alex	e2f0767be5	Decouple Status set by ability from SetMoveEffect (#7125)	2025-06-16 14:45:21 +01:00
hedara90	981aa3ee7c	Use RGB values for DEFAULT_LIGHT_COLOR (#7133) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-16 13:38:07 +02:00
Pawkkie	283bf68ff9	Fix incorrect function parameters used in AI damage calc (#7130)	2025-06-16 07:59:30 +02:00
cawtds	3491cd95e8	Fix sell price display (#7123)	2025-06-15 11:52:51 +02:00
Bivurnum	459946ac9a	Bug fix: Follower NPC no longer retains bike sprite after white out (#7120)	2025-06-15 11:10:32 +02:00
GriffinR	bfa3e4a07b	Merge pull request #2145 from abaresk/remove-berryfix ... Remove berry yield bug fix	2025-06-15 00:41:33 -04:00
Alex	522ccf06da	Use CanAbilityAbsorbMove in GetOverworldTypeEffectiveness (#7115)	2025-06-14 11:56:04 +02:00
Alex	d4146afcae	Add damage context to effectiveness multiplier (#7111)	2025-06-14 11:05:14 +02:00
DizzyEggg	1cc4321a42	Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches	2025-06-13 16:45:24 +02:00
Alex	c120fa71dc	Fixes Ally Switch in multi battles (#7109)	2025-06-13 15:18:27 +02:00
Alex	e1b542944f	Refactor damage calculations aruguments by using a struct context (#7108)	2025-06-13 14:16:40 +02:00
PhallenTree	a000a743df	Fix typos and some cleanup (mainly in battle files) (#7107)	2025-06-13 14:12:13 +02:00
Alex	aa78420b9e	Deprecate absent member from battlerState (#7091)	2025-06-12 10:41:46 +02:00
Pawkkie	3db12a0ae6	Haze Boosting AI Followup (#6966)	2025-06-11 18:30:22 +02:00
Bassoonian	192bc1ec20	Master merge (#7093)	2025-06-10 22:52:43 +02:00
GriffinR	50d81616cd	Relax MAPSEC region map data requirements	2025-06-10 13:05:03 -04:00
Alex	cb4ef705f7	Remove redundancy for ShouldLowerStat functions (#6577)	2025-06-09 21:47:16 -04:00
Hedara	bdd7c5bfa8	Merge branch 'master' into master-merge ... Conflicts: src/contest_painting.c	2025-06-09 23:27:18 +02:00
ghoulslash	96844bd3bb	fix sprite count in RepeatBallOpenParticleAnimation	2025-06-09 16:19:25 -04:00
hedara90	bc864c2519	Fix .smol compression in debug builds (#7090) ... Co-authored-by: sbird <sbird@no.tld> Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>	2025-06-09 13:17:05 +02:00
Alex	fd856e5068	Removes duplicate AI ability func (#7045) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-06-09 11:30:16 +02:00
Emilia Daelman	f4ff5e6d26	Feature/ai/wide guard quick guard singles (#7086) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-06-08 21:50:34 +02:00
kittenchilly	872bb8785b	Simplify white out messages (#6961)	2025-06-08 08:52:37 -07:00
Bassoonian	b372c272f4	Update FRLG whiteouts to new pret system (#7040) ... Co-authored-by: cawtds <38510667+cawtds@users.noreply.github.com>	2025-06-08 14:45:14 +02:00
PhallenTree	28d185be95	Fixes Pursuit potentially causing both battlers to switch into the same mon (#7084)	2025-06-07 23:59:44 +02:00
Alex	9f1eb78737	Fixes freeze during a 1v2 double battle (#7075)	2025-06-07 11:49:15 +02:00
明雅	1692d641c4	Fix Contest Painting load palette error (#7077)	2025-06-07 10:05:24 +02:00
wiz1989	e63ac48de2	added Ash Greninja overworld sprites (#6976)	2025-06-07 09:57:43 +02:00
Bivurnum	ea75a09dac	Clear saved follower NPC door warp when doing dive warp (#7065)	2025-06-07 09:54:07 +02:00
hedara90	8489b7a622	Added naive line break (#7076) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-06 20:13:07 -07:00
i0brendan0	67f7ad6b1e	[DRAFT] Fix Normalize not boosting Normal type moves if they were already Normal type (#7060) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-06-06 22:00:33 +02:00
Linathan	dc279f14ba	Chloroblast fix (#7008)	2025-06-06 21:33:56 +02:00
Linathan	25736c5628	Bug fix for Grassy Terrain incorrectly healing non-grounded Pokemon (#7058)	2025-06-05 14:35:30 +02:00
Alex	020be9d5b0	Deprecate sStatusFlagsForMoveEffects (#7063)	2025-06-05 14:32:28 +02:00
Alex	99997c49fc	Fixes speed calculation order (#7064)	2025-06-04 23:26:19 +02:00
PhallenTree	b3752e13d8	Fixes Aura Wheel + Normalize and Hunger Switch while Transformed/Terastallized (#7061)	2025-06-04 21:58:10 +02:00
Eduardo Quezada	3decd3da0a	Animation documentation (#7052)	2025-06-04 11:19:57 +02:00
Eduardo Quezada	d795de9e9d	Remove more instances of hard-coded Move IDs (#7056)	2025-06-03 23:26:48 +02:00
Philipp AUER	21f0eb1583	Debug parties and battles (#6884) ... Co-authored-by: sbird <sbird@no.tld>	2025-06-03 23:21:17 +02:00
TLM-PsIQ	8b52e100b9	Fix ScaryFace anim for Bitter Malice (#6476)	2025-06-03 22:25:29 +02:00
Bassoonian	1a6ed20713	Add dedicated getter functions for Pokémon types and abilities (#7043)	2025-06-03 22:05:22 +02:00
Alex	177fa2f096	Combines Super Fang and Guardian of Alola effects (#7048)	2025-06-03 10:26:25 +02:00
Alex	52b1b877ec	Change GetZMaxMoveAgainstProtectionModifier to prevent regressions (#7047)	2025-06-03 09:11:42 +02:00
cawtds	b36a78ed47	replace magic numbers with enums	2025-06-02 22:55:41 +02:00
cawtds	0fc900514b	sync list menu functions with firered	2025-06-02 22:51:26 +02:00
Bassoonian	c5c7bb13c9	Converts a bunch of defines to enums (#7041)	2025-06-02 15:54:37 +02:00
Alex	d33651bfd0	Battle controller pret documentation (#7029)	2025-06-02 14:22:11 +02:00
Eduardo Quezada	5502fe2c5e	GetBattlerMon cleanup (#6967)	2025-06-01 21:10:24 +02:00