3489 Commits

Author	SHA1	Message	Date
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
LOuroboros	f1ca254c28	Updated the Mimicry reimplementation ... Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN. Misc. changes: -Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN. -Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains. -Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs. -Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about. -Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes. -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it. -Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.	2023-01-03 02:27:41 -03:00
LOuroboros	d0f5653f5e	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2023-01-02 19:00:41 -03:00
Eduardo Quezada	a23501a4a3	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-01-02 18:54:57 -03:00
LOuroboros	0a00942a26	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-01-02 16:00:13 -03:00
ghoulslash	8b28d4329b	Merge pull request #2525 from AsparagusEduardo/RHH/pr/fix/FixFrontierTutor2 ... Fixed right Frontier move tutor not loading their move list correctly.	2023-01-02 13:55:00 -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	f2e63a2e41	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-12-31 03:33:42 -03:00
Eduardo Quezada D'Ottone	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
GriffinR	e88139d1b5	Add fix for Battle Tower cloning bug	2022-12-29 11:22:53 -05:00
LOuroboros	0ef148dfbb	Applied more corrections ... -Removed BattleScript_WindRiderActivatesEnd2 -Tweaked the condition of Wind Power in AbilityBattleEffects -Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier	2022-12-28 08:50:15 -03:00
LOuroboros	0159065dea	Removed Shell Trap ... It's time to let it go for my own mental sanity. Besides, it's a Gen. 7 move. I shouldn't have added it here.	2022-12-28 07:51:11 -03:00
SphericalIce	200b71be02	Fix Beat Up's battle script to avoid an out-of-bounds array access	2022-12-27 10:49:57 +00:00
LOuroboros	17410fa9c5	Fixed some issues of the Intimidate's rework	2022-12-26 00:50:44 -03:00
SonikkuA-DatH	3e807e5b1e	Update battle_scripts_1.s ... fix ORs	2022-12-21 15:12: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
SonikkuA-DatH	0a5154499e	Update battle_scripts_1.s ... Compensating Substitute, removing item	2022-12-21 14:27:39 -08: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
LOuroboros	31cd076f9d	Oopsie. Wind Power doesn't boost Attack lol	2022-12-21 11:21:42 -03: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	5eaf0e15fc	Update data/battle_scripts_1.s ... -_- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 18:08:01 -08:00
LOuroboros	6153b8e904	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-20 07:11:36 -03:00
LOuroboros	c8abf00cac	Applied corrections ... Anger Shell: -Made it print a string from the gStatDownStringIds table while lowering Def and Sp. Def -Made it use the shiny new modifybattlerstatstage macro. -Made it activate multiple times per battle, as it should. Well-Baked Body: -Turned it into an absorbing ability. Wind Rider: -Turned it into an absorbing ability. -For its Tailwind interaction, I made it activate only when Tailwind kicks in successfully, instead of whenever it's active at the end of a turn. Guard Dog: -Updated its check inside BattleScript_EffectHitEscape. -Moved it from Cmd_forcerandomswitch to BattleScript_EffectRoar. Wind Power: -Split off its move end effect from Electromorphosis'. Electromorphosis: -Split off its move end effect from Wind Power's. Hadron Engine: -Merged its Switch In effect with Electric Surge's. Protosynthesis: -Fixed its stat boost. Quark Drive: -Fixed its stat boost. Cud Chew: -Updated its ENDTURN effect's berry check. Supreme Overlord: -Tweaked the looping i variable's data type, the order of the variables and the checks inside ApplySupremeOverlordModifier. Earth Eater: -Turned it into an absorbing ability. Misc changes: -Added a variable to set the amount of stat stages raised inside AbilityMoveEffects' case ABILITYEFFECT_ABSORBING. -Added a preproc config to update the text string that they print. -Limited the scope of atkHighestStat and defHighestStat in CalcMoveBasePowerAfterModifiers to Protosynthesis's and Quark Drive's effects.	2022-12-20 07:08:29 -03:00
SonikkuA-DatH	f6fab92ac8	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-19 15:52:20 -08:00
Eduardo Quezada	1580f892a5	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/constants/pokemon.h # src/battle_script_commands.c	2022-12-19 18:53:26 -03:00
SonikkuA-DatH	562736a5e6	Update battle_scripts_1.s ... Changed STAT_BUFF_ALLOW_PTR to STAT_CHANGE_ALLOW_PTR	2022-12-18 22:50:41 -08:00
SonikkuA-DatH	2dbfc1c8f5	Update data/battle_scripts_1.s ... Fixes spacing. Thanks Lunos! Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-18 22:28:33 -08:00
SonikkuA-DatH	f0aee1f8d3	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-18 17:50:39 -08:00
SonikkuA-DatH	9cd8d81412	Update battle_scripts_1.s ... Fixed spacing	2022-12-18 15:37:44 -08:00
Eduardo Quezada	55ba9d8364	Fixed right Frontier move tutor not loading their move list correctly.	2022-12-18 13:17:33 -03:00
LOuroboros	4c9446ed0a	Fixed Speed Swap's effect	2022-12-14 12:00:45 -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
LOuroboros	8eff1a13c1	Updated BattleScript_IntimidateEffect to comply with BattleScript_TryAdrenalineOrb's demands	2022-12-11 23:17:59 -03:00
LOuroboros	e6a3396b0f	Added Adrenaline Orb check and removed silly comment	2022-12-11 19:24:36 -03:00
ghoulslash	0a9e3c8dc8	fix stattextbuffer in BattleScript_IntimidatePrevented_Item	2022-12-11 16:16:10 -05:00
ghoulslash	e3e0d60222	Merge pull request #2467 from Bassoonian/gen9moves ... Generation IX Moves	2022-12-11 14:47:47 -05:00
LOuroboros	0d1f9d9613	Reimplemented Mimicry	2022-12-09 20:46:18 -03:00
ghoulslash	6d28882e44	start gen9 hold effects	2022-12-06 09:48:36 -05:00
LOuroboros	d6b9f07681	Implemented Earth Eater's effect	2022-12-06 05:30:21 -03:00
LOuroboros	a961980e0f	Implemented Toxic Debris' effect	2022-12-06 05:23:30 -03:00
LOuroboros	aa051dab02	Implemented Costar's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7a52404fd3	Implemented Supreme Overlord's effect	2022-12-06 05:23:30 -03:00
LOuroboros	f96137eb5e	Implemented Cud Chew's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7c67f1ac27	Activated Switch In abilities during weather and terrain change ... Abilities such as Protosynthesis and Quark Drive demand it.	2022-12-06 05:23:30 -03:00
LOuroboros	24465858a7	Implemented the 4 Ruin Abilities	2022-12-06 05:23:29 -03:00
LOuroboros	de05c4dd56	Implemented Good as Gold's effect	2022-12-06 05:23:29 -03:00
LOuroboros	e25f843db3	Implemented Quark Drive's effect ... Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.	2022-12-06 05:23:29 -03:00
LOuroboros	a328088122	Implemented Protosynthesis' effect ... Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.	2022-12-06 05:23:29 -03:00
LOuroboros	34cafa746c	Implemented Electromorphosis' effect ... Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied. Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.) As a result, the game will trigger the ability multiple times if they're hit by a multihit move. This directive makes the code end the ability effect preemptively if the target does have the status flag applied.	2022-12-06 05:23:29 -03:00
LOuroboros	88cae380d0	Implemented Wind Power's effect	2022-12-06 05:23:29 -03:00
LOuroboros	c43060fbfd	Tweaked BattleScript_WellBakedBodyActivates and BattleScript_WindRiderActivatesMoveEnd	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
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	b0027cb78b	Implemented Seed Sower's effect	2022-12-02 23:31:41 -03:00
GriffinR	483c3d5c13	Document wonder news	2022-11-22 02:17:03 -05:00
Bassoonian	739680e425	Victory Dance effect	2022-11-18 22:23:34 +01:00
Bassoonian	29ae22183b	Mystical Power effect	2022-11-18 22:17:08 +01:00
Bassoonian	9512b3a57a	Implement Double Shock functionality with temporary string	2022-11-18 22:12:26 +01:00
Bassoonian	3ac3cb249e	Wicked Torque effect	2022-11-18 22:00:21 +01:00
Bassoonian	f7d1a12d2d	Data entry for gen9 moves	2022-11-18 12:15:44 +01:00
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
LOuroboros	11c99cac61	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-13 23:17:59 -03:00
LOuroboros	31a602f3b6	Optimized Intimidate's code	2022-11-12 18:03:46 -03:00
Eduardo Quezada	f2d0e547ac	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/rom_header_gf.c	2022-11-09 19:54:44 -03:00
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
Eduardo Quezada	2ef2134be1	Moved Hunger Switch to form change table.	2022-11-06 17:12:34 -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
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	44bf4a15e3	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h # include/constants/battle_move_effects.h	2022-11-04 12:19:40 -03:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
ghoulslash	1e6903840a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite	2022-11-04 09:29:45 -04:00
ghoulslash	d13431b4ab	merge w rhh master	2022-11-04 09:29:39 -04:00
Eduardo Quezada	edf4e45c4d	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -03:00
BuffelSaft	c169a9523e	Merge branch 'upcoming' into fix-stat-boost-on-hit	2022-11-03 22:01:30 +13:00
BuffelSaft	736ca893b6	Fix abilities that raise target's stat after hit ... Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.	2022-11-03 21:54:56 +13:00
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
Eduardo Quezada	e4a439aa46	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h	2022-10-30 12:30:38 -03:00
Eduardo Quezada	3172273c73	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures ... # Conflicts: # src/pokemon.c	2022-10-30 12:16:09 -03:00
GriffinR	c76beed989	Merge pull request #1807 from pret/porymap-5 ... Update for Porymap 5.0.0	2022-10-30 11:01:37 -04:00
GriffinR	01c71b4ce1	Fix more text and movements labeled as scripts	2022-10-30 03:27:28 -04:00
GriffinR	f439a2dee7	Fix EventScript_WroteSecretCodeLockOpened typo	2022-10-30 03:14:47 -04:00
BuffelSaft	224ca256ce	Requested clean up ... Rename constants, remove white space, improve B_BEAT_UP description. * Rename B_BEAT_UP_DMG to B_BEAT_UP * Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG * Remove trailing whitespace * Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE	2022-10-27 22:25:33 +13:00
GriffinR	cc182bf05e	Use Porymap's new order for connection fields	2022-10-24 10:05:59 -04:00
BuffelSaft	1b056f9044	Fix various Parental Bond issues ... - Dragon Tail and Circle Throw strike twice and then switch the target - Z moves are unaffected by Parental Bond - Renamed parentalBondOn to parentalBondState - Added constants for possible values of parentalBondState - Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP	2022-10-23 17:37:23 +13:00
BuffelSaft	6035c5a280	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-10-22 14:31:13 +13:00
GriffinR	a418f8d976	Merge pull request #1755 from GriffinRichards/map-dynamic ... Rename special map constants, treat warp ids as strings	2022-10-18 22:45:56 -04:00
tustin2121	4730870646	VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY ... Getting rid of the VAR_ prefix, to avoid the porymap problem.	2022-10-18 21:12:31 -04:00
ghoulslash	a585d56053	fix whitespace	2022-10-16 23:39:12 -04:00
tustin2121	327c648e87	Document seldom-used trigger functionality ... Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.	2022-10-16 20:46:50 -04:00
ghoulslash	71023512fd	update psycho cut anim	2022-10-16 19:20:24 -04:00
Eduardo Quezada	77f24d42e4	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-10-07 15:39:02 -03:00
GriffinR	4f407a1066	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
Eduardo Quezada D'Ottone	17c8842ad4	Merge branch 'dev' into teleport	2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone	a483899043	Merge branch 'dev' into symbiosis	2022-09-24 11:58:35 -03:00
LOuroboros	c64593cb9c	Fixed LTBTS's animation	2022-09-24 09:04:15 -03:00
Eduardo Quezada	720cb249d6	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-09-16 12:06:06 -03:00
Eduardo Quezada	6b79c7772c	Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_interface.c	2022-09-16 11:56:50 -03:00
Eduardo Quezada	77696ca686	Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2022-09-16 10:31:02 -03:00
ghoulslash	6616c89451	Merge pull request #2303 from Blackforest92/RHH-PR-Branch ... Tidying graphics - Trio Weather	2022-09-15 18:01:43 -04:00
Eduardo Quezada	dc423ef7ff	Handling repel/lure menu	2022-09-14 00:18:01 -03:00
Eduardo Quezada	de32940fdf	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
Eduardo Quezada	1d7e8bd730	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c	2022-09-13 16:22:42 -03:00
GriffinR	91c040b081	Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace ... Cleaned trailing whitespace	2022-09-13 14:00:11 -04:00
LOuroboros	222362e804	Fixed Raquaza typo	2022-09-12 21:26:22 -03:00
Eduardo Quezada	e3005e5275	Item config for repel prompt	2022-09-12 10:21:52 -03:00
Eduardo Quezada	2d78ac0192	Implemented Lures using the same vars as repels	2022-09-12 10:21:49 -03:00
Deokishisu	e3c19f5df5	Implement B2W2 Repel System ... The game now asks if the player would like to use another Repel when the one they used runs out. # Conflicts: # include/constants/vars.h	2022-09-12 10:21:38 -03:00
Eduardo Quezada	65108c3192	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
Eduardo Quezada	69f01d73cd	Added missing uses of Fairy type for Union Room and Battle Factory	2022-09-11 12:41:56 -04:00
Blackforest92	431cb6fa7c	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
Blackforest92	3acb32acb8	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
Eduardo Quezada D'Ottone	066a5bee85	Merge pull request #2277 from TheXaman/tx_debug_system_rhh ... Inclusion of the tx_debug_system	2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone	47a50b3dac	Merge branch 'master' into weather_forms_fixes	2022-09-07 23:07:25 -04:00
LOuroboros	c8f4a44380	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-09-06 20:40:34 -03:00
LOuroboros	8705d1656b	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-09-06 20:38:28 -03:00
TheXaman	6062cf45fa	Merge branch 'master' into tx_debug_system_rhh	2022-09-07 00:03:58 +02:00
Eduardo Quezada	3a6318f1d9	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor ... # Conflicts: # include/constants/battle_config.h	2022-09-06 15:20:54 -04:00
Eduardo Quezada	e253a87bc5	Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once.	2022-09-05 14:49:14 -04:00
Eduardo Quezada	7c7da8e176	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs ... # Conflicts: # src/battle_script_commands.c	2022-09-05 14:43:04 -04:00
Eduardo Quezada D'Ottone	4017fc3e20	Apply style suggestions from code review	2022-09-03 21:22:15 -04:00
GriffinR	36551dff2f	Treat warp ids as strings to allow constants	2022-09-03 15:43:43 -04:00
Eduardo Quezada	5403cd036e	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ... # Conflicts: # include/battle.h # include/battle_controllers.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controllers.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c	2022-09-02 23:24:08 -04:00
Eduardo Quezada	c7fc2e13f7	Renamed TM flags to keep consistency with the rest of the repo	2022-09-02 16:54:58 -04:00
TheXaman	b4b3e84cbd	removed default flags and added ingame warning if a function that requires them is used	2022-09-02 18:39:38 +02:00
TheXaman	ad57551db1	removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation	2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone	59f1f10dec	Merge pull request #2260 from DizzyEggg/magic_bounce ... Fix Magic Bounce targets	2022-09-01 19:56:15 -04:00
Eduardo Quezada D'Ottone	cc174b622c	Merge pull request #2278 from rh-hideout/DizzyEggg-dragontailweakarmor ... Dragon Tail Weak Armor fix	2022-09-01 19:54:33 -04:00
LOuroboros	c167e2c6cc	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
DizzyEggg	d167b4ea0a	Dragon Tail Weak Armor fix	2022-08-30 20:08:50 +02:00
DizzyEggg	7cb010d71e	fix magic bounce conflicts and fix magic coat	2022-08-30 19:36:06 +02:00
TheXaman	8c9a59ec1c	Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh	2022-08-29 19:13:11 +02:00
Eduardo Quezada D'Ottone	8ca2f949e3	Merge pull request #2233 from gruxor/tmhm_rework ... Reworked TMHM into expandable list format	2022-08-29 04:20:45 -04:00
crater-git	9f16d1dd12	Fixed battle frontier tutors (for real this time)	2022-08-27 22:45:10 -04:00
Eduardo Quezada	69f4c226f0	Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs ... # Conflicts: # src/battle_ai_main.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_script_commands.c # src/pokemon.c # src/pokemon_summary_screen.c	2022-08-27 02:42:22 -04:00
GriffinR	8aead3b4c8	Merge pull request #1747 from GriffinRichards/contest-ai-bug ... Incorporate commented bug fixes in contest AI scripts	2022-08-26 23:53:44 -04:00
Eduardo Quezada	7c86bd5d08	Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 ... # Conflicts: # include/battle_interface.h # src/battle_anim_effects_1.c # src/battle_script_commands.c # src/field_specials.c	2022-08-26 22:23:37 -04:00
Eduardo Quezada D'Ottone	bee36edd9c	Merge pull request #2173 from LOuroboros/yourAffection ... Implement affection-now-friendship mechanics	2022-08-26 14:54:32 -04:00
GriffinR	0516f94837	Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore ... Added constants for GetLeadMonFriendshipScore	2022-08-26 14:52:10 -04:00
GriffinR	c5e873aa2b	Merge pull request #1742 from GriffinRichards/sound-pan ... Add missing usage of SOUND_PAN_*	2022-08-26 14:47:24 -04:00
crater-git	54ee960970	Fixed Battle Frontier tutor move IDs	2022-08-26 10:12:11 -04:00
DizzyEggg	6331931ba3	Fix Magic Coat targets	2022-08-26 15:01:51 +02:00
Eduardo Quezada	6fb4da68f3	Corrected Oldale Town Sign labels	2022-08-25 22:00:24 -04:00
GriffinR	ce4a6e9067	MAP_NONE -> MAP_DYNAMIC	2022-08-25 21:34:05 -04:00
crater-git	ed02c4b425	Removed tutor move distinction, combined llists	2022-08-25 19:56:47 -04:00
LOuroboros	410045028a	Optimized General_AffectionHangedOn	2022-08-25 20:01:14 -03:00
LOuroboros	8bd7103b9d	Even more review corrections	2022-08-25 17:32:12 -03:00
LOuroboros	2cf2c00b29	Updated friendship labels	2022-08-25 17:10:11 -03:00
LOuroboros	7539051942	Further tweaked the affection animation	2022-08-25 17:05:57 -03:00
LOuroboros	5dd143f19d	Applied Blackforest's changes to General_AffectionHangedOn	2022-08-25 13:07:52 -03:00
LOuroboros	1fc63c3431	More review corrections	2022-08-25 11:52:21 -03:00
LOuroboros	11d6ae4820	Renamed the GetLeadMonFriendshipScore constants	2022-08-25 11:34:37 -03:00
LOuroboros	e792fae415	Review corrections ... -Simplified the affection mechanics' battle scripts. -Corrected the value seting inside CalcCritChanceStage. -Simplified the checks inside Cmd_adjustdamage -Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added. -Added constants for the values returned by GetMonFriendshipScore.	2022-08-25 10:45:57 -03:00
LOuroboros	1f4ef2a0fb	Added constants for GetLeadMonFriendshipScore	2022-08-25 10:40:56 -03:00
LOuroboros	b7ca63d151	Implemented Ice Face ... Thanks to Benício Gonçalves#3454 who provided a base to work with.	2022-08-24 13:45:34 -03:00
Eduardo Quezada	eea718cfc6	Placeholder moves can't be used in battle.	2022-08-24 00:30:49 -04:00
Eduardo Quezada	56a2e91518	Updated move limitations	2022-08-23 22:40:04 -04:00
Eduardo Quezada	1f5adf93c7	Cleaned up use of configs be almost exclusively preproc functions	2022-08-23 21:00:08 -04:00
Eduardo Quezada	afcc1178b2	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate ... # Conflicts: # data/battle_ai_scripts.s # data/battle_scripts_1.s # include/battle_controllers.h # include/battle_script_commands.h # include/battle_util.h # include/constants/battle_script_commands.h # include/constants/global.h # include/decompress.h # src/battle_anim_effects_1.c # src/battle_anim_normal.c # src/battle_anim_poison.c # src/battle_anim_water.c # src/battle_arena.c # src/battle_controller_link_opponent.c # src/battle_controller_link_partner.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_controller_recorded_opponent.c # src/battle_controller_recorded_player.c # src/battle_controller_safari.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/berry.c # src/data/trainers.h # src/decompress.c # src/field_effect.c # src/hall_of_fame.c # src/overworld.c # src/pokeball.c # src/pokemon.c # src/pokemon_icon.c # src/pokemon_storage_system.c # src/scrcmd.c	2022-08-22 20:30:45 -04:00
Eduardo Quezada	2b7a2c4d09	Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate	2022-08-22 17:30:48 -04:00
Eduardo Quezada	75ac960365	Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms	2022-08-22 17:27:21 -04:00
GriffinR	898ec580ae	Merge pull request #1737 from GriffinRichards/lock-unlock ... Clean up lock/unlock anim movement	2022-08-22 01:30:33 -04:00
GriffinR	30906762ed	Merge pull request #1740 from AsparagusEduardo/pret_stringTabs ... Fixed inconsistent use of white space for scripts, .c files and .h files.	2022-08-20 23:03:59 -04:00
GriffinR	9e175a1037	Merge pull request #1735 from GriffinRichards/arena-const ... Add some missing battle arena constants	2022-08-20 22:54:32 -04:00
GriffinR	11b4958f23	Incorporate commented bug fixes in contest AI scripts	2022-08-19 19:45:15 -04:00
GriffinR	c2d5dd2a1f	Additional battle anim sync	2022-08-19 11:51:13 -04:00
Eduardo Quezada	e43f65cc69	using BATTLE_RUN constants in BattleScript_EffectTeleport	2022-08-15 21:06:26 -04:00
Eduardo Quezada	e8a05e92e4	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
Eduardo Quezada	63e4a8adcd	Fixed instances of .string being used with spaces instead of tabs	2022-08-15 14:32:01 -04:00
GriffinR	5515e328b2	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
GriffinR	cf4d05e9e7	Fix typo	2022-08-11 12:09:38 -04:00
GriffinR	63468f9fcb	Add some missing battle arena constants	2022-08-11 12:02:56 -04:00
Eduardo Quezada D'Ottone	54097951f7	Using B_WAIT_TIME_LONG	2022-08-03 16:51:02 -04:00
Eduardo Quezada	09af7422d5	Further cleaning after comparing with pokefirered ... STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs	2022-07-28 01:27:05 -04:00
LOuroboros	032b7b2ab9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection	2022-07-25 10:24:19 -03:00
Eduardo Quezada	231727d02b	Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge ... # Conflicts: # asm/macros/event.inc # data/specials.inc # include/constants/species.h # src/data/pokemon/base_stats.h	2022-07-22 23:33:04 -04:00
Eduardo Quezada	f3bebcd12c	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge ... # Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 22:57:02 -04:00
ghoulslash	3a77b52bad	Merge pull request #2194 from AsparagusEduardo/BE_pretmerge ... Battle Engine pret merge	2022-07-22 14:00:40 -04:00
Eduardo Quezada D'Ottone	e14afd8957	Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.	2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone	cb34119711	Config for Charge raising Sp. Def.	2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone	fe63dafcc1	Merge branch 'battle_engine' into BE_pretmerge ... # Conflicts: # src/battle_anim_fire.c # src/battle_controller_player.c	2022-07-20 08:50:30 -04:00
ghoulslash	2b5bb9f6e4	move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check	2022-07-19 18:24:53 -04:00
ghoulslash	5d91bdeafc	add B_ANIM_RESTORE_BG to BattleScript_EffectTerrainHit	2022-07-17 19:13:45 -04:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04:00
ghoulslash	9b5aee3b93	fix z stat-boosts	2022-07-17 12:17:54 -04:00
Eduardo Quezada D'Ottone	e791cf90ad	Merge tag 'pretmaster' into BE_pretmerge2 ... # Conflicts: # data/battle_anim_scripts.s # include/battle_anim.h # include/battle_controllers.h # include/battle_interface.h # include/battle_main.h # include/battle_setup.h # include/constants/battle_anim.h # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_anim_fire.c # src/battle_anim_normal.c # src/battle_controllers.c # src/battle_dome.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/pokemon.c	2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone	c69275f373	Merge remote-tracking branch 'pret/master' into PE_pretmerge ... # Conflicts: # include/battle_anim.h # include/pokemon.h # src/data/pokemon/base_stats.h	2022-07-12 17:20:49 -04:00
GriffinR	e6a374f2b6	Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall	2022-07-06 14:49:08 -04:00
LOuroboros	8f728dcd79	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-07-03 13:49:18 -03:00
ghoulslash	02a62e245b	Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney ... Config for lost money after losing a battle	2022-07-01 11:58:36 -04:00
ghoulslash	b9be123716	Merge pull request #2163 from Sneed69/terrain-softlock-fix ... Fix terrain move softlock	2022-07-01 11:58:00 -04:00
ghoulslash	a349462b78	Merge pull request #2134 from LOuroboros/bePretMerge ... Pret merge for the battle_engine	2022-07-01 09:21:51 -04:00
LOuroboros	aa5c6a3f01	Implemented affection-now-friendship mechanics	2022-06-22 00:18:01 -03:00