LOuroboros
922bbacd71
Updated GetMonFriendshipScore
...
-Moved it to src/pokemon.c
-Made a battle specific variant called GetBattlerFriendshipScore.
-Made that variant return 0 for Mega Evolved 'mons and if called on link battles.
2022-08-26 21:33:43 -03:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection
...
Implement affection-now-friendship mechanics
2022-08-26 14:54:32 -04:00
DizzyEggg
6331931ba3
Fix Magic Coat targets
2022-08-26 15:01:51 +02:00
Eduardo Quezada
77e2a2da32
Fixed Net Ball Gen 7+ multiplier
2022-08-25 23:19:46 -04:00
LOuroboros
2cf2c00b29
Updated friendship labels
2022-08-25 17:10:11 -03:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves
...
Moves with EFFECT_PLACEHOLDER can't be used.
2022-08-25 15:34:23 -04:00
GriffinR
8a1130d046
Missing constant in friendshiptodamagecalculation
2022-08-25 10:21:41 -04:00
LOuroboros
e792fae415
Review corrections
...
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
2022-08-25 10:45:57 -03:00
ghoulslash
90ae339cac
Merge pull request #2240 from AsparagusEduardo/RHH_fixBEMerge
...
Included PR #2219 that was accidentally merged into BE
2022-08-25 08:47:38 -04:00
Eduardo Quezada
b2af7a1b47
Fixed critical capture fields not using TRUE or FALSE
2022-08-25 01:17:17 -04:00
Eduardo Quezada
30594a9773
Included PR that was accidentally merged into BE
2022-08-24 18:37:25 -04:00
DizzyEggg
91b76e2e4f
quash pr clean up
2022-08-24 23:39:34 +02:00
DizzyEggg
06b4548603
Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash
2022-08-24 23:35:42 +02:00
Eduardo Quezada D'Ottone
33e1562253
Merge pull request #2219 from aarant/battle_engine
...
Fixed Gen5+ multihit odds.
2022-08-24 00:34:58 -04:00
Eduardo Quezada
09fd393f97
Replaced instances of power == 0 with IS_MOVE_STATUS + fixed Wonder Skin
2022-08-23 22:38:35 -04:00
Eduardo Quezada
1f5adf93c7
Cleaned up use of configs be almost exclusively preproc functions
2022-08-23 21:00:08 -04:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
GriffinR
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -04:00
GriffinR
63468f9fcb
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
DizzyEggg
c991131b75
Change language stuff based on the french decomp
2022-08-04 11:53:16 +02:00
ExpoSeed
49da2ee53f
Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION
2022-08-02 00:15:55 -05:00
Ariel A
9a0a759b3f
Fixed multihit odds.
2022-08-01 20:23:25 -04:00
Eduardo Quezada
c6cdb2a281
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-31 22:57:46 -04:00
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
Eduardo Quezada
2214b01954
Forgot to include this fix
2022-07-29 17:07:56 -04:00
Eduardo Quezada
5d4b76c0ba
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd
Review changes
2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
aa93af4083
Fixed check
2022-07-29 10:34:21 -04:00
Eduardo Quezada
fa32f337be
Review changes
2022-07-29 10:21:20 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064
Cleanup by syncing src/battle_script_commands.c with pokefirered
2022-07-29 09:43:16 -04:00
ghoulslash
0c79d04dec
Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm
...
Prevent Transforming Pokémon from changing forms
2022-07-28 22:26:56 -04:00
Eduardo Quezada
09af7422d5
Further cleaning after comparing with pokefirered
...
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
2022-07-28 01:27:05 -04:00
Eduardo Quezada
b00bd8b181
Cleaned by comparing evolution_scene.c with pokefirered
2022-07-27 18:51:32 -04:00
Eduardo Quezada D'Ottone
aebd667260
Merge remote-tracking branch 'RHH/battle_engine' into BE_fixTransformForm
...
# Conflicts:
# src/battle_ai_main.c
2022-07-26 17:00:53 -04:00
LOuroboros
032b7b2ab9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection
2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone
8d18fc0dd8
Fixed Heal Ball not always healing caught Pokémon
2022-07-25 08:54:03 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
...
Battle Engine pret merge
2022-07-22 14:00:40 -04:00
ghoulslash
504600c996
Merge pull request #2201 from AsparagusEduardo/BE_sturdy
...
Config for Sturdy's Gen5+ effect.
2022-07-21 16:09:01 -04:00
Eduardo Quezada D'Ottone
343e685537
Sky Drop fixes
...
- Sky Drop was using lbs in the formula instead of hectograms. This has been fixed.
- Sky Drop is now affected by weight modifiers like Float Stone.
- Enabled AI_CheckBadMove for Sky Drop.
2022-07-20 15:13:53 -04:00
Eduardo Quezada D'Ottone
0f3fdd410a
Config for Sturdy's Gen5+ effect.
2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
ghoulslash
2b5bb9f6e4
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
2022-07-19 18:24:53 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
GriffinR
165f51a295
Merge pull request #1701 from GriffinRichards/faint-cmd-name
...
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
2022-07-16 08:15:54 -04:00
LOuroboros
0651cc9fe4
Updated Cmd_handleballthrow
2022-07-16 05:09:32 -03:00
Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
sphericalice
167353223c
Use MAX_MON_MOVES in Cmd_trysetencore
2022-07-11 15:23:23 +01:00
sphericalice
186f2c0232
Introduce a MOVE_UNAVAILABLE constant
2022-07-11 15:18:13 +01:00
GriffinR
2c4c9497d2
Fix comment
2022-07-06 15:02:17 -04:00
GriffinR
e6a374f2b6
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
2022-07-06 14:49:08 -04:00
LOuroboros
a1f921c33d
Fixed CanTeleport
...
Also took the chance to correct the syntax inside its switch case.
2022-07-04 16:15:44 -03:00
ghoulslash
e4bf99d777
merge w be
2022-07-03 16:20:05 -04:00
LOuroboros
8f728dcd79
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-07-03 13:49:18 -03:00
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
...
Config for lost money after losing a battle
2022-07-01 11:58:36 -04:00
ghoulslash
6cf0620f93
Merge pull request #2159 from Sneed69/trap-move-arrays
...
Trap move battle string related code cleanup
2022-07-01 11:07:28 -04:00
LOuroboros
deef09112f
Corrected usage of B_AFFECTION_MECHANICS in CalcCritChanceStage
2022-06-22 08:42:31 -03:00
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03:00
ghoulslash
c694e0cb90
merge w be
2022-06-05 08:22:24 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
sneed
86b436782a
trap move related code cleanup
2022-06-01 22:01:50 +03:00
hamish
307d5d93c4
add potlergeist animation
2022-05-23 08:53:08 -04:00
BuffelSaft
d29293f715
Prevent infinite Bide loop with Parental Bond
...
Prevent infinite loop from Bide + Parental Bond until this interaction can be implemented properly.
2022-05-22 13:05:45 +12:00
BuffelSaft
16570e8c3f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-22 12:55:55 +12:00
Sneed69
d0a2be9630
weather forms fixes and config
2022-05-22 03:20:48 +03:00
BuffelSaft
bd00df400a
Fix indentation in IsMoveAffectedByParentalBond
2022-05-22 11:51:20 +12:00
AgustinGDLV
729302c92e
Merge branch 'symbiosis' of https://github.com/AgustinGDLV/pokeemerald into symbiosis
2022-05-15 09:50:53 -07:00
AgustinGDLV
7cc284cf0b
learning GetBattlerHoldEffect is a thing
2022-05-15 09:50:12 -07:00
ghoulslash
ebb711b6e5
fix bug bite not activating if faints target. also save original move target through the effect
2022-05-13 18:24:52 -04:00
ghoulslash
cdd37ad1bb
fix stuff cheeks w new consumeberry impl
2022-05-13 16:28:23 -04:00
ghoulslash
f6f4227f49
better bug bite impl, fix item removal
2022-05-13 16:21:41 -04:00
BuffelSaft
bb25746e05
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-13 22:40:43 +12:00
Eduardo Quezada D'Ottone
f80bab897f
Merge pull request #2112 from AgustinGDLV/evo_battle
...
Gen 8 Evolution Mechanics (Battle Engine)
2022-05-09 17:40:19 -04:00
ghoulslash
07b0ce9737
add inner focus ability popup msg
2022-05-08 17:57:30 -04:00
AgustinGDLV
7b0154336d
Merge branch 'battle_engine' into symbiosis
2022-05-07 13:26:21 -07:00
AgustinGDLV
fa334b21f7
minor tweaks
2022-05-07 13:18:25 -07:00
AgustinGDLV
9d222d3ab4
fixed gems and damage-reducing berries
2022-05-07 13:12:21 -07:00
LOuroboros
195a290a98
Small corrections
2022-05-07 14:32:57 -03:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs
...
Once again, Battle Configs
2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone
dc25bc6145
Merge branch 'battle_engine' into BE_WhiteOutMoney
...
# Conflicts:
# include/constants/battle_string_ids.h
# src/battle_message.c
2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks
...
Primal Reversion Tweaks
2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone
096fe3c11d
Removed unecessary B_LEEK_ALWAYS_CRIT config
2022-05-07 10:56:31 -04:00
Eduardo Quezada D'Ottone
4e7ce0b663
Merge branch 'battle_engine' into BE_configs
...
# Conflicts:
# include/constants/battle_config.h
2022-05-07 10:25:34 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock
...
Add missing Heal Block functionalities
2022-05-07 09:13:18 -04:00
ghoulslash
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam
...
Steel Beam Move Effect Implementation
2022-05-07 08:40:34 -04:00
AgustinGDLV
2ffff788b4
fixed Fling
2022-05-06 22:29:40 -07:00
AgustinGDLV
542a0f07b4
fixed bug bite / bestow
2022-05-06 22:07:25 -07:00
BuffelSaft
3e645b1839
IsMoveAffectedByParentalBond supports dynamic move targeting
...
Update IsMoveAffectedByParentalBond to properly handle Expanding Force.
2022-05-07 14:37:02 +12:00
BuffelSaft
3e1934ebe3
Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE
...
Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.
2022-05-07 14:20:37 +12:00
BuffelSaft
8693db632b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-07 12:27:20 +12:00
AgustinGDLV
0cb6529ae2
functional but not perfect implementation
2022-05-06 14:53:16 -07:00
LOuroboros
43053d2e6c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-05-06 02:22:14 -03:00
AgustinGDLV
aff1d3949f
fixed spotlight function
2022-05-05 21:58:16 -07:00
AgustinGDLV
6235970722
added special battle evo changes
2022-05-05 11:41:27 -07:00
sneed
60d7d8f97e
Initial Commit
2022-05-03 03:38:44 +03:00
sneed
be6148d876
Add missing Heal Block functionalities
2022-05-02 04:54:25 +03:00
BuffelSaft
cbf0a6704b
Set Sticky Web user to Court Change user
...
This is for Mirror Armor to track the current user of Sticky Web/the mon that caused the stat drop.
2022-05-01 12:54:33 +12:00
BuffelSaft
af6242f2e0
Requested changes, Sticky Web edge case
...
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
2022-04-27 21:51:10 +12:00
BuffelSaft
5358cc0a00
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-04-25 13:38:13 +12:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
LOuroboros
434f6cf5ad
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-03-26 08:43:55 -03:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
BuffelSaft
6a119c5a30
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-02-13 21:06:15 +13:00
Eduardo Quezada D'Ottone
5e9767e067
Fixed actually checking for Sheer Cold instead of affecting all OHKO moves
2022-02-13 01:13:44 -03:00
Eduardo Quezada D'Ottone
dde65d5cea
Config for Sheer Cold being less accurate when not used by Ice type Pokémon
2022-02-13 01:07:42 -03:00
Eduardo Quezada D'Ottone
76e0b38960
Config for Pokémon with Oblivious being affected by Taunt
2022-02-12 23:57:23 -03:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks
2022-02-12 23:08:12 -03:00
LOuroboros
b52233ec31
Updated Conversion's effect
2022-02-11 21:42:39 -03:00
ghoulslash
209279c207
fix psycho shift string printing
2022-02-09 14:30:30 -05:00
BuffelSaft
9d1800f53e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
2022-01-27 17:18:51 +13:00
LOuroboros
8eaf0718ec
Review changes
...
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
ghoulslash
a165f9926d
canbestatused for psycho shift
2022-01-23 13:46:30 -05:00
LOuroboros
a8a8c7e2fa
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
b7df21b263
Optimized use of GetBattlerAbility
2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone
f42c4cd689
Merge pull request #1734 from ghoulslash/magician
...
Magician
2022-01-21 16:03:15 -03:00
Eduardo Quezada D'Ottone
ddfc3502f7
Fixed Pokémon Expansion flag name
2022-01-16 17:21:05 -03:00
ghoulslash
f3b9e6bb63
Merge pull request #1976 from kleeenexfeu/patch-2
...
[battle_engine] Moxie interaction with spread move/follow me fix
2022-01-16 10:58:50 -05:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician
2022-01-15 13:06:13 -03:00
Eduardo Quezada D'Ottone
80c1e11245
Merge branch 'BattleEngine' into BE_Instruct
...
# Conflicts:
# src/battle_script_commands.c
2022-01-13 20:13:01 -03:00
ghoulslash
2b69b02724
Merge pull request #2017 from AsparagusEduardo/BE_forbiddenAssist
...
Extrapolated Assist forbidden flags to Gen 8 moves
2022-01-13 11:52:11 -05:00
ghoulslash
035b2332af
cache ai damage, effectiveness calcs
2022-01-13 11:28:27 -05:00
LOuroboros
bee4019d22
Tweaked Protean's effect's InGame appearance
2022-01-11 19:52:51 -03:00
LOuroboros
352523403a
Fixed usage of B_MULTI_BATTLE_WHITEOUT
2022-01-09 14:57:45 -03:00
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
W1serV1ser
178c4c66ba
Fixed gSideTimers typo
2022-01-04 12:38:50 -08:00
W1serV1ser
66faa6aa15
Follow Me/Rage Powder effect on target goes away once affected by Sky Drop
2022-01-04 12:33:31 -08:00
Eduardo Quezada D'Ottone
d433d67558
Extrapolated Assist forbidden flags to Gen 8 moves
2022-01-01 20:21:29 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles
...
Multi battle updates
2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
ba43280a7c
Refactored Instruct to use the regular forbidden move lookup table
2021-12-29 21:04:15 -03:00
LOuroboros
cc1a243145
Update src/battle_script_commands.c
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-28 12:18:44 -03:00
W1serV1ser
e0f7e7a2d9
Updated variable name in MOVEEND_SKY_DROP_CONFUSE
2021-12-27 12:10:38 -08:00
Eduardo Quezada D'Ottone
4d6f54e8d6
Merge pull request #2007 from ghoulslash/be/roleplay
...
Update Role Play
2021-12-25 11:37:57 -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
LOuroboros
03205c995d
Update battle_script_commands.c
2021-12-24 01:59:40 -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
a725592a6b
Merge pull request #1999 from ghoulslash/be/moveeffect
...
More battle-will-end checks on stat-changing damaging effects
2021-12-23 20:23:16 -03:00
ghoulslash
b6b5d862f4
update role play mechanics
2021-12-23 08:37:11 -05:00
LOuroboros
cb44de13b3
B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT
2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports
2021-12-19 20:42:15 -03:00
LOuroboros
ffe35fbb06
Updated defeat condition on multi battles
2021-12-19 08:30:43 -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
ghoulslash
31bbc4ddde
prevent stat-raising damage effects if battle will end
2021-12-17 10:24:07 -05:00
ExpoSeed
65186b8c3a
Fix some style issues
2021-12-16 21:57:30 -06:00
