18854 Commits

Author SHA1 Message Date
ghoulslash
ab529b4e89 add stuff cheeks 2021-07-27 10:31:48 -06:00
ghoulslash
3dcfc0fc12 fix default wild ai flag logic 2021-07-27 09:53:47 -06:00
ghoulslash
0a0687ae78 add smart wild AI 2021-07-27 09:49:39 -06:00
GriffinR
80c77fc120
Merge pull request #1487 from LOuroboros/hidden_item_flags
Re-ordered the hidden item flags list
2021-07-27 10:36:20 -04:00
LOuroboros
f1195e1884 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-07-27 09:08:52 -03:00
LOuroboros
8012f4b25a Re-ordered the hidden item flags list
Instead of sorting them by location, it makes more sense to sort them by their value.
2021-07-26 20:18:11 -03:00
ghoulslash
4ca6d76160 add bug bite 2021-07-25 14:55:52 -06:00
GriffinR
b5bc762dc7
Merge pull request #1486 from sphericalice/pss-constant-fix
Use the correct constant for PSS page comparison
2021-07-25 12:49:35 -04:00
ghoulslash
c914ed8572 fix sucker punch, surging strikes, obstruct, and snipe shot 2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06:00
ghoulslash
fd61770c34 water bubble prevents burn 2021-07-25 07:53:44 -06:00
ghoulslash
eadd09bebd block item use under embargo 2021-07-25 07:39:02 -06:00
sphericalice
71de6ea939 Use the correct constant for PSS page comparison 2021-07-24 18:54:37 +01:00
ghoulslash
e6a2d2226f
Merge pull request #1540 from DizzyEggg/rage_powder
Rage powder updated to gen6
2021-07-24 07:15:58 -06:00
ghoulslash
72d346fa46
Merge pull request #1560 from rh-hideout/DizzyEggg-patch-3
Fix White Smoke affecting Shell Smash's def drop
2021-07-24 07:14:08 -06:00
ghoulslash
fd69375489
Merge pull request #1575 from Blackforest92/pokemon_expansion
Fix Arctozolt, Heliolisk, and Chespin
2021-07-24 07:13:16 -06:00
Blackforest92
365b578a66 Fix Arctozolt, Heliolisk, and Chespin 2021-07-24 13:46:02 +07:00
GriffinR
0e22b21b14
Merge pull request #1485 from LOuroboros/patch-3
Removed unused status ailment constants
2021-07-23 13:15:46 -04:00
LOuroboros
bfa824f761
Removed unused status ailment constants 2021-07-23 13:18:24 -03:00
GriffinR
e67729f647 Remove address comments in sound directory 2021-07-21 00:56:04 -04:00
Ariel Antonitis
f3cb35467a Merge branch 'romhack' into lighting 2021-07-20 19:45:40 -04:00
Ariel Antonitis
783149bd3f Fixed bug where moving truck had a shadow. 2021-07-20 19:38:32 -04:00
GriffinR
06351bf63c Remove address comments 2021-07-20 15:18:31 -04:00
ghoulslash
07e3e73372 fix ITEM_NONE to 0 for compilation reasons 2021-07-18 11:20:51 -06:00
ghoulslash
d1bc7b5676 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-07-18 11:16:53 -06:00
ghoulslash
25f9458fea
Merge pull request #1573 from LOuroboros/undoformchange
Fixed calls to UndoFormChange in battle_script_commands.c
2021-07-18 11:16:41 -06:00
ghoulslash
45d4cee243 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-07-18 11:11:03 -06:00
LOuroboros
29b1ba2a3c Fixed calls to UndoFormChange in battle_script_commands.c 2021-07-18 12:34:17 -03:00
PikalaxALT
bea170e8e9
Merge pull request #1483 from PikalaxALT/symbols_merge_commit
Use merge commit message for symbols branch
2021-07-16 12:59:03 -04:00
PikalaxALT
52512cfbe1 Use merge commit message for symbols branch 2021-07-16 12:15:53 -04:00
DizzyEggg
312583de5e
Merge pull request #1564 from BuffelSaft/form-capture
Undo form changes on capture
2021-07-16 09:22:23 +02:00
DizzyEggg
304f3b9203
Merge pull request #1565 from BuffelSaft/disguise-fix
Fix Disguise reverting on switch out
2021-07-16 09:17:10 +02:00
BuffelSaft
d2d7b6ffef Remove Mimikyu check from loop
More efficient than checking in each loop iteration.
2021-07-16 18:09:41 +12:00
BuffelSaft
90fdb74ccb Remove UndoFormChangeOnSwitch
Handle switching out Mimikyu Busted in UndoFormChange.
2021-07-16 17:56:53 +12:00
ultima-soul
3fca4c82a0
Merge pull request #1572 from LOuroboros/pikachu
Assigned dummy anims to the front sprite of each Pikachu and Pichu special form
2021-07-15 10:10:05 -07:00
LOuroboros
e55fe62d59 Assigned dummy anims to the front sprite of each Pikachu and Pichu special form 2021-07-15 13:42:51 -03:00
DizzyEggg
96b0700ea9
Merge pull request #1513 from Blackforest92/pokemon_expansion
Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor
2021-07-15 11:17:06 +02:00
DizzyEggg
d6400448fd
Merge pull request #1563 from ghoulslash/battle_ai
AI_IsTerrainAffected checks
2021-07-15 09:36:47 +02:00
ghoulslash
a29c9f9339
Merge pull request #1569 from LOuroboros/cotton_down
Fixed Cotton Down
2021-07-13 11:06:59 -06:00
ghoulslash
ebc187c16d
Merge pull request #1536 from DizzyEggg/gravity
Fix Gravity's animation
2021-07-13 10:54:45 -06:00
LOuroboros
02eace4574 Fixed Cotton Down
It will no longer affect fainted 'mons.
2021-07-13 13:54:33 -03:00
TheXaman
883995da16 shortened "human like" to "humane" to avoid clipping 2021-07-12 12:30:28 +02:00
GriffinR
a274cc6a76
Merge branch 'master' into flatten_sprite_pos 2021-07-12 01:39:28 -04:00
GriffinR
876a89eba4
Merge pull request #1482 from cstyles/physical-macro
Use the `IS_TYPE_PHYSICAL` macro in `AddMovePoints`
2021-07-12 01:25:05 -04:00
Collin Styles
eab1d7b5b1 Use the IS_TYPE_PHYSICAL macro in AddMovePoints 2021-07-11 22:02:24 -07:00
GriffinR
01f2381e01 Add LINK_MANAGER field comments from SDK 2021-07-11 16:48:59 -04:00
TheXaman
9a5c196cd0 recursive printing of evolutions aka now shows all follow up evolutions aswell, even complexer lines like Wurmple 2021-07-11 11:49:57 +02:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
BuffelSaft
63faa6e3a9 Fix Disguise reverting on switch out
Make Mimikyu's disguise stay busted when it's switched out.
2021-07-11 14:15:24 +12:00
BuffelSaft
8d432e4e34 Undo form changes on capture
This will revert busted Mimikyu, Schooling Wishiwashi etc. to their base forms when caught.
2021-07-11 12:51:27 +12:00