LOuroboros
5c485d9769
Fixed Fling when gLastUsedItem is 0
...
Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.
2021-11-15 14:02:33 -03:00
LOuroboros
de74177966
Oops
2021-11-15 12:52:05 -03:00
LOuroboros
a01fd2eb7a
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d
Fling tweaks
...
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
2021-11-15 12:40:10 -03:00
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks
...
Adjusted elements to simplify the conflicts between BE and IE
2021-11-15 08:27:28 -05:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off
...
Fix Knock Off, add config
2021-11-14 08:27:51 -05:00
Eduardo Quezada D'Ottone
bcbdb353f5
Adjusted elements to simplify the conflicts between BE and IE
2021-11-13 12:10:20 -03:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
Eduardo Quezada D'Ottone
8f52996144
Merge pull request #1892 from ghoulslash/be/wish
...
wish update
2021-11-13 11:01:04 -03:00
ghoulslash
9df66f4ac1
Merge pull request #1843 from Blackforest92/battle_engine
...
Update Giga Impact's graphic and use fade-in battle animation.
2021-11-13 08:54:37 -05:00
ghoulslash
a4204e5491
Update include/constants/battle_config.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:24 -05:00
LOuroboros
2fe015e5ce
Implemented Fling
2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone
bcb0f1b915
Merge pull request #1890 from kleeenexfeu/battle_engine
...
Bypassing screens and protections correctly
2021-11-13 10:11:02 -03:00
kleeenexfeu
f808710932
Moving IsBattlerProtected
2021-11-13 13:38:07 +01:00
ghoulslash
c4efe06f38
wish update
2021-11-12 17:55:05 -05:00
ghoulslash
96fd8e696b
brick break gen 4 and 5 config. clears aurora veil
2021-11-12 15:00:21 -05:00
ultima-soul
294fecd57c
Merge pull request #1888 from ghoulslash/be/contrary
...
Fix Contrary Animation
2021-11-12 10:19:37 -08:00
ghoulslash
a26da51e9d
fix contrary animations for MOVE_EFFECT_statchange
2021-11-12 12:44:45 -05:00
ultima-soul
c5dabf34b8
Improve Serene Grace boost config comment.
2021-11-12 09:39:18 -08:00
ghoulslash
6214d8b625
rename config
2021-11-12 07:47:24 -05:00
BuffelSaft
bdbdd0564f
Fix Knock Off, add config
...
Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
2021-11-12 21:05:42 +13:00
ghoulslash
adc1413d98
add kings rock serene grace boost config
2021-11-11 17:48:15 -05:00
ultima-soul
fd4d0db912
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects
2021-11-10 18:02:00 -08:00
BuffelSaft
e2599c2469
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-10 14:31:32 +13:00
Blackforest92
76ba9d835a
pulled latest RHH battle_engine 08-11-2021
2021-11-08 16:38:42 +07:00
BuffelSaft
d3a845d511
Fix CanAIFaintTarget
...
Rename CanAIFaintTarget to CanIndexMoveFaintTarget and create a new function, CanAIFaintTarget, that checks if any known move can KO the target.
2021-11-08 20:37:28 +13:00
ghoulslash
a90cf4a501
Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves
...
Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse
2021-11-07 17:39:03 -05:00
Eduardo Quezada D'Ottone
4e6a459b14
Optimized terrain timers
2021-11-06 19:46:52 -03:00
Eduardo Quezada D'Ottone
8773e552ac
Organized config and added failsafe to AnimTask_SetCamouflageBlend
2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone
1c4a0c205a
Camouflage types config + extra terrains
2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone
b220da1d2a
Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table
2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone
e9804a5023
Secret Power animation config
2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone
328976bf81
Secret Power effect config
2021-11-06 17:05:13 -03:00
ghoulslash
41bf1dc2f4
merge w be
2021-11-06 10:40:57 -04:00
ghoulslash
f7d11527aa
Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic
...
Config for Synchronize's interaction with toxic poisoning
2021-11-06 10:36:50 -04:00
Eduardo Quezada D'Ottone
ae8de0f07a
Merge branch 'BattleEngine' into BE_TerrainMoves
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_util.c
2021-11-06 10:44:05 -03:00
BuffelSaft
5acebe32aa
Merge pull request #1817 from LOuroboros/photonGeyser
...
Implemented Photon Geyser and Shell Side Arm
2021-11-06 16:04:53 +13:00
Eduardo Quezada D'Ottone
202827068c
a
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone
8e49e3e653
Config for Synchronize's interaction with toxic poisoning
2021-11-05 21:16:13 -03:00
BuffelSaft
4007a8d1f8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song
2021-11-06 11:52:51 +13:00
Eduardo Quezada D'Ottone
6c70a6b872
Merge pull request #1863 from LOuroboros/soulDewBE
...
Added a battle config for the Soul Dew
2021-11-05 17:09:44 -03:00
LOuroboros
5f458c9cd3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-05 10:58:53 -03:00
LOuroboros
d15eeeb8eb
Fixed the comment for B_SOUL_DEW_BOOST
2021-11-05 10:37:41 -03:00
BuffelSaft
ee83d1142c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1
2021-11-05 21:40:05 +13:00
BuffelSaft
bf786c6c9a
Fix Magma Storm
...
Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.
2021-11-05 18:22:52 +13:00
BuffelSaft
a8d44f84a1
Merge pull request #1852 from Blackforest92/battle_engine_2
...
Update waterfall, trick room, & focus blast BG
2021-11-05 15:27:52 +13:00
BuffelSaft
6df3975fc6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-05 14:32:33 +13:00
Eduardo Quezada D'Ottone
5eb8f1c158
Merge pull request #1855 from ghoulslash/be/abilityonside
...
AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide
2021-11-04 21:49:31 -03:00
LOuroboros
671cbabc3d
Added a battle config for the Soul Dew
2021-11-04 17:25:31 -03:00
ghoulslash
0ac6860855
Merge pull request #1810 from BuffelSaft/ai_improvements
...
AI: Multi-strike moves, variable power moves, sleep check
2021-11-04 12:28:00 -04:00