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
StubbornOne
b21740b757
Merge branch 'rh-hideout:battle_engine' into battle_engine
2021-09-10 10:09:09 +08: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
DizzyEggg
6a8f55dabf
fix galvanice explosion
2021-09-08 12:38:46 +02:00
ghoulslash
acee60ff3c
Merge pull request #1633 from BuffelSaft/smellysalt
...
Fix MOVE_EFFECT_REMOVE_STATUS
2021-09-07 06:34:45 -06:00
BuffelSaft
bd92552fb6
Add new line to burn was healed string
2021-09-07 16:39:42 +12:00
BuffelSaft
a4b630e6b5
Fix MOVE_EFFECT_REMOVE_STATUS
...
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.
Also, fix Ice Hammer's effect chance.
2021-09-07 16:34:32 +12:00
GriffinR
4037cf147b
Merge pull request #1500 from GriffinRichards/fix-healthboxgfx
...
Move more gfx symbols into gHealthboxElementsGfxTable
2021-09-06 21:47:44 -04:00
GriffinR
b183a793a1
Move more gfx symbols into gHealthboxElementsGfxTable
2021-09-06 17:45:10 -04:00
GriffinR
4dbaca9dc6
Merge pull request #1499 from froggestspirit/master
...
Identify unknown healthbox GFX
2021-09-06 16:54:28 -04:00
froggestspirit
71da126dbb
case
2021-09-06 16:41:59 -04:00
froggestspirit
5f755757f9
Const rename
2021-09-06 11:40:40 -04:00
froggestspirit
f8a24cdd6f
Identify unknown healthbox GFX
2021-09-06 10:42:05 -04:00
froggestspirit
73554ec88d
Merge remote-tracking branch 'pret/master'
2021-09-06 10:32:14 -04:00
ghoulslash
e93ad2e255
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble
2021-09-06 09:24:28 -04:00
ghoulslash
949c4ef63b
add ability popup
2021-09-06 09:24:15 -04:00
LOuroboros
3113e4fa12
Moved stat recalculation to HandleEndTurn_FinishBattle
2021-09-06 07:40:35 -03:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost
...
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
2021-09-06 11:32:53 +02:00
BuffelSaft
734e0aa74d
Add brackets
...
Oops!
2021-09-06 20:56:02 +12:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2
...
Fix many Disguise bugs
2021-09-06 10:32:37 +02:00
DizzyEggg
fa081d1fc5
Merge pull request #1618 from BuffelSaft/protect-like
...
Fix protect-like moves
2021-09-06 10:24:29 +02:00
DizzyEggg
67fd379771
Merge pull request #1632 from BuffelSaft/hammer-arm
...
Fix Hammer arm's effect chance
2021-09-06 10:16:47 +02:00
