Commit Graph

3263 Commits

Author SHA1 Message Date
DizzyEggg
5d958e245a
Merge pull request #2669 from Jaizu/giga_impact_contests
Fix Giga Impact on contests.
2023-02-13 09:22:24 +01: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
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
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 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
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
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
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
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
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
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