ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
ghoulslash
3404039330
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn
...
Mega Evolution alters turn order
2021-11-21 08:12:21 -05:00
Eduardo Quezada D'Ottone
31d7719429
Merge pull request #1913 from LOuroboros/healingItems
...
Changed I_LEGACY_HEALING_ITEMS
2021-11-20 23:37:24 -03:00
ghoulslash
3fb62f74c6
fix rampage cancelling
2021-11-20 18:35:56 -05:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08:00
kleeenexfeu
6402a7ab6e
follow suggestion
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:42:20 +01:00
kleeenexfeu
acddeeb1f9
follow suggestion
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:33 +01:00
LOuroboros
ad8582064b
#elif without condition bad, #else good
2021-11-19 18:49:30 -03:00
kleeenexfeu
03a9f3f413
Mega Evolution alters turn order
2021-11-19 22:03:10 +01:00
BuffelSaft
14a2e86313
Fix Scale Shot
...
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
2021-11-19 21:57:32 +13:00
BuffelSaft
98712e576e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2021-11-19 17:48:11 +13:00
TheXaman
2f8896f2f0
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
2021-11-18 15:13:04 +01:00
GriffinR
b9fa18bdd4
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros
2021-11-17 22:03:37 -05:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
...
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR
eb95ac0b9c
Document field_tasks
2021-11-17 14:44:42 -05:00
LOuroboros
7ae30f8913
I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY
...
Also fixed its inaccurate description.
2021-11-17 07:15:14 -03:00
LOuroboros
7d71fe6ce8
I_NEW_VITAMIN_EV_CAP -> I_VITAMIN_EV_CAP
2021-11-16 21:25:03 -03:00
LOuroboros
f62ec0630a
Updated Vitamins cap
2021-11-16 18:36:49 -03:00
GriffinR
d414787932
Some TV clean-up
2021-11-16 16:22:17 -05:00
GriffinR
5d9c31a610
Label slot machine ids, fix GetPriceReduction
2021-11-16 15:43:52 -05:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
Eduardo Quezada D'Ottone
cc833ebb59
Created macro + config for always critting when using high-crit moves
2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone
a1bd6bd52f
Updated species that benefit from Leek
2021-11-15 22:30:20 -03:00
LOuroboros
5c485d9769
Fixed Fling when gLastUsedItem is 0
...
Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.
2021-11-15 14:02:33 -03:00
GriffinR
65d3b58374
Add PARTY_NOTHING_CHOSEN
2021-11-15 10:57:06 -05:00
LOuroboros
de74177966
Oops
2021-11-15 12:52:05 -03:00
LOuroboros
a01fd2eb7a
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d
Fling tweaks
...
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
2021-11-15 12:40:10 -03:00
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks
...
Adjusted elements to simplify the conflicts between BE and IE
2021-11-15 08:27:28 -05:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off
...
Fix Knock Off, add config
2021-11-14 08:27:51 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim
2021-11-13 23:26:46 -05:00
GriffinR
9a932cd9c3
Merge pull request #1549 from GriffinRichards/doc-binterface
...
Document remaining symbols in battle_interface, palette, and save
2021-11-13 23:19:08 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata
...
Clean up sound, add CRY_MODE constants
2021-11-13 15:54:40 -05:00
Eduardo Quezada D'Ottone
bcbdb353f5
Adjusted elements to simplify the conflicts between BE and IE
2021-11-13 12:10:20 -03:00
Eduardo Quezada D'Ottone
67f12ef782
Fixed Hold Effect file spacing
2021-11-13 11:56:17 -03:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
ghoulslash
a4204e5491
Update include/constants/battle_config.h
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-11-13 08:50:24 -05:00
LOuroboros
2fe015e5ce
Implemented Fling
2021-11-13 10:27:05 -03:00
ghoulslash
c4efe06f38
wish update
2021-11-12 17:55:05 -05:00
Eduardo Quezada D'Ottone
a7870dbef0
Merge branch 'battle_engine' into magician
2021-11-12 19:40:34 -03:00
ghoulslash
96fd8e696b
brick break gen 4 and 5 config. clears aurora veil
2021-11-12 15:00:21 -05:00
ultima-soul
294fecd57c
Merge pull request #1888 from ghoulslash/be/contrary
...
Fix Contrary Animation
2021-11-12 10:19:37 -08:00
ghoulslash
a26da51e9d
fix contrary animations for MOVE_EFFECT_statchange
2021-11-12 12:44:45 -05:00
ultima-soul
c5dabf34b8
Improve Serene Grace boost config comment.
2021-11-12 09:39:18 -08:00
ghoulslash
6214d8b625
rename config
2021-11-12 07:47:24 -05:00
BuffelSaft
bdbdd0564f
Fix Knock Off, add config
...
Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.
2021-11-12 21:05:42 +13:00
Eduardo Quezada D'Ottone
ae26a7529c
Restored FRLG items
2021-11-11 22:26:58 -03:00
ghoulslash
adc1413d98
add kings rock serene grace boost config
2021-11-11 17:48:15 -05:00
ultima-soul
fd4d0db912
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects
2021-11-10 18:02:00 -08:00
GriffinR
343ac99049
Start pokenav conditions doc
2021-11-10 17:00:54 -05:00
