LOuroboros
ffe35fbb06
Updated defeat condition on multi battles
2021-12-19 08:30:43 -03:00
ultima-soul
18afd06f6d
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-18 00:28:18 -08:00
ultima-soul
b0b8b9bf46
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
TheXaman
fe95e88938
added option to view changes for front/back sprite picCoords and elevation live
2021-12-13 22:31:37 +01:00
TheXaman
f1f4082f62
added footprints
2021-12-13 19:24:19 +01:00
TheXaman
123969f093
fixed front sprite position including elevation and shadow for flying mon's (shadow palette too dark atm)
2021-12-13 15:05:17 +01:00
Eduardo Quezada D'Ottone
7ca07527fa
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
2021-12-12 12:33:49 -03:00
Eduardo Quezada D'Ottone
bbf7b62ceb
Config for lost money after losing a battle
2021-12-11 23:03:50 -03:00
TheXaman
51371661c2
Added new menu naviagtion, now all options can be changed
2021-12-11 15:03:56 +01:00
TheXaman
bbe918941e
added include/constants/pokemon_debug,h for defines, restructured code order
2021-12-11 12:13:14 +01:00
ultima-soul
26f29a04fd
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
...
This reverts commit ac2bcece75fa3bf5bc4018ce659e51a635d46b97, reversing
changes made to 349262ebc35abb090e51c689c74ee839713c83c6.
2021-12-10 09:41:54 -08:00
TheXaman
f6d9b74a1a
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug
2021-12-10 16:48:46 +01:00
Eduardo Quezada D'Ottone
aa2b2e6a70
Merge pull request #1929 from ultima-soul/battle_engine_sync
...
Battle Engine Upstream Sync
2021-12-09 20:02:45 -03:00
ultima-soul
ac2bcece75
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync
2021-12-09 14:16:05 -08:00
ultima-soul
a5afdac0ae
Resolved review suggestions for upstream Battle Engine sync.
2021-12-08 12:08:16 -08:00
DizzyEggg
97539d7443
Merge pull request #1951 from ghoulslash/be/sheercold
...
Ice Types immune to Sheer Cold
2021-12-06 14:12:06 +01:00
ghoulslash
c0e408bfab
fix aqua ring heal anim
2021-12-05 14:44:22 -05: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
ultima-soul
349262ebc3
Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync
2021-12-03 17:31:02 -08: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
TheXaman
40f7247e11
changed P_ENABLE_DEBUG to TRUE/FALSE
2021-12-03 11:02:22 +01:00
TheXaman
bf0d2b8393
Changed definition of P_ENABLE_DEBUG to pokemon_config.h
2021-12-02 19:29:04 +01:00
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
