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
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
Eduardo Quezada D'Ottone
e87c170db0
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# src/battle_main.c
# src/battle_script_commands.c
2021-09-23 18:20:35 -03:00
Eduardo Quezada D'Ottone
13a464ffa4
Merge pull request #1673 from ghoulslash/gen8_move_effects
...
Gen8 move effects Fixes
2021-09-23 18:04:20 -03:00
ghoulslash
2f69748e0d
merge with be
2021-09-23 14:38:01 -04:00
ghoulslash
33972b5493
merge with be
2021-09-23 12:04:13 -04:00
ghoulslash
3f34fec42f
change last ball graphic based on config. replace saveblock field with ewram field
2021-09-23 12:03:01 -04:00
Eduardo Quezada D'Ottone
d084d2a68d
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# include/battle.h
# src/battle_main.c
# src/battle_script_commands.c
2021-09-22 23:42:00 -03:00
Eduardo Quezada D'Ottone
075c0299a1
Better names for Micle and Custap flags
2021-09-22 23:29:26 -03:00
Eduardo Quezada D'Ottone
380e1e470c
Applied use of TRUE and FALSE for flags.
2021-09-22 23:29:00 -03:00
ghoulslash
936f2c7bcb
fix eject pack weak armor special case
2021-09-22 21:51:37 -04:00
ghoulslash
d738297f24
merge with be
2021-09-22 16:26:09 -04:00
ghoulslash
1309eea8ec
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects
2021-09-22 09:43:48 -04:00
ghoulslash
13062b5a8f
fix lash out, obstruct, and decorate
2021-09-22 09:43:40 -04:00
ghoulslash
fc84ebbd3e
redo prankster checks to handle assist
2021-09-22 08:06:42 -04:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change
2021-09-21 22:34:37 -03:00
Eduardo Quezada D'Ottone
f338813c6a
Merge pull request #1538 from DizzyEggg/double_onemon_battles
...
Support for double battles with only one pokemon
2021-09-20 23:40:08 -03:00
ghoulslash
0ea6c65b83
merge with be
2021-09-17 09:10:09 -04:00
ghoulslash
af8d86f0c9
merge with be
2021-09-16 13:33:35 -04:00
ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
ghoulslash
95af97593b
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 11:53:35 -04:00
LOuroboros
3113e4fa12
Moved stat recalculation to HandleEndTurn_FinishBattle
2021-09-06 07:40:35 -03:00
