1066 Commits

Author	SHA1	Message	Date
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
Alex	c489d36fc6	Fixes Gen3 berry activation timing (#6993)	2025-05-27 23:36:00 +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
GriffinR	0c32d840fa	Merge pull request #2141 from pret/porymap-6 ... Update for Porymap 6	2025-05-27 10:53:17 -04:00
AlexOn1ine	b90fdd1b3c	Master to upcoming merge	2025-05-26 10:41:11 +02:00
Bassoonian	812bde8a48	Pret merge (24th of May, 2025) (#6978)	2025-05-25 23:08:37 +02:00
Vex	7b686b6749	Fix Wish healing even if the target is Heal Blocked (#6979) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-05-25 23:01:11 +02:00
Hedara	a714779928	Merge commit '74bf498' into pret-merge	2025-05-23 17:35:13 +02:00
Bassoonian	54806c8838	Add no-whiteout feature (#6795)	2025-05-17 11:20:35 +02:00
Martin Griffin	54e9505d2b	Warn on suspicious setvar usages	2025-05-15 09:42:59 +01:00
GriffinR	929bc8b990	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2025-05-14 11:50:11 -04:00
Eduardo Quezada	3ef61e6451	Combined type-enhancing hold effects (#6846)	2025-05-14 13:45:08 +02:00
Ruby	2740fdd6e6	Timemacros (#6696)	2025-05-11 12:34:54 +02:00
Alex	4342bfb91d	Refactor stockpile resets (#6810) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-05-10 20:09:38 +02:00
Alex	6fe5f6530a	General MoveEnd clean up and Fell Stinger adjustments (#6674)	2025-05-07 00:30:43 +02:00
Bivurnum	668cd7e413	Rename follower npc macros for better specificity and to match documentation (#6742)	2025-05-02 21:08:42 +02:00
Alex	4ff2f3de42	Centralizes non volatile status effect checks (#6533) ... Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>	2025-04-30 11:34:19 -04:00
Hedara	0eeba00d1b	Merge branch 'master' into master-upcoming-2025-04-30 ... Conflicts: include/battle.h include/constants/expansion.h include/graphics.h src/battle_bg.c src/battle_util.c src/data/graphics/battle_terrain.h src/data/graphics/pokemon.h src/pokeblock_feed.c src/pokemon_sprite_visualizer.c	2025-04-30 15:22:37 +02:00
Hedara	4873589c65	Merge remote-tracking branch 'pret/master' into new-pret-merge ... Conflicts: asm/macros/battle_script.inc data/battle_anim_scripts.s include/battle.h include/battle_controllers.h include/battle_setup.h include/constants/battle.h src/battle_anim_normal.c src/battle_anim_utility_funcs.c src/battle_bg.c src/battle_controllers.c src/battle_main.c src/battle_script_commands.c	2025-04-29 20:27:33 +02:00
hedara90	5dfbdf56da	27/04/25 Master to upcoming merge (#6701)	2025-04-27 18:01:50 +02:00
Bivurnum	47723c34e5	Follower NPCs (follow-me) (#6500) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-04-27 14:56:18 +02:00
AlexOn1ine	e246b20e72	27/04/25 Master to upcoming merge	2025-04-27 09:50:25 +02:00
Ruby	aba34015db	Time menu for RTC in debug menu. (#6634) ... Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-23 19:34:37 +02:00
Alex	dfb1cd2ec0	Refactor hit escape moves to use moveend (#6671)	2025-04-21 22:52:55 +02:00
Alex	d220459a01	Fixes Intimidate / Eject Pack interaction (#6645) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-21 17:33:29 +02:00
AlexOn1ine	e2e012c3a9	conflicts	2025-04-21 15:50:57 +02:00
cawtds	0069ec1f0c	Fix captivate-oblivious interaction and related test (#6653)	2025-04-21 11:01:01 +02:00
ghoulslash	81ed774c00	EndTurnEffectOrder Refactor (#6224)	2025-04-14 10:57:34 -04:00
GriffinR	709cfa1c9a	Merge pull request #2014 from Bassoonian/battleterrain ... Rename battle terrain to environment	2025-04-13 19:32:06 -04:00
Hedara	9afd8800f3	Merge branch 'upcoming' into merrps-dns	2025-04-12 16:33:02 +02:00
Alex	4aca2fdcd3	Refactor fixed damage moves (#6449) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-10 15:01:02 +02:00
Hedara	e419606a10	Merge branch 'upcoming' into merrps-dns	2025-04-09 12:48:18 +02:00
Hedara	2210e2d410	Merge branch 'master' into upcoming-master	2025-04-09 11:06:38 +02:00
Hedara	08a2ad2c98	Merge branch 'upcoming' into merrps-dns	2025-04-09 10:01:51 +02:00
AlexOn1ine	e8cc3c81f8	conflicts	2025-04-06 14:59:12 +02:00
Alex	ae62c80d0f	Refactors faint target abilities and adds Battle Bond config (#6519) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-04-02 16:00:23 +02:00
Alex	edb196e851	Fixes Red Card against Dynamaxed mons (#6526)	2025-04-02 14:28:53 +02:00
AlexOn1ine	0c35879e02	conflicts	2025-04-01 19:11:55 +02:00
AlexOn1ine	ccebebf64f	31-03-25 Master merge	2025-03-31 18:23:46 +02:00
Alex	388389714b	Rename removelishtscreenreflect to removescreens (#6495)	2025-03-30 10:52:24 +02:00
Bassoonian	9a23f19575	19-03-25 master to upcoming merge (#6450)	2025-03-20 09:57:05 +01:00
Alex	adc2c61fe8	Unifies dynamic move category checks (#6443)	2025-03-19 23:06:08 +01:00
AlexOn1ine	3c632b8b44	19-03-25 master to upcoming merge	2025-03-19 17:12:47 +01:00
Alex	99a3d01877	Fixes dynamax reversion when ejected out + anim fix (#6416) ... Co-authored-by: hedara90 <90hedara@gmail.com>	2025-03-17 19:57:38 +01:00
wiz1989	1e2aa18ffe	Added Dynamax/Gigantamax battle messages (#6440) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-03-17 19:16:43 +01:00
Deokishisu	eaf7549854	Replace Incorrect Slow Stairs Movement with Correct One (#6275)	2025-03-16 14:51:36 -07:00
ghoulslash	d44eff4e0c	fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly	2025-03-03 14:56:08 -05:00
AlexOn1ine	0a333dbdc8	merge rhh/upcoming	2025-02-28 00:21:07 +01:00
Eduardo Quezada	2428af66cd	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-02-20 19:17:59 -03:00
Alex	502b1c5087	Rename SetPhotonGeyser to a more general use and clean up (#6272)	2025-02-17 22:07:30 +01:00
Eduardo Quezada	9c4fbbf274	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-13 13:06:32 -03:00
hedara90	7d1bbf62e1	Apply suggestions from code review ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-02-13 10:23:06 +01:00
AlexOn1ine	5ee5aa796a	merge rhh/upcoming	2025-02-12 21:01:21 +01:00
Hedara	7426a98dc5	Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge	2025-02-12 13:34:28 +01:00
Eduardo Quezada	3507862164	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-12 09:30:59 -03:00
Ariel A	c8fb56d73b	Merge branch 'followers' into followers-expanded-id	2025-02-10 00:24:50 -05:00
Ariel A	ef05bbf394	Merge remote-tracking branch 'upstream/master' into followers	2025-02-10 00:11:38 -05:00
hedara90	174bc2f29f	Fixed typo in requests_effects (#6215) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-02-09 16:59:31 -05:00
AlexOn1ine	4babfd003e	rhh merge/upcoming	2025-02-09 14:04:21 +01:00
AlexOn1ine	f2bd88a7f9	EndTurnEffectsOrder Refactor	2025-02-09 13:48:08 +01:00
Zatsu	43bce41796	Add caught mon to full party by sending a different mon to the Box (#6058) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-02-09 00:54:58 +01:00
Alex	de9e9af1b7	Fixes Spectral Thief stealing boost at the wrong time (#6197) ... Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2025-02-07 16:24:05 -05:00
Alex	765a12f520	Convert max effects to normal move effects (#6143)	2025-02-06 21:02:39 -03:00
Eduardo Quezada	64c5113b23	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-02 14:18:13 -03:00
Alex	97d8bd2646	Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154)	2025-01-31 22:02:26 +01:00
Eduardo Quezada	11bdbfb658	Fix compile issues	2025-01-26 16:35:05 -03:00
Eduardo Quezada	00241cf569	Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2 ... # Conflicts: # README.md # asm/macros/event.inc # data/scripts/pkmn_center_nurse.inc # include/constants/event_objects.h # include/constants/field_weather.h # include/overworld.h # include/palette.h # include/sprite.h # src/battle_controller_player.c # src/data/object_events/object_event_graphics.h # src/event_object_movement.c # src/field_effect_helpers.c # src/field_weather.c # src/overworld.c # src/palette.c # src/scrcmd.c # src/sprite.c	2025-01-26 12:08:10 -03:00
Ariel A	c1d105c31c	Merge branch 'lighting' into lighting-expanded-id	2025-01-25 21:45:23 -05:00
Ariel A	bc034aaf73	Merge branch 'followers-expanded-id' into lighting-expanded-id	2025-01-25 21:42:02 -05:00
Ariel A	16c31d61b4	fix: removed fadescreenswapbuffers palette dependence, via hardware fade	2025-01-25 20:58:22 -05:00
Salem	01e8d8233e	Trainer Battle Parameter Consolidation (#5982)	2025-01-25 22:02:39 +01:00
Eduardo Quezada	26daf15ce0	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-24 18:29:28 -03:00
ghoulslash	774e61e74a	Add Script Cmd for Forcing Save Game (#6090) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-01-24 20:42:16 +01:00
DizzyEggg	4e0eab9e27	Remove gDecompressionBuffer (#6029)	2025-01-23 09:47:14 +01:00
Eduardo Quezada	a756bb501c	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-19 22:31:33 -03:00
Eduardo Quezada	f6a86a65ef	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-19 10:32:57 -03:00
Alex	9ed3b176f0	Pret merge (17 of January) (#6045)	2025-01-18 19:53:29 +01:00
ghoulslash	37cbae5e54	Fix Symbiosis Needing battler Argument + Tests (#6039) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-01-18 14:44:07 +01:00
Eduardo Quezada	937b3106b4	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-17 19:33:48 -03:00
Bassoonian	bcf9a1eff8	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan	2025-01-17 21:57:25 +01:00
Raymond Dodge	b5b0ffd511	Define field script opcode constants (#2005) ... Replace the magic number opcodes in field script command macros with these new constants	2025-01-17 17:04:00 +00:00
Eduardo Quezada	ce40c3356c	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-12 08:42:57 -03:00
Eduardo Quezada	15a034a1d9	Fixed multiple transform/form change graphical issues (#6005)	2025-01-12 09:49:19 +01:00
Eduardo Quezada	21bc5cfd30	Debug menu and createmon additions/cleanup (#5994)	2025-01-11 10:07:47 +01:00
Martin Griffin	bb781f21a1	Arbitrary trainer scripts + map script/trigger softlock prevention (#5033) ... Script_RunImmediatelyUntilEffect runs a script until either a specified effect may occur or it reaches an end. All existing script commands and natives, and some specials, call Script_RequestEffects which allows us to analyze them. Any downstream script commands/natives/specials will be statically known not to call Script_RequestEffects and treated as if they have all effects. Manually tagging them with requests_effects=1 and calling Script_RequestEffects will make them analyzable. Using these, we're able to execute scripts until they either exit with no effect, or would possibly have an effect. This allows us to: 1. Not run on frame map scripts or triggers if they would have no effect. 2. Immediately run triggers if they only affect flags/vars. This removes the lag frames when biking into the Cycling Road, for example. 3. Migrate on load/on transition/on resume/on return to field/on dive warp scripts onto the global script context if they would block (approximated via SCREFF_HARDWARE). 4. Support arbitrary control flow in trainer scripts. The trainer does not see the player if the script has no effect, and the trainer will use whichever trainerbattle command is branched to. 5. Support arbitrary scripts in trainer scripts. cant_see and cant_see_if_* commands have been introduced so that scripts are able to do something when the player interacts with the trainer even if that trainer wouldn't see them.	2025-01-08 10:27:00 +00:00
Eduardo Quezada	40ba25dd3e	Converted 2 various to callnative (#5950)	2025-01-05 17:47:49 +01:00
psf	a7f77ed08d	Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337) ... Co-authored-by: sbird <sbird@no.tld> Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com> Co-authored-by: Martin Griffin <martinrgriffin@gmail.com> Co-authored-by: hedara90 <90hedara@gmail.com>	2025-01-04 14:25:03 +01:00
Eduardo Quezada	89f90e1f69	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-03 13:58:10 -03:00
Eduardo Quezada	9669a0554d	Encapsulate move data (#5852)	2025-01-01 20:34:33 +01:00
Ariel A	a515cb3c6b	Merge branch 'followers' into lighting	2025-01-01 00:37:09 -05:00
Eduardo Quezada	3bc4126558	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-28 15:28:07 -03:00
Alex	f61a0f6a30	Sheer Force fix and move effect cleanup (#5812)	2024-12-21 19:45:50 +01:00
Eduardo Quezada	dbc3cc28b8	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-12-21 09:31:23 -03:00
Eduardo Quezada	25075239a2	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-21 08:46:33 -03:00
Eduardo Quezada	82252251e7	Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220	2024-12-20 16:04:33 -03:00
Eduardo Quezada	05f300f6cc	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-12-20 15:22:14 -03:00
Pawkkie	da2a1e2aba	Destiny Bond fails on repeated use in Gen 7+ (#5652)	2024-12-05 22:29:20 +01:00
Eduardo Quezada	720b2daecc	Improve Pyramid location documentaion	2024-12-05 18:25:27 -03:00
Eduardo Quezada	3f98c78297	Added POKEMART_LIST_END to avoid users accidentally removing it (#1947)	2024-12-04 17:38:23 -05:00
Eduardo Quezada	d151e00c70	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-12-04 19:15:48 -03:00