5025 Commits

Author	SHA1	Message	Date
LOuroboros	46977b52fa	Added the footprints of all Gen. 7 and 8 species	2021-12-13 13:39:12 -03:00
TheXaman	123969f093	fixed front sprite position including elevation and shadow for flying mon's (shadow palette too dark atm)	2021-12-13 15:05:17 +01:00
Eduardo Quezada D'Ottone	7ca07527fa	Config for HP bars moving faster for higher HP amounts. Credit to Dat.H	2021-12-12 12:33:49 -03:00
Eduardo Quezada D'Ottone	bbf7b62ceb	Config for lost money after losing a battle	2021-12-11 23:03:50 -03:00
LOuroboros	f317b542e2	Updated Teleport	2021-12-11 21:20:04 -03:00
TheXaman	51371661c2	Added new menu naviagtion, now all options can be changed	2021-12-11 15:03:56 +01:00
TheXaman	bbe918941e	added include/constants/pokemon_debug,h for defines, restructured code order	2021-12-11 12:13:14 +01:00
ultima-soul	26f29a04fd	Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" ... This reverts commit ac2bcece75, reversing changes made to 349262ebc3.	2021-12-10 09:41:54 -08:00
TheXaman	f6d9b74a1a	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug	2021-12-10 16:48:46 +01:00
Eduardo Quezada D'Ottone	aa2b2e6a70	Merge pull request #1929 from ultima-soul/battle_engine_sync ... Battle Engine Upstream Sync	2021-12-09 20:02:45 -03:00
ultima-soul	ac2bcece75	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync	2021-12-09 14:16:05 -08:00
ultima-soul	d99ac2e44a	Resolved review suggestions for upstream Pokemon Expansion sync.	2021-12-09 09:51:28 -08:00
ultima-soul	a5afdac0ae	Resolved review suggestions for upstream Battle Engine sync.	2021-12-08 12:08:16 -08:00
Blackforest92	a7c9e6e230	Reverse both Hippopotas and Hippowdon icons to use male only	2021-12-09 00:24:31 +07:00
Blackforest92	55477234ef	Palette conversion GEN5	2021-12-08 21:39:31 +07:00
DizzyEggg	97539d7443	Merge pull request #1951 from ghoulslash/be/sheercold ... Ice Types immune to Sheer Cold	2021-12-06 14:12:06 +01:00
sphericalice	5c02facde4	Use more specific enum names for throwable Balls	2021-12-05 23:17:44 +00:00
sphericalice	3db871c49a	Refactor CanThrowLastUsedBall and related functions	2021-12-05 23:10:05 +00:00
ghoulslash	c0e408bfab	fix aqua ring heal anim	2021-12-05 14:44:22 -05:00
Eduardo Quezada D'Ottone	1708ac4b1b	Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles.	2021-12-04 22:13:29 -03:00
SonikkuA-DatH	b6fff16a7d	Update battle.h	2021-12-03 18:04:44 -08:00
ultima-soul	349262ebc3	Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync	2021-12-03 17:31:02 -08:00
ultima-soul	7369f60c06	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-12-03 17:30:45 -08:00
Eduardo Quezada D'Ottone	96b8d21b7a	Added form switching + Button icons	2021-12-03 19:32:31 -03:00
TheXaman	40f7247e11	changed P_ENABLE_DEBUG to TRUE/FALSE	2021-12-03 11:02:22 +01:00
TheXaman	bf0d2b8393	Changed definition of P_ENABLE_DEBUG to pokemon_config.h	2021-12-02 19:29:04 +01:00
ultima-soul	d408b56549	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-12-01 20:18:57 -08:00
ultima-soul	a68a39e35f	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-12-01 20:17:49 -08:00
ultima-soul	23bf41713c	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-12-01 20:17:08 -08:00
LOuroboros	2e67153982	Renamed the Enigma Berries' constants	2021-12-01 22:16:38 -03:00
LOuroboros	e7bef25fb1	Updated hold_effects.h	2021-12-01 13:32:43 -03:00
Blackforest92	2ad3c3f6be	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
LOuroboros	19af517bbb	Edited pointless or useless Primal Reversion code ... Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion. Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion. Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.	2021-12-01 00:56:33 -03:00
LOuroboros	f2dd7bce99	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks	2021-11-30 20:39:58 -03:00
TheXaman	c402a840b1	changed to P_ENABLE_DEBUG	2021-11-30 11:20:26 +01:00
TheXaman	50e95878e9	added Select button text, added gender based icons, imrpoved code	2021-11-30 11:16:30 +01:00
TheXaman	b0f8408fb6	added gender based sprites, added textbox line, adjusted sprite offset to match line	2021-11-30 02:29:33 +01:00
TheXaman	6c520659aa	implemented a inital pokemon debug menu based on code from Gamer2020 and AsparagusEduardo	2021-11-29 22:52:08 +01:00
ghoulslash	7a7c6afc39	larger ability popup, fix ability name printing/clearing, and config for longer ability names	2021-11-29 12:42:01 -05:00
SonikkuA-DatH	7b5dfa83af	Update battle_move_effects.h	2021-11-28 19:44:02 -08:00
SonikkuA-DatH	002556cf3f	Update battle_script_commands.h	2021-11-28 19:42:32 -08:00
SonikkuA-DatH	ca4207d497	Update battle_anim.h	2021-11-28 19:40:55 -08:00
SonikkuA-DatH	c8fba3fa90	Update graphics.h	2021-11-28 19:36:17 -08:00
TheXaman	5780560007	fixed some bugs, thanks to cbt	2021-11-28 20:28:54 +01:00
ghoulslash	d108f77aa4	revert ai item usage code	2021-11-28 13:12:56 -05:00
ultima-soul	01a90ca6c2	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-11-27 22:17:05 -08:00
ultima-soul	d0623d7b71	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-27 21:40:08 -08:00
ultima-soul	0312c5be8b	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-27 21:38:26 -08:00
Eduardo Quezada D'Ottone	fa995894b7	Added Nature evolution methods	2021-11-27 20:46:19 -03:00
Eduardo Quezada D'Ottone	7c6f76323a	Added NidoranM/Volbeat Ditto breeding config + Rotom & Furfrou	2021-11-26 22:56:48 -03:00
ghoulslash	e2af9ec3b4	ice type immunity to sheer cold	2021-11-26 11:49:49 -05:00
ghoulslash	5c52abd856	gen3 sport move functionality behind config	2021-11-23 21:20:32 -05:00
ghoulslash	e3ddad2d11	add sport effects back	2021-11-23 18:36:10 -05:00
BuffelSaft	cca7ec8c58	Fix and rename GetMoveTargetType ... Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.	2021-11-24 12:09:54 +13:00
kleeenexfeu	9b25e0147c	Update include/constants/battle_config.h ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-23 14:35:37 +01:00
kleeenexfeu	f2755ad970	reword B_RECALC_TURN_AFTER_ACTIONS explanation	2021-11-23 14:28:52 +01:00
kleeenexfeu	84e6e083f7	hate the explanations about turn order ._. ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-23 14:24:30 +01:00
kleeenexfeu	6ceffaaf3e	recalculate turn order after relevant actions	2021-11-23 13:46:36 +01:00
kleeenexfeu	1a5d3191e2	battle_engine merge	2021-11-23 13:38:36 +01:00
BuffelSaft	a89ce0c38a	Swapped webs don't trigger Defiant ... Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect? Also, fix Sticky Web not activating Defiant.	2021-11-23 22:54:30 +13:00
BuffelSaft	499fb8071d	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2021-11-23 17:12:24 +13:00
BuffelSaft	fa0b5188bb	Dynamic move targeting ... Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.	2021-11-23 16:56:11 +13:00
BuffelSaft	6b8f86c276	Snap Trap placeholder anims ... Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.	2021-11-23 11:05:36 +13:00
BuffelSaft	ff60882b29	Requested changes	2021-11-23 11:04:39 +13:00
Jaizu	b7f4658077	Added Kricketot line gender difference sprites	2021-11-22 16:30:05 -03:00
LOuroboros	8373312ed7	Add gender differences for some Gen. 4 Pokémon ... Namely: Bidoof, Kricketot, Shinx, Starly, Staravia and Staraptor Credits to CyanSMP64/Furret and Jaizu.	2021-11-22 16:25:25 -03:00
BuffelSaft	62f01e89d7	Fix Burmy form change ... Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.	2021-11-23 00:46:43 +13:00
BuffelSaft	50d0cd52e8	Clean up Corrosive Gas ... Remove code and unused move effect.	2021-11-22 15:13:54 +13:00
BuffelSaft	d2eb5f0e61	Remove shell trap effect code ... Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.	2021-11-22 14:46:47 +13:00
BuffelSaft	42b8f18cb1	Remove Corrosive Gas code ... This was not working at all in testing, so it can be done by a separate PR later.	2021-11-22 14:35:01 +13:00
BuffelSaft	70f0018c08	Partially implement Shell Trap ... Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.	2021-11-22 14:14:41 +13:00
ultima-soul	a8f9a54787	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-21 10:41:32 -08:00
ultima-soul	57bf1c7824	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-11-21 10:41:12 -08:00
ultima-soul	3ed51d6d91	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
Eduardo Quezada D'Ottone	dee7f97a8d	Merge branch 'battle_engine' into battle_ai	2021-11-21 14:46:09 -03:00
Eduardo Quezada D'Ottone	30a4ef3723	Merge pull request #1924 from ghoulslash/be/wish ... Fix wish	2021-11-21 14:04:06 -03:00
ghoulslash	3404039330	Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn ... Mega Evolution alters turn order	2021-11-21 08:12:21 -05:00
BuffelSaft	bcaa17ffb3	Finish/tidy up Court Change ... Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.	2021-11-21 17:20:45 +13:00
Eduardo Quezada D'Ottone	31d7719429	Merge pull request #1913 from LOuroboros/healingItems ... Changed I_LEGACY_HEALING_ITEMS	2021-11-20 23:37:24 -03:00
ghoulslash	3fb62f74c6	fix rampage cancelling	2021-11-20 18:35:56 -05:00
ghoulslash	37ab20e29c	fix wish	2021-11-20 16:49:04 -05:00
W1serV1ser	c2f81cd5f5	Added Sky Drop	2021-11-20 11:44:48 -08:00
kleeenexfeu	6402a7ab6e	follow suggestion ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-19 23:42:20 +01:00
kleeenexfeu	acddeeb1f9	follow suggestion ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-19 23:30:33 +01:00
LOuroboros	ad8582064b	#elif without condition bad, #else good	2021-11-19 18:49:30 -03:00
kleeenexfeu	03a9f3f413	Mega Evolution alters turn order	2021-11-19 22:03:10 +01:00
Eduardo Quezada D'Ottone	1696e60b9f	Merge pull request #1876 from ghoulslash/be/ai_updates ... Some more CanAIFaintTarget checks and other AI updates	2021-11-19 17:33:21 -03:00
BuffelSaft	14a2e86313	Fix Scale Shot ... Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.	2021-11-19 21:57:32 +13:00
BuffelSaft	98712e576e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2021-11-19 17:48:11 +13:00
BuffelSaft	16a4fc9062	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-19 16:33:24 +13:00
TheXaman	2f8896f2f0	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2021-11-18 15:13:04 +01:00
TheXaman	5104293344	Changed to TX_DEBUGGING define instead of makefile DEBUGGING option	2021-11-18 15:09:06 +01:00
GriffinR	c89dfd9f56	Finish updating macro comments	2021-11-18 01:47:58 -05:00
GriffinR	b5b5d95de6	Distinguish 'virtual object' names from object events	2021-11-17 23:40:53 -05:00
GriffinR	b9fa18bdd4	Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros	2021-11-17 22:03:37 -05:00
GriffinR	c940b67716	Continue macro comment updating	2021-11-17 17:45:59 -05:00
GriffinR	c1970a4bc8	Remove dead sub references	2021-11-17 15:47:47 -05:00
GriffinR	ecb13cdbf7	Merge pull request #1550 from GriffinRichards/doc-pokenav ... Document Pokénav	2021-11-17 14:47:34 -05:00
GriffinR	eb95ac0b9c	Document field_tasks	2021-11-17 14:44:42 -05:00
LOuroboros	7ae30f8913	I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY ... Also fixed its inaccurate description.	2021-11-17 07:15:14 -03:00
LOuroboros	7d71fe6ce8	I_NEW_VITAMIN_EV_CAP -> I_VITAMIN_EV_CAP	2021-11-16 21:25:03 -03:00
GriffinR	61aa9c3ba9	More updating event macro comments	2021-11-16 17:46:34 -05:00
LOuroboros	f62ec0630a	Updated Vitamins cap	2021-11-16 18:36:49 -03:00
GriffinR	d414787932	Some TV clean-up	2021-11-16 16:22:17 -05:00
GriffinR	5d9c31a610	Label slot machine ids, fix GetPriceReduction	2021-11-16 15:43:52 -05:00
GriffinR	63c5905914	Continue updating event macro comments	2021-11-16 13:10:23 -05:00
GriffinR	04cc923d6c	Handle optional arguments for warp commands, add WARP_ID_NONE	2021-11-16 10:53:00 -05:00
Eduardo Quezada D'Ottone	cc833ebb59	Created macro + config for always critting when using high-crit moves	2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone	a1bd6bd52f	Updated species that benefit from Leek	2021-11-15 22:30:20 -03:00
LOuroboros	5c485d9769	Fixed Fling when gLastUsedItem is 0 ... Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.	2021-11-15 14:02:33 -03:00
GriffinR	c1130592fa	Drop some overworld prefixes	2021-11-15 10:58:05 -05:00
GriffinR	65d3b58374	Add PARTY_NOTHING_CHOSEN	2021-11-15 10:57:06 -05:00
LOuroboros	de74177966	Oops	2021-11-15 12:52:05 -03:00
LOuroboros	a01fd2eb7a	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2021-11-15 12:47:26 -03:00
ghoulslash	2a1299715f	merge w be	2021-11-15 10:45:59 -05:00
LOuroboros	ea12dfdf2c	Implemented Fling	2021-11-15 12:41:00 -03:00
LOuroboros	cbb6639f8d	Fling tweaks ... -Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER) -Updated BattleScript_EffectFling following Smogon's description of Fling's effect. -Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect -No need to define flingPower when its value is 0 -Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes. -Added a preproc config for Klutz.	2021-11-15 12:40:10 -03:00
ghoulslash	0e397c43fe	Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks ... Adjusted elements to simplify the conflicts between BE and IE	2021-11-15 08:27:28 -05:00
GriffinR	4275cf4b90	Rename pokenav match call files	2021-11-15 01:30:21 -05:00
GriffinR	14d78d7633	Finish match call menu doc	2021-11-15 01:20:03 -05:00
GriffinR	c779d03b3e	Rename pokenav_match_call_ui	2021-11-15 00:21:40 -05:00
GriffinR	d4d4234283	Finish pokenav list ui doc	2021-11-15 00:09:02 -05:00
Wiz	927f9d27df	Designate gBattleAnimBgImage_Attract and related as arrays	2021-11-14 17:08:03 -05:00
ghoulslash	8b296b97a8	Merge pull request #1887 from BuffelSaft/knock-off ... Fix Knock Off, add config	2021-11-14 08:27:51 -05:00
GriffinR	f42eafc85b	Merge branch 'master' into doc-banim	2021-11-13 23:26:46 -05:00
GriffinR	159bb37bbe	Merge branch 'master' into fix_saveblock_reorder	2021-11-13 23:19:57 -05:00
GriffinR	9a932cd9c3	Merge pull request #1549 from GriffinRichards/doc-binterface ... Document remaining symbols in battle_interface, palette, and save	2021-11-13 23:19:08 -05:00
ProjectRevoTPP	9d3345a6d6	Enforce structs to enforce save block order for modern toolchains.	2021-11-13 21:41:16 -05:00
GriffinR	b14fe9dce3	Merge pull request #1547 from GriffinRichards/doc-sounddata ... Clean up sound, add CRY_MODE constants	2021-11-13 15:54:40 -05:00
GriffinR	b3e593dff5	Continue pokenav list ui doc	2021-11-13 15:52:58 -05:00
GriffinR	ec05157568	Move pokenav list item union out of list struct	2021-11-13 11:27:11 -05:00
Eduardo Quezada D'Ottone	bcbdb353f5	Adjusted elements to simplify the conflicts between BE and IE	2021-11-13 12:10:20 -03:00
Eduardo Quezada D'Ottone	67f12ef782	Fixed Hold Effect file spacing	2021-11-13 11:56:17 -03:00
ghoulslash	940a165be7	merge w be	2021-11-13 09:09:15 -05:00
Eduardo Quezada D'Ottone	8f52996144	Merge pull request #1892 from ghoulslash/be/wish ... wish update	2021-11-13 11:01:04 -03:00
ghoulslash	9df66f4ac1	Merge pull request #1843 from Blackforest92/battle_engine ... Update Giga Impact's graphic and use fade-in battle animation.	2021-11-13 08:54:37 -05:00
ghoulslash	a4204e5491	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-13 08:50:24 -05:00
LOuroboros	2fe015e5ce	Implemented Fling	2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone	bcb0f1b915	Merge pull request #1890 from kleeenexfeu/battle_engine ... Bypassing screens and protections correctly	2021-11-13 10:11:02 -03:00
kleeenexfeu	f808710932	Moving IsBattlerProtected	2021-11-13 13:38:07 +01:00
BuffelSaft	04867ac0d3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-13 17:33:25 +13:00
BuffelSaft	55b279ba0a	Fix several move effects ... Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.	2021-11-13 16:29:12 +13:00
GriffinR	3b91d8fdaf	Start pokenav list ui doc	2021-11-12 20:36:19 -05:00
GriffinR	da5752fd0d	Start match call menu doc	2021-11-12 20:17:06 -05:00
BuffelSaft	6232b046b1	Fix Burn Up ... Now works properly with and without Parental Bond. It wasn't broken before, but its interaction with Parental Bond was.	2021-11-13 12:40:45 +13:00
ghoulslash	c4efe06f38	wish update	2021-11-12 17:55:05 -05:00
Eduardo Quezada D'Ottone	a7870dbef0	Merge branch 'battle_engine' into magician	2021-11-12 19:40:34 -03:00
GriffinR	ffe2970e30	Rename pokenav menu handler files	2021-11-12 17:13:50 -05:00
GriffinR	baeacbe2f1	Clean up pokenav general menus, organize pokenav graphics	2021-11-12 17:08:12 -05:00
ghoulslash	96fd8e696b	brick break gen 4 and 5 config. clears aurora veil	2021-11-12 15:00:21 -05:00
ultima-soul	294fecd57c	Merge pull request #1888 from ghoulslash/be/contrary ... Fix Contrary Animation	2021-11-12 10:19:37 -08:00
Eduardo Quezada D'Ottone	34555b46e8	Oops	2021-11-12 14:47:35 -03:00
ghoulslash	a26da51e9d	fix contrary animations for MOVE_EFFECT_statchange	2021-11-12 12:44:45 -05:00
ultima-soul	c5dabf34b8	Improve Serene Grace boost config comment.	2021-11-12 09:39:18 -08:00
GriffinR	004d1cab3f	Clean up pokenav conditions doc	2021-11-12 11:13:49 -05:00
GriffinR	35aeff1b6d	Rename pokenav conditions files	2021-11-12 11:07:52 -05:00
GriffinR	f5152094a9	Finish pokenav conditions doc	2021-11-12 11:01:22 -05:00
ghoulslash	201a38f487	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/ai_updates	2021-11-12 08:13:21 -05:00
ghoulslash	6214d8b625	rename config	2021-11-12 07:47:24 -05:00
BuffelSaft	bdbdd0564f	Fix Knock Off, add config ... Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.	2021-11-12 21:05:42 +13:00
Eduardo Quezada D'Ottone	ae26a7529c	Restored FRLG items	2021-11-11 22:26:58 -03:00
ghoulslash	adc1413d98	add kings rock serene grace boost config	2021-11-11 17:48:15 -05:00
ghoulslash	2fac38cc83	merge w be	2021-11-11 16:16:26 -05:00
GriffinR	7efdc0902b	Finish condition graph doc	2021-11-11 15:29:15 -05:00
ultima-soul	fd4d0db912	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects	2021-11-10 18:02:00 -08:00
GriffinR	4590887359	Clean up some register constant use	2021-11-10 17:01:21 -05:00
GriffinR	343ac99049	Start pokenav conditions doc	2021-11-10 17:00:54 -05:00
GriffinR	342b7da5d3	Fix CRY_MODE_ECHO	2021-11-10 11:59:15 -05:00
ultima-soul	c74e19c062	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-11-09 20:58:19 -08:00
GriffinR	ef935f6f4a	Merge pull request #1544 from GriffinRichards/romheadergf ... Split headers from crt0.s	2021-11-09 23:54:57 -05:00
ultima-soul	69e3719f75	Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar.	2021-11-09 19:19:48 -08:00
BuffelSaft	e2599c2469	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-10 14:31:32 +13:00
GriffinR	8e424b6985	Merge branch 'master' into doc-binterface	2021-11-09 16:09:48 -05:00
GriffinR	43e942c3af	Clean up pokenav ribbons	2021-11-09 12:50:35 -05:00
ghoulslash	e635930a15	fixes	2021-11-08 21:33:00 -05:00
GriffinR	1c82571fa0	Merge pull request #1542 from GriffinRichards/doc-menu ... Document menu	2021-11-08 21:23:21 -05:00
GriffinR	adf773f1ed	Document remainder of save.c	2021-11-08 19:45:14 -05:00
GriffinR	ab1074e629	Label unknown palette functions	2021-11-08 16:08:36 -05:00
GriffinR	684f599a44	Label remaining battle_interface symbols	2021-11-08 16:03:44 -05:00
GriffinR	e3b6337c3a	Finish battle_anim_mons doc	2021-11-08 14:29:37 -05:00
ghoulslash	01cf8e6452	add AI_MoveMakesContact, dissuade multi-hit attacks against rocky helmet	2021-11-08 11:55:06 -05:00
GriffinR	d20341646a	Start battle_anim_mons doc	2021-11-08 11:46:13 -05:00
ghoulslash	8f320a8d33	some ai updates, recycle + ripen logic	2021-11-08 11:37:41 -05:00
GriffinR	1548e902cd	Add MonCoods size macro	2021-11-08 09:41:23 -05:00
Blackforest92	76ba9d835a	pulled latest RHH battle_engine 08-11-2021	2021-11-08 16:38:42 +07:00
BuffelSaft	d3a845d511	Fix CanAIFaintTarget ... Rename CanAIFaintTarget to CanIndexMoveFaintTarget and create a new function, CanAIFaintTarget, that checks if any known move can KO the target.	2021-11-08 20:37:28 +13:00
ghoulslash	a90cf4a501	Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves ... Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse	2021-11-07 17:39:03 -05:00
GriffinR	c4169cfd29	Disambiguate cry functions	2021-11-07 14:26:09 -05:00
GriffinR	54b254a829	Add CRY_MODE constants	2021-11-07 13:33:05 -05:00
BuffelSaft	e407883b58	Rethink final strike effects ... This is now checked in SetMoveEffect instead of in each move that should behave this way. Some effects will need to be redone to make them play nice with this change, but some just work as is.	2021-11-07 20:31:09 +13:00
BuffelSaft	d30f2b5712	Fix move effects list ... Fixed it properly this time!	2021-11-07 15:22:33 +13:00
BuffelSaft	9351df5ed8	Revert "Update move effect defines" ... This reverts commit be518608e8.	2021-11-07 12:25:26 +13:00
BuffelSaft	c69e7666e7	Update battle_move_effects.h	2021-11-07 12:22:55 +13:00
BuffelSaft	be518608e8	Update move effect defines ... Removing move effects above the ones that have stat change animations causes the wrong stat change to be shown, so I've reordered the list to fix that.	2021-11-07 12:16:06 +13:00
BuffelSaft	72d12a575d	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-07 12:13:18 +13:00
Eduardo Quezada D'Ottone	4e6a459b14	Optimized terrain timers	2021-11-06 19:46:52 -03:00
Eduardo Quezada D'Ottone	8773e552ac	Organized config and added failsafe to AnimTask_SetCamouflageBlend	2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone	1c4a0c205a	Camouflage types config + extra terrains	2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone	b220da1d2a	Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table	2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone	e9804a5023	Secret Power animation config	2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone	328976bf81	Secret Power effect config	2021-11-06 17:05:13 -03:00
ghoulslash	da6ec51fc2	merge w be	2021-11-06 10:43:35 -04:00
ghoulslash	41bf1dc2f4	merge w be	2021-11-06 10:40:57 -04:00
ghoulslash	f7d11527aa	Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic ... Config for Synchronize's interaction with toxic poisoning	2021-11-06 10:36:50 -04:00
Eduardo Quezada D'Ottone	ae8de0f07a	Merge branch 'BattleEngine' into BE_TerrainMoves ... # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_util.c	2021-11-06 10:44:05 -03:00
BuffelSaft	5acebe32aa	Merge pull request #1817 from LOuroboros/photonGeyser ... Implemented Photon Geyser and Shell Side Arm	2021-11-06 16:04:53 +13:00
Eduardo Quezada D'Ottone	202827068c	a ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone	8e49e3e653	Config for Synchronize's interaction with toxic poisoning	2021-11-05 21:16:13 -03:00
BuffelSaft	4007a8d1f8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song	2021-11-06 11:52:51 +13:00
Eduardo Quezada D'Ottone	6c70a6b872	Merge pull request #1863 from LOuroboros/soulDewBE ... Added a battle config for the Soul Dew	2021-11-05 17:09:44 -03:00
LOuroboros	5f458c9cd3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-05 10:58:53 -03:00
ghoulslash	0b2542e447	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai	2021-11-05 09:46:12 -04:00
LOuroboros	05c7f7ebfb	Fixed the comment for I_SOUL_DEW_BOOST	2021-11-05 10:39:27 -03:00
LOuroboros	d15eeeb8eb	Fixed the comment for B_SOUL_DEW_BOOST	2021-11-05 10:37:41 -03:00
BuffelSaft	ee83d1142c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-05 21:40:05 +13:00
BuffelSaft	bf786c6c9a	Fix Magma Storm ... Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.	2021-11-05 18:22:52 +13:00
BuffelSaft	a8d44f84a1	Merge pull request #1852 from Blackforest92/battle_engine_2 ... Update waterfall, trick room, & focus blast BG	2021-11-05 15:27:52 +13:00
BuffelSaft	6df3975fc6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-05 14:32:33 +13:00
Eduardo Quezada D'Ottone	5eb8f1c158	Merge pull request #1855 from ghoulslash/be/abilityonside ... AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide	2021-11-04 21:49:31 -03:00
GriffinR	e65677c944	Update modern linker script	2021-11-04 17:28:41 -04:00
LOuroboros	10a3c8f119	Added an item config for the Soul Dew	2021-11-04 17:29:17 -03:00
LOuroboros	671cbabc3d	Added a battle config for the Soul Dew	2021-11-04 17:25:31 -03:00
cbt6	0fe3881961	Rename WalkInPlaceFastest to WalkInPlaceFaster	2021-11-05 01:54:34 +08:00
ghoulslash	0ac6860855	Merge pull request #1810 from BuffelSaft/ai_improvements ... AI: Multi-strike moves, variable power moves, sleep check	2021-11-04 12:28:00 -04:00
GriffinR	be7d0bd3b0	Merge branch 'master' into doc-menu	2021-11-04 12:11:31 -04:00
GriffinR	17b657d83a	Finish menu documentation	2021-11-04 11:52:43 -04:00
LOuroboros	22f7e81bef	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-04 12:25:26 -03:00
LOuroboros	b64d506809	Made a function to lift Mimicry's effect	2021-11-04 12:20:31 -03:00
LOuroboros	4f251e6ec2	Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN	2021-11-04 12:13:55 -03:00
LOuroboros	e0b53f87fc	Primal Reversion Tweaks ... -Fixed the inconsistent Primal Reversion activation in double battles. -Optimized the primal weather checks in attackcanceler a little. -Fixed the issue with multi-target fire/water moves during primal rain/sun.	2021-11-04 12:04:14 -03:00
ghoulslash	6b10801ee8	convert AI_IsabilityOnSide to bool	2021-11-04 10:43:33 -04:00
BuffelSaft	cecd341011	Fix Tar Shot ... If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.	2021-11-04 20:47:45 +13:00
BuffelSaft	28e78cb6c4	Gen 8 moves initial commit ... Full credit to Nunuchu42 and cfmnephrite for this code.	2021-11-04 19:50:54 +13:00
BuffelSaft	7d10097684	Replace IsTwoStrikesMove with FLAG_TWO_STRIKES ... Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.	2021-11-04 17:11:56 +13:00
BuffelSaft	4a7ddb737b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai_improvements	2021-11-04 15:51:11 +13:00
BuffelSaft	e930dae278	Remove ability pop up for Hunger Switch ... Morpeko should change form each turn without showing its ability.	2021-11-04 15:40:26 +13:00
BuffelSaft	616be576fc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-04 15:29:38 +13:00
LOuroboros	b931e34172	Handled Mimicry's interaction with Steel Roller's effect	2021-11-03 23:23:28 -03:00
ghoulslash	4466fbd930	ai version of CanPoisonType, CanBePoisoned and IsAbilityOnSide	2021-11-03 21:36:33 -04:00
BuffelSaft	eeb40daede	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2	2021-11-04 13:52:58 +13:00
GriffinR	d6f873ba69	Continue menu documentation	2021-11-03 20:38:23 -04:00
Eduardo Quezada D'Ottone	6ee2a3aba1	Merge branch 'BattleEngine' into booleanStandard ... # Conflicts: # src/battle_main.c	2021-11-03 20:44:25 -03:00
LOuroboros	f6628e301f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-03 20:43:33 -03:00
BuffelSaft	6132f9a9fe	Merge pull request #1750 from ghoulslash/mirror_armor ... Mirror Armor	2021-11-04 11:43:59 +13:00
BuffelSaft	5a855db4ad	Fix prototype of CanBePoisoned	2021-11-04 11:08:37 +13:00
GriffinR	085f8adec6	Start remaining menu documentation	2021-11-03 17:38:08 -04:00
GriffinR	9a0618afc3	Add COPYWIN constants	2021-11-03 15:29:18 -04:00
ghoulslash	48c29a9cd8	proper mirror armor sticky web targeting	2021-11-03 15:05:52 -04:00
GriffinR	3e49ac804b	Merge branch 'master' into doc-finalmisc	2021-11-03 13:56:22 -04:00
GriffinR	e14210ce1f	Merge pull request #1536 from GriffinRichards/clean-braille ... Add font id constants, better braille support	2021-11-03 13:17:29 -04:00
GriffinR	0ba22ca112	Merge pull request #1534 from GriffinRichards/doc-btrans ... Document battle transition	2021-11-03 11:26:20 -04:00
LOuroboros	af6e72ecfe	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-03 08:56:01 -03:00
Blackforest92	b9c23f7c62	Update waterfall, trick room, & focus blast BG	2021-11-03 16:29:09 +07:00
BuffelSaft	6ce1f01b8c	Hunger Switch and Aura Wheel ... Implement the ability Hunger Switch and the move Aura Wheel.	2021-11-03 19:45:03 +13:00
BuffelSaft	74c85b5818	Implement Relic Song's form change ... Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.	2021-11-03 17:23:33 +13:00
BuffelSaft	f323e2c047	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil	2021-11-03 14:18:28 +13:00
GriffinR	afb9ff3a40	Document files with a few remaining symbols	2021-11-02 18:06:06 -04:00
cbt6	3556024a06	Distinguish clearly the two enums related to speed	2021-11-03 02:51:30 +08:00
cbt6	3f5f057ebe	Rename GoSpeedX functions to WalkNormal, WalkFast, etc.	2021-11-03 01:50:53 +08:00
cbt6	4cedd2d551	Rename WalkFastest functions to WalkFaster	2021-11-03 01:50:53 +08:00
LOuroboros	69b42de0d9	Implemented Mimicry ... Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.	2021-11-02 14:44:55 -03:00
ghoulslash	4c9f48e9d8	Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData ... Added Gen 8 contest data	2021-11-02 12:50:45 -04:00
ghoulslash	ffcba355b0	merge w be	2021-11-02 10:36:08 -04:00
BuffelSaft	95435b5f7f	Pastel Veil switchin effect attempt ... Battle script isn't working for partner for some reason.	2021-11-02 23:06:10 +13:00
BuffelSaft	40bced517a	Pastel Veil blocks poison for whole side ... Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.	2021-11-02 20:00:57 +13:00
Blackforest92	2d5ed4a1e2	Allow Giga Impact fadein background & upgrade its graphic	2021-11-02 12:53:11 +07:00
BuffelSaft	1e3b3d482b	Merge pull request #1838 from Blackforest92/battle_engine ... Edit Spacial Rend and Hurricane background	2021-11-02 17:11:47 +13:00
Eduardo Quezada D'Ottone	8332bfae46	Gen 8 combo moves	2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone	f3013d8ee9	Standarized Solarbeam into Solar Beam	2021-11-01 18:36:35 -03:00
GriffinR	54a70ca4d4	Merge pull request #1530 from GriffinRichards/doc-graphics ... Label remaining symbols in graphics.c	2021-11-01 17:00:06 -04:00
ghoulslash	98b4b821dc	merge with be	2021-11-01 13:55:55 -04:00
ghoulslash	a1e64fce4f	handle simple beam, gastro acid	2021-11-01 13:50:57 -04:00
ghoulslash	b5d20da927	merge with be	2021-11-01 11:36:18 -04:00
BuffelSaft	5d678bc2ce	Fix move effect defines ... Had a define in a comment, which offset all the new move effects and misaligned their battle scripts.	2021-11-01 23:51:03 +13:00
BuffelSaft	0345dea918	Replace EFFECT_DOUBLE_HIT with FLAG_TWO_STRIKES ... This removes the need to have separate move effects for Twineedle, Double Iron Bash, and any custom two strike moves.	2021-11-01 23:39:37 +13:00
BuffelSaft	fb25e1ac98	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-01 22:37:23 +13:00
GriffinR	ef2971d8dc	Convert GF ROM header to C	2021-11-01 01:42:02 -04:00
Blackforest92	9b6cd383a4	Optimized Rock Wrecker and Hurricane	2021-11-01 01:06:39 +07:00
Blackforest92	e59d0dd5cf	clean Spacial Rend background	2021-10-31 22:58:43 +07:00
ghoulslash	52d4d1cd34	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-31 11:40:00 -04:00
ghoulslash	bc170f3a43	merge with be	2021-10-31 11:04:39 -04:00
GriffinR	36039e1b86	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
ghoulslash	e1f0e6285b	Merge pull request #1828 from BuffelSaft/gorilla-tactics ... Implement Gorilla Tactics	2021-10-30 21:44:33 -04:00
ghoulslash	468ee66cd8	fix synthesis and leaf guard w utility umbrella	2021-10-30 11:04:50 -04:00
GriffinR	875be8a8a8	Merge pull request #1528 from GriffinRichards/doc-ereaderscr ... Document ereader screen	2021-10-30 09:34:14 -04:00
ghoulslash	ee7b63e372	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-30 09:26:33 -04:00
ghoulslash	f4537b1213	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit	2021-10-30 09:14:32 -04:00
Blackforest92	799852ea77	Introduce alternate Steel Beam	2021-10-30 17:00:55 +07:00
BuffelSaft	52054e4bfe	Fix Corrosion, Poison Touch ... - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.	2021-10-30 21:12:18 +13:00
BuffelSaft	47bfeaeecd	Implement Gorilla Tactics ... It's Choice Band but as an ability.	2021-10-30 18:31:44 +13:00
ghoulslash	af914ee7ed	merge w be	2021-10-29 22:33:50 -04:00
ghoulslash	28bc7dc14d	start ability	2021-10-29 22:32:19 -04:00
BuffelSaft	6b65ef5bcf	Merge pull request #1824 from ghoulslash/itemheal_fix ... Fix iteam healing after a failed move	2021-10-30 15:25:28 +13:00
BuffelSaft	f0e9b09258	Merge pull request #1822 from ghoulslash/harvest ... fix recycle and harvest	2021-10-30 15:00:56 +13:00
GriffinR	f51247615e	Finish documenting battle_transition	2021-10-29 18:32:53 -04:00
cbt6	9a1764f83e	Label some animation index numbers	2021-10-30 01:37:49 +08:00
GriffinR	07bf225f94	Continue battle_transition documenting	2021-10-29 11:24:36 -04:00
ghoulslash	2502820e83	document a couple hitmarkers. fix failing moves not updating hp from own healing effects	2021-10-29 09:03:14 -04:00
ghoulslash	204748e01a	fix recycle and harvest	2021-10-28 17:52:52 -04:00
ghoulslash	f342e7c590	merge with be	2021-10-28 17:03:10 -04:00
ghoulslash	e2e31f0b74	skill swap config option for switchin abilities	2021-10-28 16:53:00 -04:00
LOuroboros	a77f058146	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-10-28 14:24:43 -03:00
ghoulslash	34e966fdee	Merge pull request #1815 from LOuroboros/hyperspaceFury ... Implemented Hyperspace Fury	2021-10-28 13:20:33 -04:00
LOuroboros	82101d3581	Optimizations	2021-10-28 14:02:43 -03:00
LOuroboros	28522f3ffb	Fixed Hyperspace Fury not breaking through protections ... Also repositioned VARIOUS_JUMP_IF_SPECIES.	2021-10-28 12:09:44 -03:00
ghoulslash	bebaded415	merge with be	2021-10-27 16:48:38 -04:00
GriffinR	41ecae91f8	Label remaining symbols in graphics.c	2021-10-27 13:47:18 -04:00
LOuroboros	8c35a68060	Quick syntax tweaks	2021-10-27 11:19:39 -03:00
LOuroboros	fc7f1acf20	Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser	2021-10-27 11:13:59 -03:00
LOuroboros	1ab8c84f41	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury	2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone	773c773bac	Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape ... # Conflicts: # include/constants/battle_config.h	2021-10-26 20:35:01 -03:00
GriffinR	b0c27a8521	Document ereader screen	2021-10-26 15:44:42 -04:00
GriffinR	f9f91be60a	Merge pull request #1527 from cbt6/field-player ... Document field player functions	2021-10-26 14:29:44 -04:00
GriffinR	d6571f2355	Merge pull request #1525 from GriffinRichards/doc-recmix ... Document remainder of Record Mixing	2021-10-26 14:18:38 -04:00
cbt6	b3d779fd0d	Document field player functions	2021-10-27 01:39:00 +08:00
BuffelSaft	adcf563ba1	Add missing berry data ... Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.	2021-10-26 14:42:06 +13:00
GriffinR	4f7f6c1082	Merge pull request #1526 from sphericalice/doc-curtain-special ... Document the CloseBattlePikeCurtain special	2021-10-25 16:10:45 -04:00
sphericalice	7b5267c799	Rename TILESET_WIDTH to METATILE_ROW_WIDTH	2021-10-25 20:51:04 +01:00
ghoulslash	07d2f73306	Merge pull request #1804 from AsparagusEduardo/PE_shedinjaball ... Config for Shedinja needing a Poké Ball to be created	2021-10-25 15:49:25 -04:00
sphericalice	5bce17cbce	Fix typo in the TILESET_WIDTH comment	2021-10-25 18:11:06 +01:00
sphericalice	120e75d275	Document the CloseBattlePikeCurtain special	2021-10-25 18:03:14 +01:00
GriffinR	a612c27f2d	Drop battle transition 'phase' terminology	2021-10-25 10:20:48 -04:00
GriffinR	6dc3c9864c	Merge pull request #1520 from GriffinRichards/doc-random ... Document random remaining symbols	2021-10-24 23:43:17 -04:00
Eduardo Quezada D'Ottone	44625561e5	Taunt turn config	2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone	70aeaf288f	Rough Skin damage config	2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone	8699db942b	More ordering	2021-10-24 20:03:21 -03:00
GriffinR	7a89ad98c3	Document record mixing hall records	2021-10-24 16:13:07 -04:00
GriffinR	ab80264921	Merge pull request #1519 from GriffinRichards/doc-mgift ... Document Mystery Gift	2021-10-24 15:50:39 -04:00
GriffinR	7f3c529935	Document record mixing mail swap	2021-10-24 15:49:19 -04:00
BuffelSaft	4310868bee	AI handles multi-strike and fixed dmg moves ... Does not account for Parental Bond or Beat Up yet as those require some functions from #1676.	2021-10-24 18:49:17 +13:00
Eduardo Quezada D'Ottone	71ff664700	Ordered config into new categories	2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone	d95351dd97	Merge branch 'BattleEngine' into BE_config ... # Conflicts: # include/constants/battle_config.h	2021-10-23 19:46:33 -03:00
LOuroboros	d31700d2ac	Replaced the Red and Blue Orbs' sprites	2021-10-23 13:49:02 -03:00
Eduardo Quezada D'Ottone	abb8a97d21	Merge pull request #1616 from LOuroboros/statCalcs ... Added configs for modern post-battle stat calcs	2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone	9a8b88bdb3	Updated config description	2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone	76b6250104	Merge branch 'battle_engine' into plasmaFists	2021-10-23 11:06:34 -03:00
Jademalo	62436d9f67	IDE support formatting and consistency	2021-10-23 10:10:00 +01:00
Eduardo Quezada D'Ottone	382ec13492	Merge pull request #1752 from ghoulslash/quick_draw ... Quick Draw	2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone	d0253640fb	Merge pull request #1739 from LOuroboros/primalReversionBE ... Implemented Primal Reversion	2021-10-22 22:27:45 -03:00
Eduardo Quezada D'Ottone	35d5bc4367	Config for Shedinja needing a Poké Ball to be created	2021-10-22 20:50:53 -03:00
Jademalo	eb860a368e	Improve IDE support	2021-10-22 04:30:33 +01:00
GriffinR	303ce856ad	Fix GET_CARD_BATTLE_LOST typo	2021-10-21 16:54:16 -04:00
GriffinR	bc409baeff	Fix incorrect NUM_SECTORS_PER_SLOT define	2021-10-19 16:30:00 -04:00
ghoulslash	416c517e49	Merge pull request #1786 from Xavion3/damage_debug ... Adds simulated damage to the debug menu	2021-10-19 12:14:38 -04:00
LOuroboros	a6315ffc75	Implemented Plasma Fists	2021-10-19 09:50:18 -03:00
ghoulslash	eda99fcf29	Merge pull request #1742 from AsparagusEduardo/be_gStatuses4 ... Add gStatutes4	2021-10-19 08:45:47 -04:00
GriffinR	934a7e7a5d	Merge pull request #1516 from GriffinRichards/doc-miscbattle ... Miscellaneous battle documentation	2021-10-19 08:09:17 -04:00
Xavion3	150dd7c633	Add damage information to the debug menus	2021-10-19 22:39:07 +11:00
LOuroboros	d9b8e11a9c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE	2021-10-19 07:47:42 -03:00
GriffinR	24b4e898ad	More mauville_old_man clean up	2021-10-18 14:40:04 -04:00
GriffinR	b31bddddca	Clean up metatile_behavior	2021-10-18 12:54:29 -04:00
GriffinR	46dd10c87b	Clean up trainer_pokemon_sprites	2021-10-18 01:56:24 -04:00
GriffinR	db8ce5d7f9	Clean up mauville_old_man, drop ScrSpecial prefix	2021-10-18 01:09:41 -04:00
ghoulslash	8dc77e6fe3	Merge pull request #1782 from LOuroboros/glare ... Updated Glare	2021-10-17 22:11:33 -04:00
GriffinR	ed6fdd743f	Some pokemon_icon clean up	2021-10-17 22:04:08 -04:00
GriffinR	a950f9c771	Clean up international_string_util	2021-10-17 21:51:11 -04:00
Eduardo Quezada D'Ottone	ead5c92469	Merge branch 'battle_engine' into PLG	2021-10-17 17:38:54 -03:00
LOuroboros	e7ad7319e3	Updated Glare	2021-10-17 12:03:35 -03:00
Eduardo Quezada D'Ottone	df817fb2ab	Merge pull request #1772 from LOuroboros/gravApple ... Added Grav Apple's power boost	2021-10-17 09:51:29 -03:00
LOuroboros	59cfbe55c1	Gave Grav Apple a move effect of its own	2021-10-17 09:27:35 -03:00
GriffinR	ece7ef3410	Correct usage of MysteryEvent to MysteryGift	2021-10-17 03:00:48 -04:00
GriffinR	d0455485c3	Clean up mystery gift headers	2021-10-17 02:18:24 -04:00
GriffinR	3cd27acbea	Document wonder news	2021-10-17 02:09:31 -04:00
GriffinR	5f9069628d	Clean up mevent2	2021-10-17 01:35:26 -04:00
GriffinR	c7d550e96c	Clean up wonder card/news view	2021-10-17 01:15:16 -04:00
GriffinR	845a5e99cc	General mystery gift documentation, finish mystery gift client/server/scripts	2021-10-16 23:35:17 -04:00
ghoulslash	964e7efba9	fix MOVE_TARGET_ALL_BATTLERS and other u8 vars	2021-10-16 16:23:17 -04:00
ghoulslash	5509ceea04	expand move target field	2021-10-16 16:10:45 -04:00
BuffelSaft	df2223a5bc	Merge pull request #1745 from LOuroboros/retaliate ... Implemented Retaliate's effect	2021-10-16 22:49:32 +13:00
LOuroboros	3b6ceb1dfa	Turned Retaliate into a side timer	2021-10-16 06:04:04 -03:00
GriffinR	e1900efe1e	Merge branch 'master' into doc-miscbattle	2021-10-15 22:46:43 -04:00
GriffinR	1f39c34ca4	Merge branch 'master' into minor-constants	2021-10-15 22:44:49 -04:00
GriffinR	a4a3c1c9e5	Merge pull request #1511 from GriffinRichards/doc-union ... Document link_rfu / Union Room	2021-10-15 22:44:01 -04:00
ghoulslash	1f176242aa	add missing func definition	2021-10-15 16:06:50 -04:00
ghoulslash	c077091dbf	small fixes, check GetCatchingBattler's semi-invulnerability	2021-10-15 14:57:26 -04:00
ghoulslash	b94f710c80	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ballthrow	2021-10-15 14:49:37 -04:00
GriffinR	e3bb257bcf	Fix some trainer card link access	2021-10-15 12:22:19 -04:00
GriffinR	c02001c46d	Document mystery gift link scripts, general mystery gift	2021-10-15 12:05:06 -04:00
Eduardo Quezada D'Ottone	0a090616ef	Merge pull request #1765 from ghoulslash/shell_smash ... Shell Smash Animation	2021-10-15 12:09:06 -03:00
ghoulslash	ef19c8c415	fix gen define	2021-10-15 09:22:50 -04:00
ghoulslash	883a249836	config for catching semi-invulnerable mons	2021-10-15 09:20:32 -04:00
LOuroboros	3a25bce185	Turned Retaliate's effect into a side status	2021-10-15 06:03:48 -03:00
LOuroboros	1f97198267	Oops, I forgot to take the opponent's side into account	2021-10-15 05:02:14 -03:00
BuffelSaft	e59be67023	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-10-15 16:25:11 +13:00
Eduardo Quezada D'Ottone	b9816f0f28	Saftety Goggles typo for Item Expansion	2021-10-14 20:38:13 -03:00
Eduardo Quezada D'Ottone	21837b659a	Merge branch 'battle_engine' into bug_bite	2021-10-14 19:46:50 -03:00
GriffinR	37e52c4f34	Document some mystery gift	2021-10-14 15:10:41 -04:00
GriffinR	95406384f4	Start wonder card/news documenting	2021-10-14 13:24:20 -04:00
ghoulslash	85ce72a4d0	add shell smash anim	2021-10-14 10:47:39 -04:00
BuffelSaft	fc6e8f598c	Merge branch 'battle_engine' into battle_bond	2021-10-14 16:24:59 +13:00
GriffinR	9ab03f454d	Small correction to map script comments	2021-10-13 23:24:10 -04:00
BuffelSaft	bb8d0e3d6b	Fix Battle Bond ... Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.	2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone	d689842689	Merge pull request #1657 from ghoulslash/rototiller ... Rototiller Fix + MOVE_TARGET_ALL_BATTLERS	2021-10-13 22:45:50 -03:00
ghoulslash	a3d2bdc9cf	merge with be	2021-10-13 18:30:53 -04:00
GriffinR	def6cc8158	Label battle script macro arguments	2021-10-13 17:44:04 -04:00
GriffinR	fc15b0d5f0	Add controller buffer constants, finish misc battle doc	2021-10-13 16:21:39 -04:00
ghoulslash	3248bd796a	add quick draw	2021-10-12 21:49:18 -04:00
ghoulslash	996301d5d3	add mirror armor	2021-10-12 18:04:34 -04:00
ghoulslash	bbd09fdcf7	add wandering spirit	2021-10-12 10:32:51 -04:00
GriffinR	b0598b1aef	Clean up recorded_battle, add MOVE_IS_PERMANENT	2021-10-12 01:14:17 -04:00
GriffinR	f23e0beeba	Rename battle anim cmds, move its data, name remaining symbols	2021-10-11 13:18:21 -04:00
GriffinR	3a7995bc7c	Fix misleading RecordMixTrainerNames name	2021-10-11 10:39:37 -04:00
GriffinR	b8a44bf10a	Calculate pokemon substruct size, missing MON_PIC_SIZE	2021-10-11 10:35:53 -04:00
LOuroboros	6c550cd749	Implemented Retaliate's effect	2021-10-11 03:19:21 -03:00
ghoulslash	06bcfea3b8	merge with be	2021-10-10 19:56:33 -04:00
ghoulslash	fcada4fcad	handle rototiller + prankster	2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone	c3f8b77d82	Setting for pre-Gen6 Hidden Power Damage.	2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone	7798468ce9	Merge pull request #1738 from BuffelSaft/safety-googles ... Fix Safety Googles	2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone	cf6e3873b4	Moved Electrified to Status4.	2021-10-10 01:13:23 -03:00
Eduardo Quezada D'Ottone	903c4cbf68	Config for Blizzard + Hail	2021-10-09 23:52:37 -03:00
Eduardo Quezada D'Ottone	004f705607	Merge pull request #1549 from ghoulslash/last_ball ... add last used ball	2021-10-09 17:27:28 -03:00
GriffinR	862febe03a	Add MAP_OFFSET	2021-10-09 13:19:27 -04:00
GriffinR	28de627913	Add TRACKS_ALL, remove BGCntrlBitfield	2021-10-09 11:34:51 -04:00
GriffinR	d8e65fc4b6	More battle doc, add battle window ids	2021-10-09 03:01:10 -04:00
LOuroboros	2a7d78e68b	Oopsie	2021-10-09 01:55:36 -03:00
LOuroboros	91a68cd5db	Implemented Primal Reversion	2021-10-09 00:36:41 -03:00
BuffelSaft	07bdd2ffe6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-10-09 15:18:51 +13:00
BuffelSaft	274e964d91	Fix Safety Googles ... Fix typo and update gLastUsedItem before calling the safety goggles battle script.	2021-10-09 15:05:01 +13:00
GriffinR	31b501e7eb	Start misc battle documentation	2021-10-08 16:39:46 -04:00
ghoulslash	ce455ac7e7	merge with be	2021-10-08 07:44:32 -04:00
BuffelSaft	fbc4d7584e	Merge pull request #1610 from LOuroboros/primalAbilities ... Implement Desolate Land, Primordial Sea and Delta Stream	2021-10-08 20:01:09 +13:00
ghoulslash	9a4e0cf757	magician fixes, handle edge cases	2021-10-07 17:37:47 -04:00
GriffinR	7c5c41f23c	Combine link slot length constants	2021-10-07 16:19:02 -04:00
GriffinR	a2655ba9ab	Merge branch 'master' into doc-union	2021-10-07 16:10:35 -04:00
GriffinR	e86d3410a1	Update argument names in link headers, link_rfu doc cleanup	2021-10-07 16:05:12 -04:00
GriffinR	846942ce48	Finish remaining symbols in link_rfu_2	2021-10-07 15:23:47 -04:00
GriffinR	6aaf50ee27	Rename GF Gname, Rfu, finish bulk of Union Room, more link doc	2021-10-07 10:43:03 -04:00
ghoulslash	1031703309	magician base functionality	2021-10-06 16:00:02 -04:00
ghoulslash	4aeadd96c9	merge with be	2021-10-06 14:49:23 -04:00
ghoulslash	658235c03d	merge with be	2021-10-06 14:33:26 -04:00
ghoulslash	391cfabcac	merge with be	2021-10-06 14:31:21 -04:00
ghoulslash	ee3a2c97ee	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball	2021-10-06 13:54:40 -04:00
ghoulslash	1ad8448532	remove saveblock field	2021-10-06 13:54:33 -04:00
ghoulslash	4382420dd2	merge with be	2021-10-06 13:32:59 -04:00
ultima-soul	ce4375a10c	Ported new Ball catch rate modifier effects from Item Expansion.	2021-10-06 10:28:18 -07:00
ghoulslash	040e56b758	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_ai	2021-10-06 10:05:55 -04:00
ghoulslash	1f4844c7f5	Merge pull request #1710 from AsparagusEduardo/BE_Struggle ... Implemented modern effect of struggle with config	2021-10-06 09:27:10 -04:00
ghoulslash	245ef1ad2d	Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag ... Config for Shadow Tag vs Shadow Tag	2021-10-06 09:02:58 -04:00
LOuroboros	2b32581c14	Fixed infinite loop	2021-10-06 09:27:33 -03:00
GriffinR	4efa6c882a	Continue misc link documentation, rename reset_save_heap	2021-10-05 23:37:54 -04:00
ultima-soul	06f36595d6	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-10-05 19:25:52 -07:00
Eduardo Quezada D'Ottone	2b54b48b04	Merge branch 'PokemonExpansion' into PE_FormChangeHoldItems ... # Conflicts: # src/pokemon.c	2021-10-05 21:13:36 -03:00
Eduardo Quezada D'Ottone	43d42c95cf	Terrain Pulse effect implemented	2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone	5019615be1	Refactored Secret Power move effect into a function	2021-10-04 21:28:15 -03:00
ultima-soul	78d2215196	Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding.	2021-10-03 10:16:09 -07:00
LOuroboros	b85b3094c8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev	2021-10-03 07:05:56 -03:00
GriffinR	6e62c057f5	Document remaining symbols in pokemon.c	2021-10-02 23:48:12 -04:00
GriffinR	739e7d3c31	Document summary screen sprite manager	2021-10-02 23:47:59 -04:00
Eduardo Quezada D'Ottone	978f73475b	Config for Shadow Tag vs Shadow Tag	2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone	57ea20bc6d	Implemented modern effect of struggle with config	2021-10-02 13:32:36 -03:00
LOuroboros	c464b1b5dd	STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES	2021-10-01 23:12:59 -03:00
LOuroboros	f3ded43a88	Implemented Battle Bond	2021-10-01 22:49:17 -03:00
Eduardo Quezada D'Ottone	5593a83783	Fixed compile	2021-09-30 22:35:28 -03:00
Eduardo Quezada D'Ottone	5bf300f97c	Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE	2021-09-30 22:12:02 -03:00
GriffinR	001a25e49c	Merge pull request #1507 from GriffinRichards/doc-walda ... Document Walda Phrase	2021-09-30 12:27:20 -04:00
Pokestia	38a4dea402	Rename Battle Weather flags	2021-09-30 12:08:20 +02:00
Eduardo Quezada D'Ottone	55b61313a4	PSS uses form change table for holding items. ... # Conflicts: # src/pokemon.c	2021-09-29 02:13:44 -03:00
ghoulslash	e75a8fb67c	merge ai move and item decisions. AI will prefer to defeat player over healing	2021-09-27 21:03:27 -04:00
ghoulslash	761006a164	merge with be	2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone	4fbe4da7d0	Sitrus Berry Gen4+ heal. Credit to SBird1337	2021-09-26 18:46:34 -03:00
GriffinR	8a79ca3818	Document walda_phrase	2021-09-26 17:01:39 -04:00
LOuroboros	1b039062da	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-09-25 22:20:34 -03:00
LOuroboros	234f3290c3	Added a day time exclusive equivalent to FORM_USE_ITEM ... Primarily for Shaymin, since it can only change its form with the Gracidea during the day. Special thanks to AsparagusEduardo.	2021-09-25 22:00:10 -03:00
LOuroboros	813d114132	Synced include/constants/hold_effects.h with the BE	2021-09-25 20:58:07 -03:00
GriffinR	a66d7e1b43	Document some single-remaining symbols	2021-09-24 17:14:20 -04:00
Syreldar	4c05520bf3	Fixed Retaliate's naming.	2021-09-24 16:02:26 +02:00
GriffinR	a6ab2eb883	Merge branch 'master' into trailingSpaces	2021-09-23 21:39:21 -04:00
Eduardo Quezada D'Ottone	e87c170db0	Merge branch 'BattleEngine' into booleanStandard ... # Conflicts: # src/battle_main.c # src/battle_script_commands.c	2021-09-23 18:20:35 -03:00
ghoulslash	2f69748e0d	merge with be	2021-09-23 14:38:01 -04:00
ghoulslash	94ec25319f	syntax fixes. Use BlocksPrankster for perish song battle script	2021-09-23 14:35:37 -04:00
ghoulslash	768598b154	fix bad merge	2021-09-23 12:22:36 -04:00
ghoulslash	33972b5493	merge with be	2021-09-23 12:04:13 -04:00
ghoulslash	3f34fec42f	change last ball graphic based on config. replace saveblock field with ewram field	2021-09-23 12:03:01 -04:00
BuffelSaft	530998c4b7	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-09-23 16:41:35 +12:00
Eduardo Quezada D'Ottone	d084d2a68d	Merge branch 'BattleEngine' into booleanStandard ... # Conflicts: # include/battle.h # src/battle_main.c # src/battle_script_commands.c	2021-09-22 23:42:00 -03:00
BuffelSaft	2f03ac31b9	Multihit refactor and Parental Bond ... Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.	2021-09-23 14:31:21 +12:00
Eduardo Quezada D'Ottone	075c0299a1	Better names for Micle and Custap flags	2021-09-22 23:29:26 -03:00
Eduardo Quezada D'Ottone	2c66aa84b6	Merge pull request #1378 from ghoulslash/gen8_move_effects ... Several Gen 8 Move Effects	2021-09-22 22:48:29 -03:00
ghoulslash	9bf2ffe459	fix lash out stat fell	2021-09-22 21:15:02 -04:00
ghoulslash	d738297f24	merge with be	2021-09-22 16:26:09 -04:00
ghoulslash	3559a1b8e6	fix prankster + magic coat	2021-09-22 16:09:23 -04:00
ghoulslash	1309eea8ec	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects	2021-09-22 09:43:48 -04:00
ghoulslash	13062b5a8f	fix lash out, obstruct, and decorate	2021-09-22 09:43:40 -04:00
ghoulslash	fc84ebbd3e	redo prankster checks to handle assist	2021-09-22 08:06:42 -04:00
sbird	0ee13418dc	[ai] use expected value move dmg calculation	2021-09-22 13:15:43 +02:00
Eduardo Quezada D'Ottone	f9d1375451	Merge pull request #1375 from ExpoSeed/PE/form-change-table ... Form change table	2021-09-22 00:04:26 -03:00
Eduardo Quezada D'Ottone	287ffff2e2	Merge branch 'battle_engine' into burmy-form-change	2021-09-21 22:34:37 -03:00
Eduardo Quezada D'Ottone	f338813c6a	Merge pull request #1538 from DizzyEggg/double_onemon_battles ... Support for double battles with only one pokemon	2021-09-20 23:40:08 -03:00
Eduardo Quezada D'Ottone	08d3c31abe	Merge pull request #1584 from Blackforest92/pokemon_expansion ... Port missing Gen8 icons from DPE	2021-09-20 22:48:57 -03:00
Eduardo Quezada D'Ottone	18d91cc935	Merge pull request #1647 from BuffelSaft/gender-diff-fixes1 ... Show gender differences in evo scene	2021-09-20 22:03:23 -03:00
ghoulslash	0ea6c65b83	merge with be	2021-09-17 09:10:09 -04:00
ghoulslash	faa963fd04	merge with be	2021-09-17 09:07:38 -04:00
ghoulslash	b916d7991c	merge with be	2021-09-16 21:52:29 -04:00
ghoulslash	e756b0accc	merge with be	2021-09-16 21:41:29 -04:00
ghoulslash	af8d86f0c9	merge with be	2021-09-16 13:33:35 -04:00
ghoulslash	c2e0990aab	fix some merge conflicts	2021-09-16 13:29:36 -04:00
ghoulslash	9d8672e3df	merge with be	2021-09-16 13:12:59 -04:00
ghoulslash	ac42b19de7	some formatting fixes	2021-09-16 11:54:27 -04:00
ghoulslash	aac7ae3595	add MOVE_TARGET_ALL_BATTLERS	2021-09-16 10:45:33 -04:00
ghoulslash	9c94eb6140	but it failed check for rototiller	2021-09-16 10:24:32 -04:00
ghoulslash	85f3982fb9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster	2021-09-15 17:52:45 -04:00
ghoulslash	f61d516aad	some syntax/format fixes	2021-09-15 17:15:50 -04:00
ghoulslash	845e333ba1	fix electric/misty terrain interactions with yawn/rest failures	2021-09-15 17:11:42 -04:00
ghoulslash	aa475ab300	merge with be	2021-09-15 16:42:23 -04:00
ghoulslash	0bca01cb74	mental herb fixes	2021-09-15 12:56:58 -04:00
ghoulslash	b85586a33a	merge with be	2021-09-15 12:54:39 -04:00
ghoulslash	c4ce4c150d	fix eject pack	2021-09-14 15:38:16 -04:00
ghoulslash	55c3e152cf	replace some BufferStatChange, fix room service and terrain seeds	2021-09-14 15:07:15 -04:00
ghoulslash	60713a8f2d	fix room service activation msg, stat target	2021-09-14 12:50:36 -04:00
ghoulslash	95af97593b	fix some comment styling. fix throat spray for multi-target moves	2021-09-14 11:53:35 -04:00
ghoulslash	f3f26d1a6f	merge with be	2021-09-13 19:40:28 -04:00
BuffelSaft	4aa7c096b7	Show gender differences in evo scene	2021-09-11 16:30:09 +12:00
BuffelSaft	db928a1329	Data entry for new sprites ... Add sprite defines, entries to gender tables, etc.	2021-09-11 14:12:41 +12:00
GriffinR	cbf8863e5b	Clean up Lilycove Lady	2021-09-09 15:24:34 -04:00
ghoulslash	6915b029bd	fix echoed voice power boost	2021-09-09 11:15:58 -04:00
ghoulslash	d7938bc2dc	Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster	2021-09-09 09:44:25 -04:00
ghoulslash	b8a71cabd1	merge with be	2021-09-09 09:44:18 -04:00
BuffelSaft	a4b630e6b5	Fix MOVE_EFFECT_REMOVE_STATUS ... Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured. Also, fix Ice Hammer's effect chance.	2021-09-07 16:34:32 +12:00
DizzyEggg	68c33895fd	Merge pull request #1622 from BuffelSaft/money-boost ... Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE	2021-09-06 11:32:53 +02:00
DizzyEggg	cdec3077b2	Merge pull request #1630 from BuffelSaft/disguise2 ... Fix many Disguise bugs	2021-09-06 10:32:37 +02:00
DizzyEggg	fa081d1fc5	Merge pull request #1618 from BuffelSaft/protect-like ... Fix protect-like moves	2021-09-06 10:24:29 +02:00
BuffelSaft	bdbb4b5f7e	Fix many Disguise bugs ... Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.	2021-09-06 18:27:42 +12:00
LOuroboros	376b65f6bf	Update hold_effects.h	2021-09-04 15:36:47 -03:00
ghoulslash	933696b3cd	merge with be	2021-09-03 17:41:00 -04:00
ghoulslash	c7a587913b	replace statStages checks with CompareStat	2021-09-03 13:13:02 -04:00
ghoulslash	93e2e09148	fix terrain seeds. create generic CompareStat function	2021-09-03 12:17:38 -04:00
ghoulslash	6ce1227447	fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case	2021-09-03 11:05:11 -04:00
ExpoSeed	5a5c257f68	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-09-02 21:43:20 -05:00
ghoulslash	7c53214dad	merge with be	2021-09-02 15:33:42 -04:00
ultima-soul	a10a02a536	Merge pull request #1221 from ghoulslash/battle_engine ... Implement Pickpocket	2021-09-02 11:33:34 -07:00
BuffelSaft	13636f8691	Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE ... moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.	2021-09-02 16:15:58 +12:00
ghoulslash	dfe59992d3	merge with be	2021-09-01 07:37:45 -04:00
BuffelSaft	3371773e5c	Move touchedProtectLike to protect structs ... This makes more sense than putting it in DisableStruct.	2021-09-01 21:34:47 +12:00
BuffelSaft	ea6ce80ad4	Fix protect-like moves ... Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target. This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.	2021-09-01 19:57:03 +12:00
LOuroboros	d2bcc2ad5b	Added configs for modern post-battle stat calcs	2021-09-01 00:31:50 -03:00
LOuroboros	69b7910f47	Gave an entrance animation to Delta Stream	2021-08-31 00:15:17 -03:00
LOuroboros	0a38054925	Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly	2021-08-30 21:21:07 -03:00
ultima-soul	5cb73a012c	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-08-30 11:57:27 -07:00
ExpoSeed	0f99d9d4c6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-08-30 13:26:40 -05:00
LOuroboros	216d8f0608	Solved game freezing issue ... My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.	2021-08-27 18:28:34 -03:00
LOuroboros	9e4f33d09e	Implemented Desolate Land, Primordial Sea and Delta Stream	2021-08-27 17:56:43 -03:00
LOuroboros	554210c5e3	Removed trailing spaces in the most relevant files ... Command used for the job: egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g' Credits to Grant Murphy from Stack Overflow.	2021-08-24 19:59:32 -03:00
LOuroboros	5c1d7e52dc	Added footprints for Gen. 6 species	2021-08-23 06:28:10 -03:00
GriffinR	8f5e2bbeba	Label swap line margin flag	2021-08-21 11:04:28 -04:00
ultima-soul	43e8f76338	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:55:48 -07:00
ultima-soul	4c3ed52c2f	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:39:11 -07:00
ultima-soul	988320b89a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:25:13 -07:00
ultima-soul	840e2bc3f9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-08-16 16:33:34 -07:00
ultima-soul	76a7a2720d	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-08-16 16:10:59 -07:00
ultima-soul	b620349da0	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-16 15:43:27 -07:00
GriffinR	dfdcfc1568	Document remaining functions in cable_club	2021-08-15 16:22:15 -04:00
GriffinR	e01ae55c13	Start more link_rfu_2 documentation	2021-08-15 15:13:42 -04:00
ghoulslash	a2d885c0d4	merge with be	2021-08-12 14:48:58 -06:00
ghoulslash	0bbbd1e7a9	fix electric/misty yawn/rest interactions	2021-08-12 14:08:41 -06:00
ghoulslash	c7c0fbc296	merge with be, make AI CanBeStatused functions separate from general util ones	2021-08-12 13:37:53 -06:00
ghoulslash	d218322b2c	merge with be	2021-08-12 01:26:13 -04:00
ultima-soul	64a48800c9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-08-11 17:10:57 -07:00
ultima-soul	3f75a58137	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-08-11 16:55:29 -07:00
ultima-soul	02c9e040df	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-11 16:33:10 -07:00
GriffinR	80348e7188	Merge branch 'master' into doc-itemmenu2	2021-08-11 19:01:47 -04:00
GriffinR	cc51627465	Merge pull request #1489 from GriffinRichards/doc-playerpc ... Document player pc	2021-08-11 18:59:58 -04:00
GriffinR	0bc26d9d79	Merge pull request #1488 from GriffinRichards/doc-frontierpass2 ... Document frontier pass	2021-08-11 17:40:55 -04:00
GriffinR	28a8fe191a	Document item menu	2021-08-10 22:13:02 -04:00
BuffelSaft	30c983d9ca	Define Burmy forms in battle engine ... Title. BE needs these to compile on its own.	2021-08-08 13:14:51 +12:00
BuffelSaft	f0cb6190e0	Implement Burmy form change ... Burmy changes form based on where it last battled.	2021-08-07 20:56:10 +12:00
LOuroboros	b4c4650186	Corrected inconsistent flag label spelling	2021-08-05 17:26:03 -03:00
GriffinR	bd5cf07059	Merge branch 'master' into doc-playerpc	2021-08-02 14:08:10 -04:00
GriffinR	06b909bcd8	Document player pc	2021-08-02 13:58:40 -04:00
GriffinR	3e60a78406	Merge branch 'master' into doc-frontierpass2	2021-07-31 13:30:40 -04:00
GriffinR	602855ea99	Document frontier pass	2021-07-31 13:28:08 -04:00
Blackforest92	3bd81d347d	Add missing Gen8 icons	2021-07-31 14:48:55 +07:00
ghoulslash	ab529b4e89	add stuff cheeks	2021-07-27 10:31:48 -06:00
ghoulslash	0a0687ae78	add smart wild AI	2021-07-27 09:49:39 -06:00
LOuroboros	f1195e1884	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-07-27 09:08:52 -03:00
LOuroboros	8012f4b25a	Re-ordered the hidden item flags list ... Instead of sorting them by location, it makes more sense to sort them by their value.	2021-07-26 20:18:11 -03:00
ghoulslash	4ca6d76160	add bug bite	2021-07-25 14:55:52 -06:00
ghoulslash	c914ed8572	fix sucker punch, surging strikes, obstruct, and snipe shot	2021-07-25 09:38:54 -06:00
ghoulslash	a37d4c3da9	merge with be, give life dew jungle healing effect	2021-07-25 08:22:05 -06:00
ghoulslash	e6a2d2226f	Merge pull request #1540 from DizzyEggg/rage_powder ... Rage powder updated to gen6	2021-07-24 07:15:58 -06:00
LOuroboros	bfa824f761	Removed unused status ailment constants	2021-07-23 13:18:24 -03:00
ghoulslash	45d4cee243	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball	2021-07-18 11:11:03 -06:00
DizzyEggg	304f3b9203	Merge pull request #1565 from BuffelSaft/disguise-fix ... Fix Disguise reverting on switch out	2021-07-16 09:17:10 +02:00
BuffelSaft	90fdb74ccb	Remove UndoFormChangeOnSwitch ... Handle switching out Mimikyu Busted in UndoFormChange.	2021-07-16 17:56:53 +12:00
GriffinR	01f2381e01	Add LINK_MANAGER field comments from SDK	2021-07-11 16:48:59 -04:00
GriffinR	72bb2bd160	Merge pull request #1474 from GriffinRichards/clean-miragetower ... Clean up Mirage Tower	2021-07-10 23:26:41 -04:00
BuffelSaft	63faa6e3a9	Fix Disguise reverting on switch out ... Make Mimikyu's disguise stay busted when it's switched out.	2021-07-11 14:15:24 +12:00
ghoulslash	59c16ff1cf	AI_IsTerrainAffected checks	2021-07-10 16:41:41 -06:00
GriffinR	32fe412755	Merge pull request #1475 from GriffinRichards/doc-minor ... Label remaining symbols in a few files	2021-07-08 00:24:56 -04:00
GriffinR	fced9e507d	Merge pull request #1478 from Kurausukun/itemprint ... Change ItemPrintFunc to Use u32 Instead of s32	2021-07-08 00:15:45 -04:00
ultima-soul	ad8cfda831	Add and rearrange Key Items.	2021-07-06 17:03:46 -07:00
ultima-soul	2d8d38f44c	Add TM51 through TM100.	2021-07-05 18:11:57 -07:00
GriffinR	0f538102d9	Add local id constants for C	2021-07-05 13:54:43 -04:00
ExpoSeed	de3caaccfb	Include expansion_branches.h in global.h	2021-07-04 12:42:34 -05:00
ExpoSeed	630d172393	Include expansion_branches.h in global.h	2021-07-04 12:41:21 -05:00
ExpoSeed	0ed1d29ece	Include expansion_branches.h in global.h	2021-07-04 12:39:30 -05:00
Kurausukun	42730a8315	Revert "remove gflib" ... This reverts commit 8b59909ac5.	2021-07-03 17:39:33 -04:00
GriffinR	b4f66496ed	Merge pull request #1471 from GriffinRichards/fix-lock ... Fix some object lock names	2021-07-03 11:21:10 -04:00
ultima-soul	53e900a643	Rearranged rest of item ids except for Key Items.	2021-07-02 22:43:50 -07:00
ExpoSeed	fb69b65337	Fix redefinition error in battle_config.h	2021-07-02 14:36:55 -05:00
ExpoSeed	788b9f675f	Fix redefinition error in pokemon_config.h	2021-07-02 14:36:02 -05:00
ExpoSeed	ebe0d21c54	Fix redefinition error in item_config.h	2021-07-02 14:34:29 -05:00
TheXaman	af355fcb12	added Debug to StartMenu via DEBUG_MENU option	2021-07-02 11:49:32 +02:00
GriffinR	64d06f4c8f	Condense battle AI scripts, minor clean up	2021-07-02 02:46:01 -04:00
GriffinR	8f43d1ebeb	Document smart shopper TV show	2021-07-02 01:45:23 -04:00
GriffinR	fe89a4d147	Label remaining region_map symbols	2021-07-02 00:52:36 -04:00
GriffinR	10886a586b	Clean up mirage tower	2021-07-01 23:46:15 -04:00
ghoulslash	c06029bc72	add last used ball	2021-06-25 13:37:59 -06:00
TheXaman	defd7d9e07	Added Sound menu for SE and MUS	2021-06-22 12:38:00 +02:00
PikalaxALT	e0b58592b2	Merge pull request #1469 from GriffinRichards/fix-contesthearts ... Clarify contest heart tiles	2021-06-21 13:59:50 -04:00
GriffinR	810b51f96c	Clarify contest heart tiles	2021-06-21 13:48:03 -04:00
ultima-soul	9e0b866f09	Rearranged Poke Ball item ids.	2021-06-18 21:46:20 -07:00
BuffelSaft	4c18cb7fe7	Remove EFFECT_THAW_HIT	2021-06-19 11:49:00 +12:00
Kurausukun	10c80230c4	change printItemFunc to use u32 instead of s32 ... also change a use of -2 to LIST_CANCEL	2021-06-18 00:15:45 -04:00
Kurausukun	8b59909ac5	remove gflib	2021-06-17 22:09:48 -04:00
Xhyzi	c2bd046ea6	Shell Trap	2021-06-15 20:22:50 +02:00
Xhyzi	155e9b6332	Court Change	2021-06-15 20:14:10 +02:00
Xhyzi	271f19e6cb	Terrain Pulse	2021-06-15 20:01:57 +02:00
Xhyzi	0202b75822	Beak Blast	2021-06-15 19:57:21 +02:00
Xhyzi	7799e49e3a	Corrosive Gas	2021-06-15 19:45:24 +02:00
Xhyzi	e7ec4df70b	Rising Voltage	2021-06-15 17:51:59 +02:00
Xhyzi	ee3f3eb78f	Meteor Beam	2021-06-15 17:06:21 +02:00
Xhyzi	62525516a4	Scale Shot	2021-06-15 16:50:19 +02:00
Xhyzi	60ce39543e	Expanding Force	2021-06-15 16:29:06 +02:00
Xhyzi	5a094a3033	Snap Trap	2021-06-15 16:22:42 +02:00
ExpoSeed	b6b0062bd6	Change map header flags to use a bitfield	2021-06-13 17:02:06 -05:00
MissingNoL	721dbe9178	Implemented all PLG effects	2021-06-12 18:01:35 -07:00
MissingNoL	610b18bfdb	Implemented Double Iron Bash's effect	2021-06-12 14:27:50 -07:00
MissingNoL	beb126b534	Implemented Zippy Zap's effect	2021-06-12 13:58:54 -07:00
ultima-soul	bca67ac683	Refactor Poke Ball code to not rely on Master Ball being the first item internally.	2021-06-11 18:22:50 -07:00
ultima-soul	b7706f1b99	Remove ball catch rate modifier effects.	2021-06-10 21:59:13 -07:00
ExpoSeed	c8fc141287	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-06-10 11:54:20 -05:00
ExpoSeed	3ed06c2cc2	Remove remaining grey and replace with gray	2021-06-10 11:36:10 -05:00
BuffelSaft	e6a8faec1e	Fix thawing moves ... Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.	2021-06-10 23:48:18 +12:00
DizzyEggg	f27dcab784	Rage powder has powder moves qualities when forcing a target	2021-06-10 12:55:05 +02:00
DizzyEggg	4b29ae39ad	Allow one mon double battles	2021-06-08 16:40:47 +02:00
ultima-soul	425746763a	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 20:08:43 -07:00
ultima-soul	f3f4d8e608	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 19:52:20 -07:00
ultima-soul	0a87adad1a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 18:05:52 -07:00
LOuroboros	588b3638d3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus	2021-06-07 19:22:20 -03:00
LOuroboros	8726107d42	Removed BattleScript_FlinchPrevention ... Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.	2021-06-07 19:18:15 -03:00
ultima-soul	d30ab7760f	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-06-07 13:52:08 -07:00
ultima-soul	cf19635a80	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-06-07 13:15:46 -07:00
ultima-soul	092f02f119	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-06-07 12:00:23 -07:00
MissingNoL	bfc66a21cc	gBattlescriptCurrInstr[3] is not reading species parameter	2021-06-06 19:14:11 -07:00
ultima-soul	2563bc5c83	Merge pull request #1521 from DizzyEggg/largeexp ... Allow larger exp gains	2021-06-06 13:33:33 -07:00
MissingNoL	9cd522d254	Merge branch 'battle_engine' into Photon_Geyser	2021-06-05 16:46:28 -07:00
MissingNoL	921b80de7c	Update battle_script_commands.h ... Properly aligned the list of number IDs	2021-06-05 16:40:03 -07:00
ultima-soul	3448e19275	Merge pull request #1459 from ExpoSeed/BE/rename-flags ... Rename flags	2021-06-04 19:33:45 -07:00
ExpoSeed	4bb33367df	Newline	2021-06-04 19:35:16 -05:00
ExpoSeed	ec2c140ecb	Disambiguate Thousand Arrows flag from other flags	2021-06-04 19:34:37 -05:00
ExpoSeed	15914d7af8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags	2021-06-04 19:00:29 -05:00
ultima-soul	6edec5bc3d	Merge pull request #1437 from LOuroboros/oblivious ... Tweaked Oblivious	2021-06-04 16:51:38 -07:00
ExpoSeed	0e96b47584	Review comments	2021-06-04 18:50:11 -05:00
LOuroboros	b552db7193	Tweaked the Oblivious immunities ... Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.	2021-06-04 19:23:07 -03:00
DizzyEggg	4b744374c8	Allow larger exp gains	2021-06-03 23:17:44 +02:00
LOuroboros	b215b44951	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales	2021-06-03 05:09:14 -03:00
ultima-soul	fc19023087	Merge pull request #1493 from LOuroboros/feathers ... Corrected the Wings/Feathers	2021-06-02 22:56:16 -07:00
LOuroboros	03647c7790	Adjusted the list of item hold effects	2021-06-02 17:27:45 -03:00
LOuroboros	6ccb493f12	Adjusted the list of item hold effects	2021-06-02 17:23:58 -03:00
BuffelSaft	2a6b989c92	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press	2021-06-02 12:41:28 +12:00
LOuroboros	d48a6e00d4	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious	2021-06-01 18:15:01 -03:00
Kurausukun	2bbaf71998	[LEAK-INFORMED] fix CreateShedinja fakematch ... info: the header change is required. accesses to the struct need to be treated as non-const, even though the array must be const. thanks to jiang for figuring this out.	2021-05-31 08:20:46 -05:00
amiosi	b588e94395	more requested changes	2021-05-28 15:05:33 -04:00
MissingNoL	f30a9542ee	Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm	2021-05-27 22:21:55 -07:00
amiosi	f7651fd592	most fixes from requested changes	2021-05-27 15:55:19 -04:00
amiosi	fc81994579	Merge branch 'battle_engine' into old_findings	2021-05-27 15:28:02 -04:00
ultima-soul	eedd374a5f	Merge pull request #1420 from Blackforest92/pokemon_expansion ... Added missing gen8 battle sprites and available icons and various fixes	2021-05-24 21:13:12 -07:00
Blackforest92	d74492b591	Returning Alcremie back to monkey	2021-05-25 10:57:06 +07:00
ultima-soul	1f859e340d	Merge pull request #1415 from ghoulslash/item_expansion ... Add Berry Hold Effects	2021-05-24 11:07:35 -07:00
ghoulslash	c356ffaed4	merge with be. fix null ptr check in GetBattleMoveSplit	2021-05-24 10:46:53 -06:00
ghoulslash	5840b1f0ed	utility umbrella effect	2021-05-24 09:52:45 -06:00
Scott	265cdcdc12	Handle GetAbilityBySpecies edge cases	2021-05-23 16:17:43 -04:00
ghoulslash	c3e28e9b1a	merge with be	2021-05-23 12:22:52 -06:00
ghoulslash	54b03a474d	fix SIDE_STATUS_SCREEN_ANY	2021-05-23 12:22:07 -06:00
Eduardo Quezada D'Ottone	04c6331a60	Merge pull request #1432 from BuffelSaft/thousand_arrows ... Fix Thousand Arrows	2021-05-21 11:40:13 -04:00
LOuroboros	0bc8ed59f5	Wings -> Feathers	2021-05-17 21:58:17 -03:00
ultima-soul	50c2514267	Merge pull request #1469 from ultima-soul/pokemon_expansion_sync ... Pokemon Expansion Upstream Sync	2021-05-13 20:56:29 -07:00
gAlfonso-bit	2be29cdb77	Update IsPokemonCryPlaying	2021-05-13 11:23:11 -05:00
GriffinR	65fd334256	Name map groups	2021-05-11 10:16:04 -05:00
LOuroboros	95d41524a2	Implemented Clanging Scales' effect	2021-05-09 18:20:03 -03:00
Flametix	a8fab62c89	Fix Substitute typo	2021-05-06 20:49:04 -04:00
GriffinR	6ce27c0ff0	Restore EReaderTrainerHillSet dummy	2021-05-04 15:43:24 -04:00
ultima-soul	e864c39a5d	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-05-04 10:04:35 -07:00
GriffinR	4206359862	Fix some object lock names	2021-05-04 01:21:50 -04:00
ultima-soul	cf0fd961b9	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-28 23:56:58 -07:00
ultima-soul	00c3f060b1	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-28 23:53:23 -07:00
ultima-soul	56fc420187	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-28 21:34:30 -07:00
GriffinR	f7a699c686	Merge pull request #1421 from GriffinRichards/doc-tvrecordmix ... Document TV	2021-04-29 00:25:01 -04:00
ultima-soul	75a9fdbafa	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-28 20:50:59 -07:00
ultima-soul	0da3f74a7e	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-28 18:58:38 -07:00
GriffinR	6c38837b26	Merge pull request #1420 from GriffinRichards/doc-dataanims ... Document battler affine anims, default pokeball throw	2021-04-28 13:56:42 -04:00
GriffinR	58cef0ae52	Merge pull request #1418 from GriffinRichards/sync-ereaderhelp ... Sync e-reader helpers, document trainer hill e-reader	2021-04-28 06:08:57 -04:00
ultima-soul	14a0303e2f	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-27 18:36:37 -07:00
GriffinR	c6300b5325	Merge pull request #1417 from GriffinRichards/doc-pyramidbag ... Document Battle Pyramid Bag	2021-04-27 14:48:09 -04:00
GriffinR	18f85b5cf0	Merge pull request #1415 from GriffinRichards/doc-contestutil ... Some Contest clean up	2021-04-27 02:29:41 -04:00
GriffinR	d74017d256	Merge pull request #1419 from GriffinRichards/doc-animstatus ... Label more unused battle anims	2021-04-26 13:32:15 -04:00
GriffinR	c0aedf8df4	Merge pull request #1410 from GriffinRichards/doc-tradedata ... Document trade sequence animation, some trade cleanup	2021-04-26 13:26:12 -04:00
GriffinR	aad090e154	Document TV	2021-04-26 12:35:35 -04:00
GriffinR	bee60f4c64	Document battler sprite affine anims, default pokeball throw	2021-04-25 02:18:34 -04:00
GriffinR	e065c0c285	Label more unused battle anims	2021-04-24 18:26:25 -04:00
GriffinR	86475c5ded	Document trainer hill ereader	2021-04-24 18:04:27 -04:00
GriffinR	004c37bf02	Sync ereader_helpers with pokefirered	2021-04-24 18:03:06 -04:00
GriffinR	8c820878bf	Document Battle Pyramid Bag	2021-04-23 15:07:36 -04:00
GriffinR	bc9fc38254	Misc contest cleanup	2021-04-22 15:51:04 -04:00
GriffinR	dbe24f0baa	Clean up contest_painting	2021-04-21 20:04:12 -04:00
GriffinR	a2a9f22612	Clean up contest_util	2021-04-20 21:16:47 -04:00
GriffinR	04af378904	Document trade sequence animation, some trade cleanup	2021-04-20 05:50:39 -04:00
GriffinR	cd2a99b7c4	Doc storage - misc cleanup, some item/cursor	2021-04-17 13:33:29 -04:00
ExpoSeed	f922d42988	Refactor hidden abilities	2021-04-16 23:38:35 -05:00
ExpoSeed	db2b995bc6	Introduce NUM_ABILITY_SLOTS	2021-04-16 23:37:55 -05:00
ExpoSeed	27c6964a05	Merge branch 'num_ability_slots' into BE/num_ability_slots	2021-04-16 20:45:34 -05:00
ExpoSeed	49bb345338	Introduce NUM_ABILITY_SLOTS	2021-04-16 20:36:45 -05:00
GriffinR	80cc7d46ae	Doc storage - fix row/column flip	2021-04-16 15:07:10 -04:00
GriffinR	838a452363	Doc storage - choose box menu, move wallpaper gfx	2021-04-15 18:46:20 -04:00
GriffinR	a1ed59450e	Doc storage - wallpaper and titles	2021-04-15 16:09:41 -04:00
GriffinR	c4ef45c161	Merge pull request #1403 from GriffinRichards/doc-pokeblock ... Document Pokéblock menu and feeding scene	2021-04-14 14:17:36 -04:00
GriffinR	33ea2a1061	Remove unnecessary scope for TEST_BUTTON	2021-04-13 02:50:50 -04:00
GriffinR	82f870091e	Merge pull request #1400 from GriffinRichards/doc-pokemonanim ... Document Pokémon animation	2021-04-13 01:36:15 -04:00
GriffinR	042a2ecc41	Document pokeblock feed scene	2021-04-12 18:44:37 -04:00
GriffinR	c786a9b20c	Document pokeblock menu	2021-04-11 18:10:05 -04:00
ghoulslash	98bccaa35d	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion	2021-04-10 14:28:07 -06:00
GriffinR	09a9efd5c5	Merge pull request #1398 from GriffinRichards/doc-field ... Document field	2021-04-10 13:05:51 -04:00
GriffinR	f6016838b1	Merge pull request #1397 from GriffinRichards/doc-moremisc ... Clean up battle scripts	2021-04-10 12:41:35 -04:00
GriffinR	72ba8cf58d	Document pokemon animation types	2021-04-10 00:50:28 -04:00
ExpoSeed	8494306d1d	Rename flags	2021-04-07 16:07:30 -05:00
LOuroboros	75b6d2837e	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller	2021-04-07 17:10:52 -03:00
GriffinR	d717a635c8	event_object_movement cleanup	2021-04-06 17:55:29 -04:00
ghoulslash	71b85031e0	update NUM_BATTLE_MOVE_EFFECTS	2021-04-06 15:42:21 -06:00
GriffinR	0dc7ff8994	Minor misc field doc	2021-04-06 17:17:41 -04:00
GriffinR	4a1cfbead2	Document remaining overworld	2021-04-06 16:55:43 -04:00
GriffinR	86a9d94ce1	Document fieldmap	2021-04-06 16:05:43 -04:00
GriffinR	8bad478b49	Document disguise field effects	2021-04-06 14:51:39 -04:00
GriffinR	756fad0e61	Document some event object movement	2021-04-06 14:34:36 -04:00
GriffinR	00c3044c96	Clarify Groudon/Kyogre/Rayquaza gfx names	2021-04-06 02:38:15 -04:00
GriffinR	806abe2999	Document some objev anims, make objevgfx info static	2021-04-05 19:52:35 -04:00
GriffinR	553fe6239a	Document more field effects	2021-04-05 18:21:17 -04:00
GriffinR	f90026826a	Document some weather, field effects	2021-04-04 17:52:07 -04:00
ExpoSeed	cf9d5f8563	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table	2021-04-04 01:11:32 -05:00
ultima-soul	be7acc919a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-04-03 21:53:29 -07:00
GriffinR	5fa20534f9	Label remaining fields in Weather struct	2021-04-04 00:52:17 -04:00
GriffinR	b926fa6b07	Document thunderstorm	2021-04-04 00:44:20 -04:00
GriffinR	1494a83035	Sync drought with pokefirered, add weather tags	2021-04-03 22:47:58 -04:00
GriffinR	b6711441f5	Fix AI Guard Spec use, and Specs->Spec	2021-04-03 15:18:17 -04:00
GriffinR	f4d8a91ba4	Misc battle script cleanup	2021-04-03 14:07:31 -04:00
GriffinR	9ea9ffde09	Add remaining multistring chooser constants	2021-04-03 11:49:06 -04:00
LOuroboros	f04f35f5c3	Added a config for the amount of HP recovered by healing items	2021-04-02 20:34:57 -03:00
ultima-soul	4a81102a46	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-02 13:57:19 -07:00
ultima-soul	b8721034ef	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-02 13:42:05 -07:00
ultima-soul	939608f5b8	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-02 13:16:40 -07:00
GriffinR	1b8d405b5e	Add missing include guard suffixes	2021-04-02 12:54:40 -04:00
ghoulslash	42c7a5fea2	fix z move move IDs	2021-04-02 10:28:08 -06:00
ghoulslash	d89e2c1775	merge with be	2021-04-02 08:55:54 -06:00
GriffinR	c9d3b26ff7	Label miss string indexes	2021-04-02 02:12:46 -04:00
GriffinR	8be2c5d60b	Document Contest Lady TV Show	2021-04-02 01:49:38 -04:00
GriffinR	a0b3d4df12	Merge pull request #1390 from GriffinRichards/doc-introcred ... Document intro and credits sequences	2021-04-01 23:13:59 -04:00
GriffinR	51970f97b0	Merge pull request #1393 from GriffinRichards/doc-dewfordtrend ... Document Dewford Trend and match_call.c	2021-04-01 22:19:48 -04:00
GriffinR	f58465a274	Document match_call.c	2021-04-01 03:29:15 -04:00
LOuroboros	ed74430d26	Added a variation of BattleScript_NotAffected ... This one triggers the Ability PopUp.	2021-03-31 23:33:51 -03:00
GriffinR	771a434730	Label Trend Watcher TV show texts	2021-03-31 16:29:42 -04:00
GriffinR	86856098a3	Document Dewford Trend	2021-03-31 16:08:42 -04:00
BuffelSaft	35add44a90	Thousand Arrows hits airborne targets ... Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc. Also fixed its effect chance, which was 0 instead of 100.	2021-03-31 23:05:30 +13:00
GriffinR	50e9666e16	Merge branch 'master' into doc-introcred	2021-03-29 20:56:15 -04:00
GriffinR	dea07dc865	Standardize intro gfx names	2021-03-29 20:48:48 -04:00
GriffinR	09ff1524b4	Finish documenting credits	2021-03-29 19:58:29 -04:00
Kurausukun	102582a3df	Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc	2021-03-29 18:36:18 -04:00
GriffinR	c40fb9288c	Merge pull request #1378 from GriffinRichards/doc-berrycrush ... Document Berry Crush	2021-03-29 12:38:16 -04:00
GriffinR	62968895ca	Add MON_PIC_SIZE constant	2021-03-29 09:38:19 -04:00
GriffinR	357c5439f5	Document some credits	2021-03-29 08:52:40 -04:00
GriffinR	c86cc8b371	Document intro, start intro_credits/credits	2021-03-28 23:13:56 -04:00
ghoulslash	a595b213b4	merge with be	2021-03-28 17:29:22 -06:00
GriffinR	7a5c6d4d86	Standardize Friendship/Happiness	2021-03-27 17:27:20 -05:00
ultima-soul	7abfe7469a	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-03-23 18:41:53 -07:00
ultima-soul	56a1cab314	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-03-23 15:21:19 -07:00
ultima-soul	5bab9474dc	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-03-22 23:08:19 -07:00
GriffinR	6127c6f32e	Misc labels in battle facilities	2021-03-22 15:30:19 -05:00
GriffinR	dfc6ee0e9e	Add SAFE_DIV	2021-03-21 13:43:14 -05:00
GriffinR	557152b06e	Minor link cleanup	2021-03-21 13:40:40 -05:00
Kurausukun	5b910a11b4	port miscellaneous fr documentation	2021-03-18 20:35:39 -04:00
GriffinR	22e2c0a47c	Document Berry Crush	2021-03-18 15:18:23 -04:00
BuffelSaft	7d237d8ff6	Implement Body Press' effect ... Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.	2021-03-16 22:56:44 +13:00
GriffinR	ecd269ba2c	Merge pull request #1372 from GriffinRichards/doc-countdown ... Document minigame countdown	2021-03-15 21:39:58 -04:00
PikalaxALT	925e68c03f	Update newly named fields	2021-03-15 15:22:41 -04:00
Blackforest92	badf8945d8	Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie	2021-03-14 18:31:24 +07:00
amiosi	b081a00891	Merge branch 'battle_engine' into old_findings	2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone	292993e360	Merge pull request #1338 from ghoulslash/ripen ... Add Ripen and Finish Gen4 Berries	2021-03-13 11:16:42 -03:00
PikalaxALT	8d4dcb228a	More documentation in battle_main	2021-03-12 16:55:58 -05:00
PikalaxALT	e32a1571af	Resolve link comm buffers in gBattleStruct	2021-03-12 15:37:31 -05:00
GriffinR	b1a69d95ea	Document minigame countdown	2021-03-11 14:25:22 -05:00
GriffinR	6c297d19e8	Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking ... Document Dodrio Berry Picking	2021-03-10 18:55:41 -05:00
LOuroboros	68980cf18c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-03-10 03:58:21 -03:00
ghoulslash	d5004638a9	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-03-09 16:35:47 -07:00
ExpoSeed	3655fe52f3	Prison Bottle and Reveal Glass don't exist yet	2021-03-09 11:54:56 -06:00
ghoulslash	3f9bf5acc0	merge with be	2021-03-09 10:33:48 -07:00
ghoulslash	68388f633f	merge with be	2021-03-08 18:58:16 -07:00
GriffinR	55a40b901f	Label battle tower link script	2021-03-04 19:30:19 -06:00
ExpoSeed	f49da96f1d	Fix consumable item form change	2021-03-03 15:24:58 -06:00
ExpoSeed	07af84db8a	Implement FORM_ITEM_USE. Credits to Lunos for work on Gracidea	2021-03-03 13:54:25 -06:00
GriffinR	b9c733495b	Document dodrio berry picking	2021-03-03 14:26:05 -05:00
ExpoSeed	6f64c1b2b9	Implement GetFormChangeTargetSpecies	2021-03-03 13:07:50 -06:00
Evan	41d47a867e	format fixes	2021-03-03 10:48:57 -07:00
Evan	791fd5e709	finish berry hold effects	2021-03-03 09:25:25 -07:00
Evan	2ccdf1d89e	merge with be. magic guard checks	2021-03-03 09:21:06 -07:00
ghoulslash	0ee9425599	Update include/battle_scripts.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 09:14:07 -07:00
ghoulslash	3a30fe900a	Update include/constants/hold_effects.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 09:13:49 -07:00
ExpoSeed	f7d42cd3c8	Formatting	2021-03-02 14:25:15 -06:00
ExpoSeed	ec1a09bcd5	Revamp table	2021-03-02 14:18:34 -06:00
ExpoSeed	7e8659c4ee	Fix missed merge conflict	2021-03-02 14:17:48 -06:00
ExpoSeed	7802264732	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table	2021-03-01 19:38:13 -06:00
Evan	b130396c0e	merge with be	2021-03-01 17:05:10 -07:00
ultima-soul	e5fa583a08	Merge pull request #1334 from ghoulslash/gen8_abilities ... More Gen 8 Abilities	2021-03-01 10:40:09 -08:00
Evan	6cb8c6309a	merge with be	2021-03-01 11:28:51 -07:00
Evan	55649a67cc	Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain	2021-03-01 11:23:05 -07:00
Evan	55b8538f68	merge with be	2021-03-01 11:22:37 -07:00
ultima-soul	f6147ee054	Merge pull request #1356 from ghoulslash/tailwind_turns ... Update tailwind timer To Gen5	2021-03-01 08:51:40 -08:00
GriffinR	91ab30fa71	Rename mon markings struct	2021-02-28 17:11:46 -06:00
GriffinR	ed0347476c	Remove old declaration and define	2021-02-28 17:11:46 -06:00
GriffinR	031da44cab	Document mon markings	2021-02-28 17:11:46 -06:00
GriffinR	cbc7a72814	Merge pull request #1346 from GriffinRichards/doc-pokejump ... Document pokemon jump	2021-02-28 11:19:02 -05:00
N	cab3728e96	Strangest match	2021-02-28 10:06:07 -06:00
huderlem	10c77f1bc2	Merge pull request #1345 from GriffinRichards/doc-rtcscreen ... Document/clean up some minor screens	2021-02-28 10:03:22 -06:00
Marcus Huderle	c900de35e7	Fix build and cleanup mistakes	2021-02-28 09:54:55 -06:00
Marcus Huderle	a85fada314	Document more battle anim effects	2021-02-28 09:54:55 -06:00
GriffinR	1912b0cf0a	Merge branch 'master' into doc-rtcscreen	2021-02-28 10:28:43 -05:00
GriffinR	3f59362397	Merge branch 'master' into doc-pokejump	2021-02-28 10:27:50 -05:00
GriffinR	ea748ff7f5	Merge pull request #1344 from GriffinRichards/doc-ec ... Document easy chat and mail, script.c cleanup, add/use some general constants	2021-02-28 10:26:49 -05:00
Marcus Huderle	c323e7f061	Document some battle anim funcs and data	2021-02-27 11:04:45 -06:00
GriffinR	117b90a261	Document pokemon jump	2021-02-26 17:26:39 -05:00
GriffinR	f172ff84c9	Clean up save_failed_screen	2021-02-24 14:53:32 -05:00
GriffinR	b71b10623b	Add palette selection constants	2021-02-24 11:03:51 -05:00
GriffinR	c6141fea83	Document easy chat	2021-02-24 11:03:45 -05:00
GriffinR	1cac608dbe	Document mail	2021-02-24 11:03:39 -05:00
GriffinR	a5852d57d1	Use TASK_NONE constant	2021-02-24 11:03:25 -05:00
GriffinR	e52b46ab43	Clean up script.c	2021-02-24 11:03:17 -05:00
GriffinR	06ae5a37e2	Merge pull request #1336 from GriffinRichards/giftribbons ... Document some ribbon usage	2021-02-24 10:07:59 -05:00
GriffinR	fc3d6eb178	Merge pull request #1328 from GriffinRichards/doc-pokeuseitem ... Document PokemonUseItemEffects	2021-02-22 12:15:19 -05:00
SphericalIce	381116b3c4	Add labels for cracked floor metatiles	2021-02-22 15:29:14 +00:00
GriffinR	64fc585cc3	Document pokenav ribbons summary screen	2021-02-18 11:33:55 -05:00
GriffinR	d62f89b20c	Minor window/bg cleanup	2021-02-18 10:00:07 -05:00
GriffinR	02c1fbd733	Document ribbon TV show, add new ribbon IDs/size	2021-02-18 09:59:24 -05:00
GriffinR	e059c4fdfa	Use new gift ribbons size, label unused ribbons	2021-02-17 14:11:45 -05:00
Deokishisu	1dda9939ab	Fix Swapped Comments on PokeCoupon Tiers	2021-02-16 16:08:58 -05:00
Deokishisu	7f55bf875c	Move BoxRS Data Down to ExternalEventFlags ... As suggested, moved the BoxRS data fields into ExternalEventFlags and packed that struct.	2021-02-16 16:01:18 -05:00
Deokishisu	fb60e036ce	Document Box: Ruby & Sapphire Fields ... Labeled another field in the ExternalEventData struct used by Pokémon Box: Ruby & Sapphire. Special thanks to Citrus Bolt#4642.	2021-02-16 15:37:58 -05:00
Deokishisu	cd89d17b12	Document More External Events ... Did research to determine how the Japanese Colosseum Bonus Disc modifies the ExternalEventData fields. The Ageto Celebi flag, as well as the flag for the three PokeCoupon title rewards, have been documented and included into the struct. The PokeCoupon fields are actually 3-byte fields, so they have been turned into bitfields, since u24 isn't possible. Also discovered that Channel and US Colosseum Bonus Disc Jirachi use the same flag, so renamed that flag and commented to explain. Also made general comments explaining how the ExternalEventData and ExternalEventFlags are applicable to Emerald specifically.	2021-02-16 09:41:07 -05:00
GriffinR	ee4af94a36	Merge pull request #1324 from GriffinRichards/doc-sb ... Document remainder of secret_base.c	2021-02-15 17:41:55 -05:00
Deokishisu	7b2bf8c7e2	Rename obedient/fatefulEncounter to eventLegal ... Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind. Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.	2021-02-15 14:54:35 -05:00
Deokishisu	b89c3e901e	Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h ... The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi. The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.	2021-02-15 11:40:16 -05:00
GriffinR	5f58ea02c6	Merge pull request #1330 from sphericalice/hidden-to-buried ... Rename 'hidden' Trainers/obj events to 'buried'	2021-02-14 21:48:21 -05:00
SphericalIce	56e047f949	Fix Lilcove Motel typos	2021-02-14 21:38:39 +00:00
SphericalIce	70ff6c3b84	Rename 'hidden' Trainers/obj events to 'buried'	2021-02-14 19:25:23 +00:00