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
d99ac2e44a
Resolved review suggestions for upstream Pokemon Expansion sync.
2021-12-09 09:51:28 -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
sphericalice
5c02facde4
Use more specific enum names for throwable Balls
2021-12-05 23:17:44 +00:00
sphericalice
3db871c49a
Refactor CanThrowLastUsedBall and related functions
2021-12-05 23:10:05 +00: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
Eduardo Quezada D'Ottone
96b8d21b7a
Added form switching + Button icons
2021-12-03 19:32:31 -03: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
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
TheXaman
c402a840b1
changed to P_ENABLE_DEBUG
2021-11-30 11:20:26 +01:00
TheXaman
50e95878e9
added Select button text, added gender based icons, imrpoved code
2021-11-30 11:16:30 +01:00
TheXaman
b0f8408fb6
added gender based sprites, added textbox line, adjusted sprite offset to match line
2021-11-30 02:29:33 +01:00
TheXaman
6c520659aa
implemented a inital pokemon debug menu based on code from Gamer2020 and AsparagusEduardo
2021-11-29 22:52:08 +01: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
ghoulslash
d108f77aa4
revert ai item usage code
2021-11-28 13:12:56 -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
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
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
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
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
