LOuroboros
cf027176a8
Made ENDTURN_RETALIATE use constants
2021-10-22 11:43:38 -03:00
LOuroboros
24876ac5e3
Small tweak for BattleScript_EffectRapidSpin
2021-10-22 07:21:31 -03:00
LOuroboros
dd82e051bd
Fixed Rapid Spin raising Speed even when the move fails
2021-10-22 07:21:10 -03:00
LOuroboros
34fe0c54be
Fixed Retaliate timer's value decrease
...
I made an oopsie, basically.
Thanks to Xavion#9504 for the fix.
2021-10-21 09:11:12 -03:00
Eduardo Quezada D'Ottone
2bd8ded9d2
Merge pull request #1791 from ghoulslash/baton_pass
...
Update Baton Pass
2021-10-19 13:47:17 -03:00
ghoulslash
416c517e49
Merge pull request #1786 from Xavion3/damage_debug
...
Adds simulated damage to the debug menu
2021-10-19 12:14:38 -04:00
ghoulslash
fa8fa32259
Update src/battle_main.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-10-19 11:52:50 -04:00
ghoulslash
ebc86bb247
update baton pass status3 bits
2021-10-19 09:38:27 -04:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
ghoulslash
eda99fcf29
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
...
Add gStatutes4
2021-10-19 08:45:47 -04:00
ghoulslash
305a12161c
Merge pull request #1771 from BuffelSaft/mulit_target
...
Fix multi target moves
2021-10-19 08:43:46 -04:00
Xavion3
6a16813ce8
Rename menu option to be more appropriate to changed info
2021-10-19 23:01:07 +11:00
Xavion3
4673ff30e4
Allow the AI to see damage against it's partner
2021-10-19 23:00:40 +11:00
Xavion3
055c1c47b7
Fix double battles damage scoring
2021-10-19 23:00:04 +11:00
Xavion3
150dd7c633
Add damage information to the debug menus
2021-10-19 22:39:07 +11:00
LOuroboros
da70accc3e
Oopsie
2021-10-19 08:02:36 -03:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
LOuroboros
2dea4f6782
Forgot to port over a return for jumpifcantreverttoprimal
2021-10-19 07:23:02 -03:00
BuffelSaft
910fdfa94a
Revert "Fix multi target moves"
...
This reverts commit b5293cc3e2
2021-10-19 16:25:01 +13:00
Eduardo Quezada D'Ottone
3c6101d957
Clear gStatuses4 data
2021-10-18 21:55:16 -03:00
ghoulslash
91e6c8fb0e
Merge pull request #1784 from LOuroboros/gravAppleAI
...
Small AI improvement related to Grav Apple
2021-10-18 09:18:25 -04:00
LOuroboros
25255475a7
AI will now take Grav Apple's new effect in consideration
2021-10-18 10:05:19 -03:00
ghoulslash
8dc77e6fe3
Merge pull request #1782 from LOuroboros/glare
...
Updated Glare
2021-10-17 22:11:33 -04:00
Eduardo Quezada D'Ottone
e3252a68cd
Merge pull request #1545 from MissingNoL/PLG
...
Implemented PLG move effects
2021-10-17 18:30:50 -03:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG
2021-10-17 17:38:54 -03:00
LOuroboros
e7ad7319e3
Updated Glare
2021-10-17 12:03:35 -03:00
LOuroboros
dcea8e45ed
Fixed jumpifspecies
2021-10-17 10:51:55 -03:00
Eduardo Quezada D'Ottone
aa344aa0a2
Merge pull request #1781 from LOuroboros/dynaCannon
...
Set the right .effect to Dynamax Cannon
2021-10-17 10:17:18 -03:00
LOuroboros
5d0350cdbc
Set the right .effect to Dynamax Cannon
2021-10-17 10:08:30 -03:00
Eduardo Quezada D'Ottone
df817fb2ab
Merge pull request #1772 from LOuroboros/gravApple
...
Added Grav Apple's power boost
2021-10-17 09:51:29 -03:00
LOuroboros
d6304099ac
Review optimization
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-10-17 09:42:31 -03:00
LOuroboros
59cfbe55c1
Gave Grav Apple a move effect of its own
2021-10-17 09:27:35 -03:00
Eduardo Quezada D'Ottone
9ebc436a9d
Merge pull request #1776 from ghoulslash/move_target
...
Expand move target field to u16
2021-10-16 18:27:29 -03:00
ghoulslash
964e7efba9
fix MOVE_TARGET_ALL_BATTLERS and other u8 vars
2021-10-16 16:23:17 -04:00
Eduardo Quezada D'Ottone
d8400416ac
Merge pull request #1773 from ghoulslash/prankster
...
Redo Prankster
2021-10-16 17:15:29 -03:00
ghoulslash
5509ceea04
expand move target field
2021-10-16 16:10:45 -04:00
ghoulslash
b7dcbca871
remove atkCancelerTracker reset
2021-10-16 11:25:20 -04:00
ghoulslash
611076c24d
move prankster to ABILITYEFFECT_MOVES_BLOCK
2021-10-16 10:15:15 -04:00
LOuroboros
c2e25272b0
Added Grav Apple's power boost
2021-10-16 07:02:26 -03:00
BuffelSaft
df2223a5bc
Merge pull request #1745 from LOuroboros/retaliate
...
Implemented Retaliate's effect
2021-10-16 22:49:32 +13:00
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
