9480 Commits

Author	SHA1	Message	Date
Martin Griffin	7b306b6147	RandomElement for structured RNG ... Converts Tri Attack and Dire Claw to use structured RNG.	2023-03-27 18:50:18 +01:00
Eduardo Quezada	f6a924a791	Fixed instances of gSideTimers not using side constants	2023-03-27 11:49:50 -03:00
Eduardo Quezada	3888b10769	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h	2023-03-27 10:55:38 -03:00
Eduardo Quezada	0b8285737a	Fixed Comatose AI checks	2023-03-27 09:19:48 -03:00
ghoulslash	8d8819b797	Adds missing cases for 'Everything Customized' (#2862)	2023-03-26 21:02:46 -04:00
LOuroboros	000077f671	Implemented Axe Kick's effect	2023-03-26 20:05:30 -03:00
LOuroboros	8ae57dc912	Implemented Take Heart's effect	2023-03-26 20:05:13 -03:00
LOuroboros	d2a221eb85	Corrected Lunar Blessing's data	2023-03-26 20:04:56 -03:00
LOuroboros	05a34edb7d	Implemented Infernal Parade's effect	2023-03-26 20:04:55 -03:00
LOuroboros	1595a66559	Implemented Triple Arrows' effect	2023-03-26 20:04:36 -03:00
ghoulslash	6574e01e73	Gen. 9 Move Effects, 1st batch (#2534)	2023-03-26 16:20:47 -04:00
ghoulslash	d2d2e05a62	Fixed Grassy Terrain not healing + Added To-Do test results (#2857)	2023-03-26 15:18:42 -04:00
Alex	4b43f3eb9d	add cases for everything customized	2023-03-26 21:10:51 +02:00
Eduardo Quezada	32b2c01619	Merge branch 'RHH/upcoming' into RHH/pr/fix/GassyTerrain ... # Conflicts: # test/test.h	2023-03-26 16:06:04 -03:00
ghoulslash	dc63d096f2	add check for Gorilla Tactics when resetting choicedMove from knock off (#2854)	2023-03-26 15:03:56 -04:00
ghoulslash	dc9f0b5107	Implement Customizable NPC Trainer Parties (#2733)	2023-03-26 09:32:51 -04:00
ghoulslash	5d71afd1c0	Add Gen IX items (#2838)	2023-03-26 07:29:14 -04:00
ghoulslash	a0b95ae27e	Fix Intimidate targetting dead sides and false postpones (#2850)	2023-03-26 07:27:14 -04:00
sbird	aea5d79aa2	[trainer_parties] implement fully customizable npc trainer parties ... fix nature related bug, fix hash generation, add tests	2023-03-25 20:00:04 +01:00
sbird	b9447f88fc	fix compound eyes ohko test	2023-03-24 16:37:52 +01:00
ghoulslash	2c3db74702	fix base power calcs using battler addresses	2023-03-24 10:36:10 -04:00
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
Eduardo Quezada	c383c995f1	Applied review changes	2023-03-24 10:12:09 -03: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
Eduardo Quezada D'Ottone	1da65c4051	Fixed Grassy Terrain not healing	2023-03-23 22:33:47 -03: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	f15fb1540f	Allow Kubfu evolution with Scroll items	2023-03-23 23:16: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
DizzyEggg	8cf357a37b	tests for dire claw ceaseless edge barb barrage	2023-03-23 12:29:04 +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
Eduardo Quezada D'Ottone	023cc4d38d	Fixed erroneous uses of non e-reader Enigma Berries (#2839)	2023-03-23 09:58:26 +01:00
AgustinGDLV	03f6fe635f	changed CanBeConfused to actually check its argument (#2855)	2023-03-23 09:50:44 +01:00
CallmeEchoo	4541cc3319	add check for Gorilla Tactics ... knock off shouldnt reset choicedMove when the pokemon has the Gorilla Tactics ability	2023-03-22 22:30:24 +01:00
GriffinR	8d67bebd51	Merge pull request #1869 from GriffinRichards/const-map ... Treat map data as const	2023-03-22 13:00:06 -04:00
tennis	358180946d	Fix Intimidate targetting dead sides and false postpones	2023-03-22 11:46:50 +00:00
ghoulslash	74ec59cace	add sAnimHideHpBoxes to fix healthbox reappearing from e.g. B_ANIM_SWITCH_OUT_OPPONENT_MON	2023-03-21 18:11:49 -04:00
Eduardo Quezada	ef914a2fac	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-21 16:13:27 -03:00
ghoulslash	c61797bc38	styling and syntax fix	2023-03-21 14:31:09 -04:00
ghoulslash	1adc6b761e	remove random space	2023-03-21 13:38:24 -04:00
ghoulslash	3bd680cab9	fix GetBattleAnimMoveTargets for non-player gBattleAnimAttacker	2023-03-21 13:36:45 -04:00
Eduardo Quezada	47b4e6095d	Undo Timburr and Stunfisk friendships, as they don't change	2023-03-19 22:00:18 -03: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	d480fc90f2	Fix Scrolls type	2023-03-19 21:21:43 +01:00
Bassoonian	372c6a1afa	Add new item variables and defines	2023-03-19 20:55:39 +01:00
Eduardo Quezada	bef5d98b88	Fixed Pokémon fainting in the Overworld that don't have that specific form change entry	2023-03-18 09:47:54 -03: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
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 D'Ottone	a8c9309458	Fixed Wring Out's power (#2824) ... Fixes #2823	2023-03-13 09:07:29 +01:00
Eduardo Quezada	a0feaabef1	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-12 15:53:32 -03:00
Eduardo Quezada	c46e70ca82	Forgot about Primal Reversion	2023-03-12 02:38:27 -03:00
Eduardo Quezada	7ce68994ec	Made Mega Evolution properly use TryBattleFormChange	2023-03-12 02:32:09 -03:00
LOuroboros	6dbe772e27	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-03-10 18:23:33 -03:00
ghoulslash	6f13e4cfc5	word-align battle_interface u8 array gfx (#2812) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-03-10 20:52:22 +01:00
ghoulslash	c669745b9c	Fixed score for Work up and Growth (#2813)	2023-03-09 11:12:51 -05:00
Eduardo Quezada D'Ottone	aedf18fea9	Debug Menu improvements (#2814)	2023-03-09 08:23:58 -03:00
Eduardo Quezada D'Ottone	bb90dc7dd1	Debug menu to give items based on max quantity and map number 3digits display (#2807)	2023-03-09 08:17:29 -03:00
Eduardo Quezada D'Ottone	73236344ba	Fixes the check for speed on electrify (#2819)	2023-03-09 08:02:00 -03:00
Eduardo Quezada D'Ottone	dc6ff13c6a	Existing tests work with new species disabled (#2818)	2023-03-09 07:59:14 -03:00
Alex	9358265954	electrify ai speed check	2023-03-09 09:52:27 +01:00
DizzyEggg	eead8e8e61	Tests work with new pokemon disabled	2023-03-09 09:49:50 +01:00
Alex	35645fe01c	electrify works on all move types (#2817)	2023-03-08 23:00:25 +01:00
DizzyEggg	d695c76881	test for assist and removed assist array from battle struct	2023-03-08 22:11:28 +01:00
LOuroboros	ff7686482f	Updated PokeStorageSys related debug functions	2023-03-08 15:56:16 -03: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
Alex	27e342d7a6	Use function HasDamagingMove to avoid looping	2023-03-08 19:25:26 +01:00
GriffinR	dbf757be88	Treat map data as const	2023-03-08 12:00:30 -05:00
Alex	59a0def706	delete leftover	2023-03-08 17:30:07 +01:00
Alex	c3674d6c17	Wrong score for Work Up and Growth	2023-03-08 17:23:44 +01:00
DizzyEggg	bf4735e87c	remove test changes	2023-03-08 13:41:08 +01:00
DizzyEggg	51c8edd825	Add tests for Mega Evo, Focus Punch, Beak Blast	2023-03-08 13:22:53 +01: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
Eduardo Quezada	46bdd21e7a	Cleaned up stray comment	2023-03-07 11:39:47 -03: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	13ca2271e2	Add meltan and melmetal teachable moves (#2732)	2023-03-07 10:25:05 -03:00
DizzyEggg	318666e21d	debug minor touches to give item max quantity and map number display	2023-03-07 12:20:36 +01: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	4d99d2c926	Merge pull request #1859 from AsparagusEduardo/pret/doc/natures ... Reformatted gNatureStatTable	2023-03-04 23:31:43 -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	58b408cbbf	some new sprites	2023-03-02 17:04:24 +01:00
ghoulslash	6cf84ee53e	Fixes certain moves preventing Z status moves. (#2791)	2023-03-02 09:41:02 -05:00
ghoulslash	ad6495980f	Partially fix dex size inconsistencies (#2799)	2023-03-02 09:35:32 -05: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
GriffinR	ec89e519f9	Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful ... Rename eventLegal to modernFatefulEncounter	2023-02-28 11:48:34 -05:00
DizzyEggg	12db276a71	fix endif	2023-02-28 10:36:11 +01:00
DizzyEggg	1fb2560f7b	newline	2023-02-28 10:14:16 +01:00
DizzyEggg	9d1e31ab39	accidentally removed ifs	2023-02-28 10:12:50 +01:00
DizzyEggg	cc2778b8bb	some touches	2023-02-28 10:08:31 +01:00
ghoulslash	b399d1e8c5	fix ABILITYEFFECT_ON_TERRAIN battler Id settings	2023-02-27 22:29:23 -05:00
ghoulslash	5a740c7461	dont overwrite gbattlerAttacker in TryChangeBattleTerrain, update BattleScript_ActivateTerrainAbilities loop iterator	2023-02-27 22:18:42 -05:00
Eduardo Quezada	90021f3be6	Removed zMovePower field in gBattleMoves in favor of a function.	2023-02-27 23:49:43 -03:00
DizzyEggg	3159508603	fix dex size inaccuraccies	2023-02-27 23:08:54 +01: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
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
Alex	21ca6defa7	forgot torment	2023-02-27 18:39:17 +01:00
Alex	1a2504d5ee	forgot disable	2023-02-27 18:29:29 +01:00
Alex	930a88b0e2	z status moves did not work properly	2023-02-27 18:00:32 +01:00
DizzyEggg	5a745020ee	add tests for stockpile swallow spit up	2023-02-27 16:27:58 +01:00
DizzyEggg	3338a6b786	add messages for stockpile effects wear off	2023-02-27 12:31:29 +01:00
LOuroboros	8a036e6007	Made this build again	2023-02-27 07:51:36 -03:00
LOuroboros	a54a8d9b2a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-27 07:43:19 -03:00
DizzyEggg	468625ed1d	fit long z-moves names on battle textbox	2023-02-27 10:32:45 +01: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
LOuroboros	fe09f3e0d3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-26 23:42:01 -03:00
Eduardo Quezada	41bf9ea63c	Removed trailing whitespaces	2023-02-26 18:43:15 -03:00
DizzyEggg	4bdca43dbd	refactor mega evolution indicator sprite	2023-02-26 12:51:35 +01:00
BuffelSaft	deb3109c81	Use proper symbol name styles for Jangmo-o family (#2739)	2023-02-26 13:15:53 +13:00
Eduardo Quezada D'Ottone	abc0e20aaf	Consider Nature Power in AI_CalcDamage (#2776)	2023-02-25 12:30:53 -03:00
Alex	f249b58c01	fix style	2023-02-25 15:24:31 +01:00
Alex	7ea82820ec	Consider nature power in AI_CalcDamage	2023-02-25 15:07:45 +01:00
Eduardo Quezada	31ab56bceb	Fixed footprint symbol names.	2023-02-25 09:23:34 -03:00
Alex	df47312e32	Fix move to battle_util.c	2023-02-25 12:38:57 +01:00
Alex	fc5c93fd83	exclude status move type check	2023-02-25 12:15:40 +01:00
Eduardo Quezada	ca81d7a0f9	Forgot about Jangmo-o	2023-02-24 21:58:09 -03:00
Alex	1e1686b69a	Fixes #2414	2023-02-24 23:38:23 +01: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
DizzyEggg	3ff8c95c4e	add meltan melmetal teachable moves	2023-02-23 10:53:55 +01:00
DizzyEggg	23272074bf	fix uninitialized ai modifier variable in ai calc damage	2023-02-23 10:25:53 +01:00
Alex	1c832768bb	fix trainer party	2023-02-22 20:44:03 +01: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
Jaizu	403a6f4544	Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field ... Fix switch-in abilities activating on an empty field	2023-02-22 09:49:13 +01:00
DizzyEggg	31138455de	remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS	2023-02-22 09:28:12 +01:00
DizzyEggg	bca47a0891	Update src/battle_script_commands.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2023-02-22 09:17:23 +01:00
DizzyEggg	d73ab0246f	Fix Explosion + Galvanize + Volt Absorb and Mind Blown (#2688) ... * Fix Explosion and Mind Blown * Use battler ability in jumpifabilitypresent	2023-02-21 22:50:29 +00: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
Martin Griffin	666e59b37f	Test Roar ... The original implementation of forcerandomswitch was biased towards certain party members.	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
ghoulslash	6f23ada6e2	Merge pull request #2705 from DizzyEggg/pickup ... correct Cmd_pickup	2023-02-20 12:15:20 -05:00
DizzyEggg	a8c0e1ebeb	fix intimidate	2023-02-20 13:15:08 +01: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
LOuroboros	c33cc834bc	Updated Psyshield Bash's accuracy	2023-02-19 19:04:36 -03:00
DizzyEggg	380af442c3	Fix buggy pokemon anims with Illusion (#2639) ... * try illusion fix * fix	2023-02-19 12:05:56 +01:00
DizzyEggg	c82f35d6bf	correct Cmd_pickup	2023-02-19 12:01:13 +01:00
ghoulslash	4b64433816	Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649) ... * add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims * add missing semicolon * add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting * remove duplicate func * improve origin pulse anim * fix IsDoubleBattle call * venom drench acid uses average battler positions * add GetSubpriorityForMoveAnim * add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-19 11:48:12 +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
Eduardo Quezada D'Ottone	fcf13aab2b	Fixed evolutions that use held items to evolve not working when using Rare Candies. (#2565)	2023-02-19 10:40:55 +01:00
ghoulslash	79ea2e8074	add howl AI check for new effect (#2703) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-18 11:37:29 +01:00
LOuroboros	4be4ec3081	metatitleBehavior -> metatileBehavior	2023-02-17 16:43:22 -03:00
GriffinR	bc3805f9d3	Fix two binary palettes	2023-02-17 13:27:39 -05:00
LOuroboros	6e134bb7dc	Removed pointless IsBattlerHpLow function	2023-02-17 12:52:43 -03:00
DizzyEggg	66d2f253a1	merge with master	2023-02-17 15:43:15 +01:00
Jaizu	31316dbfd2	Merge pull request #2529 from mrgriffin/rhh-battlescript-cmd-args ... Readable BattleScript command arguments	2023-02-17 15:35:03 +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
Martin Griffin	0573aa455a	Introduce macros to parse battle script arguments ... CMD_ARGS for regular commands, VARIOUS_ARGS for various commands, and NATIVE_ARGS for callnative commands.	2023-02-17 10:05:57 +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
Eduardo Quezada	a60b179bcb	Incorporated fixes from upstream	2023-02-16 18:20:54 -03:00
DizzyEggg	d637ee3b13	Fix After You for gen8 (#2646) ... Fix After You	2023-02-16 20:59:36 +00:00
DizzyEggg	6cdca24c31	use forced switch battler bit	2023-02-16 21:58:00 +01:00
Eduardo Quezada	f4f8ab6ee9	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-02-16 17:06:49 -03:00
DizzyEggg	d7f68a3893	IsAceMon - not isAceMon	2023-02-16 15:57:15 +01: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
ghoulslash	05bef50a1f	Merge pull request #2658 from DizzyEggg/one_vs_two_egg ... Fix 1 vs 2 battles with eggs	2023-02-16 09:20:18 -05:00
ghoulslash	60a3da5811	Merge pull request #2691 from DizzyEggg/clang_scales ... Fix Clanging Scales target and effect	2023-02-16 09:13:33 -05:00
ghoulslash	8c81cf1e66	Merge pull request #2692 from DizzyEggg/shields_down ... Fix Shield Down Ability pop-up	2023-02-16 09:11:24 -05:00
sbird	fea54c9277	[intro] add fading, refactor abort, align intro gfx	2023-02-16 10:43:50 +01:00
DizzyEggg	97f9c0a4d9	oof	2023-02-15 23:45:53 +01:00
DizzyEggg	f6a0c882d1	Fix Shield Down Ability pop-up	2023-02-15 23:44:00 +01:00
DizzyEggg	94651e77a5	Fix Clang Scales target and effect	2023-02-15 22:18:18 +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	bd54990333	Review changes	2023-02-15 13:56:11 -03:00
GriffinR	69fdf0faa4	Merge pull request #1853 from GriffinRichards/doc-contest-bar ... Clarify AI_CV_AttackDown_UnknownTypeList	2023-02-15 11:29:57 -05:00
GriffinR	671c9c5353	Merge branch 'master' into doc-chat	2023-02-15 10:57:05 -05:00
Alex	e4045a7a5f	z move pp color (#2690)	2023-02-15 16:19:09 +01:00
GriffinR	a322379feb	Merge branch 'master' into doc-windows	2023-02-15 10:04:48 -05:00
GriffinR	9c1c598160	GROUPTYPE_NONE to unsigned	2023-02-15 09:49:33 -05:00
DizzyEggg	3f0f7c6b7f	Fix Battle Bond activating multiple times in battle	2023-02-15 15:30:29 +01:00
LOuroboros	7885941d3c	Tweaked Task_HandleExpansionIntro to fix the water drops glitch ... Thanks to Tustin2121.	2023-02-14 14:03:18 -03: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
ghoulslash	094554b3a3	Merge pull request #2681 from DizzyEggg/jaw_lock ... Fix Jaw Lock locking player pokemon	2023-02-13 10:40:47 -05:00
DizzyEggg	2b4d2a7695	Fix Jaw Lock locking player pokemon	2023-02-13 16:27:21 +01:00
ghoulslash	d1ef53f93a	Merge pull request #2678 from AlexOn1ine/z_indicator_in_doubles ... Z-Move Indicator was wrongly displayed in double battles	2023-02-13 08:52:06 -05:00
DizzyEggg	0577d8d04d	Fix Mirror Armor against Clear Body	2023-02-13 14:44:34 +01:00
ghoulslash	c399391891	Merge pull request #2677 from AlexOn1ine/z_moves_switch_order ... Fix switching Z-Moves when pressing SELECT in battle	2023-02-13 08:41:58 -05:00
ghoulslash	39b8c8e9e7	fix sText_BeingHitChargedPkmnWithPower battler	2023-02-13 08:39:04 -05:00
ghoulslash	d508f12ac9	merge with upcoming	2023-02-13 08:38:32 -05: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
Alex	2b32bfcdc1	add battlerId arg to ShowZMoveTriggerSprite	2023-02-12 19:39:14 +01:00
Eduardo Quezada	d699d55ba3	Reformatted gNatureStatTable	2023-02-12 01:19:03 -03: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
Alex	d363ed8152	z indicator in double battles	2023-02-11 19:55:08 +01:00
Alex	ce416be297	z_move switch move bug	2023-02-11 18:32:07 +01:00
sbird	4bcbb7c9e1	[intro] refactor expansion intro	2023-02-09 23:12:29 +01:00
ghoulslash	deb23fc7c6	Merge pull request #2648 from AlexOn1ine/pollen_puff ... Fixes Pollen Puff issue #2611	2023-02-09 08:21:33 -05:00
ghoulslash	27933836b5	Merge pull request #2662 from AlexOn1ine/heal_pulse_v2 ... Add Logic for Heal Pulse effects in double battles	2023-02-09 08:18:00 -05: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
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
Alex	41d64ea41e	heal pulse effect in double battles	2023-02-08 13:02:41 +01:00
DizzyEggg	84d7024add	cleanup	2023-02-08 12:48:48 +01:00
DizzyEggg	896b575c07	Fix volt switch breaking ace pokemon	2023-02-08 12:42:38 +01:00
DizzyEggg	8c257bde99	Fix 1 vs 2 battles with eggs	2023-02-08 10:24:19 +01:00
Eduardo Quezada	6c30c5490c	Test PR	2023-02-08 00:51:59 -03: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
Alex	5bf607049e	Fix Pollen Puff score	2023-02-07 16:41:30 +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	0d6b640876	Merge pull request #2439 from AsparagusEduardo/RHH/pr/cleanup/DragonTailEffect ... Cleaned up move effect checks for Dragon Tail/Circle Throw	2023-02-07 16:17:12 +01:00
DizzyEggg	f762ed728d	remove pointless timers from disable struct	2023-02-07 15:10:20 +01:00
DizzyEggg	0dc5e1e685	aftermath damp pop-ups and string	2023-02-07 13:01:56 +01:00
ghoulslash	0c4c3fbbb7	Fix Poison Gas Anim for MOVE_TARGET_BOTH (#2608) ... * poison gas anim handles MOVE_TARGET_BOTH * fix sprite position fields * fix it again --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-07 12:14:36 +01:00
GriffinR	bbf0cf0103	Stop hard-coding number of preset names	2023-02-04 00:00:38 -05:00
GriffinR	5496f0e6b0	Merge pull request #1850 from GriffinRichards/sync-trade ... Sync trade	2023-02-03 19:05:00 -05:00
GriffinR	c1cfd3ac66	Add fix for commented bug	2023-02-03 16:01:13 -05:00
Jaizu	717ba22ea1	Make contest opponents an enum ... I'm sure that at least 2 people eventually might consider editing them, this makes it easier.	2023-02-03 15:49:22 +01:00
ghoulslash	f060d0185f	fix wind power, electromorphosis stomping on gbattlerattacker	2023-02-02 21:59:40 -05: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	28ada9c93b	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar	2023-02-01 15:52:19 -05:00
GriffinR	020266463c	Add fix for described UB	2023-02-01 15:44:48 -05:00
GriffinR	07e00b2e41	Additional window id constant usage	2023-02-01 15:24:15 -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	30f893f255	Fix comment mistake	2023-02-01 11:52:32 -05:00
GriffinR	9003966fcc	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
GriffinR	43af7d46ca	Label data for elevator effects	2023-02-01 10:43:10 -05:00
GriffinR	27a5e05f75	Label data for screen effect tasks	2023-02-01 10:20:23 -05:00
GriffinR	603d870ea0	Fix debug printing negative values	2023-02-01 09:36:18 -05:00
GriffinR	65d476d575	Remove some incorrect color constant usage	2023-02-01 09:32:41 -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
Martin Griffin	c11774acb8	Decap gStatNamesTable, Spikes, Sturdy, and Torment	2023-02-01 13:53:57 +00:00
Eduardo Quezada D'Ottone	fcccffce45	Apply suggestions from code review ... * Jaizu ran away *	2023-01-31 09:07:45 -03:00
Jaizu	074e601c1f	Fix transform on players side too	2023-01-31 13:02:24 +01:00
Jaizu	4eb7b7048e	Make transform not break	2023-01-31 12:41:07 +01:00
Jaizu	767008427f	Don't pass down daycare like AlterEggSpeciesWithIncenseItem	2023-01-31 09:47:02 +01:00
Jaizu	68ee9e5739	Restore bugfix ... Ooopsie!	2023-01-30 13:57:59 +01:00
Jaizu	267cf1e6f0	Update comment	2023-01-29 19:45:43 +01:00
Jaizu	8b1f4ac3ac	Implement Destiny Knot	2023-01-29 19:35:46 +01:00
Jaizu	761878f1fe	Fix ball resetting when hatching an Egg	2023-01-28 21:35:04 +01:00
ghoulslash	feb4bfee42	fix toxic debris side status check	2023-01-28 13:56:09 -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	f1d97bfad7	Merge pull request #2607 from mrgriffin/rhh-battlescript-fixes ... Fix uses of gBattlescriptCurrInstr	2023-01-27 19:25:06 -03: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
Martin Griffin	4e19d1aaec	Fix uses of gBattlescriptCurrInstr ... - VARIOUS_SWAP_STATS and moveend could branch inside their own arguments. - VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY was implemented in reverse.	2023-01-27 21:27:57 +00: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	4ad4d8e25c	Encore fails if target has not moved	2023-01-27 18:55:50 +00:00
Eduardo Quezada D'Ottone	4c4fa6a2b6	Merge pull request #2603 from TeamAquasHideout/upcoming ... Fix Wood Hammer To Have 1/3rd Recoil	2023-01-27 10:47:32 -03:00
Team Aqua's Hideout	e87e8d0898	Fix Wood Hammer To Have 1/3rd Recoil ... Wood Hammer was set to 1/4th recoil before	2023-01-27 08:16:37 -05:00
Martin Griffin	6a403ab45c	Pastel Veil grants immunity to poison	2023-01-27 00:57:24 +00:00
Martin Griffin	3647825a30	Fix Poison Point ... It incorrectly activated only if the Pokémon with Poison Point could be poisoned by the attacker.	2023-01-27 00:57:24 +00:00
Martin Griffin	a13ffdbfba	U-turn does not switch the user out if Emergency Exit activates	2023-01-27 00:57:22 +00:00
ghoulslash	92341e6d6a	fix flame burst hitting semi-invulnerable partner	2023-01-26 13:04:01 -05:00
Jaizu	d074daedbe	Allow exiting the Battle Debug menu pressing B	2023-01-26 16:36:33 +01: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
walkingeyerobot	f9bb0bfb29	better handle throwing balls in a double wild battle (#2587) ... * Handle throwing balls in a double wild battle where the player has only a single Pokémon.	2023-01-25 20:15:58 +00:00
GriffinR	f4cb6d229f	Add some missing sizeof usage for SpriteSheets	2023-01-24 17:04:48 -05:00
Eduardo Quezada	a044774896	Added Gen9 item data and fixed Punching Glove's effect	2023-01-24 16:47:54 -03:00
GriffinR	10230799d3	Simplify some max value macros	2023-01-23 16:01:46 -05:00
Eduardo Quezada D'Ottone	1202f0366c	Merge pull request #2586 from Jaizu/ability_popup_fixes ... Ability popup updates	2023-01-23 17:34:18 -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	fbcad9d3ec	Merge pull request #2572 from rh-hideout/AsparagusEduardo-patch-1 ... Fixed Exp Candy S using the XS description	2023-01-23 15:00:25 -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
ghoulslash	8cc923ebcc	parentheses around random & 1	2023-01-23 09:42:04 -05: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	e93d22c0f1	optimize IsMoveMakingContact	2023-01-23 09:37:05 -05:00
ghoulslash	125e73dd07	loaded dice fix	2023-01-23 09:36:17 -05:00
ghoulslash	f97ec1975a	merge w upcoming	2023-01-23 09:24:03 -05:00
TeamAquasHideout	af07c451d0	Fix Psycho Shift printfromtable Error	2023-01-23 05:01:55 -05:00
Jaizu	a7ce3974ad	Apply feedback	2023-01-21 19:25:02 +01:00
Jaizu	c6811fb692	Ability popup fixes	2023-01-21 18:12:12 +01:00
ghoulslash	428ea97028	IsBattlerAlive instead of hp check	2023-01-21 12:11:12 -05:00
ghoulslash	a044084182	Remove redundant IsBattlerAlive checks from ITEMEFFECT_ORBS	2023-01-21 11:11:50 -05:00
ghoulslash	9e6c5725d0	add hp check to ITEMEFFECT_ORBS	2023-01-21 08:55:20 -05:00
GriffinR	29c1af50ca	Fix Best Streak stat name	2023-01-20 11:25:04 -05:00
Eduardo Quezada	4a9515e8db	Restored improvements from upstream	2023-01-20 12:34:15 -03: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
GriffinR	b7d92e8537	Revert incorrect constant usage, add new correct ones	2023-01-18 12:11:09 -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	4a9c4951ab	Merge pull request #1815 from tustin2121/patch-5 ... Adding FindObjectEventPaletteIndexByTag bugfix	2023-01-18 10:40:07 -05:00
GriffinR	a203c03eac	Add bugfix to LoadObjectEventPalette	2023-01-18 10:33:39 -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
GriffinR	d5a4bfcd6f	Merge pull request #1843 from GriffinRichards/colorize ... Colorize more grayscaled/incorrectly colored pngs	2023-01-15 12:48:42 -05:00
Jaizu	a3ae182fc2	Add constants when using GetMonsStateToDoubles_2	2023-01-15 09:50:31 +01:00
GriffinR	c0e68f33f7	Colorize pokemon storage tiles	2023-01-15 00:39:51 -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
GriffinR	1707f82992	Combine/colorize status graphics	2023-01-13 12:53:08 -05:00
Eduardo Quezada D'Ottone	6e1981369b	Fixed Exp Candy S using the XS description	2023-01-13 13:22:27 -03: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
GriffinR	ee3f5033b3	Colorize contest/interface.png	2023-01-13 00:26:40 -05:00
Eduardo Quezada	77cc407386	Review change	2023-01-12 23:44:34 -03:00
GriffinR	12cbb0b30f	Colorize and combine birch_bag/birch_grass	2023-01-12 15:22:23 -05:00
GriffinR	5b3596108d	Add some missing PARTY_SIZE usage	2023-01-12 10:51:20 -05:00
Bassoonian	3b4cba9b51	Apply suggestions from code review ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2023-01-11 14:11:47 +01: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	ba21ffb3f2	Oopsie. Protosynthesis is NOT a terrain ability	2023-01-09 14:37:18 -03: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
LOuroboros	91b2e1bb50	More review changes and added lackings ... -Removed unnecessary special handling of terrain-inducing overworld weather states from ChangeTypeBasedOnTerrain. -Mimicry now activates normally for terrain-inducing overworld weather states. -Weather abilities now activate normally when switchineffects is called, and at the beginning of a battle. -Terrain abilities now activate normally at the beginning of a battle.	2023-01-09 07:55:55 -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	612ef46d82	Forgot to add these suggestions	2023-01-08 19:26:34 -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
Eduardo Quezada	c5ea97ecc3	Review changes	2023-01-08 18:42:39 -03:00
Eduardo Quezada	9250f8c994	Standarized Pichu/Light Ball/Volt Tackle interaction into their own table, allowing for custom combinations	2023-01-08 18:35:47 -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
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	f39f48fc51	Made MOVE_EFFECT_DIRE_CLAW a tiny bit prettier	2023-01-05 03:07:28 -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
LOuroboros	7e398ce80e	Corrected the AI conditionals	2023-01-04 12:45:49 -03:00
LOuroboros	9a6bdfb74f	Added AI conditionals for the new move effects in this batch	2023-01-04 12:13:34 -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
ghoulslash	a425de77a6	Merge pull request #2446 from LOuroboros/primal ... Updated AnimTask_PrimalReversion	2023-01-04 09:16:28 -05:00
ghoulslash	a6269f8cc7	Merge pull request #2559 from AsparagusEduardo/RHH/pr/sync/pretmerge_20230103 ... For me, it was tuesday. (pret merge 2023/01/03)	2023-01-04 09:15:08 -05:00
GriffinR	36c89d345c	Merge branch 'master' into doc-wnews	2023-01-03 22:28:21 -05:00
Eduardo Quezada D'Ottone	41d846c74c	Merge pull request #2551 from ghoulslash/be/frontier_bp ... Reshape sBattlePointAwards to be easier to read	2023-01-03 21:48:08 -03:00
ghoulslash	2ee26c6240	align cols	2023-01-03 19:36:19 -05:00
Eduardo Quezada	b897b7787e	Applied bugfix from upstream	2023-01-03 15:41:03 -03: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	bb218b1616	Updated HOLD_EFFECT_ZOOM_LENS check	2023-01-03 01:10:21 -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
ghoulslash	759ee8854a	Merge pull request #2470 from LOuroboros/dev_gen9_abilities ... Implemented the majority of the Gen. 9 Abilities	2023-01-02 13:39:38 -05:00
ghoulslash	a06135b2f4	Merge pull request #2539 from AsparagusEduardo/RHH/pr/fix/FixEgg ... Fixed Eggs sometimes reading garbage graphic data.	2023-01-02 13:27:28 -05:00
ghoulslash	82bf76588c	move challengeNum index to end of sBattlePointAwards, explicitly call out frontier facilities, modes	2023-01-02 13:12:46 -05: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	d3443396e2	Made Clear Body and similar abilities be normally affected by their own stat stage reductions	2023-01-01 10:45:38 -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
Bassoonian	453aa2ffe7	Fix faulty gBaseStats reference	2022-12-31 02:01:56 +01: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	2d222ad0a9	Merge pull request #2544 from LOuroboros/miscs ... Applied minor tweaks	2022-12-30 17:51:55 -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
Jaizu	c40c7e7e65	Fix breaking modern, correct labels.	2022-12-29 16:11:17 +01:00
Jaizu	e2d47a07f5	Fix ANIM_SPRITE on regular builds with BUGFIX. ... Dicussion about this being a BUGFIX define instead limiting it only to modern. Credit SBird.	2022-12-29 12:28:44 +01: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	9bad91b167	Applied minor tweaks ... -Made setbeakblast affect a specified battler instead of the gBattlerAttacker to justify the macro's layout. -Added Shell Trap to the list of moves unaffected by Encore. -Renamed CheckFocusPunch_ClearVarsBeforeTurnStarts into CheckChosenMoveForEffectsBeforeTurnStarts because that function doesn't just check for Focus Punch anymore, and it doesn't clear any variables either.	2022-12-28 08:33:31 -03:00
LOuroboros	f5c165ff0c	Updated Dire Claw's effect again ... Thanks to MGriffin for providing a much nicer code for it.	2022-12-28 08:30:22 -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	b0127428c6	Review suggestions.	2022-12-27 00:04:46 -03:00
Eduardo Quezada	701179eb1f	Documented missing use of SPRITE_ARR_ID_MOVE_SELECTOR1	2022-12-26 21:05:18 -03:00
Eduardo Quezada D'Ottone	263ed33755	Fixed Eggs sometimes reading garbage graphic data.	2022-12-26 11:56:27 -03:00
Eduardo Quezada D'Ottone	034ba7d5d2	Fixed usage of gBattleStruct->changedSpecies so its only used by player's party	2022-12-26 08:59:37 -03:00
SphericalIce	09d20bd634	Rename ball_display_unused_extra	2022-12-26 11:30:12 +00: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	9972cce0ec	Updated MOVE_EFFECT_DIRE_CLAW	2022-12-21 20:05:10 -03:00
SonikkuA-DatH	c4db74460a	Update battle_util.c ... Noted Protection Bypassing	2022-12-21 14:50:06 -08: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
LOuroboros	c40e15f8c5	Added Sheer Force check to Anger Shell	2022-12-21 19:43:41 -03:00
Eduardo Quezada D'Ottone	da535fc8f1	Merge pull request #2530 from mrgriffin/rhh-setroost-cleanup ... Minor Roost fixes/cleanup	2022-12-21 17:04:14 -03:00
Eduardo Quezada	339d794324	Fixed compile and made table into struct	2022-12-21 16:46:32 -03:00
ghoulslash	dba1aa4f0b	fix ai helping hand	2022-12-21 12:05:38 -05: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
Eduardo Quezada D'Ottone	42d2bee519	Merge pull request #2527 from mrgriffin/rhh-cleanup-handle-terrain-move ... Cleanup HandleTerrainMove	2022-12-21 12:21:46 -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	405a42b246	Update battle_anim_effects_1.c ... spacing	2022-12-20 18:17:49 -08:00
SonikkuA-DatH	8d28d23e74	Update src/battle_util.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 18:09:15 -08:00
Philipp AUER	766c0140ee	Refactor sInverseTypeEffectivenessTable to implicit lookup (#2528) ... * [refactor, battle_util] replace sInverseTypeEffectivenessTable LUT by implicit lookup * [review, style, squashme] update switch/case codestyle Co-authored-by: LOuroboros <lunosouroboros@gmail.com> * [review, squashme] merge code branches Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Co-authored-by: sbird <sbird@no.tld> Co-authored-by: LOuroboros <lunosouroboros@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 22:48:41 -03:00
Martin Griffin	682c59869b	Cleanup HandleTerrainMove	2022-12-20 21:28:54 +00: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	07a91b9e9b	Update src/battle_script_commands.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-19 17:18:43 -08:00
SonikkuA-DatH	459631eb96	Update src/battle_script_commands.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-19 17:18:23 -08:00
SonikkuA-DatH	6215d4b1b4	Update src/battle_script_commands.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-19 17:18:05 -08: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	bf1a205661	Update src/battle_script_commands.c ... Bracket fixing Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-18 22:27:12 -08:00
SonikkuA-DatH	c81b702a86	Update src/battle_script_commands.c ... Spacing refix Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-18 22:26:51 -08:00
SonikkuA-DatH	03b5d36249	Update src/battle_script_commands.c ... removes various description Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-18 22:26:06 -08:00
SonikkuA-DatH	6a2a026c70	Update battle_anim.h ... Added required tags	2022-12-18 22:23:51 -08:00
SonikkuA-DatH	5682247ace	Add files via upload ... Base upload. Need to apply Teatime changes...	2022-12-18 19:14:54 -08:00
SonikkuA-DatH	b97a68656c	Delete battle_anim.h ... Need to replace with current...	2022-12-18 19:14:01 -08:00
SonikkuA-DatH	f0aee1f8d3	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-18 17:50:39 -08:00
SonikkuA-DatH	44b522fd1c	Update battle_script_commands.c ... Spacing	2022-12-18 15:53:07 -08:00
SphericalIce	17052d4547	Use the ITEM_NONE constant for the registeredItem save block field	2022-12-18 21:05:37 +00:00
Eduardo Quezada	bd7d949f5f	Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set	2022-12-18 13:49:02 -03:00
LOuroboros	089104cd9c	Update battle_script_commands.c	2022-12-18 10:35:58 -03:00
Eduardo Quezada	66d1c9bc65	Documenting padding in structs used by Saveblocks	2022-12-17 22:55:43 -03:00
LOuroboros	4f951b7887	Updated ENDTURN_PLASMA_FISTS	2022-12-17 03:44:19 -03:00
Eduardo Quezada	c03f354dca	Finished cleaning up the animations to the new standard	2022-12-16 20:58:41 -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
Eduardo Quezada D'Ottone	0dca5a5230	Merge pull request #2516 from LOuroboros/patch-1 ... Updated SetMoveEffect	2022-12-15 18:10:08 -03: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	7c447a1f62	Small corrections	2022-12-14 12:09:16 -03:00
LOuroboros	4c9446ed0a	Fixed Speed Swap's effect	2022-12-14 12:00:45 -03:00
LOuroboros	af6ea91e72	Applied Eduardo's suggestion	2022-12-14 10:48:12 -03:00
LOuroboros	37151e4a2d	Updated SetMoveEffect	2022-12-14 10:46:11 -03:00
LOuroboros	a3e58b05c1	Implemented Guard Dog's effect	2022-12-12 20:33:37 -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
ghoulslash	340278c83b	Merge pull request #2452 from LOuroboros/intimidate ... Optimized Intimidate's code	2022-12-11 22:04:16 -05:00
Bassoonian	07a8af5975	Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon	2022-12-11 22:09:23 +01:00
ghoulslash	e3e0d60222	Merge pull request #2467 from Bassoonian/gen9moves ... Generation IX Moves	2022-12-11 14:47:47 -05:00
Eduardo Quezada	2f96344cd9	Removed ANIM_CMD macro from unused_anims.h	2022-12-10 11:46:41 -03:00
LOuroboros	0d1f9d9613	Reimplemented Mimicry	2022-12-09 20:46:18 -03:00
ghoulslash	04e9c181ad	add covert cloak check for stats	2022-12-06 12:42:01 -05:00
ghoulslash	2391150274	Revert "CreateAbilityPopup always records ability" ... This reverts commit c8661a1bc1.	2022-12-06 11:25:27 -05:00
ghoulslash	c8661a1bc1	CreateAbilityPopup always records ability	2022-12-06 11:24:04 -05:00
ghoulslash	c327655ef5	small fixes	2022-12-06 11:12:20 -05:00
ghoulslash	5a26a69ccd	add some RecordItemEffect and RecordAbilityBattle situations, ai checks	2022-12-06 11:00:57 -05:00
ghoulslash	bdb480765c	add ability shield check to mummy, wandering spirit	2022-12-06 10:50:33 -05:00
ghoulslash	b6258adc6d	fix ShouldLowerStat clear amulet check	2022-12-06 10:43:01 -05:00
ghoulslash	6d28882e44	start gen9 hold effects	2022-12-06 09:48:36 -05:00
LOuroboros	c287f4f016	Updated sAbilitiesAffectedByMoldBreaker	2022-12-06 06:22:02 -03: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	fa78e3b2c4	Implemented Armor Tail's effect	2022-12-06 05:26:30 -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	18c30be838	Implemented Hadron Engine's effect	2022-12-06 05:23:30 -03:00
LOuroboros	dd90ab1911	Implemented Orichalcum Pulse's effect	2022-12-06 05:23:29 -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	c1e232cbf6	Implemented Rocky Payload'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
Eduardo Quezada D'Ottone	3718f58a0a	Merge pull request #2469 from LOuroboros/patch-1 ... Updated TryChangeBattleTerrain	2022-12-05 23:40:52 -03:00
LOuroboros	f9458117ee	Updated TryChangeBattleTerrain	2022-12-05 23:31:41 -03:00
Eduardo Quezada	2d694a84e3	Trying to fix remote reference	2022-12-05 21:57:28 -03:00
Bassoonian	8c77ae59d6	Use official Double Shock message	2022-12-04 21:57:02 +01:00
Bassoonian	06ab4fc842	Update move flags	2022-12-04 21:56:40 +01:00
Bassoonian	b0ead44ee8	Update battle_tv.c	2022-12-04 21:23:45 +01:00
Bassoonian	5bcb6b8afd	Update B_METRONOME_MOVES	2022-12-04 18:16:15 +01:00
Bassoonian	dc97a31c31	Change battle_debug.c to MOVES_COUNT	2022-12-04 18:15:35 +01:00
Bassoonian	c14fa82f43	Fix Headlong Rush description	2022-12-04 18:14:27 +01:00
Bassoonian	051ad7bf69	Update src/data/text/move_descriptions.h ... Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-04 00:26:05 +01:00
GriffinR	f55443656f	Add NUM_TILES_PER_METATILE	2022-12-03 17:29:02 -05:00
LOuroboros	eb082cd1a2	Implemented Purifying Salt's effect	2022-12-03 01:51:11 -03:00
LOuroboros	acb9c31bd4	Implemented Anger Shell's effect	2022-12-03 01:19:24 -03:00
LOuroboros	be71c4ca99	Implemented Thermal Exchange's effect	2022-12-03 01:15:31 -03:00
LOuroboros	b0027cb78b	Implemented Seed Sower's effect	2022-12-02 23:31:41 -03:00
LOuroboros	8dd3fd025f	Implemented Lingering Aroma's effect ... And took the chance to tweak Mummy's.	2022-12-02 23:31:38 -03:00
LOuroboros	653364fd71	Added the basic data for the Gen. 9 Abilities	2022-12-02 23:01:22 -03:00
ghoulslash	6140cacbef	set BS_SCRIPING before BattleScript_TrainerSlideMsgRet	2022-11-29 18:28:33 -05: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	4b799f2571	optimize BS_GetBattlerSide	2022-11-28 15:10:42 -05:00
ghoulslash	cd7abea6fe	fix BS_TrySymbiosis	2022-11-28 14:47:56 -05:00
ghoulslash	34ba9b4e0d	convert a few various to callnatives	2022-11-28 14:36:19 -05:00
ghoulslash	b869b836cc	add callnative bs func, convert metal burst dmg calc	2022-11-28 10:34:27 -05:00
ghoulslash	1037613b0e	Merge pull request #2418 from LOuroboros/zPP ... Made Z-Moves unusable without PP	2022-11-28 09:52:28 -05:00
ghoulslash	ac30ebd5a4	Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny ... Refactored Shiny configs + cleanup	2022-11-28 09:51:39 -05:00
tustin2121	cf6f343726	Use multi-include incbins for stormy_water ... - Removes a special case rule from the make files.	2022-11-26 23:38:39 -05:00
LOuroboros	add75d84c0	Applied a couple of tweaks ... -Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too. -Made sure to remove the candy that was used from the bag.	2022-11-25 18:12:51 -03:00
LOuroboros	53110a0ff6	Allow Lv100 'mons to access level based evos	2022-11-25 17:34:11 -03: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
GriffinR	004ce32da0	Sync text ctrl codes with pokefirered	2022-11-23 21:13:00 -05:00
Eduardo Quezada	7999220361	Fixed modern compile	2022-11-22 18:37:38 -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
Bassoonian	4ac1e4fc61	Power Shift is now a clone of Power Trick	2022-11-19 13:41:56 +01: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	4da9ecbcea	Prepare FLAG_SLICING_MOVE for merger with abilities branch	2022-11-18 22:37:31 +01:00
Bassoonian	4034f18c0e	Update PLA descriptions	2022-11-18 22:30:40 +01: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	a250341e6c	Forgot to reset Wicked Torque effect rate	2022-11-18 22:00:46 +01:00
Bassoonian	3ac3cb249e	Wicked Torque effect	2022-11-18 22:00:21 +01:00
Bassoonian	d4c92a0a19	Fix Bitter Malice's effect	2022-11-18 21:54:46 +01:00
Bassoonian	ed33f2b9ce	Change PLA moves to SV effects	2022-11-18 20:56:25 +01:00
Bassoonian	e279185152	Update move data to GEN9 (with config)	2022-11-18 12:22:15 +01:00
Bassoonian	f7d1a12d2d	Data entry for gen9 moves	2022-11-18 12:15:44 +01:00
GriffinR	df470b75dd	Merge pull request #1817 from GriffinRichards/sync-wireless ... Add cursor kind constants, sync wireless improvements	2022-11-17 15:18:20 -05: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
eatthepear	bd4b660983	Fix Berries that were broken after Bug Bite fix ... Issue #2448 Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works. I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).	2022-11-11 21:28:44 -05:00
LOuroboros	7260478c54	Uncommented level up moves	2022-11-11 01:31:22 -03:00
GriffinR	601bb0b578	Index gBattleFrontierHeldItems	2022-11-10 16:14:06 -05:00
GriffinR	3b1c8dfb17	Update list menu graphics	2022-11-09 19:44:58 -05: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
Eduardo Quezada	bd63ef18af	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/pokemon_storage_system.c	2022-11-09 19:33:26 -03:00
GriffinR	e434b0047f	More missing constant usage	2022-11-09 15:53:47 -05:00
GriffinR	431a7ef8dd	Add missing cursorKind field usage	2022-11-09 15:37:47 -05:00
GriffinR	1d1c2d41bb	Add list menu cursor constants	2022-11-09 15:16:46 -05:00
GriffinR	b3e75138da	Sync wireless improvements	2022-11-09 15:14:18 -05:00
LOuroboros	a35986fd9c	Fixed indentation in ScrCmd_faceplayer	2022-11-08 21:01:50 -03:00
LOuroboros	999a53028a	Updated AnimTask_PrimalReversion	2022-11-08 09:38:27 -03:00
Eduardo Quezada D'Ottone	e6ae0bd01e	Merge pull request #2434 from LOuroboros/badDreams ... Optimized Bad Dreams' code	2022-11-08 08:16:07 -03:00
tustin2121	33f3a7c11a	Adding FindObjectEventPaletteIndexByTag bugfix ... The code in event_object_movement.c indicates that OBJ_EVENT_PAL_TAG_NONE was meant to be a sentinel for the bottom of each of the tables involving palettes in there. sObjectEventSpritePalettes is the exception, but the functions that access it look for OBJ_EVENT_PAL_TAG_NONE even though it's not in the table. If the palette tag isn't in the table, the functions which scan it fall off the bottom of the table into an infinite loop of scanning 256 "entries" of the table (because it uses a u8 index), and the game locks up. In vanilla, the search simply never falls off the bottom of the table. It seems the developers intended for that last entry to be {NULL, OBJ_EVENT_PAL_TAG_NONE}.	2022-11-07 06:09:21 -05:00
Eduardo Quezada	237877e21b	Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System	2022-11-07 00:00:23 -03: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	0eccbdf980	Primal Reversion at the beginning of a battle now happens in the switchin ability loop, making it happen by speed order.	2022-11-06 00:36:25 -03:00
Eduardo Quezada	712d41c752	Cleaned up move effect checks for Dragon Tail/Circle Throw	2022-11-05 23:51:59 -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
BuffelSaft	bbd7b205fd	Merge pull request #2433 from ghoulslash/be/bug_bite ... Redo Bug Bite	2022-11-05 22:08:47 +13:00
LOuroboros	f56df74576	Optimized Bad Dreams' code ... Misc: -Made the ability pop up stick around until the ability's effect ends just like in ORAS. -Updated sText_BadDreamsDmg accordingly while I was at it.	2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone	fa8bf80905	Merge pull request #2420 from LOuroboros/teleport ... Updated CanTeleport	2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone	2b5aff2764	Merge pull request #2426 from tustin2121-2/patch-linker ... GF Header and Modern Builds	2022-11-04 12:27:13 -03: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
BuffelSaft	d05c74b9e9	Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams ... Fixed Bad Dream's ability popup message	2022-11-05 03:42:44 +13:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
Eduardo Quezada	5b1552514e	Review changes	2022-11-04 11:10:06 -03: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	8c66b318eb	Fixed Bad Dream's ability popup message	2022-11-04 00:46:07 -03:00
Eduardo Quezada	d23b5c95c9	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations ... # Conflicts: # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c	2022-11-03 23:31:20 -03: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
tustin2121	b32413d11e	Restoring the GFHeader ... - Also adding comment about what the header does and how to maintain it.	2022-11-02 12:45:36 -04:00
tustin2121	fd87c97ef8	Adding documentation about GFHeader	2022-11-02 12:42:58 -04:00
Eduardo Quezada	271bff5675	Gen 5+ stat recalculate in the same party loop at the end of battle that changes forms.	2022-11-02 10:06:02 -03:00
Eduardo Quezada	8b0a848424	Zen Mode triggers at the beginning of a battle	2022-11-01 23:53:04 -03: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	fa8b1b9c05	Updated descriptions of form change constants	2022-11-01 15:02:45 -03:00
Eduardo Quezada	f5b900e2ef	Defaults Primal Reversion indicator to Alpha when item not Red Orb.	2022-11-01 15:02:22 -03:00
Eduardo Quezada	a57f6d184b	Fainting by poison in the overworld reverts forms	2022-11-01 12:24:04 -03:00
Eduardo Quezada D'Ottone	ebc9fc31d2	Merge pull request #2416 from DizzyEggg/fix_palace ... Fix battle palace bug	2022-11-01 12:16:55 -03:00
DizzyEggg	51d8b57dcc	restore deleted line	2022-10-31 13:19:10 +01:00
DizzyEggg	ea43b7732c	Fix battle tent again	2022-10-31 13:16:48 +01:00
Eduardo Quezada D'Ottone	9d64c838cf	Merge pull request #2424 from LOuroboros/getItemId ... Actually removed ItemId_GetId	2022-10-31 07:15:25 -03:00
LOuroboros	52dda5fc0f	Actually removed ItemId_GetId	2022-10-30 22:52:22 -03:00
LOuroboros	5ebc996c51	Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config	2022-10-30 22:03:14 -03:00
Eduardo Quezada	14e85249d1	Review changes	2022-10-30 17:12:13 -03:00
Eduardo Quezada	d02fc43703	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-10-30 13:38:25 -03:00
GriffinR	d90132842a	Update gitignore/spacing for new region map data	2022-10-30 12:22:41 -04: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