Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

18854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GriffinR
95406384f4 Start wonder card/news documenting 2021-10-14 13:24:20 -04: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
GriffinR
ceb871e3fa Process calcrom options first 2021-10-14 10:15:08 -04:00
GriffinR
2f6928f016 Make calcrom data info optional 2021-10-14 09:52:33 -04:00
GriffinR
a8aef03a21
Merge pull request #1517 from GriffinRichards/fix-mapscriptdoc 
Small correction to map script comments
 2021-10-14 00:05:53 -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
GriffinR
9ab03f454d Small correction to map script comments 2021-10-13 23:24:10 -04: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
GriffinR
def6cc8158 Label battle script macro arguments 2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
GriffinR
b9f6dd128d
Merge pull request #1515 from GriffinRichards/fix-saveblockchunk 
Disallow negative sizes in SAVEBLOCK_CHUNK
 2021-10-13 13:30:53 -04:00
GriffinR
5860e0e937 Disallow negative sizes in SAVEBLOCK_CHUNK 2021-10-13 13:19:15 -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
BuffelSaft
61add8823e Fix Thief 
Thief doesn't work as a move end effect - the item steal animation only works if it runs before the target faints. This restores its original code and adds a simple check to handle its interaction with Parental Bond.
 2021-10-13 18:25:04 +13: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
ultima-soul
8e25d314bb Fix Safari Ball disappearing while capturing and restore Timer Ball's third frame usage. 2021-10-12 11:43:48 -07: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
GriffinR
b0598b1aef Clean up recorded_battle, add MOVE_IS_PERMANENT 2021-10-12 01:14:17 -04:00