ghoulslash
806be64935
format fixes
2021-09-16 17:10:41 -04:00
ghoulslash
b6862a4153
fix jumptocalledmove for assist + attackcanceler
2021-09-16 14:01:19 -04:00
ghoulslash
af8d86f0c9
merge with be
2021-09-16 13:33:35 -04:00
ghoulslash
c2e0990aab
fix some merge conflicts
2021-09-16 13:29:36 -04:00
ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
ghoulslash
ac42b19de7
some formatting fixes
2021-09-16 11:54:27 -04:00
ghoulslash
a50f03a06b
magic bounce overrides prankster blockage
2021-09-16 11:53:24 -04:00
ghoulslash
2067f563cd
cannot block your own prankster elevated perish song
2021-09-16 11:47:05 -04:00
ghoulslash
aeafd9e222
perish song + prankster interaction
2021-09-16 11:34:01 -04:00
ghoulslash
aac7ae3595
add MOVE_TARGET_ALL_BATTLERS
2021-09-16 10:45:33 -04:00
ghoulslash
9c94eb6140
but it failed check for rototiller
2021-09-16 10:24:32 -04:00
ghoulslash
85f3982fb9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster
2021-09-15 17:52:45 -04:00
ghoulslash
f61d516aad
some syntax/format fixes
2021-09-15 17:15:50 -04:00
ghoulslash
845e333ba1
fix electric/misty terrain interactions with yawn/rest failures
2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300
merge with be
2021-09-15 16:42:23 -04:00
ghoulslash
705b765067
update multistring chooser labels in GetMentalHerbEffect
2021-09-15 14:51:24 -04:00
ghoulslash
0bca01cb74
mental herb fixes
2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a
merge with be
2021-09-15 12:54:39 -04:00
ghoulslash
801ba039d6
fix red card
2021-09-14 19:18:53 -04:00
ghoulslash
c4ce4c150d
fix eject pack
2021-09-14 15:38:16 -04:00
ghoulslash
55c3e152cf
replace some BufferStatChange, fix room service and terrain seeds
2021-09-14 15:07:15 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -04:00
ghoulslash
60713a8f2d
fix room service activation msg, stat target
2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f
merge with be
2021-09-13 19:40:28 -04:00
BuffelSaft
7d3980de58
Fix multihit moves vs damage reducing berries
...
The extra waitmessage command is ugly but appears to be needed - if it's moved before the printstring, the message isn't displayed long enough on single hit moves.
2021-09-12 18:33:04 +12:00
LOuroboros
acf755fb9c
Fixed SPECIES_UNOWN
2021-09-11 04:35:16 -03:00
BuffelSaft
dc5259ed3f
PSS supports gender differences (kinda)
...
Update the PSS to show gender-specific icons for mons that have them. Comes with a small but harmless bug - could use some suggestions for fixing it!
2021-09-11 16:59:39 +12:00
BuffelSaft
4aa7c096b7
Show gender differences in evo scene
2021-09-11 16:30:09 +12:00
BuffelSaft
db928a1329
Data entry for new sprites
...
Add sprite defines, entries to gender tables, etc.
2021-09-11 14:12:41 +12:00
BuffelSaft
0f5444d331
Add sprites and icons for major gender differences
...
Credit to MrDollSteak for the sprites - I palette swapped the hippos and made some of the icons, but everything else is MrDS!
2021-09-11 13:52:09 +12:00
ultima-soul
fd6f7eadbb
Merge pull request #1645 from BuffelSaft/sandshrew
...
Add alolan Sandshrew line to gSpeciesToNationalPokedexNum
2021-09-09 19:13:06 -07:00
StubbornOne
b21740b757
Merge branch 'rh-hideout:battle_engine' into battle_engine
2021-09-10 10:09:09 +08:00
BuffelSaft
b598efa956
Add alolan Sandshrew line to gSpeciesToNationalPokedexNum
2021-09-10 13:47:53 +12:00
PikalaxALT
0c2e9a5b4c
Merge pull request #1502 from GriffinRichards/clean-lilycovelady
...
Clean up Lilycove Lady
2021-09-09 16:04:08 -04:00
GriffinR
cbf8863e5b
Clean up Lilycove Lady
2021-09-09 15:24:34 -04:00
ghoulslash
0cd7f3ffcd
Merge pull request #1635 from rh-hideout/DizzyEggg-galvanize_explosion
...
fix galvanize explosion + lightning rod
2021-09-09 12:04:42 -06:00
DizzyEggg
c5b810b508
Merge pull request #1643 from ghoulslash/echoed_voice
...
better echoed voice power boost
2021-09-09 19:59:45 +02:00
ghoulslash
f9cc09dc48
tweak formula
2021-09-09 13:54:16 -04:00
ghoulslash
92429c7649
better echoed voice power boost
2021-09-09 13:38:46 -04:00
ghoulslash
9d3f906fda
Merge pull request #1537 from DizzyEggg/intimidate_popup
...
Fix lag caused by ability pop-up while it's set to False
2021-09-09 09:34:50 -06:00
DizzyEggg
90c837deb6
Merge pull request #1642 from ghoulslash/echoed_voice
...
Fix echoed voice power boost
2021-09-09 17:32:27 +02:00
ghoulslash
6915b029bd
fix echoed voice power boost
2021-09-09 11:15:58 -04:00
DizzyEggg
9ad4feecf2
Merge pull request #1641 from ghoulslash/power_herb
...
Fix Item Activation Messages
2021-09-09 16:29:40 +02:00
ghoulslash
875bc52d48
fix resist berry item print msg
2021-09-09 10:15:18 -04:00
ghoulslash
5c9c425590
fix power herb actiation message
2021-09-09 10:03:24 -04:00
ghoulslash
d7938bc2dc
Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster
2021-09-09 09:44:25 -04:00
ghoulslash
b8a71cabd1
merge with be
2021-09-09 09:44:18 -04:00
DizzyEggg
4c9660bff1
Merge pull request #1579 from ghoulslash/embargo
...
Add Embargo Effect
2021-09-08 20:03:08 +02:00
DizzyEggg
decf65a025
Merge pull request #1580 from ghoulslash/water_bubble
...
Water Bubble Prevents Burn
2021-09-08 20:00:45 +02:00
