3695 commits

Author	SHA1	Message	Date
Eduardo Quezada D'Ottone	1fa9a05470	Convert move flags and bans into GCC bitfields (#2952) ... * Slicing moves to new bitfield * Wind moves to new bitfield * Two-strike moves to new bitfield * Forgot to add flagTwoStrikes to battle_moves.h * Removed "flag" from field names * FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER * Airborne moves * FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE * FLAG_BALLISTIC and FLAG_PROTECTION_MOVE * Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c * FLAG_SOUND * FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER * FLAG_DMG_MINIMIZE * Cleanup * FLAG_STAT_STAGES_IGNORED * Updated Pollen Puff's ballistic flag * FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST * thaw * FLAG_THREE_STRIKES * FLAG_IRON_FIST_BOOST * FLAG_RECKLESS_BOOST * FLAG_HIGH_CRIT * Removed empty flags * Moves that fail when called by Me First + added missing Shell Trap * Moves that fail when Gravity is active * Better names for banned fields * Moves that fail when called by Instruct * Cleanup * Contact Moves + Fixed Wandering Spirit skipping contact checks * Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect. * Simplified B_MOVE_FLAGS configs * FORBIDDEN_METRONOME * Renamed hitsPastSubstitute to ignoresSubstitute * FORBIDDEN_PARENTAL_BOND * Struggle uncallable by Metronome * FORBIDDEN_MIMIC * FLAG_KINGS_ROCK_AFFECTED * Made a single config for move flags * Macro for checking move flags * FLAG_MAGIC_COAT_AFFECTED * Fixed HasMagicCoatAffectedMove * FLAG_SNATCH_AFFECTED * Removed unused EFFECT_FLINCH_MINIMIZE_HIT * Fixed Stench/King's Rock interaction * Removed sMovesNotAffectedByStench in favor of checking move effects * Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT * Changed Gen2 configs to less than Gen 3 * FORBIDDEN_SLEEP_TALK * Cleanup * Inverted FLAG_MIRROR_MOVE_AFFECTED * FLAG_SHEER_FORCE_BOOST * Ordered * FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT * Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field * Fixed Triple Arrows test	2023-07-03 10:01:59 +02:00
hetoord	40a5995ead	Teatime tests and fixes (#3096)	2023-07-03 09:54:43 +02:00
Eduardo Quezada	2c4a9b754d	Merge branch 'RHH/master' into RHH/upcoming	2023-06-30 16:14:57 -04:00
ghoulslash	304fc4c5b5	Fix disobedience wrong move effect issue (#3089)	2023-06-30 09:03:18 -04:00
Eduardo Quezada D'Ottone	81e59ace25	Cleaned up remaining Castform hack stuff (#3063) ... * Removed gCastformFrontSpriteCoords * Removed sCastformElevations and IsCastformForm * Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct * Scrubbed unused BS commands * Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants * Removed redundant function in Pokémon Debug menu * Removed handling in animation scripts * Removed gBattleMonForms * Reduced MAX_MON_PIC_FRAMES to 2 * Removed Castform/Cherrim makefile stuff * Fixed weather form change tests not checking species. * Fixed Castform palettes after Lunos' PR	2023-06-30 09:58:07 +02:00
Alex	ea7e6265dd	Small Grassy Glide anim bug (#3092)	2023-06-29 14:07:46 -04:00
Alex	20099274d8	Fix Clear Amulet visual bug + Tests (#3074) ... * Fix Clear Amulet visual bug + Tests TODO Tests, additional tests + Triple Kick pp bug * Wonder Guard message, switch instead of if, misalignments	2023-06-28 12:26:03 -04:00
DizzyEggg	f9058a8544	Fix disobedience wrong move effect issue	2023-06-28 12:47:20 +02:00
PSF	b2901c51b0	Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat	2023-06-27 15:34:31 -07:00
ghoulslash	7371a9e401	Add many gen 8 move animations (#2861) ... * port many gen8 and 9 move anims from cfru * fix thunder cage, shell smash, shelter anims. update anim credits --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-06-21 13:19:54 -04:00
LOuroboros	2bf88502a7	More corrections	2023-06-19 04:18:53 -03:00
LOuroboros	9896f20eb8	Applied fixes and corrections (Jun 2023)	2023-06-15 09:22:26 -03:00
LOuroboros	81bb299e7f	Updated Axe Kick's battle script ... I have no idea why is this working now when I'm pretty sure it didn't work before, but I consider this a win all the same.	2023-06-13 06:50:48 -03:00
LOuroboros	313f522622	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2	2023-06-13 05:44:37 -03:00
AgustinGDLV	f91cbe9a36	updated anim macros	2023-05-29 10:23:58 -07:00
AgustinGDLV	3d4789c492	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-28 11:10:50 -07:00
Alex	112636b8f3	Fix Speed Boost animation	2023-05-28 11:54:43 +02:00
ghoulslash	a929ae8b48	Replace launchtemplate and launchtask in battle anims (#2640) ... * replace launchtemplate with createsprite using fix_launchtemplate.py * tidy up script * fix comment handing in fix_launchtemplate.py * fix double comma after sprite template * remove py script * convert launchtask -> createvisualtask * fix launchtask->createvisualtask issue * fix ANIM_PAL ORs * remove launchtemplate, launchtask macros * fix pal macros in z moves * fix bloom doom * add F_PAL_ALL_BUT_DEF * remove all ANIM_PAL_ usages * devestating drake fix * convert launchsoundtask and setblends * Reworked CFRU macro PR --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2023-05-27 17:32:53 -04:00
Eduardo Quezada D'Ottone	84d9cd0396	Fixed compile issue when disabling overworld debug menu (#3024)	2023-05-24 08:24:44 -04:00
Eduardo Quezada D'Ottone	b972199141	Battle Item Refactor Fixes (#3022)	2023-05-23 21:32:57 -04:00
AgustinGDLV	5a8715e608	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix	2023-05-23 16:10:44 -07:00
AgustinGDLV	bb10b0d1b0	fixed GetBattlerSide, removed debug script	2023-05-23 15:50:51 -07:00
AgustinGDLV	34382fcece	fixed revive in 1v2 battles	2023-05-23 14:19:24 -07:00
Alex	109b4c4f6c	Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018) ... remove leftover	2023-05-20 15:58:55 -04:00
LOuroboros	580a09e367	Updated DebugAction_Util_CheckSaveBlock	2023-05-20 15:40:36 -03:00
ghoulslash	487415e56b	Move direct statStage boosts to use statbuffchange (#3000) ... * fix double counting stat boosts for download, moxie beast boost etc * speed boost use statbuffchange * BattleScript_MoveStatDrain use statbuffchange * statbuffchange for rage --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-05-17 11:22:23 -04:00
AgustinGDLV	d133564e21	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-16 21:57:06 -07:00
AgustinGDLV	785b100693	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix	2023-05-16 16:29:38 -07:00
AgustinGDLV	0c182345bf	reworked weather form reversion + added more tests	2023-05-16 16:24:25 -07:00
AgustinGDLV	37874fe5c1	fixed revival blessing failure still showing anim (#3010)	2023-05-16 19:21:05 -04:00
Eduardo Quezada D'Ottone	2aca82300c	Merge branch 'upcoming' into mega_evo_issues	2023-05-14 22:33:01 -04:00
AgustinGDLV	dceefacb95	moved tryfaintmon back, no bugs?	2023-05-11 22:35:08 -07:00
AgustinGDLV	3b6389ec21	updated tests	2023-05-11 22:13:43 -07:00
AgustinGDLV	aec51b5b04	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-11 20:02:06 -07:00
Ultimate Bob	f985eefaa1	Show Imposter abilty in popup instead of opponent's ability.	2023-05-09 01:40:28 +10:00
Salem	fe5e59c910	Merge branch 'upcoming' into RHH/content/gen9SnowWeather	2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone	c530eb2445	Add mirror herb (#2873)	2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone	42445512ad	Battle Item Tests + critical fixes + new test macro (#2940)	2023-05-06 20:43:32 -04:00
AgustinGDLV	a5f28afe42	fixed Forecast and Flower Gift	2023-05-04 17:04:54 -07:00
CallmeEchoo	eb5b81684c	refactored snow into damaging weather ... this is necessary for ice body to properly work. doesnt actually do any damage	2023-05-05 01:38:12 +02:00
Alex	957ee36c75	Fix for Ceaseless Edge/Axe Kick visual glitch (#2969)	2023-05-02 17:25:44 -04:00
Salem	a877266400	Merge branch 'upcoming' into RHH/content/gen9SnowWeather	2023-05-02 21:19:01 +02:00
CallmeEchoo	c5a73f59a4	ad suggested changes	2023-05-02 21:17:14 +02:00
Shae	ae2d5f7d1e	Weather related Ability tests, fix for Leaf Guard not preventing Rest. (#2957)	2023-05-02 14:08:05 -04:00
CallmeEchoo	c32d5f455b	fix rebase issues	2023-05-02 16:44:42 +02:00
CallmeEchoo	f6e80b0ca7	Merge branch 'RHH/content/gen9SnowWeather' of https://github.com/CallmeEchoo/pokeemerald into RHH/content/gen9SnowWeather	2023-05-02 16:29:11 +02:00
CallmeEchoo	76721b16f8	add snow weather	2023-05-02 16:25:26 +02:00
ghoulslash	445e9c4b8b	merge w upcoming	2023-05-01 12:05:07 -04:00
ghoulslash	8cce130643	Add Frostbite status (#2942)	2023-05-01 09:45:47 -04:00
Ultimate_Bob	32e63d8cc7	Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-04-30 21:15:03 -04:00
Alex	2d6282fece	Fix for Burn Up/Double Shock (#2962)	2023-04-30 10:46:21 -04:00
ghoulslash	62ca66bc6b	Refactoring Battle Form changes into the form change tables (#2411)	2023-04-30 08:41:54 -04:00
CallmeEchoo	99cbd2af37	add snow weather	2023-04-29 20:35:58 +02:00
Alex	0cbb80dda7	Fix grassy terrain freezing the game (#2959)	2023-04-28 08:58:43 -04:00
Bassoonian	c279830892	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution	2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone	408aa30aa7	Merge pull request #17 from AgustinGDLV/pr/castform_fix	2023-04-26 14:25:36 -04:00
Salem	78c4d07b23	Add Berserk Gene Item (#2893) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-04-25 15:03:57 -04:00
Bassoonian	b1f75569a1	Merge branch 'upcoming' into rhhupcomingdev	2023-04-25 19:50:26 +02:00
CallmeEchoo	503035010e	Merge branch 'upcoming' into battleItemFixes	2023-04-24 21:11:34 +02:00
ghoulslash	868838a87d	Add thunder cage case to trap anim IDs (#2941)	2023-04-24 14:35:42 -04:00
LOuroboros	a128192bfe	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-04-24 09:36:09 -03:00
ghoulslash	1f6e335a24	merge w upcoming	2023-04-23 18:11:57 -04:00
Bassoonian	f13c39d784	Thawing out for frostbite	2023-04-23 21:20:23 +02:00
Bassoonian	13f6acf9a1	General mechanics	2023-04-23 19:20:48 +02:00
ghoulslash	cf17324040	Fixed duplicate item strings in Bag/Party menus with battle items (#2915)	2023-04-23 08:32:38 -04:00
Bassoonian	a561c6da6a	Add config to Frostbite & allow it to be inflicted	2023-04-22 23:14:49 +02:00
Bassoonian	f50bfb3770	Frostbite hurts at the end of the turn and halves SpA	2023-04-22 18:47:36 +02:00
CallmeEchoo	38476bd22c	fix Full Restore not healing confusion	2023-04-21 21:37:02 +02:00
LOuroboros	b09ab5a3ee	Updated Triple Arrows' effect's code and tests yet again ... Also added a function to get a move's secondaryEffectChance, meant to handle abilities, side statuses and the like that modify it.	2023-04-19 01:57:34 -03:00
LOuroboros	28ce87f6d3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2	2023-04-18 07:35:59 -03:00
LOuroboros	43a5aa09ef	Corrections ... -Optimized BattleScript_EffectTakeHeart -Updated the checks for EFFECT_JUNGLE_HEALING and EFFECT_TAKE_HEART in AI_CheckBadMove -Updated the code for MOVE_EFFECT_TRIPLE_ARROWS inside SetMoveEffect	2023-04-18 07:34:05 -03:00
Alex	60c88d8fcc	Update data/battle_scripts_1.s ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-04-17 19:12:39 +02:00
Alex	0531ab5d87	Fix Ability PopUp freeze	2023-04-17 18:47:54 +02:00
AgustinGDLV	d3a090020b	added code review	2023-04-15 15:30:07 -07:00
AgustinGDLV	82dc1e3e93	fixed dupe strings in battle item use	2023-04-15 09:27:28 -07:00
Eduardo Quezada	dacd0785db	Fixed Mega Evolution script name	2023-04-14 15:17:19 -04:00
AgustinGDLV	2eabcea86e	Battle Item Refactor (#2902) ... * items that can be used in battle now use battlescripts * removed ExecuteTableBasedItemEffect_ * taught AI how to use items, removed AI_itemtype/flag * X-Items store stages raised in holdEffectParam * USE_ITEM in tests	2023-04-14 19:25:50 +01:00
Eduardo Quezada	11beec62ee	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/data/pokemon/evolution.h # src/field_poison.c	2023-04-14 11:31:02 -04:00
Eduardo Quezada	7c29a24110	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413	2023-04-13 17:05:48 -04:00
AgustinGDLV	86242c1c70	MOVE_REVIVAL_BLESSING Effect (#2883) ... * implemented Revival Blessing	2023-04-12 01:14:25 +01:00
AgustinGDLV	d9ab2d1976	combined TerrainSeed and TerrainAbility loops + added terrain tests	2023-04-03 18:53:34 -07:00
AgustinGDLV	f292fefca3	fixed bad switchinabilities call in TerrainSeedLoop	2023-04-03 09:18:47 -07:00
LOuroboros	5bde98741a	Completed Take Heart's effect ... It was missing its "heals any status condition" effect because I'm dumb and I forgot to actually go and do it.	2023-03-29 00:23:46 -03:00
ghoulslash	afc4b4cdee	add mirror herb	2023-03-28 15:07:37 -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
AgustinGDLV	504ec36b2b	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-27 16:22:11 -07:00
AgustinGDLV	2017bee3f8	fixed Castform + Cherrim	2023-03-27 11:35:23 -07:00
AgustinGDLV	8a963ca38a	changed Dynamax animation	2023-03-27 09:50:58 -07: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
AgustinGDLV	aa80e3fd4e	fixed G-Max Wildfire, Max Guard interactions, and reworked changedSpecies	2023-03-26 19:14:33 -07: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	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
AgustinGDLV	aac4ef4d2a	fixed terrain effects	2023-03-25 20:02:48 -07:00
AgustinGDLV	f633d164e1	gave Max Wyrmwind a placeholder anim	2023-03-25 09:59:16 -07:00
AgustinGDLV	5d508f7963	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-24 22:40:51 -07: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
AgustinGDLV	7988c53d01	compile fix + placeholder animations (Wyrmwind broken?)	2023-03-23 22:27:26 -07:00
Zunawe	492422b6bd	Fix scanner item flag name	2023-03-23 21:47:26 -07: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
AgustinGDLV	038649594a	finished G-Max Move tests	2023-03-22 22:31:08 -07:00
AgustinGDLV	a3c8b97a6c	added tests for status1/status2 effects + bug fixes for them	2023-03-22 20:18:25 -07:00
AgustinGDLV	6233627a57	more tests + fixed hp reversion issues	2023-03-22 17:04:05 -07:00
tennis	358180946d	Fix Intimidate targetting dead sides and false postpones	2023-03-22 11:46:50 +00:00
Eduardo Quezada	ef914a2fac	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-21 16:13:27 -03:00
May8th1995	9ec31c61bf	Fixes weirdly set value for eject buttons etc (#2846) ... * Fixes weirdly set value for eject buttons etc * Remove known fialing from fixed test --------- Co-authored-by: tennis <May8th1995@users.noreply.github.com>	2023-03-21 20:12:46 +01:00
AgustinGDLV	69fd63a922	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-21 09:56:58 -07:00
AgustinGDLV	5a9e1de836	Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax	2023-03-20 21:14:33 -07:00
AgustinGDLV	7d70222770	added most Dynamax immunities/interactions + tests + fixed some move selection bugs	2023-03-20 16:40:05 -07:00
Eduardo Quezada	51b716c9d9	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 ... # Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h	2023-03-19 20:28:56 -03:00
LOuroboros	f4e8389779	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
LOuroboros	aefd318945	Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect	2023-03-14 11:43:52 -03:00
GriffinR	0c380862d6	Document the trendy saying word group	2023-03-13 15:58:40 -04:00
Eduardo Quezada	a0feaabef1	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-12 15:53:32 -03:00
Eduardo Quezada	7ce68994ec	Made Mega Evolution properly use TryBattleFormChange	2023-03-12 02:32:09 -03:00
AgustinGDLV	b708da3998	Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax	2023-03-11 00:17:30 -08:00
AgustinGDLV	4293dc8a24	not entirely confident implementation of Dynamax indicator	2023-03-10 23:03:51 -08:00
AgustinGDLV	ec4b330b9b	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-10 21:00:41 -08:00
AgustinGDLV	06bf934b02	Dynamaxed pokemon now have increased HP	2023-03-10 20:38:17 -08:00
LOuroboros	6dbe772e27	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-03-10 18:23:33 -03:00
AgustinGDLV	76073fab52	added basic Dynamax-in-battle	2023-03-10 10:20:27 -08:00
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
DizzyEggg	bf4735e87c	remove test changes	2023-03-08 13:41:08 +01:00
DizzyEggg	f6089a0057	Mega Evolution after switching and based on speed	2023-03-07 22:34:57 +01:00
AgustinGDLV	7de7599a7b	reworked scripts to remove jumpifnotally / jumpiftargetabsent	2023-03-07 12:07:11 -08:00
Eduardo Quezada	4625a46748	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_interface.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c	2023-03-07 11:26:33 -03:00
Eduardo Quezada D'Ottone	81a80e566c	Refactor Mega Evolution indicator sprite (#2805)	2023-03-07 08:06:28 -03:00
DizzyEggg	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
Eduardo Quezada D'Ottone	b3ffc9d1c4	Set link tutorial as complete when using Cheat Start (#2802)	2023-03-06 09:29:34 +01:00
GriffinR	bb078e0618	Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments ... Document music usage to make it easier to search for a specific track	2023-03-05 15:29:38 -05:00
Eduardo Quezada	a6bd35ceab	Review changes	2023-03-05 17:17:39 -03:00
ghoulslash	dec1b16138	Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790)	2023-03-05 09:50:47 -05:00
GriffinR	ce6875817f	Merge pull request #1860 from GriffinRichards/metatile-labels ... Format metatile_labels	2023-03-04 23:36:04 -05:00
Eduardo Quezada	9917f5cc8b	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 ... # Conflicts: # Makefile # include/constants/pokemon.h # include/pokemon.h # make_tools.mk # src/battle_ai_script_commands.c # src/battle_controllers.c # src/battle_main.c # src/battle_script_commands.c # src/party_menu.c # src/pokemon.c # src/trade.c # src/trainer_pokemon_sprites.c	2023-03-03 11:00:50 -03:00
ghoulslash	4e138fa4b7	Fix wrong Contrary message when affected by Intimidate (#2723)	2023-03-02 09:38:00 -05: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	fe74dd938b	Small corrections	2023-03-01 04:00:19 -03:00
LOuroboros	23673c2e9d	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-03-01 03:57:00 -03:00
AgustinGDLV	7c853ef45e	implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Finale	2023-02-28 16:37:48 -08:00
GriffinR	ec89e519f9	Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful ... Rename eventLegal to modernFatefulEncounter	2023-02-28 11:48:34 -05:00
AgustinGDLV	3cdcf2a356	implemented G-Max Chi Strike, finished G-Max Gold Rush	2023-02-27 22:01:19 -08:00
AgustinGDLV	da24b717e4	implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite	2023-02-27 21:26:03 -08:00
ghoulslash	5a740c7461	dont overwrite gbattlerAttacker in TryChangeBattleTerrain, update BattleScript_ActivateTerrainAbilities loop iterator	2023-02-27 22:18:42 -05:00
AgustinGDLV	0908129c84	implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite works on Max Moves	2023-02-27 18:43:06 -08:00
AgustinGDLV	93d8efd51f	implemented G-Max Resonance	2023-02-27 14:34:08 -08:00
DizzyEggg	c92a65dc40	Add config for stockpile raising def stats	2023-02-27 21:09:02 +01:00
AgustinGDLV	92c8503869	reorganized max move functionality to remove redundant move effects	2023-02-27 11:54:49 -08:00
DizzyEggg	3338a6b786	add messages for stockpile effects wear off	2023-02-27 12:31:29 +01:00
LOuroboros	a54a8d9b2a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-27 07:43:19 -03:00
AgustinGDLV	e537be76ea	Z-moves bypass protection (#2730)	2023-02-27 09:17:07 +01:00
DizzyEggg	44d2cc7232	Fix bugs related to Trainer Slide messages (#2699) ... * start working on trainer slides * use cmd->nextInstr	2023-02-27 09:11:25 +01:00
AgustinGDLV	a36c35aea1	implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max Volcalith	2023-02-26 23:35:36 -08:00
AgustinGDLV	4d19659b0b	implemented G-Max Stonesurge, G-Max Steelsurge	2023-02-26 22:02:06 -08:00
LOuroboros	fe09f3e0d3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-26 23:42:01 -03:00
Eduardo Quezada	41bf9ea63c	Removed trailing whitespaces	2023-02-26 18:43:15 -03:00
DizzyEggg	8ccffa617a	fix createspriteontargets on electricy anim	2023-02-26 19:47:44 +01:00
DizzyEggg	4bdca43dbd	refactor mega evolution indicator sprite	2023-02-26 12:51:35 +01:00
AgustinGDLV	503aad9137	fixed tests	2023-02-25 15:57:57 -08:00
AgustinGDLV	b4ec273353	Merge branch 'upcoming' into dynamax	2023-02-25 14:04:55 -08:00
Zunawe	f376b71f7c	Fix wrong route in item flag name	2023-02-25 13:48:39 -08:00
Eduardo Quezada	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
AgustinGDLV	38f462551f	pulled rhh master, i hate merge conflicts	2023-02-22 18:50:54 -08:00
DizzyEggg	dc83708443	Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd	2023-02-22 22:51:59 +01:00
Zunawe	60be59d18b	Fix wrong route in hidden item flag name	2023-02-22 13:13:57 -08:00
DizzyEggg	877e3fd6af	merge with upcoming	2023-02-22 19:27:42 +01:00
DizzyEggg	460dceb48b	fix intimidate derp	2023-02-22 19:20:18 +01:00
DizzyEggg	83281944fa	Add tests for Contrary	2023-02-22 16:24:27 +01:00
DizzyEggg	e0b76e98ff	Add MOVE_SHELL_TRAP Effect (#2716) ... * implemented Shell Trap Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>	2023-02-22 13:55:34 +00:00
DizzyEggg	64e26f5c86	Fix Contrary String on Intimidate	2023-02-22 13:11:16 +01: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
AgustinGDLV	87a9150134	added base functionality for max moves	2023-02-21 20:16:25 -08: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
Martin Griffin	29c64c82f3	Test Red Card ... Dragon Tail activates Red Card if the target does not switch.	2023-02-21 10:44:58 +00:00
Martin Griffin	afe09e9653	Test Dragon Tail ... Remove the "But it failed!" message if the foe cannot be switched.	2023-02-21 10:43:57 +00:00
LOuroboros	24581426a1	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-21 04:46:28 -03:00
LOuroboros	3a91a5c930	Added new trainer slide-in msg conditions ... Now they can say something: -When their last Pokémon's HP is between 25% and 50%. -When a critical hit is dealt to their first Pokémon for the first time. -When a super effective hit is dealt to their first Pokémon for the first time. -When a STAB move is used against (but doesn't faint) the opponent's Pokémon. -When the Player's Pokémon's move doesn't affect the opponent's Pokémon. -When they're about to trigger a Mega Evolution. -When they're about to trigger a Z-Move. Misc. changes: -Split GetEnemyMonCount for readability's sake. -Optimized the size allocated to trainerSlideLowHpMsgDone.	2023-02-21 04:40:02 -03:00
Zunawe	8f74a6777a	Fix spelling mistake for item flag	2023-02-20 18:17:30 -08:00
DizzyEggg	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
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
DizzyEggg	66d2f253a1	merge with master	2023-02-17 15:43:15 +01:00
DizzyEggg	0c523f9518	Fix Magic bounce powder moves against grass types (#2633) ... * Fix Magic bounce powder moves against grass types	2023-02-17 13:55:51 +00:00
DizzyEggg	56c9564e7a	8th gen Howl's effect (#2700) ... * Howl gen8 effect	2023-02-17 10:28:46 +00:00
Eduardo Quezada D'Ottone	625a7622e2	Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 ... It's ya boi, pret merge! (pret merge 2023/02/16)	2023-02-16 21:57:41 -03:00
Eduardo Quezada	f4f8ab6ee9	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-02-16 17:06:49 -03: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	60a3da5811	Merge pull request #2691 from DizzyEggg/clang_scales ... Fix Clanging Scales target and effect	2023-02-16 09:13:33 -05:00
DizzyEggg	4c18ed2bd4	remove comment	2023-02-16 15:11:48 +01: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
DizzyEggg	1c970afd6a	fix follow me working in singles (#2644) ... * fix follow me working in singles	2023-02-16 10:53:29 +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	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	b656565af0	Standardize RS mossdeep gym metatile labels	2023-02-14 11:42:13 -05:00
ghoulslash	908b509401	Fix Round's Base Power calc, Add Turn order effects (#2602) ... * fix round base power calc, add turn order change * remove unused callnative cmd * fix round turn order update * fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-14 16:49:50 +01:00
DizzyEggg	0577d8d04d	Fix Mirror Armor against Clear Body	2023-02-13 14:44:34 +01:00
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
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
DizzyEggg	513ecd50ba	Fix Spacial Rend animation	2023-02-09 13:24:23 +01:00
Jaizu	9f7267e48d	Fix Giga Impact on contests.	2023-02-09 11:29:29 +01:00
DizzyEggg	896b575c07	Fix volt switch breaking ace pokemon	2023-02-08 12:42:38 +01:00
DizzyEggg	ff088752e7	Insomnia ability pop-up (#2643) ... * Insomnia ability pop-up * remove B_MSG_STAYED_AWAKE_USING constant	2023-02-07 18:47:23 +01:00
ghoulslash	7e9d40d401	Merge pull request #2645 from DizzyEggg/damp_aftermath ... Damp shows ability pop-up when reacting with Aftermath	2023-02-07 10:18:23 -05:00
DizzyEggg	dcb63e1518	Merge pull request #2610 from ghoulslash/be/animsilktrap ... Silk trap Animation	2023-02-07 16:13:53 +01:00
ghoulslash	a775f6f31a	Merge pull request #2642 from AlexOn1ine/strange_steam_v2 ... Fix Strange Steam anim	2023-02-07 09:25:04 -05: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
Alex	2f412b206a	Fix Strange Steam anim	2023-02-07 00:40:37 +01:00
DizzyEggg	04ce8ec213	Fix Volt Absorb not activating on Thunderwave	2023-02-06 20:55:56 +01:00
ghoulslash	f060d0185f	fix wind power, electromorphosis stomping on gbattlerattacker	2023-02-02 21:59:40 -05:00
ghoulslash	c5c0e91215	fix BattleScript_TargetAbilityStatRaiseRet overwriting gBattlerAttacker	2023-02-02 21:39:01 -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
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
GriffinR	28ada9c93b	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar	2023-02-01 15:52:19 -05:00
GriffinR	9003966fcc	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
ghoulslash	3f616215ea	add silk trap anim	2023-01-28 09:03:18 -05:00
Martin Griffin	a13ffdbfba	U-turn does not switch the user out if Emergency Exit activates	2023-01-27 00:57:22 +00:00
Eduardo Quezada	7774c9727d	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 ... # Conflicts: # tools/mapjson/mapjson.cpp	2023-01-25 20:28:55 -03:00
Eduardo Quezada	3288309c43	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-01-25 19:57:19 -03:00
Eduardo Quezada D'Ottone	1bfc922c72	Merge pull request #2471 from ghoulslash/be/gen9items ... Start Gen9 Hold Effects	2023-01-23 14:58:08 -03:00
Eduardo Quezada D'Ottone	2b22bdf1e7	Merge pull request #2579 from LOuroboros/allahu ... Fixed Explosion & Intimidate's 'interaction'	2023-01-23 11:37:06 -03:00
ghoulslash	f97ec1975a	merge w upcoming	2023-01-23 09:24:03 -05:00
GriffinR	29c1af50ca	Fix Best Streak stat name	2023-01-20 11:25:04 -05:00
Eduardo Quezada	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	5a906c33ac	Merge branch 'master' into sync_battle_anim_args	2023-01-18 11:47:33 -05:00
LOuroboros	773e7f0de2	Fixed Explosion & Intimidate's 'interaction'	2023-01-17 22:16:42 -03:00
GriffinR	c663154760	Merge pull request #1836 from GriffinRichards/fix-clone ... Add fix for Battle Tower cloning bug	2023-01-15 00:32:24 -05:00
Eduardo Quezada	ac4825ad28	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_util.c	2023-01-13 11:50:47 -03:00
LOuroboros	bdcc84f019	Updated the implementation	2023-01-09 15:18:22 -03:00
LOuroboros	dccceb9689	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2023-01-09 14:59:41 -03:00
ghoulslash	cc7c546011	Merge pull request #2473 from LOuroboros/mimicry ... Reimplemented Mimicry	2023-01-09 12:54:44 -05:00
LOuroboros	620a6a5e90	Extra review changes ... -Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN -Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities. -Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN. -Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop. -Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.	2023-01-09 14:22:14 -03:00
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	d72a3731d4	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_move_effects.h	2023-01-06 15:25:49 -03:00
LOuroboros	72566e6323	Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs	2023-01-05 03:02:56 -03:00
LOuroboros	2414283bb7	Removed BattleScript_EffectHit_Ret	2023-01-04 12:32:55 -03:00
ghoulslash	a425de77a6	Merge pull request #2446 from LOuroboros/primal ... Updated AnimTask_PrimalReversion	2023-01-04 09:16:28 -05:00
Eduardo Quezada	ada47831aa	Fixed reusable repels/lures function forcefully using items while menu config is on	2023-01-04 00:00:13 -03:00