ultima-soul
d408b56549
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
ultima-soul
a68a39e35f
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-12-01 20:17:49 -08:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
LOuroboros
e7bef25fb1
Updated hold_effects.h
2021-12-01 13:32:43 -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
ghoulslash
7a7c6afc39
larger ability popup, fix ability name printing/clearing, and config for longer ability names
2021-11-29 12:42:01 -05:00
ultima-soul
01a90ca6c2
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-27 22:17:05 -08:00
ultima-soul
d0623d7b71
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-27 21:40:08 -08:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
Eduardo Quezada D'Ottone
fa995894b7
Added Nature evolution methods
2021-11-27 20:46:19 -03:00
Eduardo Quezada D'Ottone
7c6f76323a
Added NidoranM/Volbeat Ditto breeding config + Rotom & Furfrou
2021-11-26 22:56:48 -03:00
ghoulslash
e2af9ec3b4
ice type immunity to sheer cold
2021-11-26 11:49:49 -05:00
ghoulslash
5c52abd856
gen3 sport move functionality behind config
2021-11-23 21:20:32 -05:00
ghoulslash
e3ddad2d11
add sport effects back
2021-11-23 18:36:10 -05: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
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
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
6b8f86c276
Snap Trap placeholder anims
...
Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.
2021-11-23 11:05:36 +13:00
BuffelSaft
ff60882b29
Requested changes
2021-11-23 11:04:39 +13:00
BuffelSaft
50d0cd52e8
Clean up Corrosive Gas
...
Remove code and unused move effect.
2021-11-22 15:13:54 +13:00
BuffelSaft
d2eb5f0e61
Remove shell trap effect code
...
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
2021-11-22 14:46:47 +13:00
BuffelSaft
42b8f18cb1
Remove Corrosive Gas code
...
This was not working at all in testing, so it can be done by a separate PR later.
2021-11-22 14:35:01 +13:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
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
