5961 Commits

Author	SHA1	Message	Date
Philipp AUER	4928911cd0	Speed up PASSES_RANDOMLY via structured RNG (#2720)	2023-03-24 15:16:29 +01:00
ghoulslash	dca6182ed2	remove assist array from battle struct (#2816)	2023-03-24 09:23:49 -04:00
GriffinR	6be9a79b8c	Merge pull request #1871 from GriffinRichards/doc-trendy-sayings ... Document the trendy sayings word group	2023-03-24 08:05:51 -04:00
Zunawe	492422b6bd	Fix scanner item flag name	2023-03-23 21:47:26 -07:00
AgustinGDLV	6dc3c7a143	level reappears in healthbox and form reversion occurs correctly when Dynamax ends	2023-03-23 21:27:45 -07:00
Bassoonian	cd6d71cd01	Add most of the new item icons (Clear Amulet & Shards missing)	2023-03-24 00:50:06 +01:00
Bassoonian	e601719c91	Add new PLA form change items	2023-03-24 00:04:08 +01:00
Bassoonian	80d0efae0c	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev	2023-03-23 23:04:23 +01:00
LOuroboros	7ce5c5fc66	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-03-23 06:27:09 -03:00
Eduardo Quezada D'Ottone	2658fe32c2	Removed ITEM_HAS_EFFECT (#2840)	2023-03-23 10:02:32 +01:00
AgustinGDLV	6233627a57	more tests + fixed hp reversion issues	2023-03-22 17:04:05 -07:00
GriffinR	8d67bebd51	Merge pull request #1869 from GriffinRichards/const-map ... Treat map data as const	2023-03-22 13:00:06 -04:00
Eduardo Quezada	ef914a2fac	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-21 16:13:27 -03:00
AgustinGDLV	788642347b	added HP-based damage/healing interactions with Dynamax Pokemon	2023-03-21 11:36:04 -07:00
AgustinGDLV	69fd63a922	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-21 09:56:58 -07:00
AgustinGDLV	5a9e1de836	Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax	2023-03-20 21:14:33 -07:00
AgustinGDLV	7d70222770	added most Dynamax immunities/interactions + tests + fixed some move selection bugs	2023-03-20 16:40:05 -07:00
Eduardo Quezada	51b716c9d9	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 ... # Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h	2023-03-19 20:28:56 -03:00
Bassoonian	372c6a1afa	Add new item variables and defines	2023-03-19 20:55:39 +01:00
LOuroboros	f4e8389779	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
Martin Griffin	89deda0416	Allow tests to override specific RNG calls	2023-03-15 13:39:17 +00:00
GriffinR	00e211a417	Merge pull request #1873 from AsparagusEduardo/pret/pr2/stringConversionIDE ... Changed IDE macros to allow their use in compound literals without IDE errors	2023-03-15 03:00:01 -04:00
Eduardo Quezada	2cb54c49da	Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors	2023-03-14 15:38:18 -03:00
LOuroboros	aefd318945	Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect	2023-03-14 11:43:52 -03:00
Eduardo Quezada	0a9ab96390	Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments	2023-03-14 08:54:49 -03:00
GriffinR	0c380862d6	Document the trendy saying word group	2023-03-13 15:58:40 -04:00
Alex	aa29eced1f	Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites	2023-03-13 17:46:53 +01:00
Eduardo Quezada	a0feaabef1	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-12 15:53:32 -03:00
AgustinGDLV	c823e19705	implemented Gigantamax form change	2023-03-11 10:48:21 -08:00
AgustinGDLV	b708da3998	Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax	2023-03-11 00:17:30 -08:00
AgustinGDLV	4293dc8a24	not entirely confident implementation of Dynamax indicator	2023-03-10 23:03:51 -08:00
AgustinGDLV	317b52f3f6	added Dynamax trigger sprite	2023-03-10 22:05:23 -08:00
AgustinGDLV	ec4b330b9b	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-10 21:00:41 -08:00
AgustinGDLV	06bf934b02	Dynamaxed pokemon now have increased HP	2023-03-10 20:38:17 -08:00
LOuroboros	6dbe772e27	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-03-10 18:23:33 -03:00
AgustinGDLV	76073fab52	added basic Dynamax-in-battle	2023-03-10 10:20:27 -08:00
DizzyEggg	d695c76881	test for assist and removed assist array from battle struct	2023-03-08 22:11:28 +01:00
LOuroboros	f06c040bca	Updated the debug menu ... -Updated the text string used by Debug_FlagsNotSetMessage. -Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage. -Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage, -DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION -And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file. -Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff. -Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.	2023-03-08 15:27:22 -03:00
GriffinR	dbf757be88	Treat map data as const	2023-03-08 12:00:30 -05:00
AgustinGDLV	ac649a476f	added Gigantamax check + move display and tint when dynamaxed	2023-03-07 19:21:59 -08:00
LOuroboros	fdebc994d2	Updated Supreme Overlord's effect's code	2023-03-07 19:14:38 -03:00
DizzyEggg	f6089a0057	Mega Evolution after switching and based on speed	2023-03-07 22:34:57 +01:00
AgustinGDLV	7de7599a7b	reworked scripts to remove jumpifnotally / jumpiftargetabsent	2023-03-07 12:07:11 -08:00
AgustinGDLV	e937482c27	fixed potential G-Max Chi Strike, Court Change bugs	2023-03-07 11:18:19 -08:00
Eduardo Quezada	4625a46748	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_interface.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c	2023-03-07 11:26:33 -03:00
Eduardo Quezada D'Ottone	81a80e566c	Refactor Mega Evolution indicator sprite (#2805)	2023-03-07 08:06:28 -03:00
DizzyEggg	e055456b7e	Fix Protean / Libero when AI calculates Damage (#2714) ... * Fix Protean / Libero when AI calculates Damage * fix ai changing types when calculating dmg	2023-03-07 09:34:26 +01:00
DizzyEggg	a04046dbb6	Add tests for Defog and fix Defog battle strings (#2737) ... * start working on defog tests * defog tests + improve terrain end battlescripts * newline	2023-03-06 20:35:08 +01:00
DizzyEggg	306c4565a0	merge	2023-03-06 15:32:28 +01:00
DizzyEggg	d3d99c3f8c	alpha omega indicator sprites use the same palete	2023-03-06 15:22:28 +01:00
GriffinR	bb078e0618	Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments ... Document music usage to make it easier to search for a specific track	2023-03-05 15:29:38 -05:00
Eduardo Quezada	a6bd35ceab	Review changes	2023-03-05 17:17:39 -03:00
ghoulslash	dec1b16138	Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790)	2023-03-05 09:50:47 -05:00
GriffinR	ce6875817f	Merge pull request #1860 from GriffinRichards/metatile-labels ... Format metatile_labels	2023-03-04 23:36:04 -05:00
Eduardo Quezada	9917f5cc8b	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 ... # Conflicts: # Makefile # include/constants/pokemon.h # include/pokemon.h # make_tools.mk # src/battle_ai_script_commands.c # src/battle_controllers.c # src/battle_main.c # src/battle_script_commands.c # src/party_menu.c # src/pokemon.c # src/trade.c # src/trainer_pokemon_sprites.c	2023-03-03 11:00:50 -03:00
Alex	487e26e700	fix enamorus_t + samuroutt sprite + conflicts	2023-03-02 11:05:59 +01:00
LOuroboros	ff15856820	Added yet another trainer slide condition ... Now a trainer NPC can also say something before the first turn of a battle starts for good.	2023-03-02 06:16:44 -03:00
LOuroboros	fe735f9700	Applied review suggestions ... -Merged EFFECT_CEASELESS_EDGE and EFFECT_STONE_AXE into EFFECT_HIT_SET_ENTRY_HAZARD -Updated gDmgHazardsStringIds and relevant battle scripts. Can't say that I like it at all. String tables are stupid imo. -Coupled Barb Barrage's effect in CalcMoveBasePower with Venoshock's	2023-03-02 01:39:44 -03:00
LOuroboros	23673c2e9d	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-03-01 03:57:00 -03:00
AgustinGDLV	7c853ef45e	implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Finale	2023-02-28 16:37:48 -08:00
GriffinR	ec89e519f9	Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful ... Rename eventLegal to modernFatefulEncounter	2023-02-28 11:48:34 -05:00
AgustinGDLV	3cdcf2a356	implemented G-Max Chi Strike, finished G-Max Gold Rush	2023-02-27 22:01:19 -08:00
AgustinGDLV	da24b717e4	implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite	2023-02-27 21:26:03 -08:00
Eduardo Quezada	3b27b602fd	End of file	2023-02-28 00:09:43 -03:00
Eduardo Quezada	90021f3be6	Removed zMovePower field in gBattleMoves in favor of a function.	2023-02-27 23:49:43 -03:00
AgustinGDLV	0908129c84	implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite works on Max Moves	2023-02-27 18:43:06 -08:00
AgustinGDLV	93d8efd51f	implemented G-Max Resonance	2023-02-27 14:34:08 -08:00
AgustinGDLV	05fe62cbab	implemented G-Max Drum Solo, G-Max Hydrosnipe, G-Max Fireball	2023-02-27 12:11:52 -08:00
DizzyEggg	c92a65dc40	Add config for stockpile raising def stats	2023-02-27 21:09:02 +01:00
AgustinGDLV	92c8503869	reorganized max move functionality to remove redundant move effects	2023-02-27 11:54:49 -08:00
GriffinR	adf28c2f63	Merge pull request #1855 from GriffinRichards/doc-chat ... Add/correct some union room chat documentation	2023-02-27 13:25:05 -05:00
AgustinGDLV	c6c92da19c	implemented G-Max Wind Rage	2023-02-27 10:19:56 -08:00
GriffinR	8d88a38561	Merge pull request #1854 from GriffinRichards/constants-num-frames ... Add MAX_MON_PIC_FRAMES, and trainer pic size constants	2023-02-27 13:16:49 -05:00
GriffinR	4a6ea87247	Merge pull request #1865 from AsparagusEduardo/pret/doc/species2 ... Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarity	2023-02-27 13:06:04 -05:00
DizzyEggg	3338a6b786	add messages for stockpile effects wear off	2023-02-27 12:31:29 +01:00
LOuroboros	a54a8d9b2a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-27 07:43:19 -03:00
AgustinGDLV	e537be76ea	Z-moves bypass protection (#2730)	2023-02-27 09:17:07 +01:00
DizzyEggg	919fb184fe	AI knows how to handle Illusion (#2726) ... * AI knows how to handle Illusion	2023-02-27 09:12:52 +01:00
DizzyEggg	44d2cc7232	Fix bugs related to Trainer Slide messages (#2699) ... * start working on trainer slides * use cmd->nextInstr	2023-02-27 09:11:25 +01:00
AgustinGDLV	a36c35aea1	implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max Volcalith	2023-02-26 23:35:36 -08:00
AgustinGDLV	4d19659b0b	implemented G-Max Stonesurge, G-Max Steelsurge	2023-02-26 22:02:06 -08:00
LOuroboros	fe09f3e0d3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-26 23:42:01 -03:00
DizzyEggg	4bdca43dbd	refactor mega evolution indicator sprite	2023-02-26 12:51:35 +01:00
AgustinGDLV	b4ec273353	Merge branch 'upcoming' into dynamax	2023-02-25 14:04:55 -08:00
Zunawe	f376b71f7c	Fix wrong route in item flag name	2023-02-25 13:48:39 -08:00
Eduardo Quezada	31ab56bceb	Fixed footprint symbol names.	2023-02-25 09:23:34 -03:00
Eduardo Quezada	ca81d7a0f9	Forgot about Jangmo-o	2023-02-24 21:58:09 -03:00
Eduardo Quezada	bbefee6bd4	Use proper symbol styles for Hakamo-O and Kommo-O	2023-02-24 15:22:58 -03:00
Eduardo Quezada	079ca8ab29	Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification	2023-02-24 07:53:02 -03:00
Alex	48391d8eff	Basculegion female form	2023-02-24 08:46:34 +01:00
Eduardo Quezada	d330ca051a	Document music usage to make it easier to search for a specific track	2023-02-23 11:44:23 -03:00
Eduardo Quezada	f5aa3b8272	Document the 2 different sText_GotchaPkmnCaught	2023-02-23 11:43:40 -03:00
ghoulslash	827bf11307	Merge pull request #2660 from DizzyEggg/ace_voltswitch ... Fix Volt Switch / Roar with ace pokemon	2023-02-23 09:20:18 -05:00
Alex	a870ec3c22	enamorus_t cry, basculegionf sprite, new typhlosion back sprite	2023-02-23 15:20:12 +01:00
AgustinGDLV	38f462551f	pulled rhh master, i hate merge conflicts	2023-02-22 18:50:54 -08:00
AgustinGDLV	d69de9fb17	added longer 'used move' messages for max moves	2023-02-22 14:18:15 -08:00
DizzyEggg	dc83708443	Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd	2023-02-22 22:51:59 +01:00
Zunawe	60be59d18b	Fix wrong route in hidden item flag name	2023-02-22 13:13:57 -08:00
Alex	1f694ae7ed	missing pla sprites	2023-02-22 20:41:01 +01:00
DizzyEggg	877e3fd6af	merge with upcoming	2023-02-22 19:27:42 +01:00
DizzyEggg	e0b76e98ff	Add MOVE_SHELL_TRAP Effect (#2716) ... * implemented Shell Trap Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>	2023-02-22 13:55:34 +00:00
DizzyEggg	31138455de	remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS	2023-02-22 09:28:12 +01:00
AgustinGDLV	87a9150134	added base functionality for max moves	2023-02-21 20:16:25 -08:00
Eduardo Quezada	5ca9213d07	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-02-21 17:47:02 -03:00
DizzyEggg	61064ab07e	Merge branch 'upcoming' into fix_abilities_empty_field	2023-02-21 16:22:26 +01:00
Martin Griffin	29c64c82f3	Test Red Card ... Dragon Tail activates Red Card if the target does not switch.	2023-02-21 10:44:58 +00:00
Martin Griffin	afe09e9653	Test Dragon Tail ... Remove the "But it failed!" message if the foe cannot be switched.	2023-02-21 10:43:57 +00:00
LOuroboros	24581426a1	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-21 04:46:28 -03:00
LOuroboros	3a91a5c930	Added new trainer slide-in msg conditions ... Now they can say something: -When their last Pokémon's HP is between 25% and 50%. -When a critical hit is dealt to their first Pokémon for the first time. -When a super effective hit is dealt to their first Pokémon for the first time. -When a STAB move is used against (but doesn't faint) the opponent's Pokémon. -When the Player's Pokémon's move doesn't affect the opponent's Pokémon. -When they're about to trigger a Mega Evolution. -When they're about to trigger a Z-Move. Misc. changes: -Split GetEnemyMonCount for readability's sake. -Optimized the size allocated to trainerSlideLowHpMsgDone.	2023-02-21 04:40:02 -03:00
Zunawe	8f74a6777a	Fix spelling mistake for item flag	2023-02-20 18:17:30 -08:00
DizzyEggg	03915524c5	Fix switch-in abilities activating on empty field	2023-02-20 12:42:06 +01:00
DizzyEggg	53180ebf87	Update Healing wish to gen5 / gen8 mechanics (#2708) ... * Updated Healing Wish and added config * Fixed Lunar Dance message Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com> Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com> Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2023-02-20 11:25:43 +00:00
GriffinR	f888021c8f	Merge pull request #1857 from GriffinRichards/sync-mapjson ... Sync mapjson	2023-02-19 20:48:13 -05:00
DizzyEggg	380af442c3	Fix buggy pokemon anims with Illusion (#2639) ... * try illusion fix * fix	2023-02-19 12:05:56 +01:00
Eduardo Quezada D'Ottone	ec343cef02	Config to have Shuckle make Berry Juice from Oran Berries (#2331) ... * Removed unused ifdefs and made actually check for Z Power Ring * Config to have Shuckle make Berry Juice from Oran Berries * Ordered species-specific configs	2023-02-19 10:45:59 +01:00
DizzyEggg	66d2f253a1	merge with master	2023-02-17 15:43:15 +01:00
DizzyEggg	0c523f9518	Fix Magic bounce powder moves against grass types (#2633) ... * Fix Magic bounce powder moves against grass types	2023-02-17 13:55:51 +00:00
DizzyEggg	56c9564e7a	8th gen Howl's effect (#2700) ... * Howl gen8 effect	2023-02-17 10:28:46 +00:00
Eduardo Quezada D'Ottone	625a7622e2	Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 ... It's ya boi, pret merge! (pret merge 2023/02/16)	2023-02-16 21:57:41 -03:00
DizzyEggg	d637ee3b13	Fix After You for gen8 (#2646) ... Fix After You	2023-02-16 20:59:36 +00:00
Eduardo Quezada	f4f8ab6ee9	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-02-16 17:06:49 -03:00
ghoulslash	f4ef67d897	Merge pull request #2689 from DizzyEggg/grenja ... Fix Battle Bond activating multiple times in battle	2023-02-16 09:36:02 -05:00
ghoulslash	6b0b427d93	Merge pull request #2680 from DizzyEggg/mirror_armor ... Fix Mirror Armor against Clear Body	2023-02-16 09:29:04 -05:00
DizzyEggg	978d342953	use NUM_BATTLE_SIDES	2023-02-16 15:26:26 +01:00
Eduardo Quezada	7ddebb6671	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ... # Conflicts: # data/battle_ai_scripts.s # src/menu_specialized.c # src/mystery_gift_menu.c	2023-02-15 14:18:00 -03:00
Eduardo Quezada	b62e5aa72e	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ... # Conflicts: # src/battle_main.c # src/field_specials.c # src/trade.c	2023-02-15 14:11:03 -03:00
Eduardo Quezada	dbd02d3a56	Clarified Champion Ribbon's description to avoid being interpreted as needing to beat the champion in both RSE and FRLG.	2023-02-15 14:06:42 -03:00
Eduardo Quezada	bd54990333	Review changes	2023-02-15 13:56:11 -03:00
GriffinR	671c9c5353	Merge branch 'master' into doc-chat	2023-02-15 10:57:05 -05:00
GriffinR	a322379feb	Merge branch 'master' into doc-windows	2023-02-15 10:04:48 -05:00
DizzyEggg	3f0f7c6b7f	Fix Battle Bond activating multiple times in battle	2023-02-15 15:30:29 +01:00
GriffinR	d3d680c1dd	Sort metatile labels alphabetically	2023-02-14 14:36:27 -05:00
GriffinR	b656565af0	Standardize RS mossdeep gym metatile labels	2023-02-14 11:42:13 -05:00
GriffinR	0df56b808d	Remove duplicate metatile label sections	2023-02-14 11:40:15 -05:00
ghoulslash	908b509401	Fix Round's Base Power calc, Add Turn order effects (#2602) ... * fix round base power calc, add turn order change * remove unused callnative cmd * fix round turn order update * fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-14 16:49:50 +01:00
DizzyEggg	0577d8d04d	Fix Mirror Armor against Clear Body	2023-02-13 14:44:34 +01:00
DizzyEggg	5d958e245a	Merge pull request #2669 from Jaizu/giga_impact_contests ... Fix Giga Impact on contests.	2023-02-13 09:22:24 +01:00
Eduardo Quezada	a937b3221a	Documented Ribbons	2023-02-11 23:16:24 -03:00
Eduardo Quezada	96865f66af	Updated term to modernFatefulEncounter	2023-02-11 22:36:42 -03:00
Eduardo Quezada	6da5e0a280	Rename eventLegal to fatefulEncounter	2023-02-11 17:13:53 -03:00
Ariel A	b733cd14a5	Merge branch 'followers' into followers-expanded-id	2023-02-10 19:40:44 -05:00
sbird	4bcbb7c9e1	[intro] refactor expansion intro	2023-02-09 23:12:29 +01:00
Jaizu	9f7267e48d	Fix Giga Impact on contests.	2023-02-09 11:29:29 +01:00
GriffinR	c32fbf594a	Merge pull request #1851 from GriffinRichards/doc-fldspc ... Document remaining field_specials task data	2023-02-08 22:34:57 -05:00
DizzyEggg	0048e59e05	Fix SpeciesInfo struct offsets	2023-02-08 22:08:12 +01:00
GriffinR	de56e400ff	Sync clone object macro	2023-02-08 13:11:10 -05:00
Eduardo Quezada D'Ottone	8381b14c51	Implemented Xhyzi's RHH copyright intro (with config) (#2415) ... * Rhh & Pret Copyright Screen * Porygon recovered his voice * Expansion text --------- Co-authored-by: Xhyzi <xhyzdot@gmail.com> Co-authored-by: Jaizu <jaizu85@gmail.com>	2023-02-08 15:54:12 +01:00
DizzyEggg	896b575c07	Fix volt switch breaking ace pokemon	2023-02-08 12:42:38 +01:00
DizzyEggg	ff088752e7	Insomnia ability pop-up (#2643) ... * Insomnia ability pop-up * remove B_MSG_STAYED_AWAKE_USING constant	2023-02-07 18:47:23 +01:00
ghoulslash	7e9d40d401	Merge pull request #2645 from DizzyEggg/damp_aftermath ... Damp shows ability pop-up when reacting with Aftermath	2023-02-07 10:18:23 -05:00
DizzyEggg	dcb63e1518	Merge pull request #2610 from ghoulslash/be/animsilktrap ... Silk trap Animation	2023-02-07 16:13:53 +01:00
DizzyEggg	f762ed728d	remove pointless timers from disable struct	2023-02-07 15:10:20 +01:00
DizzyEggg	47ebf2e167	hmm	2023-02-07 13:33:43 +01:00
DizzyEggg	0dc5e1e685	aftermath damp pop-ups and string	2023-02-07 13:01:56 +01:00
Eduardo Quezada	101ea6522d	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_util.c	2023-02-02 17:56:13 -03:00
GriffinR	5793a1a5e7	Correct some union room chat documentation	2023-02-02 11:41:02 -05:00
LOuroboros	4b5a6e2328	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-02-01 20:18:56 -03:00
Philipp AUER	8983739267	Merge pull request #2564 from mrgriffin/rhh-battle-tests ... Battle Tests	2023-02-01 22:18:17 +01:00
GriffinR	3b15fd34cc	Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames	2023-02-01 16:09:01 -05:00
GriffinR	4328ed8b19	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows	2023-02-01 14:59:45 -05:00
GriffinR	9003966fcc	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
Martin Griffin	f1b9872bf0	Test moves, items, and abilities in battle ... Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic Spikes tests! Co-authored-by: sbird <sbird@no.tld>	2023-02-01 13:53:57 +00:00
Jaizu	4eb7b7048e	Make transform not break	2023-01-31 12:41:07 +01:00
Jaizu	424f457ec2	Remove unused INHERITED_IV_COUNT define	2023-01-31 09:44:47 +01:00
Ariel A	66c57e3442	Merge branch 'master' into followers	2023-01-29 18:44:06 -05:00
ghoulslash	3f616215ea	add silk trap anim	2023-01-28 09:03:18 -05:00
Martin Griffin	bdb04da9a5	Refactor battle animations	2023-01-28 00:16:25 +00:00
Martin Griffin	cba4b78df6	Move-based mega evolution message for NPCs/recorded battles	2023-01-28 00:16:24 +00:00
Eduardo Quezada D'Ottone	53e41a2b3d	Merge pull request #2605 from mrgriffin/rhh-battle-tests-fixes ... Rhh battle tests fixes	2023-01-27 19:24:13 -03:00
ghoulslash	2b58593e33	Merge pull request #2595 from AsparagusEduardo/RHH/pr/data/Gen9Items ... Added some Gen9 item data and fixed Punching Glove's effect	2023-01-27 16:13:50 -05:00
Martin Griffin	a13ffdbfba	U-turn does not switch the user out if Emergency Exit activates	2023-01-27 00:57:22 +00:00
Ariel A	5047f1280e	Improved saving & loading object events.	2023-01-26 17:55:32 -05:00
Eduardo Quezada	7774c9727d	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 ... # Conflicts: # tools/mapjson/mapjson.cpp	2023-01-25 20:28:55 -03:00
Eduardo Quezada	3288309c43	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-01-25 19:57:19 -03:00
Eduardo Quezada	a044774896	Added Gen9 item data and fixed Punching Glove's effect	2023-01-24 16:47:54 -03:00
GriffinR	7681340966	Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade	2023-01-23 14:45:51 -05:00
ghoulslash	321634ed3b	Silk Trap Effect (#2512) ... * add silk trap effect, analog of obstruct Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-01-23 16:42:47 -03:00
Eduardo Quezada D'Ottone	1bfc922c72	Merge pull request #2471 from ghoulslash/be/gen9items ... Start Gen9 Hold Effects	2023-01-23 14:58:08 -03:00
Eduardo Quezada D'Ottone	2b22bdf1e7	Merge pull request #2579 from LOuroboros/allahu ... Fixed Explosion & Intimidate's 'interaction'	2023-01-23 11:37:06 -03:00
ghoulslash	f97ec1975a	merge w upcoming	2023-01-23 09:24:03 -05:00
GriffinR	29c1af50ca	Fix Best Streak stat name	2023-01-20 11:25:04 -05:00
Eduardo Quezada	749225ace1	Matching merge from upstream pret ... # Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c	2023-01-20 12:31:54 -03:00
sbird	766964387e	Merge branch 'master' into feature/dynmulti	2023-01-18 23:39:31 +01:00
GriffinR	0851e55ccb	Merge pull request #1657 from PikalaxALT/sync_battle_anim_args ... Sync battle anim args	2023-01-18 12:16:49 -05:00
GriffinR	b7d92e8537	Revert incorrect constant usage, add new correct ones	2023-01-18 12:11:09 -05:00
GriffinR	d1e4bd44ce	Correct comment in maps.h	2023-01-18 11:54:06 -05:00
GriffinR	5a906c33ac	Merge branch 'master' into sync_battle_anim_args	2023-01-18 11:47:33 -05:00
GriffinR	0cc10a1ada	Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize	2023-01-18 11:07:12 -05:00
GriffinR	d68e81c2be	Clarify MB_SEMI_DEEP_WATER name	2023-01-17 21:32:55 -05:00
LOuroboros	773e7f0de2	Fixed Explosion & Intimidate's 'interaction'	2023-01-17 22:16:42 -03:00
sbird	a7cd4ca592	[script-command, dynmultichoice] implement event handler	2023-01-17 21:49:06 +01:00
sbird	276ce62d95	[script-command, dynmultichoice] add shouldSort, initialSelected arguments. read pushed arguments front to back	2023-01-17 21:49:06 +01:00
sbird	569fa0a60a	[script-command] add dynmultichoice ... * supports variable length arguments * automatically scrolls * supports building list menus from a stack	2023-01-17 21:49:06 +01:00
GriffinR	d5a4bfcd6f	Merge pull request #1843 from GriffinRichards/colorize ... Colorize more grayscaled/incorrectly colored pngs	2023-01-15 12:48:42 -05:00
GriffinR	18384894e0	Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups ... Made Types and Egg Groups into arrays	2023-01-15 00:27:20 -05:00
Eduardo Quezada	70d59d6aa9	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
GriffinR	387ea563fc	Move FRLG trainer card gfx to own folder, fix tiles	2023-01-13 13:40:13 -05:00
Eduardo Quezada	ac4825ad28	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_util.c	2023-01-13 11:50:47 -03:00
ghoulslash	c72274ee98	Merge pull request #2566 from AsparagusEduardo/RHH/pr/feature/breedBalls ... Config for ball inheritence when breeding	2023-01-13 09:35:15 -05:00
Ariel A	7b40e481ce	Improved saving & loading expanded OWs.	2023-01-12 21:45:41 -05:00
Ariel A	3a0dc0f4f6	Reworked how OW pokemon's graphics are loaded.	2023-01-12 21:45:36 -05:00
Ariel A	5d5d97b46a	Fixed most functions that take/return graphicsIds to accept u16s.	2023-01-12 21:44:56 -05:00
GriffinR	12cbb0b30f	Colorize and combine birch_bag/birch_grass	2023-01-12 15:22:23 -05:00
Bassoonian	333917941b	Add PLA+ obedience mechanics (with config)	2023-01-11 08:15:57 +01:00
GriffinR	b873d69679	Sync trade anim	2023-01-09 15:32:04 -05:00
LOuroboros	bdcc84f019	Updated the implementation	2023-01-09 15:18:22 -03:00
LOuroboros	dccceb9689	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2023-01-09 14:59:41 -03:00
ghoulslash	cc7c546011	Merge pull request #2473 from LOuroboros/mimicry ... Reimplemented Mimicry	2023-01-09 12:54:44 -05:00
LOuroboros	620a6a5e90	Extra review changes ... -Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN -Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities. -Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN. -Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop. -Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.	2023-01-09 14:22:14 -03:00
Eduardo Quezada	f8c9e7af40	Fixed config comment	2023-01-09 11:06:27 -03:00
Eduardo Quezada	1b0ce96e12	Config for ball inheritence when breeding	2023-01-09 02:16:29 -03:00
LOuroboros	c32f584940	Applied review changes	2023-01-08 19:50:27 -03:00
Eduardo Quezada	911541ba4f	Merge branch 'RHH/upcoming' into RHH/pr/feature/IncenseBaby ... # Conflicts: # include/config/pokemon.h	2023-01-08 18:48:01 -03:00
ghoulslash	da27df9f18	Merge pull request #2326 from AsparagusEduardo/RHH/pr/reworkScald ... Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2023-01-08 16:25:29 -05:00
Ariel A	72e723df65	Expanded graphicsId field.	2023-01-07 19:54:12 -05:00
GriffinR	c91b13a12b	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows	2023-01-07 13:30:11 -05:00
Eduardo Quezada D'Ottone	7622d84a4f	Revert "Removed Unown hack"	2023-01-07 11:39:56 -03:00
Eduardo Quezada	d72a3731d4	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_move_effects.h	2023-01-06 15:25:49 -03:00
LOuroboros	72566e6323	Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs	2023-01-05 03:02:56 -03:00
Eduardo Quezada D'Ottone	34d27eca0e	Merge pull request #2457 from AsparagusEduardo/RHH/pr/cleanup/unown ... Removed Unown hack	2023-01-04 18:57:28 -03:00
Eduardo Quezada	74d8c587fe	Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown ... # Conflicts: # src/data/pokemon/species_info.h # src/data/pokemon_graphics/front_pic_anims.h	2023-01-04 17:58:54 -03:00
Eduardo Quezada	55be15f690	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/config/pokemon.h	2023-01-04 16:19:57 -03:00
ghoulslash	1d2cb49bc6	Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg ... Config to restore Gen 3's damage reduction to multi target moves	2023-01-04 09:18:39 -05:00
Eduardo Quezada	ca46c22533	Removed SpeciesInfo array defines	2023-01-04 08:14:34 -03:00
GriffinR	36c89d345c	Merge branch 'master' into doc-wnews	2023-01-03 22:28:21 -05:00
Ariel A	a59564fc1e	Improved follower pokemon animation code.	2023-01-03 18:18:13 -05:00
Eduardo Quezada	e0802f13a2	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103 ... # Conflicts: # include/link_rfu.h	2023-01-03 15:40:33 -03:00
LOuroboros	f1ca254c28	Updated the Mimicry reimplementation ... Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN. Misc. changes: -Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN. -Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains. -Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs. -Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about. -Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes. -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it. -Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.	2023-01-03 02:27:41 -03:00
LOuroboros	d0f5653f5e	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2023-01-02 19:00:41 -03:00
Eduardo Quezada	a23501a4a3	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-01-02 18:54:57 -03:00
LOuroboros	0a00942a26	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-01-02 16:00:13 -03:00
ghoulslash	2944ebfe7b	Merge pull request #2543 from AsparagusEduardo/RHH/pr/fix/shinyChances ... Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+	2023-01-02 13:55:36 -05:00
LOuroboros	cdfec0fc05	Updated B_DOUBLE_WILD_CHANCE	2023-01-02 15:42:30 -03:00
LOuroboros	13d8c0d167	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2023-01-02 14:34:24 -03:00
LOuroboros	ca32d43433	Streamlined ability-on-weather changes ... Also renamed activateweatherabilities and activateterrainabilities.	2023-01-02 14:32:56 -03:00
Eduardo Quezada	16e8a5dd7f	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/battle_util.h	2023-01-01 16:02:40 -03:00
LOuroboros	f2e63a2e41	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-12-31 03:33:42 -03:00
Eduardo Quezada D'Ottone	0e1836d42b	Merge pull request #2106 from Sneed69/PartyBattlerShouldAvoidHazards ... PartyBattlerShouldAvoidHazards rewrite	2022-12-30 17:55:53 -03:00
Eduardo Quezada D'Ottone	4dc72dcfc1	Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 ... Implementing Teatime effect	2022-12-30 17:49:54 -03:00
LOuroboros	e8dfb66c30	Adding ability effect triggers for terrains and weather ... A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change. Misc. changes: -EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all. -The main reason for the rename was the inconsistency with the battle script's label. -Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.	2022-12-30 03:25:16 -03:00
LOuroboros	0ef148dfbb	Applied more corrections ... -Removed BattleScript_WindRiderActivatesEnd2 -Tweaked the condition of Wind Power in AbilityBattleEffects -Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier	2022-12-28 08:50:15 -03:00
LOuroboros	0159065dea	Removed Shell Trap ... It's time to let it go for my own mental sanity. Besides, it's a Gen. 7 move. I shouldn't have added it here.	2022-12-28 07:51:11 -03:00
GriffinR	d02d518917	Merge pull request #1829 from AsparagusEduardo/pret/doc/SaveBlockPadding ... Documenting padding in structs used by Saveblocks	2022-12-27 20:50:37 -05:00
Eduardo Quezada	1fc86e52b5	Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+	2022-12-27 21:18:20 -03:00
Eduardo Quezada	95f39c8c81	Config to restore Gen 3's damage reduction to multi target moves	2022-12-27 15:24:43 -03:00
SphericalIce	200b71be02	Fix Beat Up's battle script to avoid an out-of-bounds array access	2022-12-27 10:49:57 +00:00
Eduardo Quezada D'Ottone	b5b7631be7	Added guards to form_change_types.h	2022-12-26 09:14:28 -03:00
Eduardo Quezada	28cffda9d4	Hatch level config	2022-12-22 10:38:54 -03:00
Eduardo Quezada	d103025527	Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/config/pokemon.h	2022-12-22 10:30:01 -03:00
LOuroboros	4bb86c5d96	Implemented Barb Barrage's effect	2022-12-21 19:48:50 -03:00
LOuroboros	1229fa752a	Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's	2022-12-21 19:48:49 -03:00
LOuroboros	2cb9400ef0	Implemented Dire Claw's effect	2022-12-21 19:48:48 -03:00
LOuroboros	3ce4869766	Implemented Shell Trap's effect	2022-12-21 19:48:10 -03:00
LOuroboros	ae482ed1f4	Implemented Ceaseless Edge's effect	2022-12-21 19:47:00 -03:00
Eduardo Quezada	4ed20dca8c	Forgot to restore config to GEN_LATEST	2022-12-21 17:28:24 -03:00
Eduardo Quezada	c0d4e14a61	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/config/battle.h # include/constants/battle_move_effects.h	2022-12-21 12:46:09 -03:00
Eduardo Quezada	8840d0bbf6	Refactored incense baby checks into table and added Gen 9 config.	2022-12-21 12:31:59 -03:00
Martin Griffin	632ec92475	Minor Roost changes ... - Fix 'mon with Flying in type3 but not type1 or type2 is set to uninitialized roostTypes. - Remove unread third roostTypes element. - Option for Gen IV pure-Flying behavior.	2022-12-21 14:52:01 +00:00
LOuroboros	d943f891c5	Applied Wind Power and Wind Rider correction ... -Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop -Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.	2022-12-21 10:08:16 -03:00
SonikkuA-DatH	2c28076696	Update include/constants/battle_script_commands.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 18:08:38 -08:00
LOuroboros	6153b8e904	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-20 07:11:36 -03:00
LOuroboros	c8abf00cac	Applied corrections ... Anger Shell: -Made it print a string from the gStatDownStringIds table while lowering Def and Sp. Def -Made it use the shiny new modifybattlerstatstage macro. -Made it activate multiple times per battle, as it should. Well-Baked Body: -Turned it into an absorbing ability. Wind Rider: -Turned it into an absorbing ability. -For its Tailwind interaction, I made it activate only when Tailwind kicks in successfully, instead of whenever it's active at the end of a turn. Guard Dog: -Updated its check inside BattleScript_EffectHitEscape. -Moved it from Cmd_forcerandomswitch to BattleScript_EffectRoar. Wind Power: -Split off its move end effect from Electromorphosis'. Electromorphosis: -Split off its move end effect from Wind Power's. Hadron Engine: -Merged its Switch In effect with Electric Surge's. Protosynthesis: -Fixed its stat boost. Quark Drive: -Fixed its stat boost. Cud Chew: -Updated its ENDTURN effect's berry check. Supreme Overlord: -Tweaked the looping i variable's data type, the order of the variables and the checks inside ApplySupremeOverlordModifier. Earth Eater: -Turned it into an absorbing ability. Misc changes: -Added a variable to set the amount of stat stages raised inside AbilityMoveEffects' case ABILITYEFFECT_ABSORBING. -Added a preproc config to update the text string that they print. -Limited the scope of atkHighestStat and defHighestStat in CalcMoveBasePowerAfterModifiers to Protosynthesis's and Quark Drive's effects.	2022-12-20 07:08:29 -03:00
SonikkuA-DatH	f6fab92ac8	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-19 15:52:20 -08:00
Eduardo Quezada	1580f892a5	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/constants/pokemon.h # src/battle_script_commands.c	2022-12-19 18:53:26 -03:00
ghoulslash	79fa2c79e2	Merge pull request #2517 from LOuroboros/speed_swap ... Fixed Speed Swap's effect	2022-12-19 08:56:36 -05:00
SonikkuA-DatH	ffda816507	Update battle_script_commands.h ... Whoops, forgot the to copy paste various	2022-12-18 22:41:15 -08:00
SonikkuA-DatH	f0aee1f8d3	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-18 17:50:39 -08:00
Eduardo Quezada	66d1c9bc65	Documenting padding in structs used by Saveblocks	2022-12-17 22:55:43 -03:00
Eduardo Quezada	6a57dcdc4c	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216 ... # Conflicts: # src/data.c # src/data/pokemon_graphics/front_pic_anims.h	2022-12-16 19:19:23 -03:00
GriffinR	2aa6a9c164	Remove two unreferenced metatile labels	2022-12-16 11:05:56 -05:00
LOuroboros	852f06deea	Updated SIDE constant usages	2022-12-15 17:44:56 -03:00
GriffinR	347a02ace1	Sync trade	2022-12-15 15:40:59 -05:00
LOuroboros	4c9446ed0a	Fixed Speed Swap's effect	2022-12-14 12:00:45 -03:00
LOuroboros	6ef30da492	Update battle.h	2022-12-13 02:44:49 -03:00
LOuroboros	a56cfd1aa7	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-12 19:55:48 -03:00
Eduardo Quezada	1290a9411d	Reorganized SpecialStatus struct to minimize padding.	2022-12-12 00:37:00 -03:00
ghoulslash	340278c83b	Merge pull request #2452 from LOuroboros/intimidate ... Optimized Intimidate's code	2022-12-11 22:04:16 -05:00
ghoulslash	e3e0d60222	Merge pull request #2467 from Bassoonian/gen9moves ... Generation IX Moves	2022-12-11 14:47:47 -05:00
LOuroboros	0d1f9d9613	Reimplemented Mimicry	2022-12-09 20:46:18 -03:00
sbird	0d5adac1e1	[debug, printf] add DebugPrintfLevel macro	2022-12-07 00:03:25 +01:00
sbird	fab26b99f1	[fix] DebugPrintf with no format arguments	2022-12-06 15:59:59 +01:00
ghoulslash	6d28882e44	start gen9 hold effects	2022-12-06 09:48:36 -05:00
LOuroboros	107ace784b	Implemented Mycelium Might's effect	2022-12-06 06:18:18 -03:00
LOuroboros	d6b9f07681	Implemented Earth Eater's effect	2022-12-06 05:30:21 -03:00
LOuroboros	a961980e0f	Implemented Toxic Debris' effect	2022-12-06 05:23:30 -03:00
LOuroboros	aa051dab02	Implemented Costar's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7a52404fd3	Implemented Supreme Overlord's effect	2022-12-06 05:23:30 -03:00
LOuroboros	3c30e6bdc3	Implemented Sharpness' effect	2022-12-06 05:23:30 -03:00
LOuroboros	f96137eb5e	Implemented Cud Chew's effect	2022-12-06 05:23:30 -03:00
LOuroboros	24465858a7	Implemented the 4 Ruin Abilities	2022-12-06 05:23:29 -03:00
LOuroboros	de05c4dd56	Implemented Good as Gold's effect	2022-12-06 05:23:29 -03:00
LOuroboros	e25f843db3	Implemented Quark Drive's effect ... Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.	2022-12-06 05:23:29 -03:00
LOuroboros	a328088122	Implemented Protosynthesis' effect ... Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.	2022-12-06 05:23:29 -03:00
LOuroboros	34cafa746c	Implemented Electromorphosis' effect ... Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied. Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.) As a result, the game will trigger the ability multiple times if they're hit by a multihit move. This directive makes the code end the ability effect preemptively if the target does have the status flag applied.	2022-12-06 05:23:29 -03:00
LOuroboros	88cae380d0	Implemented Wind Power's effect	2022-12-06 05:23:29 -03:00
LOuroboros	4dc44150c5	Implemented Wind Rider's effect	2022-12-06 05:23:29 -03:00
LOuroboros	ca656b63b9	Added Well Baked Body's effect and misc. changes ... -Added a modifybattlerstatstage macro to handle stat stages in battle. -Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.	2022-12-06 05:21:24 -03:00
Bassoonian	58a54c90d2	Restore GEN_LATEST to GEN_8	2022-12-04 18:16:37 +01:00
GriffinR	f55443656f	Add NUM_TILES_PER_METATILE	2022-12-03 17:29:02 -05:00
LOuroboros	acb9c31bd4	Implemented Anger Shell's effect	2022-12-03 01:19:24 -03:00
LOuroboros	b0027cb78b	Implemented Seed Sower's effect	2022-12-02 23:31:41 -03:00
LOuroboros	653364fd71	Added the basic data for the Gen. 9 Abilities	2022-12-02 23:01:22 -03:00
Eduardo Quezada	9d1149c423	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 ... # Conflicts: # src/pokemon.c	2022-11-29 17:40:09 -03:00
ghoulslash	34ba9b4e0d	convert a few various to callnatives	2022-11-28 14:36:19 -05:00
Eduardo Quezada	4bac880042	Removed Unown hack	2022-11-25 16:55:53 -03:00
Eduardo Quezada	e858b4e709	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 ... # Conflicts: # include/battle.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_dome.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/battle_tower.c # src/data/pokemon/species_info.h # src/pokemon.c	2022-11-24 15:36:00 -03:00
Eduardo Quezada	7327be6f9e	Made Types and Egg Groups into arrays	2022-11-22 17:05:25 -03:00
GriffinR	483c3d5c13	Document wonder news	2022-11-22 02:17:03 -05:00
Ariel A	e6d1cfae24	Merge branch 'master' into followers	2022-11-21 21:21:50 -05:00
GriffinR	4736b4b14d	Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename ... Renamed gBaseStats to gSpeciesInfo	2022-11-18 17:45:23 -05:00
GriffinR	5fa364256d	Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides ... Introduce NUM_BATTLE_SIDES	2022-11-18 17:39:00 -05:00
Bassoonian	739680e425	Victory Dance effect	2022-11-18 22:23:34 +01:00
Bassoonian	29ae22183b	Mystical Power effect	2022-11-18 22:17:08 +01:00
Bassoonian	9512b3a57a	Implement Double Shock functionality with temporary string	2022-11-18 22:12:26 +01:00
Bassoonian	3ac3cb249e	Wicked Torque effect	2022-11-18 22:00:21 +01:00
Bassoonian	f7d1a12d2d	Data entry for gen9 moves	2022-11-18 12:15:44 +01:00
Eduardo Quezada	791c547b2c	Renamed missing overworld debug configs	2022-11-14 14:07:32 -03:00
Eduardo Quezada	540f4679bb	Implemented uses of Shiny config	2022-11-14 11:56:02 -03:00
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
LOuroboros	11c99cac61	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-13 23:17:59 -03:00
LOuroboros	31a602f3b6	Optimized Intimidate's code	2022-11-12 18:03:46 -03:00
Eduardo Quezada	f2d0e547ac	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/rom_header_gf.c	2022-11-09 19:54:44 -03:00
GriffinR	1d1c2d41bb	Add list menu cursor constants	2022-11-09 15:16:46 -05:00
Eduardo Quezada	2ef2134be1	Moved Hunger Switch to form change table.	2022-11-06 17:12:34 -03:00
Eduardo Quezada	62912f8caf	Battle indicator now depends on species instead of held item ... - This is to avoid a situation where a user would plop a Primal Groudon and its indicator would become Alpha if it doesn't have a Red Orb.	2022-11-06 16:01:07 -03:00
Eduardo Quezada	57bdb683ec	DoBurmyFormChange handled by FORM_CHANGE_END_BATTLE_TERRAIN	2022-11-05 23:27:40 -03:00
Eduardo Quezada	99536089cf	Renamed form change defines to be consistant with which function calls which	2022-11-05 22:02:25 -03:00
Eduardo Quezada	8f289714b2	Moved form change defines and descriptions to their own header	2022-11-05 21:36:45 -03:00
Eduardo Quezada	ceb5c8a00a	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/battle_util.h # src/battle_util.c	2022-11-05 20:11:33 -03:00
Eduardo Quezada	42f8e8c114	Multiple refactors ... - Added a general GetBattleFormChangeTargetSpecies instead of getting specific ones for Mega Evolution and Primal Reversion. - Added FORM_CHANGE_BATTLE_HP_PERCENT, to replace ShouldChangeFormHpBased. - Cleaned ifdefs for hold effects. - Finally removed UndoMegaEvolution. - FORM_CHANGE_FAINT and FORM_CHANGE_BATTLE_END restore to the first form before a battle form change if species isn't specified. - When changing from a form with more HP to one with less, now current HP is kept to fix Zygarde edge case. (Will likely need to be reworked for Dynamax, as it behaves differently) - Uses DoesSpeciesUseHoldItemToChangeForm in CanBattlerGetOrLoseItem.	2022-11-05 20:00:12 -03:00
BuffelSaft	1da4eb3b14	Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid ... Config for Dark Void being only usable by Darkrai	2022-11-05 22:42:51 +13:00
Eduardo Quezada	44bf4a15e3	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h # include/constants/battle_move_effects.h	2022-11-04 12:19:40 -03:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
ghoulslash	1e6903840a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite	2022-11-04 09:29:45 -04:00
ghoulslash	d13431b4ab	merge w rhh master	2022-11-04 09:29:39 -04:00
Eduardo Quezada	edf4e45c4d	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -03:00
BuffelSaft	c169a9523e	Merge branch 'upcoming' into fix-stat-boost-on-hit	2022-11-03 22:01:30 +13:00
BuffelSaft	736ca893b6	Fix abilities that raise target's stat after hit ... Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.	2022-11-03 21:54:56 +13:00
Eduardo Quezada	15c12af2cf	Using TryBattleFormChange in place of certain TryFormChange	2022-11-01 23:50:26 -03:00
LOuroboros	86e322dcea	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-01 22:41:31 -03:00
Eduardo Quezada D'Ottone	b8371500d3	Merge pull request #1676 from BuffelSaft/multistrike ... Multi-hit refactor and Parental Bond	2022-11-01 21:16:04 -03:00
ghoulslash	53061c7d62	Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney ... Implemented Honey's Sweet Scent functionality	2022-11-01 20:09:30 -04:00
ghoulslash	c6cb54b54e	Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures ... Implemented Lures and Repel/Lure "use another" menu	2022-11-01 20:05:15 -04:00
Eduardo Quezada	797c5514d3	Mega Evolution in form change tables	2022-11-01 18:37:23 -03:00
Eduardo Quezada	a57f6d184b	Fainting by poison in the overworld reverts forms	2022-11-01 12:24:04 -03:00
LOuroboros	5ebc996c51	Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config	2022-10-30 22:03:14 -03:00
Eduardo Quezada	e4a439aa46	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h	2022-10-30 12:30:38 -03:00
Eduardo Quezada	3172273c73	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures ... # Conflicts: # src/pokemon.c	2022-10-30 12:16:09 -03:00
GriffinR	c76beed989	Merge pull request #1807 from pret/porymap-5 ... Update for Porymap 5.0.0	2022-10-30 11:01:37 -04:00
TheXaman	933ec5ee65	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss	2022-10-30 15:10:32 +01:00
AgustinGDLV	ae7cbc2aa1	merged physical and special max moves	2022-10-27 20:38:40 -07:00
AgustinGDLV	0663510583	merged regi battle type into BATTLE_TYPE_LEGENDARY	2022-10-27 19:52:52 -07:00
AgustinGDLV	caaec99e77	added data and graphics for gigantamax mons	2022-10-27 16:18:37 -07:00
AgustinGDLV	056048daf9	added data for max moves	2022-10-27 13:17:15 -07:00
AgustinGDLV	7981887f0a	merge kyogre, groudon, rayquaza battle types	2022-10-27 11:20:46 -07:00
Eduardo Quezada	85c0d2dac8	Review changes	2022-10-27 11:26:09 -03:00
BuffelSaft	224ca256ce	Requested clean up ... Rename constants, remove white space, improve B_BEAT_UP description. * Rename B_BEAT_UP_DMG to B_BEAT_UP * Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG * Remove trailing whitespace * Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE	2022-10-27 22:25:33 +13:00
BuffelSaft	3327758cdb	Move B_BEAT_UP_DMG to other move settings ... This is more of a mechanical change like gen 8's change to Teleport, so it should go in the same block of settings.	2022-10-26 23:29:09 +13:00
Eduardo Quezada	3ed485632f	Renamed gBaseStats to gSpeciesInfo	2022-10-24 17:01:48 -03:00
BuffelSaft	d9cc98a4fe	Suggested changes ... - Various style fixes - Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle	2022-10-24 22:19:35 +13:00
BuffelSaft	a5ede1ee90	Move B_PARENTAL_BOND_DAMAGE to damage settings ... Title.	2022-10-23 21:41:42 +13:00
BuffelSaft	9b076a9dcf	Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES ... - Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally. - Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().	2022-10-23 21:40:04 +13:00
BuffelSaft	1b056f9044	Fix various Parental Bond issues ... - Dragon Tail and Circle Throw strike twice and then switch the target - Z moves are unaffected by Parental Bond - Renamed parentalBondOn to parentalBondState - Added constants for possible values of parentalBondState - Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP	2022-10-23 17:37:23 +13:00
BuffelSaft	3775c5d00c	Fix move effects ... Restore unintentionally removed MOVEEND_DEFROST, fix move effect definitions.	2022-10-22 18:54:25 +13:00
BuffelSaft	6035c5a280	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-10-22 14:31:13 +13:00
Eduardo Quezada	0a79390ec0	Primal Reversion in Form Change tables	2022-10-21 02:08:37 -03:00
Eduardo Quezada	861590f747	Form change when fainting. Goodbye UndoFormChange!	2022-10-20 18:53:12 -03:00
Eduardo Quezada	d8cc7f7abe	Form change when switching out	2022-10-20 17:56:56 -03:00
Eduardo Quezada	b74f0777da	Renamed form change constants	2022-10-20 17:22:58 -03:00
Eduardo Quezada	620e69945d	Form change for starting and ending battles. Adjusted PP for Iron Head/Behemoth moves	2022-10-20 16:40:24 -03:00
GriffinR	e752c8a2f9	Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately ... Document seldom-used trigger functionality	2022-10-20 11:45:35 -04:00
Eduardo Quezada D'Ottone	18e7fc5efc	Introduce NUM_BATTLE_SIDES	2022-10-20 08:41:18 -03:00
GriffinR	3e8baa5b04	Merge branch 'master' into porymap-5	2022-10-18 22:54:25 -04:00
GriffinR	a418f8d976	Merge pull request #1755 from GriffinRichards/map-dynamic ... Rename special map constants, treat warp ids as strings	2022-10-18 22:45:56 -04:00
tustin2121	4730870646	VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY ... Getting rid of the VAR_ prefix, to avoid the porymap problem.	2022-10-18 21:12:31 -04:00
GriffinR	e33581ff9c	Merge pull request #1671 from sphericalice/heal-location-none ... Add the HEAL_LOCATION_NONE constant	2022-10-18 18:41:04 -04:00
Abaresk	7f09894045	Merge branch 'master' into thunder	2022-10-18 04:37:56 +00:00
Marcus Huderle	48ab684b48	Fix weather color map documentation	2022-10-17 17:41:27 -07:00
tustin2121	327c648e87	Document seldom-used trigger functionality ... Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.	2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone	1607291982	Implemented Honey's Sweet Scent functionality	2022-10-16 20:20:13 -03:00
Abaresk	e67d55bfc4	Fix names	2022-10-15 13:37:24 +00:00
Abaresk	b538239f18	Add more documentation to thunder weather	2022-10-15 04:25:35 +00:00
Eduardo Quezada D'Ottone	4cbc6d4de1	Config for running indoors	2022-10-14 22:31:45 -03:00
LOuroboros	90f79999bb	Added class-based Poké Balls for trainers ... Thanks to Ghoulslash for helping me optimizing things.	2022-10-14 11:14:30 -03:00
GriffinR	60e1ad20e4	Add NUM_MON_PIC_FRAMES, and trainer pic size constants	2022-10-10 23:16:08 -04:00
GriffinR	bd023b1c6c	Merge pull request #1796 from GriffinRichards/tilesets-c ... Convert tilesets.s to C	2022-10-10 12:47:47 -04:00
GriffinR	65d3944a93	Give tileset palettes proper type, name compressed secret base tiles	2022-10-08 02:02:12 -04:00
Ariel A	1c011a9c1c	Merge branch 'master' into followers	2022-10-07 20:52:15 -04:00
Eduardo Quezada D'Ottone	2ce340e8e1	Merge pull request #2262 from LOuroboros/becomingAHero ... Fixed Mega Evolved Pokémon being able to get Friendship effects in battle	2022-10-07 18:27:29 -03:00
ghoulslash	06bddbac23	Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007 ... One for the go! (pret merge 2022/10/07)	2022-10-07 17:14:00 -04:00
Eduardo Quezada	8ea060044a	Battle text pauses config	2022-10-07 17:22:29 -03:00
Eduardo Quezada	453da8aa8c	Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID	2022-10-07 15:49:00 -03:00
Eduardo Quezada	77f24d42e4	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-10-07 15:39:02 -03:00
Eduardo Quezada	44754f8ca7	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/constants/pokemon_config.h # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c	2022-10-07 15:27:16 -03:00
Eduardo Quezada	2a8048b677	Removed ItemId_GetId like in upstream	2022-10-07 14:53:58 -03:00
Eduardo Quezada	68b474c0f0	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007 ... # Conflicts: # include/constants/items.h # src/battle_interface.c	2022-10-07 14:52:32 -03:00
Eduardo Quezada	9b977486fe	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/base_stats.h	2022-10-07 14:05:45 -03:00
LOuroboros	50ca188cb2	Replaced didMegaEvo with a shiny new species flag	2022-10-07 12:32:36 -03:00
LOuroboros	02c6bc64b2	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero	2022-10-07 12:20:52 -03:00
ghoulslash	441586f23f	Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags ... 4 new species flags	2022-10-07 10:55:43 -04:00
ghoulslash	923046c993	Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925 ... I don't have any Sunday memes (pret merge 2022-09-25)	2022-10-07 10:25:59 -04:00
GriffinR	e293986fbb	Merge pull request #1793 from GriffinRichards/clean-shop ... Clean up shop.c	2022-10-06 17:24:53 -04:00
GriffinR	c6e4c29ea3	Merge pull request #1792 from GriffinRichards/display-tiles ... Add DISPLAY_TILE_* constants	2022-10-05 20:44:28 -04:00
Eduardo Quezada	a20334f79a	Removed unused functions in item header	2022-10-04 22:06:07 -03:00
Eduardo Quezada D'Ottone	af171eb4d4	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 ... # Conflicts: # src/pokemon_summary_screen.c	2022-10-01 17:32:32 -03:00
Eduardo Quezada	0370cb3fd2	Removed comment MAP_GROUP_COUNT	2022-09-30 22:05:10 -03:00
GriffinR	fb87616e9d	Use window constants in mystery_gift_menu	2022-09-29 15:48:19 -04:00
GriffinR	4af1044439	Use window constants in region_map	2022-09-29 13:11:38 -04:00
GriffinR	16be1e8447	Use window constants for move relearner	2022-09-29 12:10:10 -04:00
GriffinR	6db489e2d5	Use constants for overworld object palette slots	2022-09-27 20:16:48 -04:00
GriffinR	4f407a1066	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
Eduardo Quezada	ecad6ff0db	Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2	2022-09-27 10:46:49 -03:00
Eduardo Quezada	fb9105f8ac	Added Mega Evolution flag	2022-09-27 10:21:26 -03:00
Eduardo Quezada	3d214f8204	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags ... # Conflicts: # src/pokemon.c	2022-09-27 10:13:32 -03:00
GriffinR	e515e52abb	Add DISPLAY_TILE_* constants	2022-09-26 19:52:17 -04:00
ghoulslash	8ecdf68491	Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix ... Fixes: Pokémon Debug isn't loading female icon palettes correctly	2022-09-26 09:09:14 -04:00
Eduardo Quezada	dfdfb72365	Separate config for updated move types	2022-09-26 07:50:43 -03:00
TheXaman	886a487bf1	Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes	2022-09-26 12:40:30 +02:00
Eduardo Quezada	5054cf3586	Documented unk40EF in Summary Screen	2022-09-25 21:33:20 -03:00
Eduardo Quezada	f969effd36	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone	17c8842ad4	Merge branch 'dev' into teleport	2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone	38df216ebd	Merge pull request #2355 from ghoulslash/be/aiparty ... Add overwrittenAbilities field	2022-09-24 14:33:02 -03:00
ghoulslash	c22671d2a2	add overwrittenAbilities field	2022-09-24 12:12:31 -04:00
Eduardo Quezada D'Ottone	a483899043	Merge branch 'dev' into symbiosis	2022-09-24 11:58:35 -03:00
Eduardo Quezada D'Ottone	d59d8b92af	Merge branch 'dev' into AI	2022-09-24 11:07:09 -03:00
GriffinR	9b6b164aad	Merge pull request #1768 from SBird1337/feature/mgba-print ... [debug] add support for mgba printf	2022-09-23 13:49:48 -04:00
sbird	343d7f7d26	[debug] do not use heap allocation for MgbaPrintf	2022-09-23 04:12:57 +02:00
sbird	12670e8e3e	[debug] simplify macros, add EX versions	2022-09-23 03:48:58 +02:00
sbird	22329d3318	[debug] use boolean constants for nStopProgram	2022-09-23 03:23:44 +02:00
sbird	44a5a8d31e	[debug] fix AGBAssert for AGBPrintf debug block	2022-09-23 03:22:57 +02:00
GriffinR	1107ff954d	Clean up shop.c	2022-09-22 15:08:17 -04:00
LOuroboros	5f67335212	Fixed typo in BoxMonKnowsMove	2022-09-19 05:21:54 -03:00
Eduardo Quezada D'Ottone	681ad8c7a9	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h # src/data/pokemon/form_species_table_pointers.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h	2022-09-18 18:25:05 -03:00
Eduardo Quezada D'Ottone	293a880238	Apply suggestions from code review	2022-09-18 00:50:21 -03:00
Ct11217	5f74781a7d	Remove ACE_POKEMON_FUNCTIONALITY	2022-09-17 17:44:50 -06:00
Eduardo Quezada	720cb249d6	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-09-16 12:06:06 -03:00
ghoulslash	8bbe1b9037	Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome ... Config to limit the moves called by Metronome (by generation)	2022-09-16 11:03:33 -04:00
Eduardo Quezada	6b79c7772c	Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_interface.c	2022-09-16 11:56:50 -03:00
Porygon23	36c1c4dc11	Update include/battle_ai_switch_items.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-09-16 08:21:13 -06:00
Eduardo Quezada	672f572ff8	Config to limit the moves called by Metronome (by generation)	2022-09-16 11:04:30 -03:00
Eduardo Quezada	77696ca686	Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2022-09-16 10:31:02 -03:00
Ct11217	cc4a9b9f4b	Recommit to Dev branch	2022-09-15 22:57:29 -06:00
Eduardo Quezada D'Ottone	7825153bb2	Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix ... Exp Candy Fixes	2022-09-15 22:46:59 -03:00
ghoulslash	6616c89451	Merge pull request #2303 from Blackforest92/RHH-PR-Branch ... Tidying graphics - Trio Weather	2022-09-15 18:01:43 -04:00
ghoulslash	354a8256e4	Merge pull request #2226 from Porygon23/AI-Logic-Updates ... Added corner case logic for AI Switching.	2022-09-15 17:56:35 -04:00
Eduardo Quezada	bca1267ca8	Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes	2022-09-15 14:52:18 -03:00
Eduardo Quezada	dc423ef7ff	Handling repel/lure menu	2022-09-14 00:18:01 -03:00
Eduardo Quezada	ee628de82f	Config to turn off Hippopotas' and Hippowdon's female icons	2022-09-13 21:42:53 -03:00
Eduardo Quezada	0caf79f702	Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 ... # Conflicts: # graphics/pokemon/cherrim/anim_front.png # graphics/pokemon/scyther/anim_front.png # graphics/pokemon/scyther/front.png # graphics/pokemon/shinx/anim_front.png # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/front_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c	2022-09-13 20:44:49 -03:00
Eduardo Quezada	de32940fdf	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
Eduardo Quezada	1d7e8bd730	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c	2022-09-13 16:22:42 -03:00
GriffinR	91c040b081	Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace ... Cleaned trailing whitespace	2022-09-13 14:00:11 -04:00
GriffinR	4c34babb4d	Merge pull request #1780 from LOuroboros/raquaza ... Fixed a typo and scripting vars alignment	2022-09-12 22:02:46 -04:00
LOuroboros	14c6d8b91a	Fixed alignment for the value of vars 0x4020 to 0x40FF	2022-09-12 21:33:03 -03:00
LOuroboros	cb83a09203	Fixed vars alignment	2022-09-12 21:27:53 -03:00
LOuroboros	222362e804	Fixed Raquaza typo	2022-09-12 21:26:22 -03:00
Eduardo Quezada	5eb9312250	Added missing labels in headers	2022-09-12 21:14:15 -03:00
GriffinR	d3d8b4a181	Merge pull request #1762 from GriffinRichards/sync-fieldmap ... Sync fieldmap	2022-09-12 14:32:27 -04:00
Eduardo Quezada	0944232059	Added shiny rerolls to Lures + reverted repel var name	2022-09-12 10:21:57 -03:00
Eduardo Quezada	e3005e5275	Item config for repel prompt	2022-09-12 10:21:52 -03:00
Eduardo Quezada	2d78ac0192	Implemented Lures using the same vars as repels	2022-09-12 10:21:49 -03:00
Deokishisu	e3c19f5df5	Implement B2W2 Repel System ... The game now asks if the player would like to use another Repel when the one they used runs out. # Conflicts: # include/constants/vars.h	2022-09-12 10:21:38 -03:00
Eduardo Quezada	66177e7958	Reworked shiny charm rerolls allow adding additional rerolls when necessary	2022-09-12 10:21:21 -03:00
Eduardo Quezada	65108c3192	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
Eduardo Quezada	61752a4977	Added parenthesis to GET_SHINY_VALUE	2022-09-11 13:35:58 -04:00
Eduardo Quezada	4b1aca19cb	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_controller_link_opponent.c # src/battle_controller_opponent.c # src/battle_controller_recorded_opponent.c # src/battle_controllers.c # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h # src/pokemon.c	2022-09-10 00:17:03 -04:00
LOuroboros	12fee71008	Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE	2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone	69d3fafdcf	Merge pull request #2273 from LOuroboros/zazaForms ... Introduced FORM_BATTLE form changes	2022-09-09 14:15:53 -04:00
Blackforest92	29529a0c47	Remove primal_particle leftovers	2022-09-09 22:28:11 +07:00
Blackforest92	d870d71dbe	Remove windstorm_brew leftovers	2022-09-09 22:26:29 +07:00
Blackforest92	431cb6fa7c	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
Eduardo Quezada	8449f237c2	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags ... # Conflicts: # src/pokemon.c	2022-09-09 09:02:35 -04:00
Eduardo Quezada	21df8c279b	Added SPECIES_FLAG_CANNOT_BE_TRADED ... - Also corrected Cylarex's forms not having the legendary flag	2022-09-09 08:59:53 -04:00
Eduardo Quezada	9144779634	Removed repeated extern consts in strings.h	2022-09-09 08:49:16 -04:00
Blackforest92	caf323a653	Erase ghost data in include/constants/map_groups.h	2022-09-09 00:40:30 +07:00
Blackforest92	3acb32acb8	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
Eduardo Quezada	7fe1e706b7	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig ... # Conflicts: # include/constants/pokemon_config.h	2022-09-08 08:52:13 -04:00
Eduardo Quezada D'Ottone	066a5bee85	Merge pull request #2277 from TheXaman/tx_debug_system_rhh ... Inclusion of the tx_debug_system	2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone	47a50b3dac	Merge branch 'master' into weather_forms_fixes	2022-09-07 23:07:25 -04:00
sbird	3a0759d458	[doc] fix misnamed dma <--> aslr	2022-09-07 14:37:03 +02:00
GriffinR	74b563f696	Merge pull request #1749 from GriffinRichards/ur-classes ... Fix names and constant usage for union room classes	2022-09-06 21:35:10 -04:00
LOuroboros	c8f4a44380	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-09-06 20:40:34 -03:00
LOuroboros	8705d1656b	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-09-06 20:38:28 -03:00
TheXaman	6062cf45fa	Merge branch 'master' into tx_debug_system_rhh	2022-09-07 00:03:58 +02:00
LOuroboros	f1c153e469	Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD ... There was never a reason not to.	2022-09-06 18:37:16 -03:00
TheXaman	b249399a53	changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()'	2022-09-06 23:00:26 +02:00
Eduardo Quezada	3a6318f1d9	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor ... # Conflicts: # include/constants/battle_config.h	2022-09-06 15:20:54 -04:00
ghoulslash	59de7e48e5	Merge pull request #2265 from AsparagusEduardo/RHH_substructFix ... Fixed PokemonSubstruct3 alignment	2022-09-06 15:14:45 -04:00
ghoulslash	971081b8fd	Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 ... Flat Merge Friday (Weekly merge)	2022-09-06 15:13:47 -04:00
LOuroboros	0b07f4a06e	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms	2022-09-06 10:53:12 -03:00
LOuroboros	bb290d5ab0	Updates ... -Removed the pointless param1 setting in sXerneasFormChangeTable -Updated the descriptions of Behemoth Blade and Behemoth Bash -Added a new parameter to the struct FormChange -Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves". -Added missing calls to "CalculateMonStats". -Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake -Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.) Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.	2022-09-06 10:45:07 -03:00
sbird	584bfe0221	[debug] add support for mgba printf ... * adds support for mgba printf debugging as well as adding support for switching between debugging configuration * adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler * adds a pretty printing format to `mini_printf` to print preproc encoded strings	2022-09-06 13:40:31 +02:00
Eduardo Quezada	e253a87bc5	Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once.	2022-09-05 14:49:14 -04:00
Eduardo Quezada	7c7da8e176	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs ... # Conflicts: # src/battle_script_commands.c	2022-09-05 14:43:04 -04:00
Eduardo Quezada	dbd56efaef	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ... # Conflicts: # src/battle_util.c	2022-09-05 12:20:57 -04:00
TheXaman	6cab795c5c	Update include/constants/overworld_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-09-05 11:02:44 +02:00
Eduardo Quezada	2ee843c70d	Proper label for species flags	2022-09-04 22:13:28 -03:00
Eduardo Quezada	a4c242f2f8	Implemented Shiny Lock functionality	2022-09-04 21:55:59 -03:00
Eduardo Quezada	74c3fdfba7	Flag to allow certain species to always have perfect IVs (like Partner Pikachu and Eevee)	2022-09-04 19:41:01 -03:00
Eduardo Quezada	89550ed05d	Updated Sport Ball's modifier.	2022-09-04 18:54:23 -03:00
Eduardo Quezada D'Ottone	4017fc3e20	Apply style suggestions from code review	2022-09-03 21:22:15 -04:00
Eduardo Quezada	41bf6bde25	Removed pointless macro	2022-09-03 00:28:53 -04:00
Eduardo Quezada	03498d7240	Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER	2022-09-02 23:57:43 -04:00
Eduardo Quezada	5403cd036e	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ... # Conflicts: # include/battle.h # include/battle_controllers.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controllers.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c	2022-09-02 23:24:08 -04:00
GriffinR	03a98c72bc	Sync fieldmap	2022-09-02 19:29:35 -04:00
Eduardo Quezada	c7fc2e13f7	Renamed TM flags to keep consistency with the rest of the repo	2022-09-02 16:54:58 -04:00
Porygon23	ba6aad5bcc	Merge branch 'master' into AI-Logic-Updates	2022-09-02 14:44:47 -06:00
TheXaman	b4b3e84cbd	removed default flags and added ingame warning if a function that requires them is used	2022-09-02 18:39:38 +02:00
TheXaman	367b12801e	changed debug_config.h to overworld_config.h, ... changed no bag use and no catching flags to battle_config.h, removed TX reference (big sad)	2022-09-02 12:33:42 +02:00
TheXaman	ad57551db1	removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation	2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone	59f1f10dec	Merge pull request #2260 from DizzyEggg/magic_bounce ... Fix Magic Bounce targets	2022-09-01 19:56:15 -04:00
GriffinR	a28fbbc1b8	Merge pull request #1748 from GriffinRichards/fix-judgement ... Standardize judgement vs judgment spelling	2022-09-01 11:51:04 -04:00
Eduardo Quezada	8d94c58cac	Shows exp when leveling up with Exp Candies	2022-08-31 21:54:27 -04:00
Eduardo Quezada	3264c3c87a	Shows amount of Exp gained.	2022-08-31 09:05:51 -04:00
LOuroboros	c167e2c6cc	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
DizzyEggg	7cb010d71e	fix magic bounce conflicts and fix magic coat	2022-08-30 19:36:06 +02:00
Eduardo Quezada	925384eedc	Generations of Pokémon can now be disabled individually	2022-08-30 12:50:59 -04:00
Eduardo Quezada	df4c065ea6	Separated P_NEW_POKEMON into sections by generation. ... Sizes: - GEN_3 15.690.076 bytes - GEN_4 17.480.816 bytes - GEN_5 19.544.944 bytes - GEN_6 20.907.332 bytes - GEN_7 22.233.288 bytes - GEN_8 23.605.744 bytes	2022-08-30 12:50:59 -04:00
TheXaman	3debf0442d	changed the locations of tx_debug_system related #defines to its own file 'constants/debug_config.h'	2022-08-30 18:02:23 +02:00
TheXaman	04c40677bd	Changed the way debug flags are handled, now in constants/battle_config.h	2022-08-30 17:41:35 +02:00
TheXaman	d9bd272452	removed the entries ld_script as per pret#1738, added newline to debug.h	2022-08-30 17:08:35 +02:00
LOuroboros	df88317a98	Introduced FORM_BATTLE form changes ... For species such as Xerneas and Zacian.	2022-08-29 19:10:52 -03:00
TheXaman	bed5639074	Changed preproc defines to TRUE/FALSE, small cleanup	2022-08-29 19:36:44 +02:00
TheXaman	8c9a59ec1c	Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh	2022-08-29 19:13:11 +02:00
ghoulslash	2cd01bd95d	Merge pull request #2239 from DizzyEggg/quash ... Quash	2022-08-29 10:43:54 -04:00
Blackforest92	61c33f56a0	Updated to latest master branch + add PLA's data to teachable_learnsets.h	2022-08-29 21:01:31 +07:00
Eduardo Quezada D'Ottone	8ca2f949e3	Merge pull request #2233 from gruxor/tmhm_rework ... Reworked TMHM into expandable list format	2022-08-29 04:20:45 -04:00
Ariel A	66acabe5c6	Refactored follower messages.	2022-08-29 00:43:38 -04:00
Eduardo Quezada	12b32606f5	Fixed PokemonSubstruct3 alignment	2022-08-27 03:05:06 -04:00
Eduardo Quezada	69f4c226f0	Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs ... # Conflicts: # src/battle_ai_main.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_script_commands.c # src/pokemon.c # src/pokemon_summary_screen.c	2022-08-27 02:42:22 -04:00
Eduardo Quezada	15d611ba65	Usage of BATTLE_PARTNER	2022-08-27 01:26:13 -04:00
Eduardo Quezada	0a34d47041	Merge remote-tracking branch 'pret/master' into pret_clean2	2022-08-27 00:56:00 -04:00
Eduardo Quezada	7c86bd5d08	Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 ... # Conflicts: # include/battle_interface.h # src/battle_anim_effects_1.c # src/battle_script_commands.c # src/field_specials.c	2022-08-26 22:23:37 -04:00
LOuroboros	922bbacd71	Updated GetMonFriendshipScore ... -Moved it to src/pokemon.c -Made a battle specific variant called GetBattlerFriendshipScore. -Made that variant return 0 for Mega Evolved 'mons and if called on link battles.	2022-08-26 21:33:43 -03:00
Eduardo Quezada D'Ottone	bee36edd9c	Merge pull request #2173 from LOuroboros/yourAffection ... Implement affection-now-friendship mechanics	2022-08-26 14:54:32 -04:00
GriffinR	0516f94837	Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore ... Added constants for GetLeadMonFriendshipScore	2022-08-26 14:52:10 -04:00
crater-git	f8fb4e8cf2	Renamed funcs, lists, etc. - Teach->Teachable	2022-08-26 14:48:06 -04:00
GriffinR	c5e873aa2b	Merge pull request #1742 from GriffinRichards/sound-pan ... Add missing usage of SOUND_PAN_*	2022-08-26 14:47:24 -04:00
crater-git	b8a3cc2846	Consolidated funcs, renamed CanMonLearnMove	2022-08-26 11:07:08 -04:00
crater-git	54ee960970	Fixed Battle Frontier tutor move IDs	2022-08-26 10:12:11 -04:00
ghoulslash	ae2ff4c1d8	Merge pull request #2258 from AsparagusEduardo/RHH_enableBugfix ... Enable BUGFIX by default	2022-08-26 09:56:19 -04:00
DizzyEggg	6331931ba3	Fix Magic Coat targets	2022-08-26 15:01:51 +02:00
Eduardo Quezada D'Ottone	399a0c9d6f	Merge pull request #2142 from AgustinGDLV/exp_candy ... Gen 8 EXP Candies	2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone	6b414d9555	Apply suggestions from code review ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-25 22:40:19 -04:00
Eduardo Quezada	4c999b40b1	Enable BUGFIX by default	2022-08-25 22:35:33 -04:00
GriffinR	ce4a6e9067	MAP_NONE -> MAP_DYNAMIC	2022-08-25 21:34:05 -04:00
crater-git	ed02c4b425	Removed tutor move distinction, combined llists	2022-08-25 19:56:47 -04:00
AgustinGDLV	e204527f43	changed candy item parameters	2022-08-25 15:52:47 -07:00
LOuroboros	8bd7103b9d	Even more review corrections	2022-08-25 17:32:12 -03:00
DizzyEggg	622a7f8141	merge with master	2022-08-25 22:10:59 +02:00
LOuroboros	2cf2c00b29	Updated friendship labels	2022-08-25 17:10:11 -03:00
ghoulslash	552d1f3d7b	Merge pull request #2237 from gruxor/compat_define ... Reworked branch defines into single compatibility define	2022-08-25 15:36:01 -04:00
ghoulslash	15a368163d	Merge pull request #2247 from AsparagusEduardo/RHH_specialPic ... LoadSpecialPokePic adjustments	2022-08-25 15:35:21 -04:00
ghoulslash	591bac25c4	Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves ... Moves with EFFECT_PLACEHOLDER can't be used.	2022-08-25 15:34:23 -04:00
LOuroboros	5dd143f19d	Applied Blackforest's changes to General_AffectionHangedOn	2022-08-25 13:07:52 -03:00
LOuroboros	1fc63c3431	More review corrections	2022-08-25 11:52:21 -03:00
DizzyEggg	a0ec8a5a80	4 digit hp in battle	2022-08-25 16:40:56 +02:00
LOuroboros	11d6ae4820	Renamed the GetLeadMonFriendshipScore constants	2022-08-25 11:34:37 -03:00
LOuroboros	e792fae415	Review corrections ... -Simplified the affection mechanics' battle scripts. -Corrected the value seting inside CalcCritChanceStage. -Simplified the checks inside Cmd_adjustdamage -Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added. -Added constants for the values returned by GetMonFriendshipScore.	2022-08-25 10:45:57 -03:00
LOuroboros	1f4ef2a0fb	Added constants for GetLeadMonFriendshipScore	2022-08-25 10:40:56 -03:00
ghoulslash	f736766c94	Merge pull request #2238 from DizzyEggg/multi ... Wild multi battles and doubles 2 vs 1 interface	2022-08-25 08:47:02 -04:00
Eduardo Quezada	af137c9b9d	Multiple changes ... - Simplified LoadSpecialPokePic - Changed all checks flag checks to houldShowFemaleDifferences	2022-08-25 03:42:41 -04:00
LOuroboros	7b7ba93d45	Fixed P_UPDATED_ABILITIES's comment	2022-08-24 20:35:13 -03:00
crater-git	6012731f27	Removed redundant ifdef	2022-08-24 19:31:55 -04:00
DizzyEggg	91b76e2e4f	quash pr clean up	2022-08-24 23:39:34 +02:00
DizzyEggg	06b4548603	Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash	2022-08-24 23:35:42 +02:00
DizzyEggg	7aa55f2753	better interface 1 player mon in double	2022-08-24 23:00:21 +02:00
crater-git	940f9f1726	Moved branch defs to config.h, now only for compat	2022-08-24 16:10:32 -04:00
DizzyEggg	e3ab439ec0	Fix multi wild battles	2022-08-24 21:56:24 +02:00
LOuroboros	b7ca63d151	Implemented Ice Face ... Thanks to Benício Gonçalves#3454 who provided a base to work with.	2022-08-24 13:45:34 -03:00
Blackforest92	07a07ddc8d	Update to latest master branch + allow Reveal Glass to work with Enamorus	2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone	21867a6061	Merge branch 'master' into AI	2022-08-24 01:07:35 -04:00
Eduardo Quezada	eea718cfc6	Placeholder moves can't be used in battle.	2022-08-24 00:30:49 -04:00
Eduardo Quezada	56a2e91518	Updated move limitations	2022-08-23 22:40:04 -04:00
Ct11217	67f473f38b	Fixed recommended issues. ... Added additional comments. Reordered switching ladder in ShouldSwitch() function. Functions that can specify a specific party mon to switch into need to come first.	2022-08-23 19:49:54 -06:00
crater-git	45511fcc44	Reworked TMHM into expandable list format	2022-08-23 21:44:42 -04:00
Eduardo Quezada	1f5adf93c7	Cleaned up use of configs be almost exclusively preproc functions	2022-08-23 21:00:08 -04:00
GriffinR	3771abbe08	Fix names and constant usage for union room classes	2022-08-23 12:44:07 -04:00
Eduardo Quezada	7c7887aa65	Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret	2022-08-23 08:25:27 -04:00
DizzyEggg	05ec8fb182	AI knows Party mons	2022-08-23 11:58:17 +02:00
Eduardo Quezada	afcc1178b2	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate ... # Conflicts: # data/battle_ai_scripts.s # data/battle_scripts_1.s # include/battle_controllers.h # include/battle_script_commands.h # include/battle_util.h # include/constants/battle_script_commands.h # include/constants/global.h # include/decompress.h # src/battle_anim_effects_1.c # src/battle_anim_normal.c # src/battle_anim_poison.c # src/battle_anim_water.c # src/battle_arena.c # src/battle_controller_link_opponent.c # src/battle_controller_link_partner.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_controller_recorded_opponent.c # src/battle_controller_recorded_player.c # src/battle_controller_safari.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/berry.c # src/data/trainers.h # src/decompress.c # src/field_effect.c # src/hall_of_fame.c # src/overworld.c # src/pokeball.c # src/pokemon.c # src/pokemon_icon.c # src/pokemon_storage_system.c # src/scrcmd.c	2022-08-22 20:30:45 -04:00
DizzyEggg	327782646b	Save party mons ai	2022-08-23 01:07:25 +02:00
Eduardo Quezada	75ac960365	Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms	2022-08-22 17:27:21 -04:00
GriffinR	898ec580ae	Merge pull request #1737 from GriffinRichards/lock-unlock ... Clean up lock/unlock anim movement	2022-08-22 01:30:33 -04:00
GriffinR	30906762ed	Merge pull request #1740 from AsparagusEduardo/pret_stringTabs ... Fixed inconsistent use of white space for scripts, .c files and .h files.	2022-08-20 23:03:59 -04:00
GriffinR	261b0ff118	Standardize judgement vs judgment spelling	2022-08-20 22:58:46 -04:00
GriffinR	9e175a1037	Merge pull request #1735 from GriffinRichards/arena-const ... Add some missing battle arena constants	2022-08-20 22:54:32 -04:00
Eduardo Quezada	76d2d92abb	Merge branch 'pretmaster' into pret_clean2	2022-08-20 12:43:09 -04:00
GriffinR	1685365cd4	Merge pull request #1727 from AsparagusEduardo/pret_clean ... Cleanup from https://github.com/pret/pokefirered/pull/532	2022-08-19 21:27:55 -04:00
Martin Griffin	d57442a511	Decimal paletteNums	2022-08-19 17:05:22 +01:00
GriffinR	c2d5dd2a1f	Additional battle anim sync	2022-08-19 11:51:13 -04:00
Martin Griffin	5719a7f7bc	Use static inline instead of extern inline for modern	2022-08-19 15:47:50 +01:00
Martin Griffin	6fed961ed6	Write palette IDs in hex	2022-08-19 15:29:35 +01:00
Blackforest92	a9d09bcd17	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion	2022-08-19 17:53:01 +07:00
Blackforest92	00a827b3fb	Add PLA pokemon to Form Species Table, add Kleavor's graphics	2022-08-19 17:47:34 +07:00
Eduardo Quezada	3bc2cf921c	Sync src/battle_controllers.c with pokefirered	2022-08-18 14:30:22 -04:00
Eduardo Quezada	59f89bde9e	Misc cleanup	2022-08-18 14:23:45 -04:00
Ct11217	a4b53126f6	Added AI_FLAG_ACE_POKEMON ... When this flag is set, the trainer will have an "Ace" pokemon that will always be sent out last. If this flag is set, the last Pokemon in the party will be considered the "Ace" Pokemon. This is similar to the gym leader functionality found in Sword & Shield.	2022-08-17 18:23:12 -06:00
Ariel A	d846b9c781	Added dynamic palette support for virtual objects. ... Added flag to hide follower on certain maps.	2022-08-17 19:58:46 -04:00
Ariel A	16babe87fc	Follower pokemon now disappears when teleporting. ... Fixed GF's incorrect GFX id on Route 123.	2022-08-17 19:50:22 -04:00
Ariel A	7edb7bbc23	Added battle slide-in animation for Pokemon follower.	2022-08-16 19:52:38 -04:00
Eduardo Quezada	5933c42439	Synced Route 4 and 10's MapSec labels	2022-08-16 18:23:37 -04:00
GriffinR	26734d80f3	Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum ... Convert MON_DATA constants into enum to ease editing and addition of fields.	2022-08-15 18:51:32 -04:00
Eduardo Quezada	0149f420f9	Corrected comment	2022-08-15 17:36:55 -04:00
Eduardo Quezada	e8a05e92e4	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
tustin2121	ec73158f16	Moving documentation comments per request ... from the discord chat.	2022-08-15 16:37:38 -04:00
tustin2121	1cb659df8c	Renaming Script Contexts ... - Determined how the various script contexts were used and renamed accordingly. - ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts. - ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames. - ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.	2022-08-15 15:18:12 -04:00
GriffinR	5515e328b2	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
GriffinR	2df6cc1820	Merge pull request #1730 from GriffinRichards/sync-naming-screen ... Clean up naming screen graphics	2022-08-12 11:05:55 -04:00
GriffinR	574cf1ddb9	Merge pull request #1725 from GriffinRichards/security-signature ... Sector security -> signature	2022-08-12 10:47:10 -04:00
Ct11217	b95e450cb6	Added corner case logic for AI Switching. ... 1. Refactor Perish Song 2. Yawn 3. Secondary Damage (Leech Seed, Cursed etc). 4. Added Preliminary logic to help AI be smarter against semi-invulnerable Added AI logic regarding abilities that benefit from switching 1. Natural Cure 2. Regenerator	2022-08-11 22:48:36 -06:00
GriffinR	cf4d05e9e7	Fix typo	2022-08-11 12:09:38 -04:00
GriffinR	63468f9fcb	Add some missing battle arena constants	2022-08-11 12:02:56 -04:00
GriffinR	286a99eb1d	Merge pull request #1723 from GriffinRichards/fix-impassable ... MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes	2022-08-10 21:28:14 -04:00
GriffinR	bfdbbad468	Split naming screen palettes/graphics, use correct image palettes, clean up	2022-08-09 09:27:28 -04:00
Eduardo Quezada	1fd1870a13	Moved enum to include/pokemon.h	2022-08-08 18:40:47 -04:00
Eduardo Quezada	75d52dc762	Convert MON_DATA constants into enum to ease editing and addition of fields.	2022-08-08 18:18:17 -04:00
Eduardo Quezada	4b08a511c3	Cleanup from https://github.com/pret/pokefirered/pull/532	2022-08-07 22:40:15 -04:00
GriffinR	2487ddb128	Sector security -> signature	2022-08-05 10:42:31 -04:00
DizzyEggg	c991131b75	Change language stuff based on the french decomp	2022-08-04 11:53:16 +02:00
GriffinR	e5c36cd745	MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes	2022-08-03 14:21:13 -04:00
GriffinR	79384ec9f3	Merge pull request #1702 from GriffinRichards/clean-psn ... Clean up field_poison.c	2022-08-02 13:20:49 -04:00
GriffinR	99a37b5aa5	Merge pull request #1717 from mrgriffin/trainer-party-macro ... Macros for keeping .partyFlags, .partySize, and .party in sync	2022-08-02 13:11:43 -04:00
ExpoSeed	807c3fd17f	Delete item and ability defines in configs	2022-08-02 00:28:42 -05:00
ExpoSeed	49da2ee53f	Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION	2022-08-02 00:15:55 -05:00
GriffinR	79c5a5983e	Merge pull request #1721 from AsparagusEduardo/pret_clean2 ... Companion PR to pokefirered #525	2022-08-01 16:57:40 -04:00
Eduardo Quezada	c6cdb2a281	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-31 22:57:46 -04:00
GriffinR	5101811407	Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands ... Further cleaning after comparing with pokefirered	2022-07-30 09:09:23 -04:00
Eduardo Quezada	40805fffc0	Space cleanup	2022-07-29 21:28:39 -04:00
Eduardo Quezada	5d4b76c0ba	Review changes from pokefirered #524	2022-07-29 17:00:07 -04:00
Eduardo Quezada	9dc64b67cd	Review changes	2022-07-29 15:38:23 -04:00
Eduardo Quezada	01558ff8f3	Struct pointers star standarizing	2022-07-29 11:15:33 -04:00
Eduardo Quezada	13672680b0	void pointer standarized	2022-07-29 10:52:35 -04:00
Eduardo Quezada	7b3401ee27	Standarized use of star in pointer types	2022-07-29 10:17:58 -04:00
Eduardo Quezada	9caca17064	Cleanup by syncing src/battle_script_commands.c with pokefirered	2022-07-29 09:43:16 -04:00
Jaizu	7a8c28ccca	Remove duplicated CB2_InitCopyrightScreenAfterBootup	2022-07-29 10:52:36 +02:00
Greenphx9	05cbd6a906	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names	2022-07-29 18:49:25 +10:00
LOuroboros	b9c83710c4	Sync this branch's include/constants/moves.h with the BE's	2022-07-28 11:12:28 -03:00
Eduardo Quezada	09af7422d5	Further cleaning after comparing with pokefirered ... STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs	2022-07-28 01:27:05 -04:00
Martin Griffin	2380d13a43	Macros for keeping .partyFlags, .partySize, and .party in sync	2022-07-27 23:25:37 +01:00
GriffinR	1da46a4bbc	Merge pull request #1715 from AsparagusEduardo/pret_docBooleans ... Documented boolean uses	2022-07-27 12:09:02 -04:00
Eduardo Quezada	e1c15a9cf6	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-27 08:16:10 -04:00
LOuroboros	b59f7aed7f	Added a constant for NPC trainer name length (#1712)	2022-07-25 22:59:13 -04:00
Eduardo Quezada	a37d8b1346	Documented boolean uses	2022-07-25 14:59:14 -04:00
LOuroboros	032b7b2ab9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection	2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone	bfb86fdc86	Config for Gen 3 faint switch mechanics	2022-07-24 14:57:47 -04:00
Eduardo Quezada	e96c9c87fa	Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 23:38:52 -04:00
Eduardo Quezada	231727d02b	Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge ... # Conflicts: # asm/macros/event.inc # data/specials.inc # include/constants/species.h # src/data/pokemon/base_stats.h	2022-07-22 23:33:04 -04:00
Eduardo Quezada	f3bebcd12c	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge ... # Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 22:57:02 -04:00
ghoulslash	1260666c91	Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides ... Added Egg breeding species overrides.	2022-07-22 14:05:14 -04:00
ghoulslash	3a77b52bad	Merge pull request #2194 from AsparagusEduardo/BE_pretmerge ... Battle Engine pret merge	2022-07-22 14:00:40 -04:00
Eduardo Quezada D'Ottone	56b9a50109	Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus ... # Conflicts: # include/constants/battle_config.h	2022-07-21 16:28:16 -04:00
ghoulslash	49a932a892	Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky ... Fixed Light That Burns The Sky not using the calculated damage category	2022-07-21 16:14:38 -04:00
ghoulslash	30a494f964	Merge pull request #2197 from AsparagusEduardo/BE_explosion ... Config for Explosion halving defense	2022-07-21 16:11:32 -04:00
ghoulslash	504600c996	Merge pull request #2201 from AsparagusEduardo/BE_sturdy ... Config for Sturdy's Gen5+ effect.	2022-07-21 16:09:01 -04:00
Eduardo Quezada D'Ottone	e4ae280ca6	Fixed calls to IsZMove	2022-07-21 15:32:14 -04:00
Eduardo Quezada D'Ottone	25397e5794	Fixed Light That Burns The Sky not using the calculated damage category ... Also: - Modified move defines to ease with future move expansion. - Enabled Instruct's check for Z Moves in AI_CheckBadMove.	2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone	0f3fdd410a	Config for Sturdy's Gen5+ effect.	2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone	e14afd8957	Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.	2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone	cb34119711	Config for Charge raising Sp. Def.	2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone	fe63dafcc1	Merge branch 'battle_engine' into BE_pretmerge ... # Conflicts: # src/battle_anim_fire.c # src/battle_controller_player.c	2022-07-20 08:50:30 -04:00
ghoulslash	99424e1aaf	Update include/battle.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-07-19 19:03:05 -04:00
ghoulslash	2b5bb9f6e4	move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check	2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone	1cfb267b34	Config for Explosion halving defense	2022-07-18 13:10:27 -04:00
Eduardo Quezada D'Ottone	1dcbf59686	Config for Plus and Minus interaction	2022-07-18 08:11:02 -04:00
Ariel A	9beee311c4	Merge branch 'master' into romhack	2022-07-17 15:13:15 -04:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04:00
Eduardo Quezada D'Ottone	e791cf90ad	Merge tag 'pretmaster' into BE_pretmerge2 ... # Conflicts: # data/battle_anim_scripts.s # include/battle_anim.h # include/battle_controllers.h # include/battle_interface.h # include/battle_main.h # include/battle_setup.h # include/constants/battle_anim.h # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_anim_fire.c # src/battle_anim_normal.c # src/battle_controllers.c # src/battle_dome.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/pokemon.c	2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone	f78bb4fb84	Merge remote-tracking branch 'pret/master' into item_expansion ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-12 17:42:32 -04:00
Eduardo Quezada D'Ottone	c69275f373	Merge remote-tracking branch 'pret/master' into PE_pretmerge ... # Conflicts: # include/battle_anim.h # include/pokemon.h # src/data/pokemon/base_stats.h	2022-07-12 17:20:49 -04:00
GriffinR	30a5821997	Merge pull request #1705 from sphericalice/move-unavailable ... Introduces a MOVE_UNAVAILABLE constant	2022-07-12 11:32:57 -04:00
sphericalice	186f2c0232	Introduce a MOVE_UNAVAILABLE constant	2022-07-11 15:18:13 +01:00
Greenphx9	4294682d8c	16-letter move names ... Move define, add spaces between comments, fix include if TRUE -> if set to TRUE Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>	2022-07-11 12:49:30 +10:00
LOuroboros	a1004485c5	Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH	2022-07-10 20:08:28 -03:00
GriffinR	06dc93fc2f	Clean up field_poison.c	2022-07-06 21:04:54 -04:00
Blackforest92	ff861ff963	Add some of Legends Arceus battle sprites	2022-07-04 12:28:40 +07:00
ghoulslash	fac6f21ed0	AI_EFFECTIVENESS_xY are enums	2022-07-03 16:28:34 -04:00
ghoulslash	e4bf99d777	merge w be	2022-07-03 16:20:05 -04:00
LOuroboros	c04f7d5e5b	Changed B_TELEPORT_BEHAVIOR's description comment	2022-07-03 13:51:34 -03:00
LOuroboros	8f728dcd79	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-07-03 13:49:18 -03:00
Blackforest92	8c88e8a9b7	Legends Arceus Pokemon 95% Finished	2022-07-03 17:15:37 +07:00
ghoulslash	02a62e245b	Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney ... Config for lost money after losing a battle	2022-07-01 11:58:36 -04:00
ghoulslash	6cf0620f93	Merge pull request #2159 from Sneed69/trap-move-arrays ... Trap move battle string related code cleanup	2022-07-01 11:07:28 -04:00
sneed	c1af418340	define B_MSG_WRAPPED_ constants	2022-07-01 17:52:46 +03:00
ghoulslash	fc2cfd8c9d	Merge pull request #2136 from LOuroboros/pePretMerge ... Pret merge for the pokemon_expansion	2022-07-01 09:22:55 -04:00
ghoulslash	a349462b78	Merge pull request #2134 from LOuroboros/bePretMerge ... Pret merge for the battle_engine	2022-07-01 09:21:51 -04:00
ghoulslash	42f3cccdbe	Merge pull request #2154 from HamishSinclair/poltergeist ... add poltergeist animation	2022-07-01 09:19:49 -04:00
ghoulslash	f4918222e8	Merge pull request #2156 from Sneed69/ai_3rd_type ... Type effectivess related AI bugfixes	2022-07-01 09:09:12 -04:00
ghoulslash	80ac427443	Merge pull request #2160 from Sneed69/ignore-mystery-type-3 ... IS_BATTLER_OF_TYPE ignores third type if it's Mystery	2022-07-01 08:55:08 -04:00
LOuroboros	aa5c6a3f01	Implemented affection-now-friendship mechanics	2022-06-22 00:18:01 -03:00
GriffinR	57222323c1	Merge pull request #1678 from GriffinRichards/const-frontier ... Add some battle frontier constant usage	2022-06-18 10:22:58 -04:00
GriffinR	4660f8c88b	Document battle tower TV show	2022-06-14 09:37:39 -04:00
GriffinR	7143865f6f	Add some battle frontier constant usage	2022-06-09 12:57:28 -04:00
GriffinR	1f540845cb	Merge pull request #1675 from GriffinRichards/doc-arg ... Document generic arguments	2022-06-09 11:11:02 -04:00
ghoulslash	b33a8b0cb4	move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use	2022-06-05 11:09:04 -04:00
ghoulslash	c694e0cb90	merge w be	2022-06-05 08:22:24 -04:00
GriffinR	bc2dbd772e	Add warning to NUM_OBJ_EVENT_GFX	2022-06-03 16:18:34 -04:00
GriffinR	1ca1bff81c	Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg	2022-06-03 15:43:21 -04:00
GriffinR	34438e6bc4	Continue documenting generic arguments	2022-06-03 15:38:03 -04:00
Sneed69	c60de5055d	remove IsMoveWithoutAnimation	2022-06-03 17:42:42 +03:00
sphericalice	380cb46919	Correct CreateRegionMapPlayerIcon's argument names ... Correct CreateRegionMapPlayerIcon's argument names in include/region_map.h	2022-06-03 15:04:52 +01:00
sphericalice	35bdaccedc	Add the HEAL_LOCATION_NONE constant	2022-06-03 14:59:01 +01:00
sneed	5934acbdc5	IS_BATTLER_OF_TYPE ignores 3rd type if mystery	2022-06-01 22:21:32 +03:00
sneed	86b436782a	trap move related code cleanup	2022-06-01 22:01:50 +03:00
GriffinR	a8437493c1	Document generic argument names in battle anim palettes	2022-06-01 12:25:01 -04:00
GriffinR	5e6d8a77e4	Document some generic argument names	2022-05-31 14:34:25 -04:00
sneed	2e855b204a	ai accounts for a third type	2022-05-29 04:55:37 +03:00
Martin Griffin	1cc59acca9	Static assertion for size of save structs	2022-05-25 19:48:42 +01:00
sneed	c8e08edbae	rename item1 and item2 in BaseStats	2022-05-23 19:10:24 +03:00
hamish	307d5d93c4	add potlergeist animation	2022-05-23 08:53:08 -04:00
sneed	ce468a0903	add macros for handling form base stats	2022-05-23 01:04:21 +03:00
Eduardo Quezada D'Ottone	f2c509eab7	Merge pull request #2151 from Sneed69/dummy_abilities ... Add dummy abilities to make base stats header smaller	2022-05-22 13:27:27 -04:00
sneed	587b056ccb	add dummy abilities to PE	2022-05-22 19:55:09 +03:00
BuffelSaft	16570e8c3f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-22 12:55:55 +12:00
Sneed69	d0a2be9630	weather forms fixes and config	2022-05-22 03:20:48 +03:00
GriffinR	6d772a5e30	Merge pull request #1662 from GriffinRichards/door-gfx ... Clean up door animations	2022-05-21 16:07:02 -04:00
Ariel A	01f73f54e1	Added follower transform effect and Castform forms. Credit: larryturbo ... Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053	2022-05-18 19:12:30 -04:00
GriffinR	5c8e1e81ea	Color single-palette door anim graphics	2022-05-18 12:41:20 -04:00
GriffinR	593e2c9be0	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
AgustinGDLV	bd008e4c80	fixed softlocks / messages	2022-05-16 15:25:13 -07:00
TheXaman	675957c24a	new caught mon page should now show proper form in PE	2022-05-15 00:41:35 +02:00
ghoulslash	f6f4227f49	better bug bite impl, fix item removal	2022-05-13 16:21:41 -04:00
LOuroboros	74265efe61	Corrected size value of trainerHillTimes	2022-05-13 10:55:53 -03:00
LOuroboros	577791a6bc	Moved order of defined header files in include/global.h	2022-05-13 10:52:09 -03:00
LOuroboros	1d75f3ffde	Moved order of defined header files in include/global.h	2022-05-13 10:51:49 -03:00
LOuroboros	5397d020d7	Moved order of defined header files in include/global.h	2022-05-13 10:51:13 -03:00
LOuroboros	08225bbba9	Post Pret merge fix ... I made an oopsie.	2022-05-13 10:46:08 -03:00
BuffelSaft	bb25746e05	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-13 22:40:43 +12:00
LOuroboros	52d6c96e69	Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge	2022-05-13 03:20:42 -03:00
LOuroboros	12d956872b	Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge	2022-05-13 03:18:37 -03:00
LOuroboros	2263caef7a	Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine	2022-05-13 03:17:31 -03:00
Ariel A	28ec60a776	Fixed some field effect palettes. Removed leftover CacheLightMetatiles.	2022-05-10 23:21:54 -04:00
sneed	bceccf5474	changes	2022-05-10 08:17:31 +03:00
sneed	709f583390	Initial commit	2022-05-10 02:58:24 +03:00
Eduardo Quezada D'Ottone	f80bab897f	Merge pull request #2112 from AgustinGDLV/evo_battle ... Gen 8 Evolution Mechanics (Battle Engine)	2022-05-09 17:40:19 -04:00
Eduardo Quezada D'Ottone	b6922a1dab	Merge branch 'pokemon_expansion' into evo_overworld	2022-05-09 16:36:34 -04:00
AgustinGDLV	9bb5db2275	removed duplicate define	2022-05-08 21:23:51 -07:00
ghoulslash	07b0ce9737	add inner focus ability popup msg	2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone	13f9919b9e	Merge pull request #2123 from Sneed69/wikiberry_battle ... Update Confuse Berry Hold Effect (Battle Engine)	2022-05-08 09:02:33 -04:00
Eduardo Quezada D'Ottone	c71b60d9f8	Merge branch 'PokemonExpansion' into PE_breedOverrides ... # Conflicts: # include/constants/pokemon_config.h	2022-05-07 19:45:06 -04:00
Eduardo Quezada D'Ottone	989ec641f4	Merge pull request #2120 from ghoulslash/be/healblock ... Heal Block AI and Pollen Puff Selection Prevention	2022-05-07 19:29:24 -04:00
sneed	f83875cf0f	remove item expansion check	2022-05-07 23:34:38 +03:00
AgustinGDLV	7b0154336d	Merge branch 'battle_engine' into symbiosis	2022-05-07 13:26:21 -07:00
AgustinGDLV	c7bee35161	fixed conflict with new PR	2022-05-07 13:23:41 -07:00
AgustinGDLV	9d222d3ab4	fixed gems and damage-reducing berries	2022-05-07 13:12:21 -07:00
sneed	c6b529ed50	add missing constant	2022-05-07 22:09:08 +03:00
AgustinGDLV	8a0a2a5a39	Apply suggestions from code review ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-05-07 09:36:03 -07:00
AgustinGDLV	017f44f5ac	Apply suggestions from code review ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-05-07 09:35:00 -07:00
ghoulslash	0172f84617	Merge pull request #2070 from AsparagusEduardo/PE_evoData ... Updated missing evolution and form change data	2022-05-07 11:37:11 -04:00
ghoulslash	9fa4d916d3	Merge pull request #2055 from AsparagusEduardo/BE_configs ... Once again, Battle Configs	2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone	dc25bc6145	Merge branch 'battle_engine' into BE_WhiteOutMoney ... # Conflicts: # include/constants/battle_string_ids.h # src/battle_message.c	2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone	cbe73de8c8	Merge pull request #1861 from LOuroboros/primalReversionTweaks ... Primal Reversion Tweaks	2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone	096fe3c11d	Removed unecessary B_LEEK_ALWAYS_CRIT config	2022-05-07 10:56:31 -04:00
Eduardo Quezada D'Ottone	4e7ce0b663	Merge branch 'battle_engine' into BE_configs ... # Conflicts: # include/constants/battle_config.h	2022-05-07 10:25:34 -04:00
ghoulslash	07579bd42b	prevent ally pollen puff selection under heal block. add some ai checks for heal block	2022-05-07 09:56:32 -04:00
ghoulslash	adfb336a3f	Merge pull request #2105 from Sneed69/healblock ... Add missing Heal Block functionalities	2022-05-07 09:13:18 -04:00
ghoulslash	e5b777695c	Merge pull request #2107 from Sneed69/steelbeam ... Steel Beam Move Effect Implementation	2022-05-07 08:40:34 -04:00
AgustinGDLV	542a0f07b4	fixed bug bite / bestow	2022-05-06 22:07:25 -07:00
BuffelSaft	57003c62fd	EFFECT_SOLAR_BEAM ... Fix definition.	2022-05-07 14:20:56 +12:00
BuffelSaft	3e1934ebe3	Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE ... Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.	2022-05-07 14:20:37 +12:00
BuffelSaft	8693db632b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-07 12:27:20 +12:00
AgustinGDLV	0cb6529ae2	functional but not perfect implementation	2022-05-06 14:53:16 -07:00
sneed	ef7cd3cdfe	BattleScript_DefiantActivates rename	2022-05-06 11:15:24 +03:00
LOuroboros	43053d2e6c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-05-06 02:22:14 -03:00
AgustinGDLV	e730d64945	corrections	2022-05-05 15:54:33 -07:00
AgustinGDLV	03c48b4f3f	compatibility with evo_battle	2022-05-05 15:46:53 -07:00
AgustinGDLV	7d42f93861	added special overworld evo changes	2022-05-05 11:55:31 -07:00
AgustinGDLV	6235970722	added special battle evo changes	2022-05-05 11:41:27 -07:00
sneed	865b771db7	initial commit	2022-05-05 00:57:19 +03:00
Ariel A	831c73c18c	Added system for conditional follower messages.	2022-05-03 23:01:02 -04:00
Eduardo Quezada D'Ottone	49905cee04	Ability Patch	2022-05-03 14:14:04 -04:00
sneed	60d7d8f97e	Initial Commit	2022-05-03 03:38:44 +03:00
sneed	b17d1f7816	Add generation specific interactions	2022-05-02 17:56:09 +03:00
sneed	23870a40a8	Initial commit	2022-05-02 06:04:16 +03:00
PikalaxALT	ff936c15e1	Sync arg descriptions from FireRed ... https://github.com/pret/pokefirered/pull/501	2022-04-28 13:46:23 -04:00
Ariel A	483d4b3448	Fixed all field effects with gendered palette tags (warp arrow, surf blob, bird)	2022-04-27 22:43:12 -04:00
Eduardo Quezada D'Ottone	cb9cace04f	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_KadabraEverstone ... # Conflicts: # include/constants/pokemon_config.h	2022-04-27 12:05:33 -04:00
ghoulslash	7bc50392d0	Merge pull request #2072 from AsparagusEduardo/PE_ShellBlastEverstone ... Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone	2022-04-27 08:51:37 -04:00
ghoulslash	166b16d22c	Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV ... Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs	2022-04-27 08:48:22 -04:00
ghoulslash	574be40f26	Merge pull request #2099 from Greenphx9/calyrex_rider_icons ... Calyrex Rider Icons	2022-04-27 08:43:53 -04:00
BuffelSaft	746d9ea6c5	Add AI_GetBattlerMoveTargetType() ... Add AI version of the function that handles move target selection, as it needs to have ability and item info that it may not have access to.	2022-04-27 22:23:20 +12:00
BuffelSaft	af6242f2e0	Requested changes, Sticky Web edge case ... Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.	2022-04-27 21:51:10 +12:00
BuffelSaft	5358cc0a00	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-04-25 13:38:13 +12:00
Greenphx9	b3294c60a2	Calyrex Rider Icons	2022-04-22 16:31:17 +10:00
GriffinR	fc5747f0f7	Merge pull request #1649 from GriffinRichards/clean-trainer ... Trainer hill clean up	2022-04-20 00:20:44 -04:00
TheXaman	c54bf21b01	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2022-04-16 23:18:35 +02:00
TheXaman	8006b8dbcd	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss	2022-04-16 23:17:55 +02:00
Eduardo Quezada D'Ottone	a6175d2622	Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs	2022-04-16 13:01:15 -04:00
Eduardo Quezada D'Ottone	84d713a50f	Legendary and Mythical flags	2022-04-14 18:44:20 -04:00
TheXaman	2fa812df26	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge	2022-04-13 20:51:35 +02:00
LOuroboros	446bcd3181	Merge branch 'master' of https://github.com/pret/pokeemerald into pePret	2022-04-11 01:23:18 -03:00
LOuroboros	eb1834ce84	Merge branch 'master' of https://github.com/pret/pokeemerald into iePret	2022-04-11 01:22:48 -03:00
LOuroboros	b6e2945072	Merge branch 'master' of https://github.com/pret/pokeemerald into bePret	2022-04-11 01:22:10 -03:00
LOuroboros	3ca9ac5b37	Post merge corrections	2022-04-03 14:27:33 -03:00
LOuroboros	f82c946ff3	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge	2022-04-03 13:26:27 -03:00
LOuroboros	af2f70e000	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge	2022-04-03 13:21:40 -03:00
LOuroboros	fa39dc76dc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
GriffinR	328b925a08	Move trainer hill map data to bin files	2022-03-31 14:08:31 -04:00
GriffinR	62f3f144ab	Clean up some trainer hill	2022-03-31 12:54:07 -04:00
GriffinR	66cbe29c14	Add bugfix for Battle Factory trainer IVs	2022-03-30 09:37:03 -04:00