ghoulslash
dc9e418155
Update src/battle_script_commands.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-10-30 11:53:58 -04:00
ghoulslash
de6140193a
Merge pull request #1833 from LOuroboros/patch-2
...
Fixed Move_SPECIAL_REND typo
2021-10-30 11:34:54 -04:00
ghoulslash
1925874d35
hunger switch unaffected by wandering spirit
2021-10-30 11:18:50 -04:00
LOuroboros
0ddcb69c65
Fixed Move_SPECIAL_REND typo
2021-10-30 12:14:28 -03:00
ghoulslash
468ee66cd8
fix synthesis and leaf guard w utility umbrella
2021-10-30 11:04:50 -04:00
LOuroboros
10cda70129
Fixed Pikalax's PR
2021-10-30 11:51:29 -03:00
PikalaxALT
de23b3b04d
New move tilemap bins are easier to edit
2021-10-30 11:51:22 -03:00
ghoulslash
a461823cbf
weather ball anim checks utility umbrella
2021-10-30 09:48:23 -04:00
ghoulslash
ee7b63e372
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella
2021-10-30 09:26:33 -04:00
ghoulslash
eedd255b18
Merge pull request #1832 from Blackforest92/battle_engine
...
Alternate fix to Steel Beam
2021-10-30 09:19:54 -04:00
ghoulslash
3e364b4870
switchin abilities activate after wandering spirit
2021-10-30 09:16:33 -04:00
ghoulslash
f4537b1213
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit
2021-10-30 09:14:32 -04:00
ghoulslash
4b0325dbe4
neutralizing gas switchout
2021-10-30 09:13:08 -04:00
Eduardo Quezada D'Ottone
1811d75c23
Merge pull request #1829 from rh-hideout/revert-1760-ex_fix_move_bg_tilemaps
...
Revert "Ex fix move bg tilemaps"
2021-10-30 09:08:25 -03:00
Blackforest92
799852ea77
Introduce alternate Steel Beam
2021-10-30 17:00:55 +07:00
BuffelSaft
52054e4bfe
Fix Corrosion, Poison Touch
...
- CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 21:12:18 +13:00
BuffelSaft
da30f023e8
Revert "Ex fix move bg tilemaps"
2021-10-30 19:32:37 +13:00
BuffelSaft
47bfeaeecd
Implement Gorilla Tactics
...
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed
merge w be
2021-10-29 22:33:50 -04:00
ghoulslash
28bc7dc14d
start ability
2021-10-29 22:32:19 -04:00
BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix
...
Fix iteam healing after a failed move
2021-10-30 15:25:28 +13:00
BuffelSaft
f0e9b09258
Merge pull request #1822 from ghoulslash/harvest
...
fix recycle and harvest
2021-10-30 15:00:56 +13:00
ghoulslash
cb9f4fbb42
Merge pull request #1760 from PikalaxALT/ex_fix_move_bg_tilemaps
...
Ex fix move bg tilemaps
2021-10-29 09:12:15 -04:00
ghoulslash
2502820e83
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 09:03:14 -04:00
Eduardo Quezada D'Ottone
8b45320b9a
Merge pull request #1820 from ghoulslash/skill_swap
...
Gen 4+ Skill Swap
2021-10-28 20:16:59 -03:00
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
ghoulslash
e2e31f0b74
skill swap config option for switchin abilities
2021-10-28 16:53:00 -04:00
LOuroboros
a77f058146
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-10-28 14:24:43 -03:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
...
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04:00
ghoulslash
3a86881fb3
Merge pull request #1819 from LOuroboros/patch-2
...
Fixed Shadow Force
2021-10-28 13:19:24 -04:00
LOuroboros
82101d3581
Optimizations
2021-10-28 14:02:43 -03:00
LOuroboros
2803b840e5
Updated Shadow Force's move data
2021-10-28 13:52:35 -03:00
LOuroboros
28522f3ffb
Fixed Hyperspace Fury not breaking through protections
...
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -04:00
LOuroboros
8c35a68060
Quick syntax tweaks
2021-10-27 11:19:39 -03:00
LOuroboros
de157919b0
Added animations for Shell Side Arm
2021-10-27 11:14:17 -03:00
LOuroboros
ad95fa3d15
Updated Shell Side Arm's description
2021-10-27 11:14:12 -03:00
LOuroboros
d5b5090d52
Fixed BattleScript_EffectPhotonGeyser
2021-10-27 11:14:08 -03:00
LOuroboros
fc7f1acf20
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 11:13:59 -03:00
ghoulslash
289ec6ad40
Merge pull request #1808 from AsparagusEduardo/BE_ghostEscape
...
Completed Ghost type trapping inmunity
2021-10-26 22:22:13 -04:00
LOuroboros
1ab8c84f41
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury
2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
d4eaa73292
Added check in IsRunningFromBattleImpossible.
2021-10-26 20:45:59 -03:00
Eduardo Quezada D'Ottone
773c773bac
Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
...
# Conflicts:
# include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
BuffelSaft
4faa077641
Triple Kick, Super Fang tweaks
...
Ignore accuracy for Triple Kick and assume all hits will connect. Super Fang always does at least 1 damage, so this should be accounted for.
2021-10-26 13:41:08 +13:00
ghoulslash
83c1170698
Merge pull request #1802 from LOuroboros/rapidSpin
...
Fixed Rapid Spin
2021-10-25 15:47:27 -04:00
LOuroboros
442376e75b
Replaced jumpifbyte with jumpifhalfword in a few BattleScripts
2021-10-25 16:36:17 -03:00
ghoulslash
bd268ba3d1
Merge pull request #1811 from AsparagusEduardo/BE_config
...
battle_config.h reordering and new configs
2021-10-25 14:52:41 -04:00
Eduardo Quezada D'Ottone
44625561e5
Taunt turn config
2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone
70aeaf288f
Rough Skin damage config
2021-10-24 20:07:22 -03:00
