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
b0a1153a2b
Merge pull request #1600 from LOuroboros/gen6_footprints
...
Added footprints for Gen. 6 species
2021-09-06 10:36:46 +02: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
BuffelSaft
4c8a12006c
Fix Hammer Arm's effect chance
2021-09-06 19:45:30 +12:00
LOuroboros
7725ea0878
Fixed Milotic's shiny palette
...
Credits to Jaizu.
2021-09-06 04:13:45 -03:00
BuffelSaft
bdbb4b5f7e
Fix many Disguise bugs
...
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 18:27:42 +12:00
ultima-soul
2cda676b50
Merge pull request #1628 from LOuroboros/patch-2
...
Sync hold_effects.h with the BE
2021-09-04 11:57:49 -07:00
LOuroboros
376b65f6bf
Update hold_effects.h
2021-09-04 15:36:47 -03:00
ghoulslash
3066e09e68
decap pokemon in mental herb
2021-09-04 08:43:33 -04:00
ghoulslash
a9cbaa5966
fix mental herb encore, heal block
2021-09-04 08:40:43 -04:00
ghoulslash
f682e409f0
update mental herb desc
2021-09-04 08:19:57 -04:00
ghoulslash
e475813799
revert mental herb desc
2021-09-04 08:18:38 -04:00
ghoulslash
d66f3910d9
Merge branch 'mental_herb' of github.com:ghoulslash/pokeemerald into mental_herb
2021-09-03 17:41:09 -04:00
ghoulslash
933696b3cd
merge with be
2021-09-03 17:41:00 -04:00
ghoulslash
b362ce7f33
Merge pull request #1621 from BuffelSaft/move-data
...
Correct Liquidation and Sparkling Aria move data
2021-09-03 13:02:33 -06:00
ghoulslash
79f39a1fd0
fix eject button
2021-09-03 14:56:36 -04:00
ghoulslash
5c5276b04d
red card fixes
2021-09-03 14:29:28 -04:00
ghoulslash
4e2948012f
poison type still absorbs toxic spikes with heavy duty boots
2021-09-03 13:18:33 -04:00
ghoulslash
c7a587913b
replace statStages checks with CompareStat
2021-09-03 13:13:02 -04:00
ghoulslash
93e2e09148
fix terrain seeds. create generic CompareStat function
2021-09-03 12:17:38 -04:00
ghoulslash
7f4accdae4
fix room service switching in effect
2021-09-03 11:16:16 -04:00
ghoulslash
6ce1227447
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 11:05:11 -04:00
ExpoSeed
5a5c257f68
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine
...
Implement Pickpocket
2021-09-02 11:33:34 -07:00
BuffelSaft
13636f8691
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
...
moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
2021-09-02 16:15:58 +12:00
BuffelSaft
7d251c39f7
Correct Liquidation and Sparkling Aria
...
Liquidation is affected by Sheer Force, Sparkling Aria should hit both foes and ally.
2021-09-02 16:05:36 +12:00
BuffelSaft
cdb28f038f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into shields-down
2021-09-02 11:36:55 +12:00
LOuroboros
46fb92c4da
Optimized checks
2021-09-01 17:40:12 -03:00
ghoulslash
dd83e37261
Merge pull request #1615 from LOuroboros/choiceUTurn
...
Fixed U-turn and Choice Items interaction
2021-09-01 06:00:02 -06:00
ghoulslash
03e21bb27e
Merge pull request #1591 from BuffelSaft/mienshao
...
Fix Mienshao's front sprite
2021-09-01 05:58:51 -06:00
ghoulslash
39a254f80d
fix sprite pos changes
2021-09-01 07:45:41 -04:00
ghoulslash
dfe59992d3
merge with be
2021-09-01 07:37:45 -04:00
BuffelSaft
3371773e5c
Move touchedProtectLike to protect structs
...
This makes more sense than putting it in DisableStruct.
2021-09-01 21:34:47 +12:00
BuffelSaft
eb0f0b7ce8
Fix Sucker Punch vs Protect moves
...
Might as well do this here too. Sucker Punch should fail against Protect, not trigger Protect's effects.
2021-09-01 21:32:07 +12:00
BuffelSaft
ea6ce80ad4
Fix protect-like moves
...
Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target.
This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.
2021-09-01 19:57:03 +12:00
LOuroboros
9990bda7a4
Fixed if statement for stat recalculation
...
Thanks to Syreldar.
2021-09-01 02:55:15 -03:00
