ghoulslash
c0e408bfab
fix aqua ring heal anim
2021-12-05 14:44:22 -05:00
LOuroboros
a5659f3339
AI partners no longer get exp.
2021-12-04 23:00:57 -03:00
Eduardo Quezada D'Ottone
1708ac4b1b
Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles.
2021-12-04 22:13:29 -03:00
kleeenexfeu
340d505116
Moxie/follow me fix
2021-12-04 17:41:31 +01:00
kleeenexfeu
e7321c22f2
Moxie spread move fix
2021-12-04 17:38:26 +01:00
ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
GriffinR
888bb4ae9e
Merge pull request #1570 from GriffinRichards/fix-flag
...
Fix incorrect flag animation palettes
2021-12-03 18:44:24 -05:00
GriffinR
8cbb207795
Merge pull request #1568 from GriffinRichards/fix-roamerstatus
...
Add BUGFIX for roamer's status
2021-12-03 16:58:53 -05:00
GriffinR
d501636730
Fix incorrect flag animation palettes
2021-12-03 16:36:18 -05:00
sphericalice
10c6630ffd
Remove extra spaces in battle strings
2021-12-03 19:34:03 +00:00
Eduardo Quezada D'Ottone
ae1d124a0c
Merge pull request #1969 from LOuroboros/patch-2
...
Removed ITEM_ENIGMA_BERRY_E_READER usage
2021-12-03 15:53:46 -03:00
LOuroboros
ac606364e9
Removed ITEM_ENIGMA_BERRY_E_READER usage
2021-12-03 15:44:12 -03:00
Eduardo Quezada D'Ottone
8058da5b88
Merge pull request #1963 from ghoulslash/be/aifix
...
Fix AI protect struct reset
2021-12-02 16:24:52 -03:00
ghoulslash
0434bf22e6
Merge pull request #1962 from LOuroboros/patch-2
...
One more merge conflict rejected
2021-12-02 13:20:14 -05:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ghoulslash
fbf74a9988
fix protect struct reset
2021-12-01 15:30:07 -05:00
LOuroboros
e7bef25fb1
Updated hold_effects.h
2021-12-01 13:32:43 -03:00
LOuroboros
19af517bbb
Edited pointless or useless Primal Reversion code
...
Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion.
Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion.
Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.
2021-12-01 00:56:33 -03:00
LOuroboros
f2dd7bce99
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks
2021-11-30 20:39:58 -03:00
Eduardo Quezada D'Ottone
14f974c9a9
Merge pull request #1954 from ghoulslash/be/aifix
...
revert ai item usage code
2021-11-30 14:06:25 -03:00
GriffinR
1a08d8fcb4
Add BUGFIX for roamer's status
2021-11-29 12:56:03 -05:00
ghoulslash
e731d93c0b
update a couple gen 3 ability names
2021-11-29 12:46:14 -05:00
ghoulslash
7a7c6afc39
larger ability popup, fix ability name printing/clearing, and config for longer ability names
2021-11-29 12:42:01 -05:00
GriffinR
83be1bfc8f
Remove sFiller from malloc.c
2021-11-29 11:19:30 -05:00
ghoulslash
d108f77aa4
revert ai item usage code
2021-11-28 13:12:56 -05:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
GriffinR
4c64863bc5
Merge pull request #1567 from LOuroboros/sBattleTerrainTable
...
Renamed gBattleTerrainTable
2021-11-27 23:43:22 -05:00
GriffinR
01859a63ff
Merge pull request #1566 from cbt6/move-speed
...
Rename speed parameter to distance in jump functions
2021-11-27 23:37:50 -05:00
LOuroboros
b042eb6436
gBattleTerrainTable -> sBattleTerrainTable
2021-11-28 01:22:27 -03:00
cbt6
c59c7b0518
Use enums for jump distances
2021-11-28 12:01:29 +08:00
cbt6
b6430098d4
Rename speed parameter to distance in jump functions
2021-11-28 12:01:29 +08:00
GriffinR
e677a00676
Merge pull request #1560 from GriffinRichards/retire-ok
...
Retire OK bot
2021-11-27 21:27:14 -05:00
ghoulslash
e2af9ec3b4
ice type immunity to sheer cold
2021-11-26 11:49:49 -05:00
LOuroboros
68c557fd46
Updated Light Ball's effect and improved readability
2021-11-24 19:04:15 -03:00
ghoulslash
95ad508868
baton pass status4_xx_sport
2021-11-23 21:25:03 -05:00
ghoulslash
5c52abd856
gen3 sport move functionality behind config
2021-11-23 21:20:32 -05:00
ghoulslash
b5bc8bb346
fix B_SPORT_DMG_REDUCTION
2021-11-23 18:37:27 -05:00
ghoulslash
e3ddad2d11
add sport effects back
2021-11-23 18:36:10 -05:00
BuffelSaft
cca7ec8c58
Fix and rename GetMoveTargetType
...
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 12:09:54 +13:00
kleeenexfeu
9b25e0147c
Update include/constants/battle_config.h
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-23 14:35:37 +01:00
kleeenexfeu
f2755ad970
reword B_RECALC_TURN_AFTER_ACTIONS explanation
2021-11-23 14:28:52 +01:00
kleeenexfeu
84e6e083f7
hate the explanations about turn order ._.
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-23 14:24:30 +01:00
kleeenexfeu
1a3561bb0b
space
2021-11-23 13:48:03 +01:00
kleeenexfeu
6ceffaaf3e
recalculate turn order after relevant actions
2021-11-23 13:46:36 +01:00
kleeenexfeu
1a5d3191e2
battle_engine merge
2021-11-23 13:38:36 +01:00
BuffelSaft
fd4414fe62
Spaces instead of tabs
2021-11-23 23:01:43 +13:00
BuffelSaft
a89ce0c38a
Swapped webs don't trigger Defiant
...
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?
Also, fix Sticky Web not activating Defiant.
2021-11-23 22:54:30 +13:00
BuffelSaft
499fb8071d
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-23 17:12:24 +13:00
BuffelSaft
fa0b5188bb
Dynamic move targeting
...
Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 16:56:11 +13:00
GriffinR
e0fae879da
Merge pull request #1558 from GriffinRichards/update-macros
...
Update event macro comments
2021-11-22 19:10:49 -05:00
