7396 Commits

Author	SHA1	Message	Date
Eduardo Quezada	3507862164	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-12 09:30:59 -03:00
Alex	72de12609c	Fixes BATTLER_TURN_DAMAGED battler id (#6236)	2025-02-11 16:18:00 -03:00
Alex	cc9ca81c29	Add abstraction layer for battler positions (#6212)	2025-02-11 11:32:34 -05: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
Pawkkie	579fa6410d	Switch chance config support (#6187)	2025-02-10 00:30:54 +01:00
hedara90	174bc2f29f	Fixed typo in requests_effects (#6215) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-02-09 16:59:31 -05:00
Eduardo Quezada	99cb40d896	Added test support for 5 battle configs (#5914) ... Co-authored-by: sbird <sbird@no.tld> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-02-09 22:29:23 +01:00
Pawkkie	bd50fe6014	Fix AI switching in absorbing mon incorrectly (#6227)	2025-02-09 22:28:06 +01:00
Eduardo Quezada	a2ad5d2ca3	Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210)	2025-02-09 21:54:03 +01:00
Alex	5f13f9545f	Redefine IsBattlerAlive in battle.h as a static inline (#6211)	2025-02-09 14:09:23 -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
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
Eduardo Quezada	e29e1c6ca7	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-07 15:33:26 -03:00
Eduardo Quezada	b51598c14d	Removed Trainer Slides footgun (#6205)	2025-02-07 13:30:57 +01:00
Alex	765a12f520	Convert max effects to normal move effects (#6143)	2025-02-06 21:02:39 -03:00
hedara90	f9d1fdcf4c	Follower Object Event refactor (#6129) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-02-06 21:12:42 +01:00
Hedara	27da389d1e	Merge branch 'master' into master-to-upcoming	2025-02-06 13:05:02 +01:00
Pawkkie	4359cbb77c	SwitchType enum to clean up GetMostSuitableMonToSwitchInto (#6184)	2025-02-05 16:49:53 +01:00
ghoulslash	dc21befcc9	CanAbilityX Function Cleanup (#6183) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-02-05 16:48:51 +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
Alex	b90b1e2546	Clean up - Add ability args instead of calcing the ability again (#6186)	2025-02-04 18:04:05 -05:00
GriffinR	cdadd7d2ed	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
tertu	14178edfe3	Don't use SeedRng some places where it isn't necessary (#6156)	2025-02-03 20:03:13 +01:00
Eduardo Quezada	fe41f9eaf5	Fixed non-regional forms breeding incorrectly (#4985)	2025-02-03 17:03:29 +01:00
Eduardo Quezada	64c5113b23	Merge branch '_RHH/master' into _RHH/upcoming	2025-02-02 14:18:13 -03:00
Alex	f8c2e860d7	Remove unused PainSplit scripting global (#6164)	2025-02-02 14:50:39 +01:00
Eduardo Quezada	7c6eda21b1	Added missing in-battle "Move Info" button prompt (#6155)	2025-02-01 18:47:36 +01:00
Alex	97d8bd2646	Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154)	2025-01-31 22:02:26 +01:00
Eduardo Quezada	ee1b75614d	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-30 22:46:06 -03:00
khbsd	4fc56128d0	Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites (#5874) ... Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>	2025-01-30 22:29:20 -03:00
Eduardo Quezada	1c3cabb52a	Fix typo	2025-01-30 18:46:06 -03:00
Eduardo Quezada	370cfd5bb4	Begin 1.10.3 cycle	2025-01-30 18:40:03 -03:00
Eduardo Quezada	397e98b954	Version 1.10.2 (#6144)	2025-01-30 18:38:28 -03:00
Alex	32eb5dfba5	Remove global sBattler_AI (#6128)	2025-01-29 19:58:16 +01:00
Alex	94c98e6233	Clean up follow up for Simultaneous Reduction HP (#6139)	2025-01-29 19:39:19 +01:00
Alex	6432027f6b	Replace BattleStruct members quickClawRandom/quickDrawRandom with locals (#6136)	2025-01-29 07:02:40 -03:00
bassforte123	72edeeffad	Update pokemon.h with nature comments (#6133)	2025-01-28 21:37:02 +01:00
Alex	49cbebd212	Remove formToChangeInto (Unused) (#6137)	2025-01-28 17:11:11 -03:00
Eduardo Quezada	927bb8f833	Fixed AI not handling type effectiveness beyond x8 (#6127)	2025-01-28 19:16:10 +01:00
DizzyEggg	b2448ea002	Fix upcoming not working on no cash (#6121)	2025-01-26 20:25:57 -03:00
Frank DeBlasio	9b96462204	Consolidated contest opponent filters into gContestOpponents (#6119)	2025-01-26 23:12:49 +01:00
kittenchilly	058bf58b7b	Match current gen behavior for battle environment after fishing (#6099)	2025-01-26 22:39:14 +01:00
Eduardo Quezada	be74612b9e	u32 in FadeScreenHardware	2025-01-26 17:17:37 -03:00
Eduardo Quezada	3fc9b0195d	Cleaned up code to align with previous review comments	2025-01-26 17:14:00 -03: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
PhallenTree	4158f9251f	Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109)	2025-01-26 13:06:11 +01:00
hedara90	e1e3bcfa91	Tera starstorm (#6073) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-01-26 11:08:46 +01: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	090c4f3936	feat: hardware fades now affect BLDALPHA too	2025-01-25 20:57:30 -05:00
Frank DeBlasio	4e8ddebb8d	Updated trainer pic tutorial (#6049) ... Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2025-01-25 19:36:19 -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
Alex	77b677dbf9	Introduces BattleTurnCounter to simplfy timer checks (#6080)	2025-01-25 14:26:38 -05:00
hedara90	88986baf5f	Trainer Party Pools (#5731) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-01-25 13:28:46 +01:00
Eduardo Quezada	26daf15ce0	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-24 18:29:28 -03:00
Eduardo Quezada	cd84e07341	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-23 23:01:25 -03:00
psf	b109aa0c92	Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide (#6018)	2025-01-23 16:28:33 +01:00
DizzyEggg	4e0eab9e27	Remove gDecompressionBuffer (#6029)	2025-01-23 09:47:14 +01:00
Bassoonian	a1c47a931f	Revert "Converts a bunch of defines to enums" (#6082)	2025-01-22 21:50:39 +01:00
hedara90	2a8f4b03dc	Revert "Revert map related enum conversion" (#6079)	2025-01-22 21:25:24 +01:00
hedara90	2b9c5fe4e7	Revert map related enum conversion (#6078) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-01-22 19:37:56 +01:00
Eduardo Quezada	af884b1be4	Cleaned up Debug Menu (#6070)	2025-01-22 15:27:08 +01:00
hedara90	e8d3b4163f	Trainerslide animation fix (#6040) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-01-22 14:50:23 +01:00
Pawkkie	3c5bd4d16c	Return the universe to a state of balanced quilibrium (#6074)	2025-01-21 18:25:15 -05:00
Pawkkie	ea4434db2a	Switch trapping AI will consider Trace (#6059)	2025-01-22 00:07:15 +01:00
Alex	f2840cb047	Fixes Eject Pack triggering twice on Intimidate (#6072)	2025-01-21 17:58:52 -05:00
Eduardo Quezada	ed505cfb5f	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-21 19:32:51 -03:00
Alex	b2f2a8c9fb	Fixes Rapid Spin / Toxic Debris interaction (#6023) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2025-01-21 21:43:54 +01:00
Bassoonian	a3ce3a569d	Converts a bunch of defines to enums (#6071)	2025-01-21 21:19:41 +01:00
Alex	b1831daa98	Adds static assert for DamageCalculationData (#6063)	2025-01-21 21:15:25 +01:00
Alex	ac9c8ac3bb	Replace WEATHER_HAS_EFFECT with HasWeatherEffect (#6069)	2025-01-21 08:43:45 +01:00
Alex	27c8ec07c2	Documentation for DisableStruct (#6066)	2025-01-20 16:41:42 -05:00
Pawkkie	7d39dd4aae	Add AI_FLAG_PREDICT_INCOMING_MON: AI will score against predicted switchin if predicting switch (#6037)	2025-01-20 20:54:38 +01:00
khbsd	52666fb545	IV/EV Info on Summary Screen (#6027)	2025-01-20 09:41:31 +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
Eduardo Quezada	cd1482bbaa	Expanded Pokémon Follower transformation functionality (#5048)	2025-01-18 23:19:06 +01:00
AERDU	e4e4460636	fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 (#6032)	2025-01-18 19:54:20 +01:00
Alex	9ed3b176f0	Pret merge (17 of January) (#6045)	2025-01-18 19:53:29 +01:00
Bassoonian	243900cdbb	Rename DexNav flags and vars (#6044)	2025-01-18 14:44:40 +01:00
Bassoonian	db5dc85b70	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan	2025-01-18 13:07:05 +01:00
Bassoonian	cc9a4d34c6	Fix tests not building	2025-01-18 13:07:01 +01:00
Bassoonian	199760a6d3	Add known failing learnset cap test (#6046)	2025-01-17 21:04:46 -05:00
DizzyEggg	e83f7c79eb	Fix conflicting types for rotating gate functions (#2087)	2025-01-17 18:19:21 -05:00
DizzyEggg	0a436d580e	Extern gSprites and gOamMatrices with known array size (#2090)	2025-01-17 18:18:17 -05: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	6162628104	A bit more of addressing	2025-01-17 19:25:29 -03:00
hedara90	3bcfa355eb	Config for move slot rearrangement in battle (#6017) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-01-17 23:03:01 +01:00
Eduardo Quezada	ffc8903f93	More review addressing	2025-01-17 18:47:38 -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
Eduardo Quezada	cacd07db9a	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-17 13:49:32 -03:00
moostoet	3b19f6972b	Rename Furfrou Species tags to match Pokemon Showdown exports (#6041)	2025-01-17 14:39:52 -03:00
Pawkkie	465d30fbd0	Add AI_FLAG_PREDICT_SWITCH (#6028)	2025-01-16 21:43:16 +01:00
cawtds	75d5edad08	Fix UB when accessing move result flags (#6030) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-01-15 21:30:25 +01:00
ghoulslash	fd26d3a406	Fix Redirection Abilities Not Drawing in Ally Moves (#6026) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-01-15 15:20:31 +01:00
Martin Griffin	ed0c9a4671	Restore lock/lockall/locktrainer/release/releaseall in triggers (#5976)	2025-01-15 10:22:26 -03:00
hedara90	7c6c9120ea	Ewram and unused function cleanup sweep (#6019) ... Co-authored-by: Hedara <hedara90@gmail.com>	2025-01-15 14:07:12 +01:00
Pawkkie	e8dd8da5f7	Add AI_FLAG_PREFER_HIGHEST_DAMAGE_MOVE (#6025) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2025-01-14 14:13:48 -05: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
Alex	ddef67bbb1	Future Sight Innards Out follow up for upcoming (#5998)	2025-01-12 00:25:50 +01:00
Alex	8f34c76395	Removes Resource Flags and moves fields to DisableStruct (#5945)	2025-01-11 09:39:10 -03:00
DizzyEggg	f15d89893e	Allow Party Menu with 0 Pokemon (#5997)	2025-01-11 12:14:31 +01:00
Eduardo Quezada	8821779815	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-11 08:07:15 -03:00
Alex	6e5f40d506	Introduces BattlerState struct for the Battle Engine (#5954)	2025-01-11 07:12:22 -03:00
Eduardo Quezada	21bc5cfd30	Debug menu and createmon additions/cleanup (#5994)	2025-01-11 10:07:47 +01:00
Eduardo Quezada	c33c38e020	Remove form change function footguns (#5995)	2025-01-11 09:57:39 +01:00
Eduardo Quezada	0fefb444de	Multiple removals of hardcoded move IDs (#5964)	2025-01-10 17:07:32 -05:00
Alex	75a2d419e1	Follo up for Innards Out / Future Sight interaction (#5967)	2025-01-10 16:59:37 +01:00
Alex	e264fa6fc0	Removed OW_AUTO_SIGNPOST (#5978)	2025-01-08 16:14:38 -08:00
psf	81d877339c	Removed OW_AUTO_SIGNPOST (#5974)	2025-01-08 21:36:50 +01:00
Pawkkie	b5f539ed21	Rename AI_FLAG_PREFER_STRONGEST_MOVE (#5972)	2025-01-08 14:00:20 +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
Alex	5391b451ae	Shell Bell Clean up / Simplification and Tests (#5924)	2025-01-07 21:50:23 +01:00
PhallenTree	c10287b4c1	Fixes various Dynamax HP conversions/calculations (#5933)	2025-01-07 20:08:31 +01:00
wiz1989	5bfc25a4ff	changed data according to suggestions from the PR	2025-01-07 15:33:22 +01:00
wiz1989	04da838d88	Innards Out and Future Sight interaction	2025-01-07 14:00:09 +01:00
shachar700	a0e8753083	Update vars.h (cleanup) ... Removed an extra are	2025-01-06 22:17:24 +02:00
Alex	5317371fea	Last fix for Sparkling Aria / Covert Cloak / Shield Dust interaction (#5956)	2025-01-06 12:03:41 +01:00
Eduardo Quezada	40ba25dd3e	Converted 2 various to callnative (#5950)	2025-01-05 17:47:49 +01:00
shachar700	cbd0b3ef0c	Field effect for cutting grass is missing setfieldeffectargument. Issue #5766 (#5952)	2025-01-05 16:45:21 +01:00
khbsd	76964dd96a	Fly from Pokenav (#5679)	2025-01-05 00:24:58 +01:00
Eduardo Quezada	d7bbb2e628	Easy customizable Hidden Move types (#5872)	2025-01-04 21:42:14 +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
ghoulslash	401df8da4d	move overwrittenAbilities field to DisableStruct (#5946) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2025-01-03 18:17:23 +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	161c3aadea	OW_OBJECT_SUBPRIORITY	2025-01-03 13:51:11 -03:00
Bassoonian	9199b6f3cc	Adds Dexnav (#4818)	2025-01-03 14:19:02 +01:00
Alex	ec1876b826	Remove EWRAM gHpDealt (not needed anymore) (#5925)	2025-01-02 23:37:58 +01:00
ghoulslash	9707d09f79	some more Dexnav -> DexNav	2025-01-02 10:13:06 -05:00
Philipp AUER	94fba81a90	Initialize m4a and IRQ handler in a loaded section (#5912) ... Co-authored-by: sbird <sbird@no.tld>	2025-01-02 15:11:32 +01:00
ghoulslash	7a9e847fd4	some clean up	2025-01-02 09:00:56 -05: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
Eduardo Quezada	e040dcb0b4	Begin 1.10.2 cycle	2025-01-01 16:20:40 -03:00
Eduardo Quezada	89699939de	Version 1.10.1	2025-01-01 16:17:49 -03:00
Eduardo Quezada	6b8665d08f	Speed up tests in headless mode (#5889)	2025-01-01 10:24:23 +01:00
Ariel A	a6ef9c7577	Merge branch 'followers' into followers-expanded-id	2025-01-01 00:39:14 -05:00
Ariel A	4047f9b764	feat: added FadeScreenHardware utility	2025-01-01 00:37:35 -05:00
Ariel A	faf773a54b	feat: added time-blend override	2025-01-01 00:37:21 -05:00
Ariel A	a515cb3c6b	Merge branch 'followers' into lighting	2025-01-01 00:37:09 -05:00
Eduardo Quezada	e1275594c5	Renamed OW type effectiveness function for clarity (#5917)	2024-12-31 22:55:42 +01:00
Eduardo Quezada	004efd1e5a	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-31 18:38:03 -03:00
Alex	51cfb96fd5	Fixes Sparkling Aria Shield Dust / Covert Cloak interaction (#5911)	2024-12-31 12:52:16 +01:00
Ariel A	3fffb9fac6	feat: added configuration to restrict following pokemon. Closes #42	2024-12-30 21:38:18 -05:00
Alex	9d30299148	Fixes Stance Change, Sleep Talk interaction (#5909)	2024-12-31 00:38:01 +01:00
Bassoonian	bf125c8f5e	Fix wrong value for NUM_MOVE_EFFECTS (#5913)	2024-12-30 23:51:48 +01:00
Alex	3db351359a	Clean up redundancy for mugshots (#5906)	2024-12-30 18:32:21 +01:00
Alex	af19b13195	Adds Pledge Side Statuses as Starting Statuses (#5899)	2024-12-30 09:18:23 +01:00
Alex	f864bf8b70	Adds Generational config for Magic Guard (Fix for Gen4+) (#5893)	2024-12-30 09:01:20 +01:00
Eduardo Quezada	009de5c98c	Setting Battle configs during tests (#5803) ... Co-authored-by: sbird <sbird@no.tld>	2024-12-29 23:28:39 +01:00
Hedara	2088f2a12d	Merge branch 'master' into master-upcoming	2024-12-29 21:43:07 +01:00
Eduardo Quezada	7ddb4cdc1b	Fixed TODO tests not showing up when filtering by name (#5894)	2024-12-29 14:18: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	0bb86e4437	struct	2024-12-28 10:23:28 +01:00
Alex	5900a01061	Atk Canceller refactor / reorder / clean up (#5885)	2024-12-27 21:14:05 +01:00
Eduardo Quezada	50d325f081	Slight contest documentation (#2078)	2024-12-27 11:09:33 -05:00
Eduardo Quezada	91c7bd9e53	Fixed givemon not respecting perfect IVs for species (#5873)	2024-12-26 21:22:45 +01:00
AlexOn1ine	9c34634dd6	Draft Change	2024-12-25 11:03:32 +01:00
DizzyEggg	b1dbc6e9b2	Fix ASSUMPTIONS not working (#5869)	2024-12-24 06:46:40 -03:00
Alex	8edf14423a	Refactors argument into a union (#5853) ... Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-12-23 15:51:35 -03:00
Eduardo Quezada	f9fed98665	Fixed MOVE_EFFECT_FREEZE_OR_FROSTBITE not being usable in battle scripts (#5859)	2024-12-22 23:39:48 +01:00
Bassoonian	5560f339d0	Remove unused various (#5851)	2024-12-21 20:26:46 -03:00
Alex	f61a0f6a30	Sheer Force fix and move effect cleanup (#5812)	2024-12-21 19:45:50 +01: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
Eduardo Quezada	e175c5aca8	Changes Various defines to an Enum (#5840) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-12-21 11:48:31 +01:00
AlexOn1ine	573200d56a	nobody saw anything but again	2024-12-21 11:23:30 +01:00
AlexOn1ine	ff4c2aaf78	nobody saw anything	2024-12-21 10:24:34 +01:00
AlexOn1ine	71318eca5f	Revert weather order	2024-12-21 10:04:16 +01:00
Eduardo Quezada	53aebc34dd	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-20 20:48:13 -03:00
AlexOn1ine	2c419ccb57	review comments	2024-12-20 22:43:05 +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
Bassoonian	5cc0b35d81	Replace power checks with IS_MOVE_STATUS (#5820) ... Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-12-20 08:20:46 -03:00
hedara90	e579333427	Egg cycle length fix (#5828) ... Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-12-20 11:23:51 +01:00
Alex	f27bf843cb	Changes Various defines to an Enum (#5839)	2024-12-20 10:49:40 +01:00
AlexOn1ine	eb4427db94	primal weather fix	2024-12-19 21:41:32 +01:00
AlexOn1ine	99fef0260f	Battle Weather Refactor	2024-12-19 20:50:08 +01:00
PhallenTree	f4a0cc0055	Adds Thief/Covet config to send stolen item to bag and Pickup config to pickup user's item in wild battles (#5829)	2024-12-19 13:51:03 +01:00
Alex	a2aba3f86a	Changes target TURN_DAMAGED and MAX_HP to inlines (#5822)	2024-12-17 17:21:12 -05:00
Eduardo Quezada	bcc65e74a6	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-14 13:03:16 -03:00
Alex	4bff9f8ee9	Fixes simu hp reduction when no partner was on field (#5799)	2024-12-10 21:48:31 +01:00
PhallenTree	3ad5de5fef	Adds missing Friend Ball friendship bonus upon catching (#5795)	2024-12-10 08:26:23 -03:00
GriffinR	dbff8c4360	Merge branch 'porymap-6' into generate-map-constants	2024-12-09 20:25:41 -05:00
hedara90	75eaf890a2	Evolution level 1 learn (#5791) ... Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-12-09 13:21:30 +01:00
hedara90	09a8d051d4	Added the missing config to use new terrains (#5792) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-09 12:28:31 +01:00
Eduardo Quezada	66a2a16bbc	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-08 12:00:29 -03:00
Alex	3f3f4cfe1c	New Volt Switch Animation (#5729) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-07 15:52:13 +01:00
hedara90	54d372162f	Added NBSP and up+down arrows to all fonts (#5767) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-07 07:26:23 -03:00
PhallenTree	775ea3b564	Pursuit refactor (#5707)	2024-12-06 19:14:46 +01:00
Eduardo Quezada	29ef1cf9ad	Stick to the new name	2024-12-05 21:00:55 -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
Philipp AUER	7744298788	Fix fixed point damage calculation off-by-1s (#5775) ... Co-authored-by: sbird <sbird@no.tld>	2024-12-05 11:35:56 +00:00
Eduardo Quezada	458bd5ad4d	Review changes pt 1	2024-12-05 07:56:49 -03: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
Pawkkie	599f4d339b	Adds SleepClauseBlock enum to CanBeSlept (#5773)	2024-12-04 21:54:31 +01:00
Eduardo Quezada	68b5b63ecb	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/hp_reduction	2024-12-04 12:04:47 -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
Frank DeBlasio	1b880a1185	Converted item-related variables to COMPOUND_STRINGs (#5714)	2024-12-03 23:11:59 +01: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
Martin Griffin	993663d9b0	Variadic IS_BATTLER_OF_TYPE and GetBattlerTypes (#5708)	2024-12-03 13:12:54 +01:00
Frank DeBlasio	a97cfaa068	Converts multi-choice options to COMPOUND_STRINGs (#5686)	2024-12-03 12:32:13 +01:00
Pawkkie	c8b0da2493	Add AI_FLAG_WEIGH_ABILITY_PREDICTION (#5636)	2024-12-03 12:28:22 +01:00
Pawkkie	b15f7ad4f1	Sleep Clause global config (#5762)	2024-12-02 16:35:28 -05:00
AlexOn1ine	8acb31339d	rename critChance and moveDamage	2024-12-02 19:57:45 +01: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
Eduardo Quezada	7ac7ab8f6f	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-02 13:49:43 -03: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	4635f0e0f8	Converted Stance Change to proper Form Change + Tests (#5749)	2024-12-01 22:36:25 +01:00
Eduardo Quezada	00cb7b36e1	Actually start 1.11.0 cycle	2024-12-01 15:36:39 -03:00
Eduardo Quezada	2e30e66e15	Begin 1.11.0 cycle	2024-12-01 15:33:42 -03:00
Eduardo Quezada	7e5327864e	Start of 1.10.1 cycle	2024-12-01 15:27:01 -03:00
Eduardo Quezada	bd7a46f9c7	Version 1.10.0	2024-12-01 15:10:46 -03:00
Eduardo Quezada	720938f040	Fix conflicts	2024-12-01 14:28:26 -03:00
Eduardo Quezada	7010080465	Merge branch '_RHH/upcoming' into _RHH/pr/master/1.10.0	2024-12-01 14:28:12 -03:00
Eduardo Quezada	6fe935f1b8	Version 1.9.4	2024-12-01 14:04:13 -03:00
Alex	0ca588943b	Fixes choiced moves not locked in after ability block (#5738)	2024-12-01 13:45:35 +01:00
Eduardo Quezada	1a581c407c	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-01 08:11:32 -03:00
Alex	b3b0973fbb	Fixes Population Bomb / Triple Kick missing message (#5747)	2024-11-30 18:06:17 -05:00
hedara90	e4ef3a440f	Automatic Line Breaks, somewhat even lines (#5689) ... Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-11-29 18:46:45 +01:00
Hedara	f6fdca615f	Merge branch 'master' into master-to-upcoming	2024-11-29 11:32:12 +01:00
Alex	0f4b598984	Fixes Aegislash not reverting back (#5734)	2024-11-28 23:21:42 +01:00
Alex	88cdd8bdfb	Fixes Kee Maranga and Enigma Berry (#5727)	2024-11-28 11:22:32 +01:00
Alex	6b170d70f1	Fixes Red Card / Eject Pack interaction (#5724)	2024-11-27 14:05:11 -05:00
GriffinR	382ee9e276	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2024-11-23 16:10:33 -05:00
Alex	194f7644b8	Changes taget bit of Flower Shield (#5698)	2024-11-23 12:02:40 -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
Eduardo Quezada	b2ef363ac8	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-19 14:19:53 -03:00
AERDU	5388ed0cad	Mimicry updates typing with RemoveAllTerrains() (#5666) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-11-17 10:21:01 +01:00
Alex	67c7106fee	Refactors Absorb to use Moveend (#5670)	2024-11-17 09:59:04 +01:00
ghoulslash	6f78288a9b	fix dexNavSearchLevels array size	2024-11-13 21:21:45 -05:00
hedara90	3481340da8	Critical Hit documentation and distorted match up struct switch (#5665)	2024-11-13 22:30:27 +01:00
PhallenTree	0919fbdc2d	Fix Order Up + Tera Stellar breaking each other with Commander (#5667)	2024-11-13 11:45:08 +01:00
AlexOn1ine	4dc784bd2d	fix conflict	2024-11-12 23:30:49 +01:00
AlexOn1ine	3204454853	Critical Hit documentation and distorted match up struct switch	2024-11-12 23:27:53 +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
Martin Griffin	f770cb1ea3	Check that PASSES_RANDOMLY affected a Random call (#5635)	2024-11-11 10:59:58 +01:00
kittenchilly	7409b87d17	Add merged placeholder text for trainer name with class (#5622)	2024-11-10 21:21:27 -03:00
Eduardo Quezada	5f87d2e8a7	Convert gBattleStringsTable to COMPOUND_STRINGs (#5649)	2024-11-10 00:22:37 +01:00
GriffinR	b89fda79ea	Generate MAPSEC constants from JSON	2024-11-06 21:43:13 -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
Bassoonian	6d38e260d6	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov	2024-11-05 10:31:40 +01:00
Eduardo Quezada	ee2535be96	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-03 12:21:22 -03: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
hedara90	02d7767327	Set default battle shadow to Gen3 (#5632) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-11-03 07:29:09 -03:00
Alex	45d063dcf8	Fixes Dragon Tail using the effect twice during a Parental Bond attack (#5630) ... Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-11-02 09:38:29 -03:00
Martin Griffin	39f5596d09	Improve unneeded SEND_OUT error	2024-11-01 17:06:22 +00:00
Eduardo Quezada	ac1dd857f7	Fixed text wrap obtaining the incorrect glyph width (#5620)	2024-11-01 15:07:58 +01:00
Alex	35a22d6e82	Follow up for #5570 (#5625)	2024-10-31 10:58:00 +01:00
Alex	d5f8e9cc0e	Combines CalculateMoveDamage arguments into a struct (#5570)	2024-10-31 07:59:28 +01:00
GhoulMage	5df6f0b753	AI_FLAG_ACE_POKEMON takes into account separate trainers (#5608)	2024-10-29 15:18:29 -04:00
Eduardo Quezada	dfa3690d74	Added config to disable gender differences (#5595)	2024-10-29 15:38:26 +01:00
Alex	76eae8ed00	Decouple Poke Ball ids from item ids (#5560)	2024-10-28 18:03:15 +01:00
Alex	0b66f52ead	Minor BattleStruct clean up (#5585)	2024-10-28 16:35:31 +01:00
Eduardo Quezada	e8b8ca19a9	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-28 12:13:55 -03:00
Eduardo Quezada	3442b09852	Renamed folders and symbols to match species defines (#5581)	2024-10-27 20:15:11 +01:00
Eduardo Quezada	13d3245204	Added compressed OW mon VRAM notice in config file (#5599)	2024-10-27 14:04:33 -04:00
GhoulMage	6819dd3c37	New AI flag for marking the two last Pokémon as Ace Pokémon. (#5587)	2024-10-27 11:32:45 -04:00
Martin Griffin	09c424b70f	Mark all tests as used (#5531)	2024-10-25 13:05:19 +02:00
Pawkkie	7413d107ae	Should switch refactor to facilitate switch prediction (#5466) ... Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2024-10-25 13:04:42 +02:00
Eduardo Quezada	afa7ab9b2e	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-24 07:47:52 -03:00
Pawkkie	03eda5749d	Healer ability tests (#5559)	2024-10-22 19:02:28 +02:00
hedara90	bcfdf41078	Follower female fix (#5475) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-10-22 12:38:06 -03:00
Martin Griffin	1421ed1b24	Tests: detect task leaks (#5528)	2024-10-22 10:19:00 +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
Frank	544b76fbbf	Added value for bard sound length	2024-10-21 09:04:42 -04:00
Eduardo Quezada	3205f377d5	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-21 08:18:44 -03:00
GhoulMage	d11fd21cd6	Changing EVO_NONE from 0xFFFE to 0 (#5547)	2024-10-21 07:33:21 -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
ghoulslash	4fc07c4369	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2024-10-20 18:46:54 -04:00
Eduardo Quezada	59e617b16d	Updated Wring Out effects to match Eruption effects (#5549)	2024-10-20 21:44:28 +02:00
Bassoonian	601438e980	Centralise AI Tests trainer name (#5532)	2024-10-19 17:51:20 -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
RavePossum	85197eda5e	Move Relearner and Renaming From Summary Screen (#5513) ... * implement move relearner in summary screen * implement renaming in summary screen * Enable summary screen rename and relearn by default * Store original callback when opening screen to invoke later, hide rename/relearn for mons being moved in PC * add a config to not restore full PP when relearning from summary screen * hide summary relearner option if mon has no relearnable moves * add note not to decap RELEARN string * re-static function that now no longer needs to be accessible elsewhere * Fix move relearner not showing up if you first select a mon with no moves * The great curly brace massacre of 2024 (PR feedback) * sprinkling in some parentheses * PR feedback 2 (curly braces & whitespace)	2024-10-19 14:43:05 +02:00
ghoulslash	229525d122	some cleanup	2024-10-18 22:13:49 -04:00
ghoulslash	cb9f1f27a7	move dexnav flags, vars to config, add DEXNAV_ENABLED config to add static asserts that flags, vars are setup and dexnav cannot be used/accessed otherwise	2024-10-18 22:00:19 -04: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
kittenchilly	04aa5b7c24	Add more later gen fishing mechanics (#5518) ... * Add new fishing bite odds and follower boost * Sticky * Update item.h * Update field_player_avatar.c * Update field_player_avatar.c	2024-10-18 16:45:31 +02:00
Eduardo Quezada	358c0d0699	Added back GBA sprites via config (#5206) ... * Add back older sprites * Graphics config * Added GBA most graphical data to gSpeciesInfo * Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files * GBA mon icons * Split GBA footprints into separate config * Separated GBA icons into their own config * Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS * Moved GBA sprites to regular folder with prefix * Renamed configs * Temporarely disabled shadows when GBA sprites are enabled * Removed remaining files from pokemon_old folder	2024-10-18 13:37:00 +02:00
Eduardo Quezada	ee9c6d4912	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-17 00:16:01 -03:00
Pawkkie	9882e0aea6	Refactor ShouldSwitchIfAllBadMoves (#5452) ... * Refactor ShouldSwitchIfAllBadMoves * Rest of bugfix * Enable Shed Tail test * Revert "Enable Shed Tail test" This reverts commit e0b9a3affcf3c465c8743741e5ca61bde6c8cb18. * Better names for i, j * Fix MAX_MON_MOVES that should be MAX_BATTLERS_COUNT * battlerIndex / moveIndex fix * Update src/battle_controller_player_partner.c --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-10-16 11:22:48 -04: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
Bassoonian	d4387d880c	Replace hardcoded flute check with consumability check (#5508)	2024-10-16 12:07:34 +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
luckytyphlosion	a55c75d350	Get rid of common syms (#2040)	2024-10-14 23:52:11 -04: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
Eduardo Quezada	0a4b3a8dd7	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-12 16:23:27 -03:00
Bassoonian	eedeaf1ead	Clean up scrcmd PR (#5511) ... Renamed CheckPartyHasSpecie to CheckPartyHasSpecies and cleaned up function calls	2024-10-12 10:34:05 -07: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
Ariel A	d80190fe10	fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh	2024-10-12 12:23:18 -04:00
GriffinR	a2a3255bdd	Fix typo, remove old size check	2024-10-12 03:30:35 -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
ghoulslash	353915ef64	Add various tests, add RNG_RANDOM_TARGET (#5438) ... * burn dmg test depends on config * burn and frostbite tests use B_BURN_DAMAGE config for denom val * update kings shield test with config * add RNG_RANDOM_TARGET, use SetRandomTarget in HandleAction_UseMove target acquisition, update uproar test to PASSES_RANDOMLY since test will fail if you target the soundproof voltorb. Slightly faster UproarWakeUpCheck * add sticky web+contrary test * add EXPECT_EQ to contrary+sticky web test * Update src/battle_script_commands.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Update src/battle_util.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Update test/battle/move_effect/uproar.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * fix test * syntax fix --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-10-11 23:47:46 +02:00
SarnPoke	2db1f071fa	Add battle flag that prevents running from wild Pokémon (#5502) ... * Add No Running Battle Flag Adds a flag that if set prevents the player from being able to run from wild battles. * Formatting battle_util.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Adjust for pre-Gen 8 Teleport Addresses the edge case with Teleport when used with under Gen 8 mechanics. --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-10-11 21:59:50 +02:00
GriffinR	091b7269df	Move heal locations data to their associated map.json (#2034)	2024-10-11 15:15:55 -04:00
Pawkkie	464c90a862	ShouldSwitchIfGameStatePrompt Tests (#5462) ... * Weird tests plz help <3 * better RNG tag names? * DATA.trial for data to reset between trials * Fix Wonder Guard test * Unused errors * Finish new tests * Split fix into its own PR * Spacing * Rename RNG_AI_SWITCH_TOXICD * Forgot to save file lol --------- Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2024-10-11 19:57:19 +02:00
hedara90	cac815164a	Cleanup extraneous function in header (#5506)	2024-10-11 12:14:14 +02:00
kittenchilly	5b4acea651	Add config to change Vivillon's breeding form (#4813) ... * Add config to change Vivillon's default form * Update daycare.c * Remove the default form stuff * Update daycare.c * Clean up * Assert and fancy	2024-10-10 21:27:50 +02:00
ghoulslash	9dbcd18251	Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function (#5497)	2024-10-10 10:42:09 -04:00
Bassoonian	d0379b9b55	Turn item hold effects into an enum (#5498) ... * Turn item hold effects into an enum * Rename to ItemHoldEffect	2024-10-10 14:23:59 +02:00
Pawkkie	2afc7f6138	ShouldPivot type cleanup (#5441) ... * Cleanup ShouldPivot type * PIVOT to SHOULD_PIVOT	2024-10-10 12:54:35 +02:00
AlexOn1ine	d0a97970ba	Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function	2024-10-10 09:55:25 +02:00
Alex	1454644376	Removes duplicate code in AI functions (#5457) ... * Make functions CanAbilityAbsorbMove and CanAbilityBlockMove * clean up * Replace ai code with CanAbilityBlockMove / CanAbilityAbsorbMove * Adds CanPartnerAbilityBlockMove * Use switches instead of if-blocks * solve potential bug in singles with spread attacks * fix test * revert other fix * flash fire does not increase a stat * left a comment for a future test and addition * remove more checks * comment was incorrect. it only applies to storm drain and lightning rod * revert ndebug * revert minor change * Update src/battle_util.c	2024-10-09 15:50:59 +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
Eduardo Quezada	ee00c251ae	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-08 14:52:12 -03:00
Eduardo Quezada	541ca2619b	Start 1.9.4 cycle	2024-10-08 14:47:32 -03:00
Eduardo Quezada	a76f7fe92e	Version 1.9.3 (#5485) ... * Version 1.9.3 * Updated to latest master	2024-10-08 14:45:09 -03:00
Pawkkie	efad9a32a9	Fix AI tests using PASSES_RANDOMLY (#5486)	2024-10-08 13:04:35 -04:00
Eduardo Quezada	f913f2884b	Add config for shadow intensity	2024-10-08 12:21:06 -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	a6a6737c42	some dexnav improvements, use CalculateDexnavShinyRolls for shiny rolls	2024-10-04 13:54:56 -04:00
Eduardo Quezada	a7fca616b0	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-04 14:28:13 -03:00
ghoulslash	2e52e3331f	merge w upcoming	2024-10-04 12:56:21 -04:00
wiz1989	6f59d26753	updated Conversion 2 mechanics to 5+ (#5453) ... * updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2 * fixes and added new test cases * bugfixing and added EWRAM u16 gLastUsedMoveType * update after Pawkkie review --------- Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>	2024-10-04 12:42:15 -04:00
kittenchilly	19009c6d21	Add support for overworld sprite gender differences + add all the sprites (#5394)	2024-10-04 17:56:21 +02:00
Eduardo Quezada	0f8b2a1ba8	Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909	2024-10-04 10:23:58 -03:00
Alex	077bbd3442	Adds padding in AiLogicData (#5468) ... * Adds padding in AiLogicData * Update battle.h * Update battle.h * Update battle.h	2024-10-03 22:11:54 -04:00
Eduardo Quezada	80af2af9ad	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-03 14:33:01 -03:00
ghoulslash	be5f2e095e	fix duplicating flute glitch (#5436) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-10-03 13:01:18 +02: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
psf	2597d8a35a	Updated species defines (#5075) ... * First version of new defines * Fixed cloaks * Fixed cloaks * Fixed cloaks * Fixed cloaks * Fixed cloaks * Removed old defines * Removed old defines * Removed old defines and cleaned up some macros * Undid changes to documentation Deleted unused defines Updated defines Fixed tests fixed docs * moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599 * fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591	2024-10-02 18:24:57 -03:00
Pawkkie	ded97e5296	Switch AI refactor + considers free switches (#5379) ... * Switch AI considers free switches from pivot move * Fix Baton Pass refactor * Some cleanup and comments * Mon fainting to hazards is a 0HKO * Revert "Mon fainting to hazards is a 0HKO" This reverts commit 446f73822651af55ee1a36aeb61f3f0c9317d244. * Cleanup speed check / Eject Pack * Move eject trackers to AiLogicData * Review feedback and WhoStrikesFirst changes * This linebreak will bug me lol * Also this comment, heck * Last bit of comment cleanup	2024-10-01 23:10:02 +02:00
Alex	b93e58266e	Fixes recoil moves not triggering berries if possible (#5449) ... * Fixes recoil moves not triggering berries if possible * Update battle_script_commands.h	2024-10-01 10:43:58 +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
Bassoonian	5a8a393dcd	Add Sideways Stairs (#4836)	2024-09-30 00:06:25 +02: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
ghoulslash	c8afe9bbde	some formatting fixes	2024-09-29 13:34:11 -04:00
ghoulslash	be3ee1ba85	merge w upcoming	2024-09-29 13:33:20 -04:00
Pawkkie	5e027754c7	Add ShouldSwitch result to AiLogicData (#5440) ... * Add ShouldSwitch to AiLogicData * Convert shouldSwitch to bitfield * Update include/battle.h Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Update include/battle.h --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-29 12:16:33 -04:00
Eduardo Quezada	5130ea9da3	Merge branch '_RHH/master' into _RHH/upcoming	2024-09-28 11:45:49 -03:00
Bassoonian	7dad83070f	Added MB_X_Y_STAIR_WARP metatile behaviors (#5278)	2024-09-28 15:21:11 +02:00
pkmnsnfrn	6cea365135	Merge branch 'upcoming' into stairWarps	2024-09-27 17:25:57 -07:00
kittenchilly	c1dffc694e	Merge level_caps and ev_caps into one caps file (#5429) ... * Merge level_caps and ev_caps into one caps file * Update caps.h	2024-09-27 23:40:49 +02: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
psf	ad0778722b	Adds SAVE_TYPE_ERROR_SCREEN (#5188) ... * Original commit * Moved config from save to general https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747901 Reindent function per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747984 Split Compound String into seperate lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104 Changed Rom to ROM per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104 Removed extra new line per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748172 * fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2295134679 * Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2306527812 * Removed comment and made line breaks consistent per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#pullrequestreview-2320266015	2024-09-22 19:07:17 +02:00
psf	009b42394e	Merge branch 'upcoming' into stairWarps	2024-09-22 09:40:34 -07:00
ghoulslash	b7246a018c	merge w upcoming	2024-09-22 09:13:25 -04: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
Frank DeBlasio	d1bb7770d3	Converted berry and PokeBlock strings to COMPOUND_STRINGs (#5324) ... * Converted bag pocket names to COMPOUND_STRINGs * Converted berry-related text to COMPOUND_STRINGs * Converted PokeBlock-related text to COMPOUND_STRINGs * Added indexes to BerryFirmnessStrings * Updated call to sBerryFirmnessStrings * Changed gText to sText	2024-09-21 20:44:25 +02:00
Bassoonian	8ba96fdac4	Add OW_AUTO_SIGNPOST and associated metatile behaviors (#5044)	2024-09-21 20:39:07 +02:00
GriffinR	a551efea43	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2024-09-19 12:33:34 -04:00
GriffinR	e4e90eacd6	Merge pull request #2023 from Bassoonian/updatemapmacros ... Fix defines in MAP_NUM and MAP_GROUP	2024-09-19 12:17:16 -04:00
psf	fee26e29f5	Add AUTO_SCROLL_TEXT and NUM_FRAMES_AUTO_SCROLL_DELAY (#5054) ... * Added AUTO_SCROLL_TEXT * Moved NUM_FRAMES_AUTO_SCROLL_DELAY * Moved NUM_FRAMES_AUTO_SCROLL_DELAY per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268265 * Apply suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268524 Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Added ability to skip text with button press per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054\#issuecomment-2267100771 * Update gflib/text.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054#issuecomment-2274402891 * Update text.h * Fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files\#r1711780606 * Moved NUM_FRAMES_AUTO_SCROLL_DELAY * Update gflib/text.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-09-19 12:01:12 +02:00
Alex	71dfd3e7c0	Ogerpon masks were missing their hold effects (#5391) ... * Ogerpon masks were missing their hold effects * fix wrong num * test * correct tests and additional fix * added hold effect to battle debug	2024-09-19 00:25:53 +02:00
PhallenTree	76656e85c2	Fix Quash implementation, adds After You and Quash missing configs + tests (#5400) ... * Fix Quash + After You and Quash configs * Add tests	2024-09-19 00:10:29 +02:00
nescioquid	ac2b41ae71	Typo fixes and Growth move description change (#5398) ... * changes Growth's move description to account for Gen 5+ behavior * completes B_DIVE_BALL_MODIFIER comment * fixes typos and incongruent spacing in various files * Update src/data/moves_info.h Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-09-18 23:03:36 +02:00
Alex	6ef36837e9	Fixed corruption of the next turn used move caused by Scale Shot (#5397)	2024-09-18 16:58:49 +02:00
Kurausukun	52c2728ff6	remove gflib	2024-09-18 10:37:34 -04:00
Eduardo Quezada	53414cb8bb	Form changes and evolutions happen based on fake RTC	2024-09-16 16:15:30 -03:00
Eduardo Quezada	6116b8b04e	Start 1.9.3 cycle	2024-09-16 11:57:41 -03:00
Eduardo Quezada	889a02d263	Version 1.9.2 (#5357) ... * Version 1.9.2 * Apply suggestions from code review Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com> * Updated to latest master * Updated to latest master * Fix last PR * Corrected order + Pumpkaboo/Gourgeist credits --------- Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-09-16 12:12:34 -03:00
Bassoonian	0b429a8649	Merrp merge (September 9th) (#5359)	2024-09-15 13:21:39 +02:00
Alex	25e9ca2ac6	Cleaned up a bit of code with GetBattlerPartyData (#5378) ... * rename GetBattlerPartyData	2024-09-15 08:24:26 +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
Alex	0d7c193e4c	fixes Micle Berry not increasing accuracy on the next turn (#5358) ... * fixes Micle Berry not increasing accuracy on the next turn * adds bitfield instead of using protect struct * test from pawkkie * ndebug * renaming * delete redundant comment * typo * micle berry more detailed descriptions	2024-09-14 19:55:03 -04:00
DizzyEggg	c4b5818d98	remove ScriptContext_Enable from secret_base.h	2024-09-14 19:13:02 +02:00
pkmnsnfrn	60fb0b34fd	Modified getobjectxy to allow for custom destinations	2024-09-14 07:48:24 -07:00