13262 Commits

Author	SHA1	Message	Date
Martin Griffin	dc1abb72dc	Fix substruct offsets from #7313 (#7431)	2025-07-29 13:13:29 +02:00
Nephrite	2eeb346387	Bag refactor3 + Ghoulslash's sorting feature port (#7330)	2025-07-29 10:47:32 +02:00
Nephrite	689bf0bcbc	Fixed item swapping bug (#7428) (#7430)	2025-07-29 10:28:12 +02:00
Alex	038bd2717d	Pret merge (27th of July, 2025) (#7422)	2025-07-28 15:13:23 +02:00
grintoul	1fbee7cce0	fixed-damage-move-ai-calc-fix (#7385)	2025-07-28 14:10:34 +02:00
Pawkkie	95e45b5568	Fix Echoing Voice calcs (#7416)	2025-07-28 14:10:03 +02:00
Nephrite	7c6cff1fb3	Get/SetMonData optimisation (#7313)	2025-07-28 11:42:28 +01:00
Eduardo Quezada	d801556a97	Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727	2025-07-27 11:59:07 -04:00
cawtds	5da5cb4c8c	document shop menu palette	2025-07-26 20:19:45 +02:00
Pawkkie	b12fcd8c7e	Fix dynamic move types in switching (#7415)	2025-07-26 19:59:17 +02:00
Pawkkie	57fda0d060	Improve AI's priority handling (#7337)	2025-07-26 18:22:47 +02:00
Eduardo Quezada	cf4bb3e286	Moved some fields to BattlerState/PartyState (#7409)	2025-07-25 22:16:35 +02:00
Pawkkie	fa129ba906	Fix hit escape switching hardcode (#7403)	2025-07-25 19:28:24 +02:00
Alex	e7cf162180	Fixes various Choice lock issues (#7383)	2025-07-25 10:18:30 -04:00
Alex	845838bbc0	Fixes bug for affectionScore in doubles for spread moves (#7395)	2025-07-25 09:32:45 -04:00
Alex	e222b725d2	Remove leftover code (#7397)	2025-07-25 09:32:20 -04:00
ghoulslash	219823f9a9	Fix Incompatible Z-Move Activation (#7399) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-07-25 10:49:15 +02:00
GriffinR	6f8a1bbdb8	Add pack/unpack for data masks (#2163)	2025-07-23 09:28:34 +01:00
Pawkkie	c544fee140	Improve AI's Sucker Punch handling (#7389)	2025-07-22 20:13:10 +02:00
Alex	8e8813e593	Show chosen move in the battle debug menu (#7382)	2025-07-22 12:58:15 -04:00
grintoul	14a7fc58ad	Multibattle Partner AI Flags and 2vs1 battler3 AI Flags fix (#7378)	2025-07-20 15:00:55 -04:00
Pawkkie	a92f432daf	Improve AI type matchup calcs (#7364) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-07-20 12:53:14 +02:00
Pawkkie	cb66393df7	Add missing break (#7356)	2025-07-20 11:34:51 +02:00
Pawkkie	249b4d1574	19/07/25 Master merge (#7375)	2025-07-19 19:22:48 -04:00
Alex	c6f539c8be	Adds Missing break in ABILITY_TERAFORM_ZERO (#7377)	2025-07-19 19:21:10 -04:00
surskitty	1b996fbb8e	AI refactor for weather-setting, terrain-setting, Trick Room behaviors; doubles-focused (#7319)	2025-07-19 19:20:07 -04:00
AlexOn1ine	90eef35715	master merge	2025-07-19 17:01:18 +02:00
hedara90	2f6e1ea6d3	Enum conversion for enum MoveEffects and enum BattleMoveEffects (#7366)	2025-07-19 10:28:25 +02:00
Pawkkie	e502c078e8	Switch AI can see weather abilities of switchin candidates during damage calcs (#7373)	2025-07-19 10:22:24 +02:00
Pawkkie	c61c2bbbc1	Fix AI unusable move scoring freeze (#7369)	2025-07-19 09:56:56 +02:00
Alex	71d40cc3f1	Convert various to callnatives (#7355)	2025-07-18 19:12:37 +02:00
hedara90	05b1db8cc6	trainerproc copy other trainer party (#7251)	2025-07-18 15:57:57 +01:00
ghoulslash	ac69a61cb4	Fix magnet rise ai timer check (#7361) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-07-18 16:57:32 +02:00
Alex	705f194d98	Fixes various battler corruption during switch in ability activation (#7352)	2025-07-18 12:28:00 +02:00
Pawkkie	65a63fb9f0	Improve AI's ShouldRecover (#7342)	2025-07-16 23:30:51 +02:00
Pawkkie	0406caa687	Improve AI's setup logic (#7345)	2025-07-16 17:05:08 -04:00
PhallenTree	19c9aa508d	Fixes shadows and mon animations for Illusioned battlers (#7347)	2025-07-16 22:31:06 +02:00
PhallenTree	67d007f4fb	Fixes Grassy Terrain healing when Heal Blocked/Semi-Invulnerable (#7353)	2025-07-16 22:29:25 +02:00
Pawkkie	64f9d6a24e	Fix AI resisted move scoring (#7350)	2025-07-15 13:13:30 -04:00
Pawkkie	0e37bfd7ff	Fix stat change / stat ID ambiguity (#7346) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-07-15 12:07:26 -04:00
Alex	d5c1d3322c	Fixes Status overwrites and Effect Spore wrong func args (#7340)	2025-07-15 17:52:44 +02:00
AlexOn1ine	674d46bb0f	Fixes incorrect recoil damage after a berry was eaten	2025-07-15 15:37:23 +02:00
Alex	73a2e5104e	Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe (#7326)	2025-07-14 21:34:21 +02:00
Pawkkie	d27884cbb8	AI_FLAG_ASSUME_STATUS_MOVES -- AI flag to randomly know some of the player's status moves (#7324)	2025-07-14 15:04:31 -04:00
kittenchilly	b62e4924a3	Turn OW_FRLG_WHITEOUT into OW_WHITEOUT_CUTSCENE and make it generational (#6962)	2025-07-14 13:08:14 +02:00
surskitty	1a1d8b58f8	Merge remote-tracking branch 'rh-hideout/upcoming' into rhh_assume_powerful_status	2025-07-13 22:03:48 -04:00
surskitty	f0da7c1707	Renaming Powerful status functions.	2025-07-13 22:00:00 -04:00
Pawkkie	5c2980b906	AI assumes Magnitude / Present damage (#7334)	2025-07-13 22:31:19 +02:00
mudskipper13	688ec0023e	battle intro: fix issues with follower slide-in and wild shiny mon (#7325)	2025-07-13 20:47:14 +02:00
Pawkkie	bc4ad07f47	Merge branch 'master' into master-to-upcoming	2025-07-13 13:34:35 -04:00
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