7576 Commits

Author	SHA1	Message	Date
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	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
hedara90	14dbbf63d4	Remove competitive syntax config (#7154) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-07-12 13:03:36 -07: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	9ccb1fbc3a	Lowering the default odds to 90%, 70%, and 40%.	2025-07-12 01:01:18 -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
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	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
Martin Griffin	f4cc802656	Fix crashing tests looping (#7299)	2025-07-09 09:02:55 +02:00
khbsd	57dad22ac4	feat: separate water and rock smash encounter rate checks (#7293)	2025-07-08 20:52:42 +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
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
Alex	f808201945	Fixes Natural Gift moveend execution (#7274)	2025-07-05 15:05:35 -04: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
surskitty	c360900a5b	Renaming STATUS1_REFRESH and adding more constants for common STATUS1 checks. (#7284)	2025-07-05 13:46:23 +02:00
Nephrite	e8abfbce49	Untangled TMs and HMs from item ids (#7173)	2025-07-04 19:07:53 +02:00
hedara90	56907bc26e	Merrp merge, 2025-06-25 (#7217)	2025-07-04 13:03:09 +02:00
surskitty	b3f52166df	Changing P_ONLY_OBTAINABLE_SHINIES to truly be Only Obtainable Shinies (#7275)	2025-07-04 11:06:36 +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	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
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
Hedara	947faa97d3	Start of 1.12.2 cycle	2025-06-30 11:01:46 +02:00
Hedara	1e281547ed	1.12.1 Release commit	2025-06-30 11:01:13 +02: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
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
PhallenTree	a82aa618fb	Adds Ability Shield activation message (#7224)	2025-06-26 14:42:32 +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	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	c0a50096f3	Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge ... Conflicts: include/constants/event_objects.h src/event_object_movement.c src/follower_helper.c	2025-06-25 17:54:59 +02:00
Hedara	1916703e5a	Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge ... Conflicts: include/battle_script_commands.h include/constants/event_objects.h include/event_object_movement.h include/field_effect.h include/field_effect_helpers.h include/sprite.h src/battle_controller_player.c src/event_object_movement.c src/pokeball.c	2025-06-25 17:49:19 +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
Alex	f8551830c9	Adds Gen5+ Encore config (#7051)	2025-06-25 15:58:30 +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
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	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	1f2fe7396b	feat: added abnormal weather follower message ... Includes support for follower matching != species	2025-06-24 20:19:23 -04: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
DizzyEggg	e1b83d6056	Match graphics declarations with externs (#2089)	2025-06-23 20:31:18 +01:00
psf	456a8f6aa0	Update the description of OW_OBJECT_VANILLA_SHADOWS (#7184)	2025-06-23 15:40:13 +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
Bassoonian	c34ec8956d	Master to upcoming merge, 20/06/25 (#7169)	2025-06-23 10:04:44 +02:00
DizzyEggg	53f8ae11ff	Move gTradePlatform_Tilemap to header (#2088)	2025-06-22 19:48:37 -04: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
AlexOn1ine	aabb632894	Master to upcoming merge, 20/06/25	2025-06-20 17:09:58 +02:00
Bassoonian	24fdac662e	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196	2025-06-19 14:32:23 +02:00
Daniel Walls	cc33d6171b	Add config options for removing bard phoneme audio to save ROM space (#7155)	2025-06-18 20:16:25 -07:00
Eduardo Quezada	8a0bc495d5	Fixed description of FORM_CHANGE_WITHDRAW (#7152)	2025-06-18 22:09:59 +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
Nephrite	06cd3af3ea	Volatile status refactoring (#6983)	2025-06-18 07:22:41 +02: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
Alex	e2f0767be5	Decouple Status set by ability from SetMoveEffect (#7125)	2025-06-16 14:45:21 +01:00
hedara90	b2a0107a68	Test runner fixes (#7100) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-15 12:02:29 +02:00
cawtds	3491cd95e8	Fix sell price display (#7123)	2025-06-15 11:52:51 +02:00
Alex	c6b4118c3c	Added AI_FLAG_PP_STALL_PREVENTION to AI_FLAG_SMART_TRAINER (#7112)	2025-06-14 11:06:23 +02:00
Alex	d4146afcae	Add damage context to effectiveness multiplier (#7111)	2025-06-14 11:05:14 +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
hedara90	c9a49e696e	Increased heap by 768 bytes (#7097) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-11 17:55:32 +02:00
Bassoonian	192bc1ec20	Master merge (#7093)	2025-06-10 22:52:43 +02: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
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
hedara90	8489b7a622	Added naive line break (#7076) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-06 20:13:07 -07:00
Linathan	dc279f14ba	Chloroblast fix (#7008)	2025-06-06 21:33:56 +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
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
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	8697bef20c	BtlController_EmitTwoReturnValues cleanup (#6855)	2025-06-01 11:29:02 +02:00
hedara90	392d4db319	Fix follower compression (#7038) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-06-01 10:06:12 +02:00
Alex	ede15918cf	Refactors Final Gambit + Tests (#7005)	2025-05-31 15:52:53 +02:00
jfb1337	096493aa35	AI: Add AI_SMART_TERA flag to make smarter decisions about when to terastalize. (#6705) ... Co-authored-by: jfb1337 <> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-05-31 09:47:25 +02:00
Alex	eb81820ae3	Clean up battlescript calls with func BattleScriptCall (#6873)	2025-05-31 09:09:35 +02:00
cawtds	21499cbee1	Refactor field moves (#6660)	2025-05-31 09:03:12 +02:00
PhallenTree	fa342b2909	Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004)	2025-05-31 08:45:46 +02:00
hedara90	6e64f6f5ef	New sprite compressor (#5627) ... Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: DizzyEggg Co-authored-by: Raymond Dodge <git@rayrobdod.name>	2025-05-30 23:10:54 +02:00
Hedara	0e968b31a9	Start of 1.13 cycle	2025-05-30 21:24:29 +02:00
Hedara	98c03315a9	Start of 1.12.1 cycle	2025-05-30 20:55:09 +02:00
Hedara	efa2fb3be7	Expansion 1.12.0	2025-05-30 20:53:32 +02:00
Hedara	09ee1d0b2d	Merge branch 'upcoming' into expansion-1.11.4	2025-05-30 20:45:19 +02:00
Hedara	acb4a9cf62	Expansion 1.11.4	2025-05-30 20:15:56 +02:00
AlexOn1ine	f4c64a2d79	conflicts	2025-05-30 19:20:32 +02:00
psf	9656400f88	Moved time constants to dedicated files (#7019)	2025-05-30 16:39:01 +02:00
cawtds	1e32cf278c	fix battle controller macros (#7021)	2025-05-30 16:31:38 +02:00
Alex	213503dee9	Fixes spread move fire types not defrosting all targets (#6998)	2025-05-29 11:25:10 +02:00
Hedara	c8570d7c2b	Remove incorrectly re-added ABILITYEFFECT_ cases	2025-05-28 14:38:57 +02:00
Hedara	9d80ad530d	Merge branch 'master' into master-to-upcoming ... Conflicts: Makefile data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc data/maps/MtChimney/scripts.inc data/maps/MtPyre_Summit/scripts.inc data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc include/constants/event_objects.h include/constants/expansion.h src/battle_script_commands.c src/battle_util.c src/field_screen_effect.c	2025-05-28 14:26:15 +02:00
psf	d80e92e687	Pret merge (27th of May, 2025) (#6995)	2025-05-28 03:44:51 -07:00
Alex	c489d36fc6	Fixes Gen3 berry activation timing (#6993)	2025-05-27 23:36:00 +02:00
Hedara	156e0b394c	Start of 1.11.4 cycle	2025-05-27 20:34:28 +02:00
Hedara	7d1833f277	1.11.3 release	2025-05-27 20:33:27 +02:00
Hedara	647c786c53	Merge commit '07c897a' into pret-merge ... Conflicts: include/constants/heal_locations.h map_data_rules.mk	2025-05-27 19:46:13 +02:00
Hedara	c27930eabf	Merge commit '678fdf9' into pret-merge ... Conflicts: data/maps/BirthIsland_Exterior/scripts.inc data/maps/DesertUnderpass/scripts.inc data/maps/Route117/scripts.inc data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc data/maps/SootopolisCity/scripts.inc include/constants/event_objects.h src/battle_setup.c src/event_object_movement.c src/field_control_avatar.c src/item_use.c src/scrcmd.c tools/mapjson/mapjson.cpp	2025-05-27 19:22:40 +02:00
Hedara	5e9b8cdbad	Merge commit 'cc388ef' into pret-merge ... Conflicts: src/map_name_popup.c	2025-05-27 19:06:35 +02:00
Hedara	4a442cc3e6	Merge commit '091b726' into pret-merge ... Conflicts: include/constants/heal_locations.h map_data_rules.mk	2025-05-27 19:02:53 +02:00
Hedara	9bfef357a2	Merge commit 'e4e90ea' into pret-merge ... Conflicts: src/battle_setup.c src/field_specials.c src/menu_helpers.c src/pokedex_area_screen.c src/roamer.c src/script.c	2025-05-27 18:53:30 +02:00
Hedara	090550626e	Merge commit '113226b03ad745183299dae1833f2a773b927cef' into pret-merge ... Conflicts: include/constants/metatile_behaviors.h	2025-05-27 18:34:53 +02:00
GriffinR	0c32d840fa	Merge pull request #2141 from pret/porymap-6 ... Update for Porymap 6	2025-05-27 10:53:17 -04:00
Alex	983f8e34a1	Fixes repeated learning of level up moves (#6981)	2025-05-26 14:15:16 -07:00
Bivurnum	46e2e676c6	Make setobjextxy work with npc followers during ON_WARP map script (#6913)	2025-05-26 18:59:14 +02:00
AlexOn1ine	b90fdd1b3c	Master to upcoming merge	2025-05-26 10:41:11 +02:00
Hedara	2e4833240f	Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge ... Conflicts: include/item.h src/battle_ai_script_commands.c src/battle_main.c src/battle_pyramid_bag.c src/battle_script_commands.c src/battle_util.c src/item.c src/item_menu.c src/item_use.c src/pokemon.c src/pokemon_summary_screen.c src/shop.c	2025-05-24 21:24:56 +02:00
Hedara	3ecd8afab0	Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge ... Conflicts: Makefile	2025-05-24 20:42:01 +02:00
Hedara	2b92ba315a	Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge ... Conflicts: include/battle_anim.h include/battle_controllers.h include/battle_gfx_sfx_util.h include/battle_interface.h include/battle_main.h include/battle_script_commands.h include/battle_util.h include/easy_chat.h include/event_object_movement.h include/field_effect.h include/field_effect_helpers.h include/field_player_avatar.h include/intro.h include/item_use.h include/metatile_behavior.h include/move_relearner.h include/pokedex.h include/pokemon.h include/pokemon_icon.h include/roamer.h include/script_pokemon_util.h include/sprite.h include/text.h include/wild_encounter.h src/battle_controllers.c	2025-05-24 20:38:21 +02:00
Hedara	a90dd491d2	Merge commit 'e1e7d1cf3530799774fa13d4e409bed7067ffa25' into pret-merge	2025-05-24 19:35:01 +02:00