9255 Commits

Author	SHA1	Message	Date
Bassoonian	02af4d0943	Fixes Ominous Wind targeting	2023-04-08 18:53:04 +02:00
GriffinR	d4e243136f	Merge pull request #1878 from GriffinRichards/num-text-printers ... Replace NUM_TEXT_PRINTERS with WINDOWS_MAX	2023-04-08 08:41:04 -04:00
sbird	903b56756d	fix an oversight that caused battles to continuesly be double battles	2023-04-08 02:23:43 +02:00
ghoulslash	ff2afb0eec	Fixed Comatose AI checks (#2866)	2023-04-07 09:27:28 -04:00
ghoulslash	c3e9f4b571	Added B_DOUBLE_WILD_REQUIRE_2_MONS to use of B_DOUBLE_WILD_CHANCE even when there is only one Pokémon in the party (#2878)	2023-04-07 09:26:22 -04:00
Philipp AUER	d57d8e6e71	Revert "Fix overworld poison not working on newer generations config" ... This reverts commit e1beb55a51.	2023-04-07 11:35:30 +02:00
Jaizu	e1beb55a51	Fix overworld poison not working on newer generations config	2023-04-07 11:21:47 +02:00
Jaizu	4709d2b46f	Fix trainers having empty movesets	2023-04-07 10:53:44 +02:00
Alex	bd4736cc97	initial commit ... test multi battle final remove empty line	2023-04-06 20:56:44 +02:00
Bassoonian	50b5dba655	Fix string issue as requested by Jaizu	2023-04-06 10:13:32 +02:00
Bassoonian	dfee8a4759	OW Poison configs	2023-04-06 00:26:52 +02:00
Eduardo Quezada D'Ottone	5fe79d83c1	Fix CalcMoveBasePower using battler addresses (#2858)	2023-04-03 23:27:36 -04:00
GriffinR	57396026b2	Replace NUM_TEXT_PRINTERS with WINDOWS_MAX	2023-03-31 14:57:51 -04:00
GriffinR	4b859ff1e4	Use tilemap file for cable car pylons	2023-03-31 00:44:22 -04:00
PSF	24df9823e8	In response to PR discussion, added new preproc config for developers to toggle Overworld_ResetBattleFlagsAndVars	2023-03-30 06:35:38 -07:00
pkmnsnfrn	6a7466c929	Added B_DOUBLE_WILD_REQUIRE_2_MONS to allow use of B_DOUBLE_WILD_CHANCE even when there is only one Pokémon in the party	2023-03-29 11:11:07 -07:00
Alex	8c4396ddaf	Gen9 move tests batch2	2023-03-29 13:01:20 +02:00
LOuroboros	977a55bdee	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2	2023-03-29 07:40:16 -03:00
PSF	686d42709a	Added documentation on resetting battle flags and vars ... Added Overworld_ResetBattleFlagsAndVars to Overworld_ResetStateAfterWhiteOut	2023-03-28 15:50:58 -07:00
ghoulslash	f8bbcdfe73	minor fix to mirror herb message	2023-03-28 15:12:54 -04:00
ghoulslash	afc4b4cdee	add mirror herb	2023-03-28 15:07:37 -04:00
ghoulslash	10ef3e8348	style fixes	2023-03-28 10:58:44 -04:00
ghoulslash	00d695ac2b	add AI_FLAG_OMNISCIENT	2023-03-28 10:38:48 -04:00
LOuroboros	ed9e860400	Post cherrypick corrections and improvements ... -Made BattleScript_EffectTakeHeart use modifybattlerstatstage -Optimized usage of BattleScript_EffectInfernalParade -Tweaked the way in which Triple Arrows' increased crit. hit chance is handled -Optimized syntax for case MOVE_EFFECT_TRIPLE_ARROWS in SetMoveEffect -Optimized case EFFECT_INFERNAL_PARADE in CalcMoveBasePower -Infernal Parade is not known to interact with Comatose, so Eduardo and I will extrapolate that here -Added AI conditionals for some of the effects -Made Triage notice Jungle Healing and moves that use its effect	2023-03-28 10:08:52 -03:00
ghoulslash	dd99cb6da8	Fixed instances of gSideTimers not using side constants (#2867)	2023-03-27 21:48:50 -04:00
Eduardo Quezada D'Ottone	fa245c6edf	fix GetBattleAnimMoveTargets for non-player gBattleAnimAttacker (#2848)	2023-03-27 18:11:22 -03:00
AgustinGDLV	b856cb3e62	fixed Eiscue + multiple weather form changes at once (probably)	2023-03-27 12:05:06 -07:00
AgustinGDLV	2017bee3f8	fixed Castform + Cherrim	2023-03-27 11:35:23 -07:00
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
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