11626 Commits

Author SHA1 Message Date
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
LOuroboros
1f97198267 Oops, I forgot to take the opponent's side into account 2021-10-15 05:02:14 -03:00
BuffelSaft
8db2e725d5 Parental Bond/Bug Bite interaction
Bug Bite's effect should only occur on the final strike of Parental Bond (which can also be the first strike if it KO's the target).
2021-10-15 17:07:02 +13:00
BuffelSaft
e59be67023 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-10-15 16:25:11 +13:00
BuffelSaft
3631561638 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald into genders-in-PSS 2021-10-15 16:17:55 +13:00
BuffelSaft
7610a9abad Fix bug with female icon sprites
Thanks to AsparagusEduardo for this code!
2021-10-15 16:17:08 +13:00
Eduardo Quezada D'Ottone
b9816f0f28 Saftety Goggles typo for Item Expansion 2021-10-14 20:38:13 -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
PikalaxALT
187f10be9d
Merge pull request #1518 from GriffinRichards/calcrom-data
Make calcrom data info optional
2021-10-14 15:22:28 -04:00
GriffinR
37e52c4f34 Document some mystery gift 2021-10-14 15:10:41 -04:00