GriffinR
c70ec9748a
Some union_room_chat clean up
2021-10-17 17:27:32 -04:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG
2021-10-17 17:38:54 -03:00
GriffinR
164590e37d
Merge pull request #1512 from GriffinRichards/minor-constants
...
Add some misc constants/usage
2021-10-17 11:32:30 -04: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
BuffelSaft
0b7072e007
Merge pull request #1780 from rh-hideout/revert-1666-bKGD_PE
...
Revert "Fix the 'bKGD: invalid index' error"
2021-10-17 23:49:26 +13:00
Eduardo Quezada D'Ottone
80d8e4cfd4
Revert "Fix the 'bKGD: invalid index' error"
2021-10-17 07:32:49 -03:00
GriffinR
ff594ccb82
Fix leftover icon_shadow names
2021-10-17 03:22:55 -04:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
GriffinR
d0455485c3
Clean up mystery gift headers
2021-10-17 02:18:24 -04:00
GriffinR
3cd27acbea
Document wonder news
2021-10-17 02:09:31 -04:00
GriffinR
5f9069628d
Clean up mevent2
2021-10-17 01:35:26 -04:00
GriffinR
c7d550e96c
Clean up wonder card/news view
2021-10-17 01:15:16 -04:00
GriffinR
356e6d7f08
Clean up mystery gift menu
2021-10-16 23:58:11 -04:00
GriffinR
845a5e99cc
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04: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
9986591b6f
Fixed Female Pyroar's sprite position
2021-10-16 17:22:24 -03: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
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle
2021-10-15 22:46:43 -04:00
GriffinR
1f39c34ca4
Merge branch 'master' into minor-constants
2021-10-15 22:44:49 -04:00
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union
...
Document link_rfu / Union Room
2021-10-15 22:44:01 -04: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
GriffinR
e3bb257bcf
Fix some trainer card link access
2021-10-15 12:22:19 -04:00
GriffinR
c02001c46d
Document mystery gift link scripts, general mystery gift
2021-10-15 12:05:06 -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
16a133bf54
Merge pull request #1766 from AsparagusEduardo/fix_gogglesIE
...
Saftety Goggles typo for Item Expansion
2021-10-15 10:13:53 -04: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
Eduardo Quezada D'Ottone
2e8ad12857
Merge pull request #1648 from BuffelSaft/genders-in-PSS
...
PSS supports gender differences (kinda)
2021-10-15 08:55:44 -03: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