4471 Commits

Author	SHA1	Message	Date
Eduardo Quezada	3507862164	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-12 09:30:59 -03:00
AlexOn1ine	b4f17c7506	review comments	2025-02-11 12:06:16 +01:00
Ariel A	c8fb56d73b	Merge branch 'followers' into followers-expanded-id	2025-02-10 00:24:50 -05:00
Ariel A	a4e032c28d	Merge branch 'followers' into lighting	2025-02-10 00:19:48 -05:00
Ariel A	ef05bbf394	Merge remote-tracking branch 'upstream/master' into followers	2025-02-10 00:11:38 -05:00
PhallenTree	cf5b95cee8	Fixes Expanding Force and Spectral Thief move animations (#6185)	2025-02-09 22:34:48 +01:00
Eduardo Quezada	a2ad5d2ca3	Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210)	2025-02-09 21:54:03 +01: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
ghoulslash	6f541bb449	Fix Liquid Ooze + Leech Seed Test (#6217) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-02-08 22:42:25 +01:00
Frank DeBlasio	41882b267d	Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195)	2025-02-08 12:51:22 -08: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
Hedara	27da389d1e	Merge branch 'master' into master-to-upcoming	2025-02-06 13:05:02 +01:00
hedara90	cad1a37566	Tachyon Cutter and Salt Cure animations (#6182) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-02-05 15:27:21 +01:00
GriffinR	cdadd7d2ed	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
PhallenTree	5238665a7a	Fixes Suction Cups ability popup and Red Card + Guard Dog interaction (#6171)	2025-02-03 18:31:14 +01: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
Alex	89cfd85b8f	Fixes battler mutation during the intim script (#6151) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-01-31 21:49:26 +01:00
Eduardo Quezada	3fc9b0195d	Cleaned up code to align with previous review comments	2025-01-26 17:14:00 -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
hedara90	e1e3bcfa91	Tera starstorm (#6073) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-01-26 11:08:46 +01:00
Ariel A	bc034aaf73	Merge branch 'followers-expanded-id' into lighting-expanded-id	2025-01-25 21:42:02 -05:00
Ariel A	8933b84e1c	Merge branch 'followers' into followers-expanded-id	2025-01-25 21:40:51 -05:00
Ariel A	84fecf21c9	Merge branch 'followers' into lighting	2025-01-25 21:38:22 -05:00
Pawkkie	43e41bbed8	Add Code Entry functionality (#5951)	2025-01-25 22:03:08 +01: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
Ariel A	c492bb3fec	fix: follower field movements after scripted movement update	2025-01-21 23:27:28 -05:00
Pawkkie	44ebf33f1d	Add Steven Multi to debug menu (#6064)	2025-01-20 22:29:21 +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
Eduardo Quezada	c363c28b22	Addressing a bunch of small things	2025-01-17 18:21:48 -03:00
Bassoonian	bcf9a1eff8	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan	2025-01-17 21:57:25 +01:00
GriffinR	2f67b17571	Document bard music (#2053) ... * Missing bard song limit constants * Index bard sound arrays with word constants * Document bard music	2025-01-17 17:54:38 +00: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
hedara90	9c7c94d474	Fixed a bunch of move anims (#5936) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-01-12 10:01:44 +01:00
Eduardo Quezada	15a034a1d9	Fixed multiple transform/form change graphical issues (#6005)	2025-01-12 09:49:19 +01:00
Eduardo Quezada	8821779815	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-11 08:07:15 -03:00
Martin Griffin	1551a33069	Fix leftover test change from #5033 (#5987)	2025-01-09 17:28:09 -03: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
shachar700	cbd0b3ef0c	Field effect for cutting grass is missing setfieldeffectargument. Issue #5766 (#5952)	2025-01-05 16:45:21 +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
ghoulslash	03684c6539	Battle Weather Refactor (#5833)	2025-01-04 07:33:25 -05:00
Eduardo Quezada	89f90e1f69	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-03 13:58:10 -03:00
ghoulslash	d8ea4fa1ec	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2025-01-02 08:28:21 -05:00
Eduardo Quezada	a50c78bb1e	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-01 18:34:42 -03:00
Alex	b7e945fbfb	Reverts wrongly done partial Eject Pack fix (#5928)	2025-01-01 21:41:42 +01:00
Eduardo Quezada	9669a0554d	Encapsulate move data (#5852)	2025-01-01 20:34:33 +01:00
Ariel A	a6ef9c7577	Merge branch 'followers' into followers-expanded-id	2025-01-01 00:39:14 -05:00
Ariel A	a515cb3c6b	Merge branch 'followers' into lighting	2025-01-01 00:37:09 -05:00
Ariel A	01335fa453	Unfreeze follower object during lockall (if safe movement flag set). ... MSGBOX_SIGN no longer freezes follower.	2025-01-01 00:35:30 -05:00
Eduardo Quezada	004efd1e5a	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-31 18:38:03 -03:00
Alex	7e0c1f9323	New U-turn animation to fix visibility (#5910)	2024-12-31 00:36:07 +01:00
Alex	af19b13195	Adds Pledge Side Statuses as Starting Statuses (#5899)	2024-12-30 09:18:23 +01:00
Hedara	2088f2a12d	Merge branch 'master' into master-upcoming	2024-12-29 21:43:07 +01:00
ghoulslash	ca31145d36	Fix Salt Cure script (#5895) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-12-29 16:51:33 +01:00
AlexOn1ine	74f1d7cb80	merge rhh/upcomig	2024-12-28 21:03:34 +01:00
AlexOn1ine	6a906a3fc1	refactor done	2024-12-28 20:55:59 +01:00
Eduardo Quezada	3bc4126558	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-28 15:28:07 -03:00
AlexOn1ine	9c34634dd6	Draft Change	2024-12-25 11:03:32 +01:00
Eduardo Quezada	e883b7c251	Fixed Wish triggering Disguise (#5860)	2024-12-22 23:39:17 +01:00
Alex	f61a0f6a30	Sheer Force fix and move effect cleanup (#5812)	2024-12-21 19:45:50 +01:00
Eduardo Quezada	a5b079d833	REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS	2024-12-21 11:00:27 -03:00
Eduardo Quezada	1e6628b78d	Address Review comments Pt2	2024-12-21 10:49:59 -03: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
kittenchilly	c3133193e2	Fix Hit Escape moves giving Exp to the mon that switches in (#5844)	2024-12-21 10:30:25 +01:00
Alex	5b05e7913c	Pret merge (20th of December) (#5845)	2024-12-21 10:17:58 +01:00
Eduardo Quezada	53aebc34dd	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-20 20:48:13 -03:00
PhallenTree	742f7a4875	Fixes Cotton Down and Gulp Missile not interacting correctly with stat reduction prevention effects (#5841)	2024-12-20 22:24:23 +01: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
AlexOn1ine	99fef0260f	Battle Weather Refactor	2024-12-19 20:50:08 +01:00
Alex	b22a867e11	Fixes Room Service (#5827)	2024-12-19 14:12:01 +01:00
Alex	99ba36b446	Fixes Tidy Up (#5819)	2024-12-17 09:47:37 +01:00
GriffinR	dbff8c4360	Merge branch 'porymap-6' into generate-map-constants	2024-12-09 20:25:41 -05:00
Eduardo Quezada	66a2a16bbc	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-08 12:00:29 -03:00
kittenchilly	6e6352569f	Narrower font tweaks and font fitting fixes (#5782)	2024-12-07 18:12:09 -03:00
iriv24	cb12bdc220	Fix No Guard failing OHKO Moves into Semi-Invulnerable Pokemon (#5779) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-12-07 18:11:45 -03:00
Alex	3f3f4cfe1c	New Volt Switch Animation (#5729) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-07 15:52:13 +01:00
ghoulslash	6e24b6af3d	Gravity fix + Sky Drop Test (#5780) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-12-07 14:48:01 +01:00
ghoulslash	a775098e83	Fix octolock + defiant (#5781) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-12-07 13:38:34 +01:00
PhallenTree	775ea3b564	Pursuit refactor (#5707)	2024-12-06 19:14:46 +01: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
Eduardo Quezada	a92350fb53	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-04 18:55:56 -03:00
Eduardo Quezada	e4f8b4ccf0	Addressed review changes (minus encapsulation)	2024-12-04 11:31:28 -03:00
Eduardo Quezada	5c180a0b09	Added FONT_SHORT_NARROWER (#5101)	2024-12-04 06:30:19 -08:00
Alex	70224f0ea3	Fixes items preventing other switch in effects (#5732) ... Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-12-03 11:15:29 -05:00
AlexOn1ine	d95dbadccc	merge rhh/upcoming	2024-12-02 19:00:55 +01:00
AlexOn1ine	aa61f24e81	clean up	2024-12-02 18:25:24 +01:00
AlexOn1ine	09c9d8a800	merge rhh/upcoming	2024-12-02 17:45:00 +01:00
Pawkkie	2b7905beb1	Add B_FLAG_SLEEP_CLAUSE (#5566) ... Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu> Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com> Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-02 09:06:03 +01:00
Eduardo Quezada	0322d51887	Split "Do nothing" move effects (#5613)	2024-12-02 09:05:04 +01:00
Eduardo Quezada	1a581c407c	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-01 08:11:32 -03:00
Alex	acdd447160	Changes Max Phantasm move anim script call (#5737)	2024-11-30 19:19:08 -05:00
Hedara	f6fdca615f	Merge branch 'master' into master-to-upcoming	2024-11-29 11:32:12 +01:00
Alex	c4fe97011e	Fix Floral Healing anim (#5733)	2024-11-28 22:51:34 +01:00
Sadfish the Sad	64887ee876	dark void, clangorous soulblaze, vortex animation fixes (#5650)	2024-11-25 19:57:22 +01:00
GriffinR	382ee9e276	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2024-11-23 16:10:33 -05:00
AlexOn1ine	97b30cb712	simultaneous hp reduction	2024-11-23 08:35:01 +01:00
Alex	612c8d3ff6	Fixes heal blocked leeach seed in tests (#5700)	2024-11-21 17:18:44 +00:00
PhallenTree	596b8b20f4	Fixes Neutralizing Gas crashes + adds missing interaction, Regenerator small fix (#5694)	2024-11-21 17:35:05 +01:00
Alex	572ea141af	Fixes Absorb regression caused by #5670 (#5688)	2024-11-19 14:56:34 -05:00
Eduardo Quezada	b2ef363ac8	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-19 14:19:53 -03:00
Alex	67c7106fee	Refactors Absorb to use Moveend (#5670)	2024-11-17 09:59:04 +01:00
surtr-games	13692076f9	Fixed a bug with Counter and Mirror Coat where they would be scored up depending on the wrong target mon type category.	2024-11-14 00:30:25 -05:00
hedara90	a06dc03207	Fixed curse + Protean interaction (#5663) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-11-12 19:18:37 +01:00
hedara90	1d7e4cf8fc	Cleans up Primal Reversion code (#5659)	2024-11-12 13:48:06 +01:00
Alex	b55c87f73f	Fixes Take heart (#5658) ... Co-authored-by: KyleLaporte <moog272@gmail.com> Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-11-11 14:58:09 -05:00
Alex	a8351e305c	Fixes Red Card / Eject Pack interaction with Emergency Exit (#5657) ... Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-11-11 14:56:51 -05:00
AlexOn1ine	a3fe53dd28	Cleans up Primal Reversion code	2024-11-11 20:31:21 +01:00
Eduardo Quezada	b48e5770be	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-11 15:58:42 -03:00
ghoulslash	931a05f12b	Mrcrge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2024-11-11 12:38:52 -05:00
Eduardo Quezada	e005ffb576	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-06 10:01:48 -03:00
Alex	8581646c22	Convert 3 variouses to callnatives (#5646)	2024-11-06 10:09:49 +01:00
Alex	dc740b4e9a	Fixes Magic Coat message (#5645)	2024-11-06 10:09:00 +01:00
ghoulslash	57225e878a	some more fixes	2024-11-03 10:11:05 -05:00
ghoulslash	b488ff9b53	merge w upcoming	2024-11-03 07:11:40 -05:00
Eduardo Quezada	afa7ab9b2e	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-24 07:47:52 -03:00
ghoulslash	6de4222c22	Fix AnimTask_HorizontalShake uses for shaking screen in battle anims (#5562) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-10-22 16:24:48 +02:00
kittenchilly	db24128ee3	Update battle messages to Gen 5+ standards (#3240) ... Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-10-21 14:52:45 -03:00
Eduardo Quezada	3205f377d5	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-21 08:18:44 -03:00
Ariel A	0f706ac9e0	Merge branch 'followers' into followers-expanded-id	2024-10-21 00:05:26 -04:00
Ariel A	4056804575	feat: improved follower handling during scripted movements	2024-10-20 23:55:05 -04:00
Eduardo Quezada	495de8d182	Fix Follow Me failing in Single Battles for Gen 6/7 config (#5542)	2024-10-19 13:59:49 -03:00
ghoulslash	d487bd0548	Revival Blessing fixes + Using Lunar Blessing's animation (#5490) ... * revival blessing fixes, add anim * fix lunar blessing anim * Added support for Revival Blessing in tests * Added test to confirm absent flag fix --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-10-19 11:34:58 -03:00
ghoulslash	54484593b3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2024-10-18 21:46:54 -04:00
Bassoonian	3077592e68	Pret merge 2024-10-15 (#5527)	2024-10-17 09:00:18 +02:00
Eduardo Quezada	ee9c6d4912	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-17 00:16:01 -03:00
ghoulslash	43f184d0a5	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2024-10-16 10:26:55 -04:00
AlexOn1ine	d044f53c72	Adds tests and Costar fix from PR #5526	2024-10-16 10:51:41 +02:00
ghoulslash	1cdc91ce53	Add Costar Tests, Download Test for Doubles (#5526) ... * add download double battle test * fix costar and add test --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-10-16 10:44:01 +02:00
GriffinR	0eb6d1d74c	Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants	2024-10-15 22:04:45 -04:00
GriffinR	da9c0239d9	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2024-10-15 22:02:40 -04:00
ghoulslash	bb78d45400	some fixes	2024-10-15 21:24:53 -04:00
ghoulslash	cf78462fab	merge w upcoming	2024-10-15 21:24:47 -04:00
Eduardo Quezada	9ed153ff93	Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015	2024-10-15 22:22:52 -03:00
Eduardo Quezada	80447bee8e	Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015	2024-10-15 20:56:56 -03:00
GriffinR	a0be2cbf7b	Fix Fallorbor typo	2024-10-12 23:50:12 -04:00
GriffinR	f61c0099b9	OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA	2024-10-12 23:34:02 -04:00
GriffinR	bf17d54b52	Finish adding local IDs to map.json files	2024-10-12 23:32:28 -04:00
Eduardo Quezada	0a4b3a8dd7	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-12 16:23:27 -03:00
Bassoonian	8dba27249c	Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210	2024-10-12 18:41:33 +02:00
Ariel A	e10005010e	Merge branch 'followers' into followers-expanded-id	2024-10-12 12:27:05 -04:00
GriffinR	cb66ea6653	Continue adding local IDs to map.json files	2024-10-12 12:24:57 -04:00
Ariel A	d80190fe10	fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh	2024-10-12 12:23:18 -04:00
GriffinR	9f31b0fe90	Generate local IDs from map.json files	2024-10-12 03:04:24 -04:00
psf	0ef3f7dedd	Merge branch 'upcoming' into scriptCommands	2024-10-11 16:27:02 -07:00
GriffinR	091b7269df	Move heal locations data to their associated map.json (#2034)	2024-10-11 15:15:55 -04:00
kittenchilly	130d6042e0	Add Ion Deluge animation (#5467)	2024-10-10 22:37:57 +02:00
PhallenTree	8d2d62273b	Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs (#5493) ... * Updated ability popups of Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, Fix Doodle and Role Play issues * More Doodle fixes * Add tests * Fix Doodle not activating if partner is fainted and its ability cannot be suppressed * Fix tests compile * Commander cantBeOverwritten * Add battle script for Overwrite then Regular ability	2024-10-10 18:36:01 +02:00
SonikkuA-DatH	708f64247f	Heart Swap Move Animation (#5460)	2024-10-09 10:43:04 +02:00
Eduardo Quezada	1d9557811b	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-10-08 15:58:17 -03:00
psf	0dcb28ba0e	Add OW_UNION_DISABLE_CHECK and OW_FLAG_MOVE_UNION_ROOM_CHECK (#5448) ... * First addition of both checks * Updated config file * fixed spacing * Updated spacing * Fixed issues where feature was always on * Update overworld.h fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5448#discussion_r1789647611	2024-10-07 17:07:23 +02:00
ghoulslash	2e52e3331f	merge w upcoming	2024-10-04 12:56:21 -04:00
Eduardo Quezada	0f8b2a1ba8	Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909	2024-10-04 10:23:58 -03:00
kittenchilly	44bf14e6fd	Add functionality to Poké Flute and Town Map (#5405) ... * Add functionality to Poké Flute and Town Map * Poke flute in-battle * Address reviews * Update item_use.c * Update battle_message.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c	2024-10-03 10:52:59 +02:00
Eduardo Quezada	d1056f887b	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-09-30 15:52:49 -03:00
psf	58aa1e0034	Merge branch 'upcoming' into scriptCommands	2024-09-30 06:57:54 -07:00
Alex	42c43a3f8f	Adds Commander and Order Up (#5246) ... * Adds Commander * review points * new line * correction * regression / double targeting still broken * fix wrong target order * transform fixes * haze test * fixes, tests * bring back wrongly removed else if case * Eject Pack / Button test + fix * red card fix * test fixes * Fixes Tatsu being hit by multi hit move * change transform check * fix test + revert change * Fix Tatsugiri attacking after freed up from Dozo in the same turn * Dragon Darts tests * fix test * review comments * assumtion in wrong file * Order Up test fixes --------- Co-authored-by: hedara90 <90hedara@gmail.com>	2024-09-29 22:45:50 +02:00
Eduardo Quezada	5130ea9da3	Merge branch '_RHH/master' into _RHH/upcoming	2024-09-28 11:45:49 -03:00
PhallenTree	e67d5a23ed	Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive (#5430) ... * Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive) * Add Snatch interactions with Dancer, Swallow * Trace fix + cleanup * Simplify Quash * Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests * Fix Booster Energy Ability Popup * Accidentally removed healing from Swallow * More Trace cleanup	2024-09-24 18:40:44 +02:00
Bassoonian	60e2c0f859	Merge item description branch history (#5419) ... * Recreated ghoul's item_desc_header branch Fixed tabs vs spaces Fixing whitespace * Fixed item in header not showing on maximum flash level * Fixed item icon being affected by thunderstorms * Shops now set the obtained item flag. * Fixed build * fix seashore house * better soda pop fix, thx asparagus * fix item icon showing in battle pyramid * fix hiding item desc in battle pyramid --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-09-22 12:05:45 +02:00
ghoulslash	d695a6240d	Convert settotemboost command to callnative (#5418) ... * settotemboost use callnative * Update src/battle_main.c --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-22 11:25:42 +02:00
Frank DeBlasio	1ba0875654	Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS (#5166) ... * Removed FRONTIER_BRAIN_SPRITES * Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE * Updated TRAINER_CLASS macro * Removed FRONTIER_BRAIN_TEXTS * Turned Frontier Brain text to COMPOUND_STRINGs * Removed frontier_brain.inc from event_scripts.s * Addressed front sprite comment * Addressed backsprite comments	2024-09-22 09:54:01 +02:00
kleenxfeu	16e8be1233	Mega evolution animation is a little smoother (#4816) ... * Smoother primal/mega animation * Just to make the CI run. It needs to run * Update src/battle_anim_effects_3.c --------- Co-authored-by: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-21 23:47:19 +02:00
Bassoonian	8ba96fdac4	Add OW_AUTO_SIGNPOST and associated metatile behaviors (#5044)	2024-09-21 20:39:07 +02:00
ghoulslash	4cd23a377d	anger shell use saveattacker (#5409) ... * anger shell use saveattacker * tabs instead of spaces * add BattleScript_RestoreAttackerButItFailed for anger shell failure * Update data/battle_scripts_1.s Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-20 18:19:45 +02:00
GriffinR	a551efea43	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2024-09-19 12:33:34 -04:00
Alex	6ef36837e9	Fixed corruption of the next turn used move caused by Scale Shot (#5397)	2024-09-18 16:58:49 +02:00
Sadfish the Sad	f6319d8446	new animations for many moves more details in description (#5367) ... New: Me First, Zippy Zap, Splishy Splash, Floaty Fall, Pika Papow, Bouncy Bubble, Buzzy Buzz, Sizzly Slide, Glitzy Glow, Baddy Bad, Sappy Seed, Freezy Frost, Sparkly Swirl, Veevee Volley, Snap Trap, Astral Barrage, Burning Bulwark Updated: Aura Sphere, Dark Void, Spirit Shackle Fixed: Springtide Storm, Bleakwind Storm, Wildbolt Storm, Sandsear Storm, Clangorous Soul(Blaze)	2024-09-15 08:22:40 +02:00
pkmnsnfrn	a509f28038	Changed Scripot_GetObjectFacingDirection to callnative	2024-09-14 06:32:47 -07:00
PhallenTree	100c7dd8ad	Fixes Powder (status) interactions + tests (#5370) ... * Simplified fix from #4638 * Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge * Powder Tests * Remove duplicate * Assume Powder is a powder move * Add config for Powder Rain interaction * Only primal rain * Z-Moves fix handled in Canceller_Z_Moves * Fix BattleScript name * Make sure Z-Move + Powder still damages user	2024-09-13 18:08:23 +02:00
pkmnsnfrn	ecd435cd84	Changed CheckChosenMOnMatchDesiredSpecies and CheckPartyHasSpecies to callnative	2024-09-12 20:45:14 -07:00
pkmnsnfrn	c2db77c4f6	Changed Script_GetSetPokedexFlag to callnative	2024-09-12 20:15:55 -07:00
pkmnsnfrn	be7938f322	Changed CheckObjectAtXY to callnative	2024-09-12 18:55:11 -07:00
pkmnsnfrn	10bb349b8c	Changed GetObjectPosition to callnative	2024-09-12 18:41:42 -07:00
psf	1ba8e7d300	Merge branch 'upcoming' into signpost	2024-09-12 14:45:37 -07:00
pkmnsnfrn	f87440a25a	Removed setmonball per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531	2024-09-12 05:43:55 -07:00
pkmnsnfrn	a0e914b749	Merge branch 'upcoming' into scriptCommands	2024-09-12 05:39:24 -07:00
Eduardo Quezada	831b394ca1	Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909 ... # Conflicts: # Makefile # include/battle.h # include/battle_main.h # include/battle_util.h # include/data.h # make_tools.mk # map_data_rules.mk # src/battle_setup.c # src/fieldmap.c	2024-09-11 15:26:14 -03:00
Eduardo Quezada	fc1212b060	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-09-11 08:09:09 -03:00
Eduardo Quezada	551c558186	Merge branch '_RHH/master' into _RHH/upcoming	2024-09-11 07:28:02 -03:00
Eduardo Quezada	cdf781f726	Fixed Toxic Thread stat increase (#5369)	2024-09-11 11:18:58 +02:00
Alex	5089b1d0b4	Adds callnative for soundproofcheck to addtionally check the flag (#5301) ... * Adds callnative for soundproofcheck to addtionally check the flag * rename callnative, include parish song and missing ability recording	2024-09-09 06:52:26 -03:00
hedara90	d62b7270c8	Fixed trainerslide arguments (#5344) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-09-09 10:49:05 +02:00
SonikkuA-DatH	8c3531ffc7	Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak (#5325)	2024-09-07 18:04:47 +02:00
Salem	90089ecf51	add debug build target (#4817) ... * add debug build target * fix maybe uninitialized error * add option to undef NDEBUG * debug for agbcc * init instead of ignore to not break agbcc * make clean removes modern and agbcc artifacts. explicit use of -O0 again for NOOPT * automatically enable debug menu when building for debug * automatically enable debug menu when building for debug * automatically enable debug menu when building for debug * clean up previous mess omg * remove preproc around debug menus * automatically enable debug menu when building for debug * clean up previous mess omg * Apply suggestions from code review Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Update Makefile * Update field_control_avatar.c * make debug print independent * remove unwanted changes * remove trailing endif --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-09-07 10:13:22 -04:00
psf	0e1b62c732	Merge branch 'upcoming' into signpost	2024-09-05 17:11:32 -07:00
Frank DeBlasio	3aa24f527e	Converted Mechadoll text to COMPOUND_STRINGs (#5276)	2024-09-04 14:56:19 -04:00