Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine
...
Added Sky Drop to Battle Engine
2022-01-07 18:14:40 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports
...
Add sport effects back
2021-12-24 18:59:50 -03:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
W1serV1ser
58a5a9cbec
Simplified skyDropTargets storage and made other minor improvements
...
A lot of these changes are based on ghoulslash's version of Sky Drop.
2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai
...
Smart Wild AI Option
2021-12-23 20:18:18 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports
2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy
2021-12-18 13:38:12 -03: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
ultima-soul
26f29a04fd
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
...
This reverts commit ac2bcece75349262ebc3
2021-12-10 09:41:54 -08: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
SonikkuA-DatH
76136c4858
Update battle_main.c
2021-12-03 18:07:35 -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
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -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
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
ghoulslash
95ad508868
baton pass status4_xx_sport
2021-11-23 21:25:03 -05: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
62f01e89d7
Fix Burmy form change
...
Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.
2021-11-23 00:46:43 +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
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
Eduardo Quezada D'Ottone
dee7f97a8d
Merge branch 'battle_engine' into battle_ai
2021-11-21 14:46:09 -03:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08:00
kleeenexfeu
62b31aec55
syntax
2021-11-20 02:12:43 +01:00
kleeenexfeu
da20dae9c3
Only recalculate speed for battler choosing a move
...
Other actions have priority
2021-11-20 02:09:33 +01:00
kleeenexfeu
c1743db19a
follow suggestion
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:45 +01:00
kleeenexfeu
fa4d71817b
Spaces instead of tab
2021-11-19 22:30:30 +01: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
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
...
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR
f42eafc85b
Merge branch 'master' into doc-banim
2021-11-13 23:26:46 -05:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
ghoulslash
65cb371104
fix needing to 'run' twice
2021-11-11 16:16:46 -05:00
ghoulslash
2fac38cc83
merge w be
2021-11-11 16:16:26 -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
4590887359
Clean up some register constant use
2021-11-10 17:01:21 -05:00
GriffinR
8e424b6985
Merge branch 'master' into doc-binterface
2021-11-09 16:09:48 -05:00
GriffinR
684f599a44
Label remaining battle_interface symbols
2021-11-08 16:03:44 -05:00
GriffinR
e3b6337c3a
Finish battle_anim_mons doc
2021-11-08 14:29:37 -05:00
Eduardo Quezada D'Ottone
c2a17510a9
Terrain Pulse animations
2021-11-07 11:25:08 -03:00
ghoulslash
41bf1dc2f4
merge w be
2021-11-06 10:40:57 -04:00
Eduardo Quezada D'Ottone
62b6accbcc
Using IsBattlerTerrainAffected
2021-11-06 11:07:40 -03:00
Eduardo Quezada D'Ottone
ae8de0f07a
Merge branch 'BattleEngine' into BE_TerrainMoves
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_util.c
2021-11-06 10:44:05 -03:00
LOuroboros
5f458c9cd3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-05 10:58:53 -03:00
ghoulslash
0b2542e447
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai
2021-11-05 09:46:12 -04:00
BuffelSaft
616be576fc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2
2021-11-04 15:29:38 +13:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
Eduardo Quezada D'Ottone
6ee2a3aba1
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# src/battle_main.c
2021-11-03 20:44:25 -03:00
ghoulslash
48c29a9cd8
proper mirror armor sticky web targeting
2021-11-03 15:05:52 -04:00
LOuroboros
af6e72ecfe
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-03 08:56:01 -03:00
BuffelSaft
6ce1f01b8c
Hunger Switch and Aura Wheel
...
Implement the ability Hunger Switch and the move Aura Wheel.
2021-11-03 19:45:03 +13:00
ghoulslash
98b4b821dc
merge with be
2021-11-01 13:55:55 -04:00
ghoulslash
af914ee7ed
merge w be
2021-10-29 22:33:50 -04:00
ghoulslash
28bc7dc14d
start ability
2021-10-29 22:32:19 -04:00
BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix
...
Fix iteam healing after a failed move
2021-10-30 15:25:28 +13:00
ghoulslash
2502820e83
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 09:03:14 -04:00
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04:00
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -04:00
LOuroboros
fc7f1acf20
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 11:13:59 -03:00
Eduardo Quezada D'Ottone
d4eaa73292
Added check in IsRunningFromBattleImpossible.
2021-10-26 20:45:59 -03:00
Eduardo Quezada D'Ottone
abb8a97d21
Merge pull request #1616 from LOuroboros/statCalcs
...
Added configs for modern post-battle stat calcs
2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists
2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw
...
Quick Draw
2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone
d0253640fb
Merge pull request #1739 from LOuroboros/primalReversionBE
...
Implemented Primal Reversion
2021-10-22 22:27:45 -03:00
ghoulslash
fa8fa32259
Update src/battle_main.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-10-19 11:52:50 -04:00
ghoulslash
ebc86bb247
update baton pass status3 bits
2021-10-19 09:38:27 -04:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
ghoulslash
eda99fcf29
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
...
Add gStatutes4
2021-10-19 08:45:47 -04:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
Eduardo Quezada D'Ottone
3c6101d957
Clear gStatuses4 data
2021-10-18 21:55:16 -03:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle
2021-10-15 22:46:43 -04:00
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union
...
Document link_rfu / Union Room
2021-10-15 22:44:01 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -04:00
ghoulslash
5108d173fc
fix protect struct fields being set during ai calcs
2021-10-13 10:11:02 -04:00
ghoulslash
3248bd796a
add quick draw
2021-10-12 21:49:18 -04:00
GriffinR
b0598b1aef
Clean up recorded_battle, add MOVE_IS_PERMANENT
2021-10-12 01:14:17 -04:00
Eduardo Quezada D'Ottone
cf6e3873b4
Moved Electrified to Status4.
2021-10-10 01:13:23 -03:00
GriffinR
d8e65fc4b6
More battle doc, add battle window ids
2021-10-09 03:01:10 -04:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union
2021-10-07 16:10:35 -04:00
ghoulslash
658235c03d
merge with be
2021-10-06 14:33:26 -04:00
ghoulslash
ee3a2c97ee
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball
2021-10-06 13:54:40 -04:00
ghoulslash
4382420dd2
merge with be
2021-10-06 13:32:59 -04:00
ultima-soul
ce4375a10c
Ported new Ball catch rate modifier effects from Item Expansion.
2021-10-06 10:28:18 -07:00
ghoulslash
040e56b758
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_ai
2021-10-06 10:05:55 -04:00
Eduardo Quezada D'Ottone
43d42c95cf
Terrain Pulse effect implemented
2021-10-04 22:45:37 -03:00
GriffinR
6e62c057f5
Document remaining symbols in pokemon.c
2021-10-02 23:48:12 -04:00
Eduardo Quezada D'Ottone
6208995606
Fixed Run Away.
2021-10-02 15:52:55 -03:00
LOuroboros
43e73ac576
Fixed Safari Zone
2021-10-01 05:25:25 -03:00
Pokestia
38a4dea402
Rename Battle Weather flags
2021-09-30 12:08:20 +02:00
ghoulslash
e75a8fb67c
merge ai move and item decisions. AI will prefer to defeat player over healing
2021-09-27 21:03:27 -04:00
