LOuroboros
3b6ceb1dfa
Turned Retaliate into a side timer
2021-10-16 06:04:04 -03:00
BuffelSaft
4861f2eea2
Merge pull request #1755 from ghoulslash/prankster_fix
...
Fix protect struct fields being set during ai calcs
2021-10-16 17:59:30 +13:00
BuffelSaft
791f4164a2
Fix PP being checked when HITMARKER_NO_PPDEDUCT is set
...
This fixes multi target moves and seems like it should be done anyway,
2021-10-16 17:31:27 +13:00
BuffelSaft
b5293cc3e2
Fix multi target moves
...
Only run CANCELLER_PRANKSTER when moving to the next target of a multi target move. If more cancellers are needed they can be added/moved after CANCELLER_PRANKSTER.
2021-10-16 17:04:36 +13:00
Eduardo Quezada D'Ottone
724eb7279a
Merge pull request #1768 from ghoulslash/ballthrow
...
Config for Catching Semi-Invulnerable Mons
2021-10-15 17:27:26 -03:00
ghoulslash
1f176242aa
add missing func definition
2021-10-15 16:06:50 -04:00
ghoulslash
c077091dbf
small fixes, check GetCatchingBattler's semi-invulnerability
2021-10-15 14:57:26 -04:00
ghoulslash
b94f710c80
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ballthrow
2021-10-15 14:49:37 -04:00
Eduardo Quezada D'Ottone
16f97f4b48
Merge pull request #1746 from ghoulslash/sand_spit
...
Fix sand spit + primal weather
2021-10-15 12:11:53 -03:00
Eduardo Quezada D'Ottone
0a090616ef
Merge pull request #1765 from ghoulslash/shell_smash
...
Shell Smash Animation
2021-10-15 12:09:06 -03:00
ghoulslash
ef19c8c415
fix gen define
2021-10-15 09:22:50 -04:00
ghoulslash
883a249836
config for catching semi-invulnerable mons
2021-10-15 09:20:32 -04:00
LOuroboros
2bf8022673
Changed how SIDE_STATUS_RETALIATE is cleared
2021-10-15 07:30:05 -03:00
LOuroboros
3a25bce185
Turned Retaliate's effect into a side status
2021-10-15 06:03:48 -03:00
LOuroboros
1f97198267
Oops, I forgot to take the opponent's side into account
2021-10-15 05:02:14 -03:00
Eduardo Quezada D'Ottone
8a6aee7546
Merge pull request #1581 from ghoulslash/bug_bite
...
Bug Bite and Stuff Cheeks
2021-10-14 20:09:58 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite
2021-10-14 19:46:50 -03:00
Eduardo Quezada D'Ottone
9b20fd4a07
Merge pull request #1748 from ghoulslash/memento
...
Fix memento Gen 7 fail condition
2021-10-14 18:27:01 -03:00
Eduardo Quezada D'Ottone
8be9e4ae1d
Merge pull request #1763 from BuffelSaft/battle_bond
...
Fix Battle Bond
2021-10-14 18:23:13 -03:00
ghoulslash
85ce72a4d0
add shell smash anim
2021-10-14 10:47:39 -04:00
ghoulslash
2e75325806
Merge pull request #1764 from BuffelSaft/storm_drain
...
Fix Storm Drain/Dive bug
2021-10-14 10:17:35 -04:00
BuffelSaft
85dd7ff63c
Fix Storm Drain/Dive bug
...
If Storm Drain is triggered by dive it should clear the attacker's semi-invulnerable status.
2021-10-14 16:40:18 +13:00
BuffelSaft
fc6e8f598c
Merge branch 'battle_engine' into battle_bond
2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b
Fix Battle Bond
...
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone
d689842689
Merge pull request #1657 from ghoulslash/rototiller
...
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
2021-10-13 22:45:50 -03:00
PikalaxALT
e12c7c07ac
New move tilemap bins are easier to edit
2021-10-13 21:01:47 -04:00
Eduardo Quezada D'Ottone
567dd9a8a4
Merge pull request #1754 from ghoulslash/terrain
...
Terrain Fixes
2021-10-13 21:36:01 -03:00
ghoulslash
7f2efb6619
format fixes, fix healing berries from printing message at full hp
2021-10-13 18:40:45 -04:00
ghoulslash
a3d2bdc9cf
merge with be
2021-10-13 18:30:53 -04:00
ghoulslash
5108d173fc
fix protect struct fields being set during ai calcs
2021-10-13 10:11:02 -04:00
ghoulslash
b447d582cd
fix terrain timer decrementing and bg changing with anims disabled
2021-10-13 09:04:03 -04:00
ghoulslash
3248bd796a
add quick draw
2021-10-12 21:49:18 -04:00
ghoulslash
f9272a89fa
add mirror armor check to two-stage stat decrease effects
2021-10-12 21:09:27 -04:00
ghoulslash
996301d5d3
add mirror armor
2021-10-12 18:04:34 -04:00
ghoulslash
c0f3b7c3b4
record abilities from wandering spirit
2021-10-12 11:58:37 -04:00
ghoulslash
25a4da71fe
remove unused macro
2021-10-12 10:37:59 -04:00
ghoulslash
bbd09fdcf7
add wandering spirit
2021-10-12 10:32:51 -04:00
ghoulslash
11626d5043
fix memento fail condition
2021-10-12 07:53:28 -04:00
ghoulslash
791a899eed
fix sand spit + primal weather
2021-10-11 21:29:08 -04:00
ghoulslash
e66820e646
Merge pull request #1744 from AsparagusEduardo/BE_configHiddenPow
...
Setting for pre-Gen6 Hidden Power Damage.
2021-10-11 15:13:16 -04:00
LOuroboros
6c550cd749
Implemented Retaliate's effect
2021-10-11 03:19:21 -03:00
ghoulslash
6212a3c431
Merge pull request #1703 from AsparagusEduardo/fix_ConfuseBerries
...
Fixed confuse berries affecting the wrong battler.
2021-10-10 20:21:03 -04:00
ghoulslash
06bcfea3b8
merge with be
2021-10-10 19:56:33 -04:00
ghoulslash
fcada4fcad
handle rototiller + prankster
2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82
Setting for pre-Gen6 Hidden Power Damage.
2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
3f51132af2
Merge pull request #1733 from ghoulslash/substitute_fix
...
Fix DoesSubstituteBlockMove calls
2021-10-10 18:53:44 -03:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles
...
Fix Safety Googles
2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
01f563cb5e
Fix infinite loop
2021-10-10 08:46:31 -03:00
BuffelSaft
8a7e6379b6
Merge pull request #1732 from ghoulslash/perish_song
...
Fix Soundproof cancelling out user's Perish Song
2021-10-10 22:55:20 +13:00
Eduardo Quezada D'Ottone
cf6e3873b4
Moved Electrified to Status4.
2021-10-10 01:13:23 -03:00
